Skip to content

Commit 59a8064

Browse files
committed
go.mod: update github.com/containers/image/v5
Version 5.22 introduced a new option to /etc/containers/policy.json called keyPaths, see containers/image#1609 EL9 immediately took advantage of this new feature and started using it, see https://gitlab.com/redhat/centos-stream/rpms/containers-common/-/commit/04645c4a84442da3324eea8f6538a5768e69919a This quickly became an issue in our code: The go library (containers/image) parses the configuration file very strictly and refuses to create a client when policy.json with an unknown key is present on the filesystem. As we used 5.21.1 that doesn't know the new key, our unit tests started to failing when containers-common was present. Reproducer: podman run --pull=always --rm -it centos:stream9 dnf install -y dnf-plugins-core dnf config-manager --set-enabled crb dnf install -y gpgme-devel libassuan-devel krb5-devel golang git-core git clone https://github.com/osbuild/osbuild-composer cd osbuild-composer # install the new containers-common and run the test dnf install -y https://kojihub.stream.centos.org/kojifiles/packages/containers-common/1/44.el9/x86_64/containers-common-1-44.el9.x86_64.rpm go test -count 1 ./... # this returns: --- FAIL: TestClientResolve (0.00s) client_test.go:31: Error Trace: client_test.go:31 Error: Received unexpected error: Unknown key "keyPaths" invalid policy in "/etc/containers/policy.json" github.com/containers/image/v5/signature.NewPolicyFromFile /osbuild-composer/vendor/github.com/containers/image/v5/signature/policy_config.go:88 github.com/osbuild/osbuild-composer/internal/container.NewClient /osbuild-composer/internal/container/client.go:123 github.com/osbuild/osbuild-composer/internal/container_test.TestClientResolve /osbuild-composer/internal/container/client_test.go:29 testing.tRunner /usr/lib/golang/src/testing/testing.go:1439 runtime.goexit /usr/lib/golang/src/runtime/asm_amd64.s:1571 Test: TestClientResolve client_test.go:32: Error Trace: client_test.go:32 Error: Expected value not to be nil. Test: TestClientResolve When run with an older containers-common, it succeeds: dnf install -y https://kojihub.stream.centos.org/kojifiles/packages/containers-common/1/40.el9/x86_64/containers-common-1-40.el9.x86_64.rpm go test -count 1 ./... PASS To sum it up, I had to upgrade github.com/containers/image/v5 to v5.22.0. Unfortunately, this wasn't so simple, see go get github.com/containers/image/v5@latest go: github.com/containers/image/[email protected] requires github.com/letsencrypt/[email protected] requires github.com/honeycombio/[email protected] requires github.com/gobuffalo/pop/[email protected] requires github.com/mattn/[email protected]+incompatible: reading github.com/mattn/go-sqlite3/go.mod at revision v2.0.3: unknown revision v2.0.3 It turns out that github.com/mattn/[email protected]+incompatible has been recently retracted mattn/go-sqlite3#998 and this broke a ton of packages depending on it. I was able to fix it by adding exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible to our go.mod, see mattn/go-sqlite3#975 (comment) After adding it, go get github.com/containers/image/v5@latest succeeded and tools/prepare-source.sh took care of the rest. Signed-off-by: Ondřej Budai <[email protected]>
1 parent 774cc9e commit 59a8064

File tree

694 files changed

+89345
-49135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

694 files changed

+89345
-49135
lines changed

go.mod

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ module github.com/osbuild/osbuild-composer
22

33
go 1.16
44

5+
exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible
6+
57
require (
68
cloud.google.com/go/cloudbuild v1.2.0
7-
cloud.google.com/go/compute v1.6.1
8-
cloud.google.com/go/storage v1.22.0
9+
cloud.google.com/go/compute v1.7.0
10+
cloud.google.com/go/storage v1.22.1
911
github.com/Azure/azure-pipeline-go v0.2.3
10-
github.com/Azure/azure-sdk-for-go v63.4.0+incompatible
12+
github.com/Azure/azure-sdk-for-go v66.0.0+incompatible
1113
github.com/Azure/azure-storage-blob-go v0.13.0
1214
github.com/Azure/go-autorest/autorest v0.11.27
1315
github.com/Azure/go-autorest/autorest/azure/auth v0.5.11
14-
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
15-
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
16-
github.com/BurntSushi/toml v1.1.0
17-
github.com/aws/aws-sdk-go v1.44.4
16+
github.com/BurntSushi/toml v1.2.0
17+
github.com/aws/aws-sdk-go v1.44.44
1818
github.com/containers/common v0.48.0
19-
github.com/containers/image/v5 v5.21.1
19+
github.com/containers/image/v5 v5.22.0
2020
github.com/coreos/go-semver v0.3.0
2121
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
2222
github.com/deepmap/oapi-codegen v1.8.2
@@ -35,20 +35,20 @@ require (
3535
github.com/labstack/echo/v4 v4.7.2
3636
github.com/labstack/gommon v0.3.1
3737
github.com/opencontainers/go-digest v1.0.0
38-
github.com/opencontainers/image-spec v1.0.3-0.20211202193544-a5463b7f9c84
38+
github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198
3939
github.com/openshift-online/ocm-sdk-go v0.1.266
4040
github.com/oracle/oci-go-sdk/v54 v54.0.0
4141
github.com/prometheus/client_golang v1.12.1
4242
github.com/segmentio/ksuid v1.0.4
43-
github.com/sirupsen/logrus v1.8.1
43+
github.com/sirupsen/logrus v1.9.0
4444
github.com/spf13/cobra v1.4.0
45-
github.com/stretchr/testify v1.7.1
45+
github.com/stretchr/testify v1.8.0
4646
github.com/ubccr/kerby v0.0.0-20170626144437-201a958fc453
4747
github.com/vmware/govmomi v0.28.0
48-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
49-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
50-
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150
51-
google.golang.org/api v0.75.0
52-
google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3
48+
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2
49+
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
50+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8
51+
google.golang.org/api v0.86.0
52+
google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f
5353
gopkg.in/ini.v1 v1.66.6
5454
)

go.sum

Lines changed: 709 additions & 41 deletions
Large diffs are not rendered by default.

vendor/cloud.google.com/go/.release-please-manifest-submodules.json

Lines changed: 105 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/cloud.google.com/go/.release-please-manifest.json

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/cloud.google.com/go/CHANGES.md

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/cloud.google.com/go/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/cloud.google.com/go/README.md

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/cloud.google.com/go/compute/apiv1/accelerator_types_client.go

Lines changed: 18 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/cloud.google.com/go/compute/apiv1/addresses_client.go

Lines changed: 22 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)