29f66a251f
Version 5.22 introduced a new option to /etc/containers/policy.json called
keyPaths, see
https://github.com/containers/image/pull/1609
EL9 immediately took advantage of this new feature and started using it, see
04645c4a84
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/v5@v5.22.0 requires
github.com/letsencrypt/boulder@v0.0.0-20220331220046-b23ab962616e requires
github.com/honeycombio/beeline-go@v1.1.1 requires
github.com/gobuffalo/pop/v5@v5.3.1 requires
github.com/mattn/go-sqlite3@v2.0.3+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/go-sqlite3@v2.0.3+incompatible has been
recently retracted https://github.com/mattn/go-sqlite3/pull/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
https://github.com/mattn/go-sqlite3/issues/975#issuecomment-955661657
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 <ondrej@budai.cz>
54 lines
2 KiB
Modula-2
54 lines
2 KiB
Modula-2
module github.com/osbuild/osbuild-composer
|
|
|
|
go 1.16
|
|
|
|
exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible
|
|
|
|
require (
|
|
cloud.google.com/go/cloudbuild v1.2.0
|
|
cloud.google.com/go/compute v1.7.0
|
|
cloud.google.com/go/storage v1.22.1
|
|
github.com/Azure/azure-pipeline-go v0.2.3
|
|
github.com/Azure/azure-sdk-for-go v66.0.0+incompatible
|
|
github.com/Azure/azure-storage-blob-go v0.13.0
|
|
github.com/Azure/go-autorest/autorest v0.11.27
|
|
github.com/Azure/go-autorest/autorest/azure/auth v0.5.11
|
|
github.com/BurntSushi/toml v1.2.0
|
|
github.com/aws/aws-sdk-go v1.44.44
|
|
github.com/containers/common v0.48.0
|
|
github.com/containers/image/v5 v5.22.0
|
|
github.com/coreos/go-semver v0.3.0
|
|
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
|
|
github.com/deepmap/oapi-codegen v1.8.2
|
|
github.com/getkin/kin-openapi v0.93.0
|
|
github.com/go-openapi/swag v0.21.1 // indirect
|
|
github.com/gobwas/glob v0.2.3
|
|
github.com/golang-jwt/jwt/v4 v4.4.1
|
|
github.com/google/go-cmp v0.5.8
|
|
github.com/google/uuid v1.3.0
|
|
github.com/gophercloud/gophercloud v0.24.0
|
|
github.com/hashicorp/go-retryablehttp v0.7.1
|
|
github.com/jackc/pgtype v1.11.0
|
|
github.com/jackc/pgx/v4 v4.16.0
|
|
github.com/julienschmidt/httprouter v1.3.0
|
|
github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b
|
|
github.com/labstack/echo/v4 v4.7.2
|
|
github.com/labstack/gommon v0.3.1
|
|
github.com/opencontainers/go-digest v1.0.0
|
|
github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198
|
|
github.com/openshift-online/ocm-sdk-go v0.1.266
|
|
github.com/oracle/oci-go-sdk/v54 v54.0.0
|
|
github.com/prometheus/client_golang v1.12.1
|
|
github.com/segmentio/ksuid v1.0.4
|
|
github.com/sirupsen/logrus v1.9.0
|
|
github.com/spf13/cobra v1.4.0
|
|
github.com/stretchr/testify v1.8.0
|
|
github.com/ubccr/kerby v0.0.0-20170626144437-201a958fc453
|
|
github.com/vmware/govmomi v0.28.0
|
|
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2
|
|
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
|
|
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8
|
|
google.golang.org/api v0.86.0
|
|
google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f
|
|
gopkg.in/ini.v1 v1.66.6
|
|
)
|