go.mod: update github.com/containers/image/v5
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>
This commit is contained in:
parent
fa514c5326
commit
29f66a251f
694 changed files with 90636 additions and 50426 deletions
40
vendor/github.com/proglottis/gpgme/.appveyor.yml
generated
vendored
40
vendor/github.com/proglottis/gpgme/.appveyor.yml
generated
vendored
|
|
@ -1,40 +0,0 @@
|
|||
---
|
||||
version: 0.{build}
|
||||
platform: x86
|
||||
branches:
|
||||
only:
|
||||
- master
|
||||
|
||||
clone_folder: c:\gopath\src\github.com\proglottis\gpgme
|
||||
|
||||
environment:
|
||||
GOPATH: c:\gopath
|
||||
GOROOT: C:\go-x86
|
||||
CGO_LDFLAGS: -LC:\gpg\lib
|
||||
CGO_CFLAGS: -IC:\gpg\include
|
||||
GPG_DIR: C:\gpg
|
||||
|
||||
install:
|
||||
- nuget install 7ZipCLI -ExcludeVersion
|
||||
- set PATH=%appveyor_build_folder%\7ZipCLI\tools;%PATH%
|
||||
- appveyor DownloadFile https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-2.1.20_20170403.exe -FileName gnupg-w32-2.1.20_20170403.exe
|
||||
- 7z x -o%GPG_DIR% gnupg-w32-2.1.20_20170403.exe
|
||||
- copy "%GPG_DIR%\lib\libgpg-error.imp" "%GPG_DIR%\lib\libgpg-error.a"
|
||||
- copy "%GPG_DIR%\lib\libassuan.imp" "%GPG_DIR%\lib\libassuan.a"
|
||||
- copy "%GPG_DIR%\lib\libgpgme.imp" "%GPG_DIR%\lib\libgpgme.a"
|
||||
- set PATH=%GOPATH%\bin;%GOROOT%\bin;%GPG_DIR%\bin;C:\MinGW\bin;%PATH%
|
||||
- C:\cygwin\bin\sed -i 's/"GPG_AGENT_INFO"/"GPG_AGENT_INFO="/;s/C.unsetenv(v)/C.putenv(v)/' %APPVEYOR_BUILD_FOLDER%\gpgme.go
|
||||
|
||||
test_script:
|
||||
- go test -v github.com/proglottis/gpgme
|
||||
|
||||
|
||||
build_script:
|
||||
- go build -o example_decrypt.exe -i %APPVEYOR_BUILD_FOLDER%\examples\decrypt.go
|
||||
- go build -o example_encrypt.exe -i %APPVEYOR_BUILD_FOLDER%\examples\encrypt.go
|
||||
|
||||
artifacts:
|
||||
- path: example_decrypt.exe
|
||||
name: decrypt example binary
|
||||
- path: example_encrypt.exe
|
||||
name: encrypt example binary
|
||||
32
vendor/github.com/proglottis/gpgme/.travis.yml
generated
vendored
32
vendor/github.com/proglottis/gpgme/.travis.yml
generated
vendored
|
|
@ -1,32 +0,0 @@
|
|||
---
|
||||
language: go
|
||||
os:
|
||||
- linux
|
||||
- osx
|
||||
- windows
|
||||
dist: xenial
|
||||
sudo: false
|
||||
|
||||
go:
|
||||
- 1.11
|
||||
- 1.12
|
||||
- 1.13
|
||||
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- libgpgme11-dev
|
||||
homebrew:
|
||||
packages:
|
||||
- gnupg
|
||||
- gnupg@1.4
|
||||
- gpgme
|
||||
update: true
|
||||
|
||||
matrix:
|
||||
allow_failures:
|
||||
- os: windows
|
||||
|
||||
before_install:
|
||||
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install msys2; fi
|
||||
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install gpg4win; fi
|
||||
2
vendor/github.com/proglottis/gpgme/gpgme.go
generated
vendored
2
vendor/github.com/proglottis/gpgme/gpgme.go
generated
vendored
|
|
@ -1,7 +1,7 @@
|
|||
// Package gpgme provides a Go wrapper for the GPGME library
|
||||
package gpgme
|
||||
|
||||
// #cgo LDFLAGS: -lgpgme -lassuan -lgpg-error
|
||||
// #cgo pkg-config: gpgme
|
||||
// #cgo CPPFLAGS: -D_FILE_OFFSET_BITS=64
|
||||
// #include <stdlib.h>
|
||||
// #include <gpgme.h>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue