fix(autodiscovery/dockercompose): skip images whose tag is not a version by jouve · Pull Request #9760 · updatecli/updatecli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/plugins/autodiscovery/dockercompose/compose.go
50 changes: 43 additions & 7 deletions pkg/plugins/autodiscovery/dockercompose/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,24 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/updatecli/updatecli/pkg/plugins/utils/docker"
"github.com/updatecli/updatecli/pkg/plugins/utils/version"
)

func TestDiscoverManifests(t *testing.T) {

testdata := []struct {
name string
rootDir string
digest bool
Auths map[string]docker.InlineKeyChain
versionFilter version.Filter
expectedPipelines []string
}{
{
name: "Scenario 1 - digest",
rootDir: "testdata",
digest: true,
expectedPipelines: []string{`name: 'deps(dockercompose): bump "jenkinsci/jenkins" digest'
expectedPipelines: []string{
`name: 'deps(dockercompose): bump "jenkinsci/jenkins" digest'
sources:
jenkins-lts:
name: 'get latest image tag for "jenkinsci/jenkins"'
Expand Down Expand Up @@ -92,7 +94,8 @@ targets:
Token: "mysecretToken",
},
},
expectedPipelines: []string{`name: 'deps(dockercompose): bump "jenkinsci/jenkins" tag'
expectedPipelines: []string{
`name: 'deps(dockercompose): bump "jenkinsci/jenkins" tag'
sources:
jenkins-lts:
name: 'get latest image tag for "jenkinsci/jenkins"'
Expand Down Expand Up @@ -137,6 +140,40 @@ targets:
sourceid: 'jenkins-weekly'
transformers:
- addprefix: 'jenkinsci/jenkins:'
`,
},
},
{
// A tag that Masterminds semver cannot parse at all leaves a nil
// dockerimage spec and fails GreaterThanPattern. That service has to be
// skipped without crashing, and without discarding the manifest already
// found for the service listed before it.
name: "Scenario 3 - no digest, tag not parseable as a version",
rootDir: "testdata-unparsable-tag",
digest: false,
versionFilter: version.Filter{Kind: "semver", Pattern: "patch"},
expectedPipelines: []string{
`name: 'deps(dockercompose): bump "jenkinsci/jenkins" tag'
sources:
a-pinned:
name: 'get latest image tag for "jenkinsci/jenkins"'
kind: 'dockerimage'
spec:
image: 'jenkinsci/jenkins'
tagfilter: ''
versionfilter:
kind: 'semver'
pattern: '2.150.x'
targets:
a-pinned:
name: 'deps: update Docker image "jenkinsci/jenkins" to "{{ source "a-pinned" }}"'
kind: 'yaml'
spec:
file: 'docker-compose.yaml'
key: '$.services.a-pinned.image'
sourceid: 'a-pinned'
transformers:
- addprefix: 'jenkinsci/jenkins:'
`,
},
},
Expand All @@ -147,8 +184,9 @@ targets:
digest := tt.digest
composefile, err := New(
Spec{
Digest: &digest,
Auths: tt.Auths,
Digest: &digest,
Auths: tt.Auths,
VersionFilter: tt.versionFilter,
}, tt.rootDir, "", "")

require.NoError(t, err)
Expand All @@ -169,8 +207,6 @@ targets:
pipelines = append(pipelines, string(rawPipelines[i]))
assert.Equal(t, tt.expectedPipelines[i], pipelines[i])
}

})
}

}
Loading