Skip to content

Commit 1b18baa

Browse files
schristoffschristoff
authored
Merge pull request #306 from dgannon991/chore/bump-deps
Bumped all deps with an RHDA warning
2 parents 2a65de0 + 135b94e commit 1b18baa

File tree

5 files changed

+1432
-139
lines changed

5 files changed

+1432
-139
lines changed

‎driver/docker/docker.go

+12-10
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ import (
1111
"strconv"
1212
"strings"
1313

14+
"github.com/distribution/reference"
1415
"github.com/docker/cli/cli/command"
15-
"github.com/docker/distribution/reference"
1616
"github.com/docker/docker/api/types"
1717
"github.com/docker/docker/api/types/container"
18+
"github.com/docker/docker/api/types/image"
19+
registrytypes "github.com/docker/docker/api/types/registry"
1820
"github.com/docker/docker/api/types/strslice"
1921
"github.com/docker/docker/client"
2022
"github.com/docker/docker/pkg/jsonmessage"
@@ -132,8 +134,8 @@ func (d *Driver) SetContainerErr(w io.Writer) {
132134
d.containerErr = w
133135
}
134136

135-
func pullImage(ctx context.Context, cli command.Cli, image string) error {
136-
ref, err := reference.ParseNormalizedNamed(image)
137+
func pullImage(ctx context.Context, cli command.Cli, imageName string) error {
138+
ref, err := reference.ParseNormalizedNamed(imageName)
137139
if err != nil {
138140
return err
139141
}
@@ -143,15 +145,15 @@ func pullImage(ctx context.Context, cli command.Cli, image string) error {
143145
if err != nil {
144146
return err
145147
}
146-
authConfig := command.ResolveAuthConfig(ctx, cli, repoInfo.Index)
147-
encodedAuth, err := command.EncodeAuthToBase64(authConfig)
148+
authConfig := command.ResolveAuthConfig(cli.ConfigFile(), repoInfo.Index)
149+
encodedAuth, err := registrytypes.EncodeAuthConfig(authConfig)
148150
if err != nil {
149151
return err
150152
}
151-
options := types.ImagePullOptions{
153+
options := image.PullOptions{
152154
RegistryAuth: encodedAuth,
153155
}
154-
responseBody, err := cli.Client().ImagePull(ctx, image, options)
156+
responseBody, err := cli.Client().ImagePull(ctx, imageName, options)
155157
if err != nil {
156158
return err
157159
}
@@ -216,7 +218,7 @@ func (d *Driver) exec(op *driver.Operation) (driver.OperationResult, error) {
216218
}
217219

218220
if d.config["CLEANUP_CONTAINERS"] == "true" {
219-
defer cli.Client().ContainerRemove(ctx, resp.ID, types.ContainerRemoveOptions{})
221+
defer cli.Client().ContainerRemove(ctx, resp.ID, container.RemoveOptions{})
220222
}
221223

222224
containerUID := getContainerUserID(ii.Config.User)
@@ -234,7 +236,7 @@ func (d *Driver) exec(op *driver.Operation) (driver.OperationResult, error) {
234236
return driver.OperationResult{}, fmt.Errorf("error copying to / in container: %s", err)
235237
}
236238

237-
attach, err := cli.Client().ContainerAttach(ctx, resp.ID, types.ContainerAttachOptions{
239+
attach, err := cli.Client().ContainerAttach(ctx, resp.ID, container.AttachOptions{
238240
Stream: true,
239241
Stdout: true,
240242
Stderr: true,
@@ -267,7 +269,7 @@ func (d *Driver) exec(op *driver.Operation) (driver.OperationResult, error) {
267269
}
268270
}()
269271

270-
if err = cli.Client().ContainerStart(ctx, resp.ID, types.ContainerStartOptions{}); err != nil {
272+
if err = cli.Client().ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {
271273
return driver.OperationResult{}, fmt.Errorf("cannot start container: %v", err)
272274
}
273275
statusc, errc := cli.Client().ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)

‎driver/kubernetes/kubernetes.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"strings"
1515
"time"
1616

17-
"github.com/docker/distribution/reference"
17+
"github.com/distribution/reference"
1818
"github.com/hashicorp/go-multierror"
1919
"github.com/opencontainers/go-digest"
2020
"github.com/pkg/errors"

‎driver/kubernetes/kubernetes_integration_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ func createTestPVC(t *testing.T, ctx context.Context) (string, func()) {
267267
},
268268
Spec: v1.PersistentVolumeClaimSpec{
269269
AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce},
270-
Resources: v1.ResourceRequirements{Requests: map[v1.ResourceName]resource.Quantity{
270+
Resources: v1.VolumeResourceRequirements{Requests: map[v1.ResourceName]resource.Quantity{
271271
v1.ResourceStorage: resource.MustParse("64Mi"),
272272
}},
273273
},

‎go.mod

+109-73
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,165 @@
11
module github.com/cnabio/cnab-go
22

3-
go 1.19
3+
go 1.23
4+
5+
toolchain go1.23.2
46

57
require (
68
github.com/Masterminds/semver v1.5.0
7-
github.com/cnabio/image-relocation v0.0.0-20220815190842-cd2f11ecad88
8-
github.com/cyberphone/json-canonicalization v0.0.0-20210303052042-6bc126869bf4
9-
github.com/docker/cli v23.0.1+incompatible
10-
github.com/docker/distribution v2.8.1+incompatible
11-
github.com/docker/docker v23.0.1+incompatible
12-
github.com/docker/go-connections v0.4.0
9+
github.com/cnabio/image-relocation v0.9.0
10+
github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f
11+
github.com/docker/cli v27.3.1+incompatible
12+
github.com/docker/docker v27.3.1+incompatible
13+
github.com/docker/go-connections v0.5.0
1314
github.com/hashicorp/go-multierror v1.1.1
14-
github.com/mitchellh/copystructure v1.0.0
15+
github.com/mitchellh/copystructure v1.2.0
1516
github.com/oklog/ulid v1.3.1
1617
github.com/opencontainers/go-digest v1.0.0
1718
github.com/pkg/errors v0.9.1
1819
github.com/qri-io/jsonpointer v0.1.1
1920
github.com/qri-io/jsonschema v0.2.2-0.20210723092138-2eb22ee8115f
20-
github.com/stretchr/testify v1.7.0
21+
github.com/stretchr/testify v1.9.0
2122
github.com/xeipuuv/gojsonschema v1.2.0
2223
gopkg.in/yaml.v2 v2.4.0
23-
k8s.io/api v0.24.1
24-
k8s.io/apimachinery v0.24.1
25-
k8s.io/client-go v0.24.1
24+
k8s.io/api v0.31.1
25+
k8s.io/apimachinery v0.31.1
26+
k8s.io/client-go v0.31.1
2627
)
2728

2829
require (
29-
cloud.google.com/go v0.81.0 // indirect
30-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
30+
cloud.google.com/go v0.110.0 // indirect
31+
cloud.google.com/go/compute/metadata v0.5.2 // indirect
32+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8 // indirect
33+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
3134
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
32-
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
33-
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
35+
github.com/Azure/go-autorest/autorest v0.11.29 // indirect
36+
github.com/Azure/go-autorest/autorest/adal v0.9.24 // indirect
3437
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
3538
github.com/Azure/go-autorest/logger v0.2.1 // indirect
3639
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
37-
github.com/Microsoft/go-winio v0.5.2 // indirect
38-
github.com/PuerkitoBio/purell v1.1.1 // indirect
40+
github.com/Microsoft/go-winio v0.6.2 // indirect
41+
github.com/PuerkitoBio/purell v1.2.1 // indirect
3942
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
4043
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
4144
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
4245
github.com/beorn7/perks v1.0.1 // indirect
4346
github.com/bugsnag/bugsnag-go v1.5.0 // indirect
4447
github.com/bugsnag/panicwrap v1.2.0 // indirect
4548
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
46-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
49+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
50+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4751
github.com/cloudflare/cfssl v1.4.1 // indirect
48-
github.com/containerd/containerd v1.6.18 // indirect
49-
github.com/containerd/stargz-snapshotter/estargz v0.4.1 // indirect
50-
github.com/davecgh/go-spew v1.1.1 // indirect
51-
github.com/docker/docker-credential-helpers v0.6.3 // indirect
52-
github.com/docker/go v1.5.1-1 // indirect
52+
github.com/containerd/log v0.1.0 // indirect
53+
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
54+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
55+
github.com/distribution/reference v0.6.0 // indirect
56+
github.com/docker/distribution v2.8.2+incompatible // indirect
57+
github.com/docker/docker-credential-helpers v0.8.2 // indirect
58+
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
5359
github.com/docker/go-metrics v0.0.1 // indirect
54-
github.com/docker/go-units v0.4.0 // indirect
60+
github.com/docker/go-units v0.5.0 // indirect
5561
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
5662
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
57-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
58-
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
59-
github.com/fvbommel/sortorder v1.0.2 // indirect
60-
github.com/go-logr/logr v1.2.2 // indirect
61-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
62-
github.com/go-openapi/jsonreference v0.19.5 // indirect
63-
github.com/go-openapi/swag v0.19.14 // indirect
63+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
64+
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
65+
github.com/felixge/httpsnoop v1.0.4 // indirect
66+
github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
67+
github.com/fvbommel/sortorder v1.1.0 // indirect
68+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
69+
github.com/go-logr/logr v1.4.2 // indirect
70+
github.com/go-logr/stdr v1.2.2 // indirect
71+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
72+
github.com/go-openapi/jsonreference v0.21.0 // indirect
73+
github.com/go-openapi/swag v0.23.0 // indirect
6474
github.com/go-sql-driver/mysql v1.4.1 // indirect
6575
github.com/gofrs/uuid v3.2.0+incompatible // indirect
6676
github.com/gogo/protobuf v1.3.2 // indirect
67-
github.com/golang/protobuf v1.5.2 // indirect
68-
github.com/google/gnostic v0.5.7-v3refs // indirect
69-
github.com/google/go-containerregistry v0.5.1 // indirect
77+
github.com/golang/protobuf v1.5.4 // indirect
78+
github.com/google/gnostic v0.7.0 // indirect
79+
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
80+
github.com/google/go-cmp v0.6.0 // indirect
81+
github.com/google/go-containerregistry v0.20.2 // indirect
7082
github.com/google/gofuzz v1.2.0 // indirect
71-
github.com/gorilla/mux v1.8.0 // indirect
83+
github.com/google/uuid v1.6.0 // indirect
84+
github.com/gorilla/mux v1.8.1 // indirect
85+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
7286
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
7387
github.com/hashicorp/errwrap v1.1.0 // indirect
74-
github.com/imdario/mergo v0.3.12 // indirect
75-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
88+
github.com/imdario/mergo v0.3.16 // indirect
89+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7690
github.com/jinzhu/gorm v1.9.11 // indirect
7791
github.com/josharian/intern v1.0.0 // indirect
7892
github.com/json-iterator/go v1.1.12 // indirect
7993
github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
80-
github.com/klauspost/compress v1.11.13 // indirect
81-
github.com/mailru/easyjson v0.7.6 // indirect
94+
github.com/klauspost/compress v1.17.11 // indirect
95+
github.com/mailru/easyjson v0.7.7 // indirect
8296
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8397
github.com/miekg/pkcs11 v1.1.1 // indirect
84-
github.com/mitchellh/reflectwalk v1.0.0 // indirect
85-
github.com/moby/patternmatcher v0.5.0 // indirect
86-
github.com/moby/sys/sequential v0.5.0 // indirect
87-
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
98+
github.com/mitchellh/go-homedir v1.1.0 // indirect
99+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
100+
github.com/moby/docker-image-spec v1.3.1 // indirect
101+
github.com/moby/patternmatcher v0.6.0 // indirect
102+
github.com/moby/sys/sequential v0.6.0 // indirect
103+
github.com/moby/sys/user v0.3.0 // indirect
104+
github.com/moby/sys/userns v0.1.0 // indirect
105+
github.com/moby/term v0.5.0 // indirect
88106
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
89107
github.com/modern-go/reflect2 v1.0.2 // indirect
90108
github.com/morikuni/aec v1.0.0 // indirect
91109
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
92110
github.com/onsi/ginkgo v1.16.4 // indirect
93-
github.com/onsi/gomega v1.17.0 // indirect
94-
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
95-
github.com/opencontainers/runc v1.1.5 // indirect
96-
github.com/pmezard/go-difflib v1.0.0 // indirect
97-
github.com/prometheus/client_golang v1.11.1 // indirect
98-
github.com/prometheus/client_model v0.2.0 // indirect
99-
github.com/prometheus/common v0.30.0 // indirect
100-
github.com/prometheus/procfs v0.7.3 // indirect
101-
github.com/sirupsen/logrus v1.8.1 // indirect
102-
github.com/spf13/cobra v1.1.3 // indirect
111+
github.com/onsi/gomega v1.33.1 // indirect
112+
github.com/opencontainers/image-spec v1.1.0 // indirect
113+
github.com/pelletier/go-toml v1.9.5 // indirect
114+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
115+
github.com/prometheus/client_golang v1.20.5 // indirect
116+
github.com/prometheus/client_model v0.6.1 // indirect
117+
github.com/prometheus/common v0.60.0 // indirect
118+
github.com/prometheus/procfs v0.15.1 // indirect
119+
github.com/sirupsen/logrus v1.9.3 // indirect
120+
github.com/spf13/cobra v1.8.1 // indirect
103121
github.com/spf13/pflag v1.0.5 // indirect
104-
github.com/theupdateframework/notary v0.6.1 // indirect
105-
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
122+
github.com/theupdateframework/notary v0.7.0 // indirect
123+
github.com/vbatts/tar-split v0.11.6 // indirect
124+
github.com/x448/float16 v0.8.4 // indirect
125+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
106126
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
107-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
108-
golang.org/x/net v0.7.0 // indirect
109-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
110-
golang.org/x/sync v0.1.0 // indirect
111-
golang.org/x/sys v0.5.0 // indirect
112-
golang.org/x/term v0.5.0 // indirect
113-
golang.org/x/text v0.7.0 // indirect
114-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
115-
google.golang.org/appengine v1.6.7 // indirect
116-
google.golang.org/protobuf v1.28.0 // indirect
117-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
127+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
128+
go.opentelemetry.io/otel v1.31.0 // indirect
129+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.17.0 // indirect
130+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.31.0 // indirect
131+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0 // indirect
132+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0 // indirect
133+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0 // indirect
134+
go.opentelemetry.io/otel/metric v1.31.0 // indirect
135+
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
136+
go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
137+
go.opentelemetry.io/otel/trace v1.31.0 // indirect
138+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
139+
golang.org/x/crypto v0.28.0 // indirect
140+
golang.org/x/net v0.30.0 // indirect
141+
golang.org/x/oauth2 v0.23.0 // indirect
142+
golang.org/x/sync v0.8.0 // indirect
143+
golang.org/x/sys v0.26.0 // indirect
144+
golang.org/x/term v0.25.0 // indirect
145+
golang.org/x/text v0.19.0 // indirect
146+
golang.org/x/time v0.7.0 // indirect
147+
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
148+
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
149+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
150+
google.golang.org/grpc v1.67.1 // indirect
151+
google.golang.org/protobuf v1.35.1 // indirect
118152
gopkg.in/dancannon/gorethink.v3 v3.0.5 // indirect
153+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
119154
gopkg.in/fatih/pool.v2 v2.0.0 // indirect
120155
gopkg.in/gorethink/gorethink.v3 v3.0.5 // indirect
121156
gopkg.in/inf.v0 v0.9.1 // indirect
122157
gopkg.in/yaml.v3 v3.0.1 // indirect
123-
k8s.io/klog/v2 v2.60.1 // indirect
124-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
125-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
126-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
127-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
128-
sigs.k8s.io/yaml v1.2.0 // indirect
158+
gotest.tools/v3 v3.0.3 // indirect
159+
k8s.io/klog/v2 v2.130.1 // indirect
160+
k8s.io/kube-openapi v0.0.0-20241009091222-67ed5848f094 // indirect
161+
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
162+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
163+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
164+
sigs.k8s.io/yaml v1.4.0 // indirect
129165
)

0 commit comments

Comments
 (0)