Skip to content

Commit ff86369

Browse files
authored
Fix security issues reported by Black Duck (#5014)
1 parent 238339c commit ff86369

File tree

11 files changed

+224
-197
lines changed

11 files changed

+224
-197
lines changed

.github/workflows/documentation.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: actions/setup-go@v5
2525
with:
26-
go-version: '1.21.x'
26+
go-version: '1.22.4'
2727

2828
- name: Install Groovy
2929
run: sudo apt-get update && sudo apt-get install groovy -y

.github/workflows/update-go-dependencies.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v4
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: '1.21.x'
16+
go-version: '1.22.4'
1717
- name: Perform update
1818
run: |
1919
git checkout -B gh-action-update-golang-dependencies

.github/workflows/upload-go-master.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v4
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: '1.21.x'
16+
go-version: '1.22.4'
1717
- env:
1818
CGO_ENABLED: 0
1919
run: |

.github/workflows/verify-go.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: styfle/[email protected]
1616
- uses: actions/setup-go@v5
1717
with:
18-
go-version: '1.21.x'
18+
go-version: '1.22.4'
1919
- name: Cache Golang Packages
2020
uses: actions/cache@v3
2121
with:
@@ -43,7 +43,7 @@ jobs:
4343
steps:
4444
- uses: actions/setup-go@v5
4545
with:
46-
go-version: '1.21.x'
46+
go-version: '1.22.4'
4747
- name: Cache Golang Packages
4848
uses: actions/cache@v3
4949
with:
@@ -63,7 +63,7 @@ jobs:
6363
steps:
6464
- uses: actions/setup-go@v5
6565
with:
66-
go-version: '1.21.x'
66+
go-version: '1.22.4'
6767
- name: checkout
6868
uses: actions/checkout@v4
6969
with:
@@ -78,7 +78,7 @@ jobs:
7878
steps:
7979
- uses: actions/setup-go@v5
8080
with:
81-
go-version: '1.21.x'
81+
go-version: '1.22.4'
8282
- name: Cache Golang Packages
8383
uses: actions/cache@v3
8484
with:
@@ -98,7 +98,7 @@ jobs:
9898
steps:
9999
- uses: actions/setup-go@v5
100100
with:
101-
go-version: '1.21.x'
101+
go-version: '1.22.4'
102102
- name: Cache Golang Packages
103103
uses: actions/cache@v3
104104
with:

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21 AS build-env
1+
FROM golang:1.22.4 AS build-env
22
COPY . /build
33
WORKDIR /build
44

go.mod

+50-55
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
module github.com/SAP/jenkins-library
22

3-
go 1.21
4-
5-
toolchain go1.21.9
6-
7-
// It is a locked dependency of github.com/buildpacks/[email protected]. The maintainers may remove the lock
8-
// in future releases. Check if 'replace' statement still there in their go.mod file. Remove line below if not.
9-
replace github.com/moby/buildkit => github.com/moby/buildkit v0.11.6
3+
go 1.22.4
104

115
require (
126
cloud.google.com/go/storage v1.38.0
@@ -15,14 +9,14 @@ require (
159
github.com/Jeffail/gabs/v2 v2.6.1
1610
github.com/Masterminds/sprig v2.22.0+incompatible
1711
github.com/antchfx/htmlquery v1.2.4
18-
github.com/aws/aws-sdk-go-v2/config v1.19.0
12+
github.com/aws/aws-sdk-go-v2/config v1.26.6
1913
github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0
2014
github.com/bmatcuk/doublestar v1.3.4
2115
github.com/bndr/gojenkins v1.1.1-0.20240109173050-c316119c46d5
22-
github.com/buildpacks/lifecycle v0.18.4
16+
github.com/buildpacks/lifecycle v0.18.5
2317
github.com/cloudevents/sdk-go/v2 v2.10.1
24-
github.com/docker/cli v24.0.6+incompatible
25-
github.com/docker/docker v24.0.7+incompatible
18+
github.com/docker/cli v27.1.0+incompatible
19+
github.com/docker/docker v27.1.1+incompatible
2620
github.com/evanphx/json-patch v5.7.0+incompatible
2721
github.com/getsentry/sentry-go v0.26.0
2822
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
@@ -34,7 +28,7 @@ require (
3428
github.com/go-playground/universal-translator v0.18.1
3529
github.com/go-playground/validator/v10 v10.14.1
3630
github.com/google/go-cmp v0.6.0
37-
github.com/google/go-containerregistry v0.16.1
31+
github.com/google/go-containerregistry v0.19.0
3832
github.com/google/go-github/v45 v45.2.0
3933
github.com/google/uuid v1.6.0
4034
github.com/hashicorp/go-retryablehttp v0.7.2
@@ -53,15 +47,15 @@ require (
5347
github.com/pkg/errors v0.9.1
5448
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
5549
github.com/sirupsen/logrus v1.9.3
56-
github.com/spf13/cobra v1.8.0
50+
github.com/spf13/cobra v1.8.1
5751
github.com/spf13/pflag v1.0.5
5852
github.com/stretchr/testify v1.9.0
59-
github.com/testcontainers/testcontainers-go v0.25.0
53+
github.com/testcontainers/testcontainers-go v0.33.0
6054
github.com/xuri/excelize/v2 v2.4.1
61-
golang.org/x/mod v0.16.0
62-
golang.org/x/oauth2 v0.17.0
63-
golang.org/x/text v0.14.0
64-
google.golang.org/api v0.167.0
55+
golang.org/x/mod v0.17.0
56+
golang.org/x/oauth2 v0.18.0
57+
golang.org/x/text v0.16.0
58+
google.golang.org/api v0.169.0
6559
gopkg.in/ini.v1 v1.67.0
6660
gopkg.in/yaml.v2 v2.4.0
6761
helm.sh/helm/v3 v3.14.0
@@ -74,42 +68,44 @@ require (
7468
dario.cat/mergo v1.0.0 // indirect
7569
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
7670
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 // indirect
77-
github.com/Microsoft/hcsshim v0.11.4 // indirect
7871
github.com/agext/levenshtein v1.2.3 // indirect
7972
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
8073
github.com/apex/log v1.9.0 // indirect
8174
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 // indirect
82-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect
75+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7 // indirect
8376
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
8477
github.com/cloudflare/circl v1.3.3 // indirect
78+
github.com/containerd/errdefs v0.1.0 // indirect
8579
github.com/containerd/log v0.1.0 // indirect
86-
github.com/containerd/typeurl v1.0.2 // indirect
80+
github.com/containerd/platforms v0.2.1 // indirect
81+
github.com/containerd/typeurl/v2 v2.1.1 // indirect
8782
github.com/cpuguy83/dockercfg v0.3.1 // indirect
8883
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
89-
github.com/distribution/reference v0.5.0 // indirect
84+
github.com/distribution/reference v0.6.0 // indirect
9085
github.com/felixge/httpsnoop v1.0.4 // indirect
9186
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
92-
github.com/go-jose/go-jose/v3 v3.0.1 // indirect
87+
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
9388
github.com/go-logr/stdr v1.2.2 // indirect
9489
github.com/go-ole/go-ole v1.2.6 // indirect
9590
github.com/google/gnostic-models v0.6.8 // indirect
9691
github.com/google/s2a-go v0.1.7 // indirect
9792
github.com/heroku/color v0.0.6 // indirect
9893
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
99-
github.com/moby/buildkit v0.12.2 // indirect
94+
github.com/moby/buildkit v0.12.5 // indirect
95+
github.com/moby/docker-image-spec v1.3.1 // indirect
10096
github.com/moby/patternmatcher v0.6.0 // indirect
10197
github.com/moby/sys/sequential v0.5.0 // indirect
98+
github.com/moby/sys/user v0.1.0 // indirect
10299
github.com/oapi-codegen/runtime v1.0.0 // indirect
103-
github.com/opencontainers/runc v1.1.9 // indirect
104100
github.com/pjbgf/sha1cd v0.3.0 // indirect
105101
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
106-
github.com/shirou/gopsutil/v3 v3.23.8 // indirect
102+
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
107103
github.com/shoenig/go-m1cpu v0.1.6 // indirect
108104
github.com/skeema/knownhosts v1.2.1 // indirect
109105
github.com/tklauser/go-sysconf v0.3.12 // indirect
110106
github.com/tklauser/numcpus v0.6.1 // indirect
111107
github.com/yusufpapurcu/wmi v1.2.3 // indirect
112-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect
108+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
113109
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
114110
go.opentelemetry.io/otel v1.24.0 // indirect
115111
go.opentelemetry.io/otel/metric v1.24.0 // indirect
@@ -118,14 +114,13 @@ require (
118114
go.uber.org/multierr v1.6.0 // indirect
119115
go.uber.org/zap v1.17.0 // indirect
120116
golang.org/x/image v0.0.0-20220302094943-723b81ca9867 // indirect
121-
golang.org/x/tools v0.17.0 // indirect
122-
google.golang.org/genproto/googleapis/api v0.0.0-20240304161311-37d4d3c04a78 // indirect
123-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240228224816-df926f6c8641 // indirect
117+
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
118+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
124119
)
125120

126121
require (
127122
cloud.google.com/go v0.112.1 // indirect
128-
cloud.google.com/go/compute v1.24.0 // indirect
123+
cloud.google.com/go/compute v1.25.1 // indirect
129124
cloud.google.com/go/iam v1.1.6 // indirect
130125
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0 // indirect
131126
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -134,34 +129,34 @@ require (
134129
github.com/Masterminds/goutils v1.1.1 // indirect
135130
github.com/Masterminds/semver v1.5.0 // indirect
136131
github.com/Masterminds/semver/v3 v3.2.1 // indirect
137-
github.com/Microsoft/go-winio v0.6.1 // indirect
132+
github.com/Microsoft/go-winio v0.6.2 // indirect
138133
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
139134
github.com/antchfx/xpath v1.2.0 // indirect
140135
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
141-
github.com/aws/aws-sdk-go-v2 v1.21.2 // indirect
136+
github.com/aws/aws-sdk-go-v2 v1.24.1 // indirect
142137
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
143-
github.com/aws/aws-sdk-go-v2/credentials v1.13.43 // indirect
144-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 // indirect
145-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect
146-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect
147-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 // indirect
148-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect
138+
github.com/aws/aws-sdk-go-v2/credentials v1.16.16 // indirect
139+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 // indirect
140+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect
141+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect
142+
github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3 // indirect
143+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
149144
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 // indirect
150-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect
145+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 // indirect
151146
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 // indirect
152-
github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect
153-
github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 // indirect
154-
github.com/aws/smithy-go v1.15.0 // indirect
147+
github.com/aws/aws-sdk-go-v2/service/sso v1.18.7 // indirect
148+
github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 // indirect
149+
github.com/aws/smithy-go v1.19.0 // indirect
155150
github.com/beorn7/perks v1.0.1 // indirect
156151
github.com/buildpacks/imgutil v0.0.0-20230919143643-4ec9360d5f02 // indirect
157152
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
158153
github.com/cespare/xxhash/v2 v2.2.0 // indirect
159-
github.com/containerd/containerd v1.7.11 // indirect
154+
github.com/containerd/containerd v1.7.20 // indirect
160155
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
161156
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
162157
github.com/docker/distribution v2.8.3+incompatible // indirect
163158
github.com/docker/docker-credential-helpers v0.8.0 // indirect
164-
github.com/docker/go-connections v0.4.0 // indirect
159+
github.com/docker/go-connections v0.5.0 // indirect
165160
github.com/docker/go-metrics v0.0.1 // indirect
166161
github.com/docker/go-units v0.5.0 // indirect
167162
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
@@ -188,7 +183,7 @@ require (
188183
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
189184
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
190185
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
191-
github.com/gorilla/mux v1.8.0 // indirect
186+
github.com/gorilla/mux v1.8.1 // indirect
192187
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
193188
github.com/hashicorp/errwrap v1.1.0 // indirect
194189
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -206,7 +201,7 @@ require (
206201
github.com/josharian/intern v1.0.0 // indirect
207202
github.com/json-iterator/go v1.1.12 // indirect
208203
github.com/kevinburke/ssh_config v1.2.0 // indirect
209-
github.com/klauspost/compress v1.17.1 // indirect
204+
github.com/klauspost/compress v1.17.4 // indirect
210205
github.com/leodido/go-urn v1.2.4 // indirect
211206
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
212207
github.com/magicsong/color-glog v0.0.1 // indirect
@@ -229,7 +224,7 @@ require (
229224
github.com/oklog/ulid v1.3.1 // indirect
230225
github.com/onsi/ginkgo v1.16.5 // indirect
231226
github.com/opencontainers/go-digest v1.0.0 // indirect
232-
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
227+
github.com/opencontainers/image-spec v1.1.0 // indirect
233228
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
234229
github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c
235230
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
@@ -250,16 +245,16 @@ require (
250245
go.mongodb.org/mongo-driver v1.11.6 // indirect
251246
go.opencensus.io v0.24.0 // indirect
252247
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
253-
golang.org/x/crypto v0.22.0
248+
golang.org/x/crypto v0.25.0
254249
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3
255-
golang.org/x/net v0.21.0 // indirect
256-
golang.org/x/sync v0.6.0
257-
golang.org/x/sys v0.19.0 // indirect
258-
golang.org/x/term v0.19.0 // indirect
250+
golang.org/x/net v0.26.0 // indirect
251+
golang.org/x/sync v0.7.0
252+
golang.org/x/sys v0.22.0 // indirect
253+
golang.org/x/term v0.22.0 // indirect
259254
golang.org/x/time v0.5.0 // indirect
260255
google.golang.org/appengine v1.6.8 // indirect
261256
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
262-
google.golang.org/grpc v1.62.0 // indirect
257+
google.golang.org/grpc v1.64.1 // indirect
263258
google.golang.org/protobuf v1.33.0 // indirect
264259
gopkg.in/inf.v0 v0.9.1 // indirect
265260
gopkg.in/warnings.v0 v0.1.2 // indirect
@@ -271,7 +266,7 @@ require (
271266
k8s.io/klog/v2 v2.110.1 // indirect
272267
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
273268
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
274-
oras.land/oras-go v1.2.4 // indirect
269+
oras.land/oras-go v1.2.6 // indirect
275270
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
276271
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
277272
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)