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>
186 lines
5.1 KiB
Go
186 lines
5.1 KiB
Go
// Copyright 2022 Google LLC
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
// Code generated by protoc-gen-go_gapic. DO NOT EDIT.
|
|
|
|
// Package longrunning is an auto-generated package for the
|
|
// Long Running Operations API.
|
|
//
|
|
// NOTE: This package is in alpha. It is not stable, and is likely to change.
|
|
//
|
|
// Example usage
|
|
//
|
|
// To get started with this package, create a client.
|
|
// ctx := context.Background()
|
|
// c, err := longrunning.NewOperationsClient(ctx)
|
|
// if err != nil {
|
|
// // TODO: Handle error.
|
|
// }
|
|
// defer c.Close()
|
|
//
|
|
// The client will use your default application credentials. Clients should be reused instead of created as needed.
|
|
// The methods of Client are safe for concurrent use by multiple goroutines.
|
|
// The returned client must be Closed when it is done being used.
|
|
//
|
|
// Using the Client
|
|
//
|
|
// The following is an example of making an API call with the newly created client.
|
|
//
|
|
// ctx := context.Background()
|
|
// c, err := longrunning.NewOperationsClient(ctx)
|
|
// if err != nil {
|
|
// // TODO: Handle error.
|
|
// }
|
|
// defer c.Close()
|
|
//
|
|
// req := &longrunningpb.ListOperationsRequest{
|
|
// // TODO: Fill request struct fields.
|
|
// // See https://pkg.go.dev/google.golang.org/genproto/googleapis/longrunning#ListOperationsRequest.
|
|
// }
|
|
// it := c.ListOperations(ctx, req)
|
|
// for {
|
|
// resp, err := it.Next()
|
|
// if err == iterator.Done {
|
|
// break
|
|
// }
|
|
// if err != nil {
|
|
// // TODO: Handle error.
|
|
// }
|
|
// // TODO: Use resp.
|
|
// _ = resp
|
|
// }
|
|
//
|
|
// Use of Context
|
|
//
|
|
// The ctx passed to NewClient is used for authentication requests and
|
|
// for creating the underlying connection, but is not used for subsequent calls.
|
|
// Individual methods on the client use the ctx given to them.
|
|
//
|
|
// To close the open connection, use the Close() method.
|
|
//
|
|
// For information about setting deadlines, reusing contexts, and more
|
|
// please visit https://pkg.go.dev/cloud.google.com/go.
|
|
package longrunning // import "cloud.google.com/go/longrunning/autogen"
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
"os"
|
|
"runtime"
|
|
"strconv"
|
|
"strings"
|
|
"unicode"
|
|
|
|
"google.golang.org/api/option"
|
|
"google.golang.org/grpc/metadata"
|
|
)
|
|
|
|
// For more information on implementing a client constructor hook, see
|
|
// https://github.com/googleapis/google-cloud-go/wiki/Customizing-constructors.
|
|
type clientHookParams struct{}
|
|
type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error)
|
|
|
|
var versionClient string
|
|
|
|
func getVersionClient() string {
|
|
if versionClient == "" {
|
|
return "UNKNOWN"
|
|
}
|
|
return versionClient
|
|
}
|
|
|
|
func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context {
|
|
out, _ := metadata.FromOutgoingContext(ctx)
|
|
out = out.Copy()
|
|
for _, md := range mds {
|
|
for k, v := range md {
|
|
out[k] = append(out[k], v...)
|
|
}
|
|
}
|
|
return metadata.NewOutgoingContext(ctx, out)
|
|
}
|
|
|
|
func checkDisableDeadlines() (bool, error) {
|
|
raw, ok := os.LookupEnv("GOOGLE_API_GO_EXPERIMENTAL_DISABLE_DEFAULT_DEADLINE")
|
|
if !ok {
|
|
return false, nil
|
|
}
|
|
|
|
b, err := strconv.ParseBool(raw)
|
|
return b, err
|
|
}
|
|
|
|
// DefaultAuthScopes reports the default set of authentication scopes to use with this package.
|
|
func DefaultAuthScopes() []string {
|
|
return []string{
|
|
"",
|
|
}
|
|
}
|
|
|
|
// versionGo returns the Go runtime version. The returned string
|
|
// has no whitespace, suitable for reporting in header.
|
|
func versionGo() string {
|
|
const develPrefix = "devel +"
|
|
|
|
s := runtime.Version()
|
|
if strings.HasPrefix(s, develPrefix) {
|
|
s = s[len(develPrefix):]
|
|
if p := strings.IndexFunc(s, unicode.IsSpace); p >= 0 {
|
|
s = s[:p]
|
|
}
|
|
return s
|
|
}
|
|
|
|
notSemverRune := func(r rune) bool {
|
|
return !strings.ContainsRune("0123456789.", r)
|
|
}
|
|
|
|
if strings.HasPrefix(s, "go1") {
|
|
s = s[2:]
|
|
var prerelease string
|
|
if p := strings.IndexFunc(s, notSemverRune); p >= 0 {
|
|
s, prerelease = s[:p], s[p:]
|
|
}
|
|
if strings.HasSuffix(s, ".") {
|
|
s += "0"
|
|
} else if strings.Count(s, ".") < 2 {
|
|
s += ".0"
|
|
}
|
|
if prerelease != "" {
|
|
s += "-" + prerelease
|
|
}
|
|
return s
|
|
}
|
|
return "UNKNOWN"
|
|
}
|
|
|
|
// maybeUnknownEnum wraps the given proto-JSON parsing error if it is the result
|
|
// of receiving an unknown enum value.
|
|
func maybeUnknownEnum(err error) error {
|
|
if strings.Contains(err.Error(), "invalid value for enum type") {
|
|
err = fmt.Errorf("received an unknown enum value; a later version of the library may support it: %w", err)
|
|
}
|
|
return err
|
|
}
|
|
|
|
// buildHeaders extracts metadata from the outgoing context, joins it with any other
|
|
// given metadata, and converts them into a http.Header.
|
|
func buildHeaders(ctx context.Context, mds ...metadata.MD) http.Header {
|
|
if cmd, ok := metadata.FromOutgoingContext(ctx); ok {
|
|
mds = append(mds, cmd)
|
|
}
|
|
md := metadata.Join(mds...)
|
|
return http.Header(md)
|
|
}
|