Skip to content

Commit 4459228

Browse files
plumpyplumpy
authored
chore: final cleanups of the go.mod file (#9663)
* chore: update an import that moved * chore: add replace stanzas for deps that moved * chore: go get -u ./... && go mod tidy && go mod vendor
1 parent cd7c1fb commit 4459228

16 files changed

+79
-32
lines changed

‎go.mod

+13-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,20 @@ module github.com/GoogleContainerTools/skaffold/v2
22

33
go 1.23.4
44

5-
// doesn't work well with windows
5+
// broken on Windows, see https://github.com/karrick/godirwalk/issues/70
66
exclude github.com/karrick/godirwalk v1.17.0
77

8+
replace github.com/alessio/shellescape => github.com/alessio/shellescape v1.4.2
9+
10+
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16
11+
812
require (
913
4d63.com/tz v1.2.0
1014
cloud.google.com/go/cloudbuild v1.19.2
1115
cloud.google.com/go/monitoring v1.22.1
1216
cloud.google.com/go/profiler v0.4.2
1317
cloud.google.com/go/storage v1.50.0
18+
dario.cat/mergo v1.0.1
1419
github.com/AlecAivazis/survey/v2 v2.3.7
1520
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0
1621
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.25.0
@@ -45,12 +50,11 @@ require (
4550
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1
4651
github.com/hashicorp/hcl v1.0.1-vault-7
4752
github.com/heroku/color v0.0.6
48-
github.com/imdario/mergo v0.3.16
4953
github.com/joho/godotenv v1.5.1
5054
github.com/karrick/godirwalk v1.16.2
5155
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
5256
github.com/krishicks/yaml-patch v0.0.10
53-
github.com/letsencrypt/boulder v0.0.0-20250114010515-bb9d82b85f7b
57+
github.com/letsencrypt/boulder v0.0.0-20250114215406-2e1f733c269b
5458
github.com/mattn/go-colorable v0.1.14
5559
github.com/mitchellh/go-homedir v1.1.0
5660
github.com/moby/buildkit v0.18.2
@@ -116,7 +120,6 @@ require (
116120
cloud.google.com/go/iam v1.3.1 // indirect
117121
cloud.google.com/go/longrunning v0.6.4 // indirect
118122
cloud.google.com/go/trace v1.11.3 // indirect
119-
dario.cat/mergo v1.0.1 // indirect
120123
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
121124
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
122125
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
@@ -139,23 +142,23 @@ require (
139142
github.com/ProtonMail/go-crypto v1.1.4 // indirect
140143
github.com/agext/levenshtein v1.2.3 // indirect
141144
github.com/ahmetalpbalkan/dlog v0.0.0-20170105205344-4fb5f8204f26 // indirect
142-
github.com/alessio/shellescape v1.4.2 // indirect
145+
github.com/alessio/shellescape v1.5.1 // indirect
143146
github.com/apex/log v1.9.0 // indirect
144147
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
145148
github.com/aws/aws-sdk-go-v2 v1.32.8 // indirect
146-
github.com/aws/aws-sdk-go-v2/config v1.28.10 // indirect
147-
github.com/aws/aws-sdk-go-v2/credentials v1.17.51 // indirect
149+
github.com/aws/aws-sdk-go-v2/config v1.28.11 // indirect
150+
github.com/aws/aws-sdk-go-v2/credentials v1.17.52 // indirect
148151
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 // indirect
149152
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 // indirect
150153
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 // indirect
151154
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
152-
github.com/aws/aws-sdk-go-v2/service/ecr v1.38.3 // indirect
155+
github.com/aws/aws-sdk-go-v2/service/ecr v1.38.4 // indirect
153156
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.29.2 // indirect
154157
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
155158
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 // indirect
156159
github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 // indirect
157160
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 // indirect
158-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.6 // indirect
161+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.7 // indirect
159162
github.com/aws/smithy-go v1.22.1 // indirect
160163
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20241227172826-c97b94eac159 // indirect
161164
github.com/beorn7/perks v1.0.1 // indirect
@@ -219,6 +222,7 @@ require (
219222
github.com/gorilla/mux v1.8.1 // indirect
220223
github.com/gorilla/websocket v1.5.3 // indirect
221224
github.com/huandu/xstrings v1.5.0 // indirect
225+
github.com/imdario/mergo v1.0.1 // indirect
222226
github.com/inconshreveable/mousetrap v1.1.0 // indirect
223227
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
224228
github.com/jedisct1/go-minisign v0.0.0-20241212093149-d2f9f49435c7 // indirect

‎go.sum

+10-10
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:W
117117
github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
118118
github.com/aws/aws-sdk-go-v2 v1.32.8 h1:cZV+NUS/eGxKXMtmyhtYPJ7Z4YLoI/V8bkTdRZfYhGo=
119119
github.com/aws/aws-sdk-go-v2 v1.32.8/go.mod h1:P5WJBrYqqbWVaOxgH0X/FYYD47/nooaPOZPlQdmiN2U=
120-
github.com/aws/aws-sdk-go-v2/config v1.28.10 h1:fKODZHfqQu06pCzR69KJ3GuttraRJkhlC8g80RZ0Dfg=
121-
github.com/aws/aws-sdk-go-v2/config v1.28.10/go.mod h1:PvdxRYZ5Um9QMq9PQ0zHHNdtKK+he2NHtFCUFMXWXeg=
122-
github.com/aws/aws-sdk-go-v2/credentials v1.17.51 h1:F/9Sm6Y6k4LqDesZDPJCLxQGXNNHd/ZtJiWd0lCZKRk=
123-
github.com/aws/aws-sdk-go-v2/credentials v1.17.51/go.mod h1:TKbzCHm43AoPyA+iLGGcruXd4AFhF8tOmLex2R9jWNQ=
120+
github.com/aws/aws-sdk-go-v2/config v1.28.11 h1:7Ekru0IkRHRnSRWGQLnLN6i0o1Jncd0rHo2T130+tEQ=
121+
github.com/aws/aws-sdk-go-v2/config v1.28.11/go.mod h1:x78TpPvBfHH16hi5tE3OCWQ0pzNfyXA349p5/Wp82Yo=
122+
github.com/aws/aws-sdk-go-v2/credentials v1.17.52 h1:I4ymSk35LHogx2Re2Wu6LOHNTRaRWkLVoJgWS5Wd40M=
123+
github.com/aws/aws-sdk-go-v2/credentials v1.17.52/go.mod h1:vAkqKbMNUcher8fDXP2Ge2qFXKMkcD74qvk1lJRMemM=
124124
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 h1:IBAoD/1d8A8/1aA8g4MBVtTRHhXRiNAgwdbo/xRM2DI=
125125
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23/go.mod h1:vfENuCM7dofkgKpYzuzf1VT1UKkA/YL3qanfBn7HCaA=
126126
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 h1:jSJjSBzw8VDIbWv+mmvBSP8ezsztMYJGH+eKqi9AmNs=
@@ -129,8 +129,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 h1:l+X4K77Dui85pIj5fo
129129
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27/go.mod h1:KvZXSFEXm6x84yE8qffKvT3x8J5clWnVFXphpohhzJ8=
130130
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
131131
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
132-
github.com/aws/aws-sdk-go-v2/service/ecr v1.38.3 h1:T+IMPnZs0Fo++nglydSsLnHFXvuxk9ePeY2v+qyPnhs=
133-
github.com/aws/aws-sdk-go-v2/service/ecr v1.38.3/go.mod h1:gOMFY4rPwJFnq2/v3sWgQykTlNxzHBop2W/4K9ilnw4=
132+
github.com/aws/aws-sdk-go-v2/service/ecr v1.38.4 h1:fHhgjhEmgqTJ9GTRpKzYT7fiyZ1+KkiOMz7DS0kA/w8=
133+
github.com/aws/aws-sdk-go-v2/service/ecr v1.38.4/go.mod h1:gOMFY4rPwJFnq2/v3sWgQykTlNxzHBop2W/4K9ilnw4=
134134
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.29.2 h1:h4q24ImESGfeamE0I0KJvsblO+03tn8J3+upacKf0vw=
135135
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.29.2/go.mod h1:3jWiVYuMsv18/qYLY6xVNe84CG/wKaa7vnLaH2/XtxI=
136136
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 h1:iXtILhvDxB6kPvEXgsDhGaZCSC6LQET5ZHSdJozeI0Y=
@@ -141,8 +141,8 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 h1:YqtxripbjWb2QLyzRK9pByfEDvgg
141141
github.com/aws/aws-sdk-go-v2/service/sso v1.24.9/go.mod h1:lV8iQpg6OLOfBnqbGMBKYjilBlf633qwHnBEiMSPoHY=
142142
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 h1:6dBT1Lz8fK11m22R+AqfRsFn8320K0T5DTGxxOQBSMw=
143143
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8/go.mod h1:/kiBvRQXBc6xeJTYzhSdGvJ5vm1tjaDEjH+MSeRJnlY=
144-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.6 h1:VwhTrsTuVn52an4mXx29PqRzs2Dvu921NpGk7y43tAM=
145-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.6/go.mod h1:+8h7PZb3yY5ftmVLD7ocEoE98hdc8PoKS0H3wfx1dlc=
144+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.7 h1:qwGa9MA8G7mBq2YphHFaygdPe5t9OA7SvaJdwWTlEds=
145+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.7/go.mod h1:+8h7PZb3yY5ftmVLD7ocEoE98hdc8PoKS0H3wfx1dlc=
146146
github.com/aws/smithy-go v1.22.1 h1:/HPHZQ0g7f4eUeK6HKglFz8uwVfZKgoI25rb/J+dnro=
147147
github.com/aws/smithy-go v1.22.1/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
148148
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20241227172826-c97b94eac159 h1:nInKoiKhglzD87LZ66eiTCHBen1QrE0AWuCmFVSPfgQ=
@@ -447,8 +447,8 @@ github.com/krishicks/yaml-patch v0.0.10 h1:H4FcHpnNwVmw8u0MjPRjWyIXtco6zM2F78t+5
447447
github.com/krishicks/yaml-patch v0.0.10/go.mod h1:Sm5TchwZS6sm7RJoyg87tzxm2ZcKzdRE4Q7TjNhPrME=
448448
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
449449
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
450-
github.com/letsencrypt/boulder v0.0.0-20250114010515-bb9d82b85f7b h1:I9gh6wvEDyy6EuQGXPnIWg5w8s3QZ1gSkEXGVe1LBro=
451-
github.com/letsencrypt/boulder v0.0.0-20250114010515-bb9d82b85f7b/go.mod h1:w1Qdn1NioL94Dsk35HaBlY1rl8bYu/32YQwiGPhgsew=
450+
github.com/letsencrypt/boulder v0.0.0-20250114215406-2e1f733c269b h1:fX+KtsV7ubre0M3c+658JazKjPMmstCFKyjywfWHsyA=
451+
github.com/letsencrypt/boulder v0.0.0-20250114215406-2e1f733c269b/go.mod h1:w1Qdn1NioL94Dsk35HaBlY1rl8bYu/32YQwiGPhgsew=
452452
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
453453
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
454454
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=

‎pkg/skaffold/config/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"sync"
2828
"time"
2929

30-
"github.com/imdario/mergo"
30+
"dario.cat/mergo"
3131
"github.com/mitchellh/go-homedir"
3232
api_errors "k8s.io/apimachinery/pkg/api/errors"
3333
api_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎vendor/github.com/aws/aws-sdk-go-v2/config/CHANGELOG.md

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/aws/aws-sdk-go-v2/config/go_module_metadata.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/aws/aws-sdk-go-v2/credentials/CHANGELOG.md

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/aws/aws-sdk-go-v2/credentials/go_module_metadata.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/aws/aws-sdk-go-v2/service/ecr/CHANGELOG.md

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/aws/aws-sdk-go-v2/service/ecr/api_op_DescribeImageScanFindings.go

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/aws/aws-sdk-go-v2/service/ecr/api_op_GetLifecyclePolicyPreview.go

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/aws/aws-sdk-go-v2/service/ecr/go_module_metadata.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/aws/aws-sdk-go-v2/service/ecr/internal/endpoints/endpoints.go

+17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/aws/aws-sdk-go-v2/service/sts/CHANGELOG.md

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/aws/aws-sdk-go-v2/service/sts/go_module_metadata.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/aws/aws-sdk-go-v2/service/sts/internal/endpoints/endpoints.go

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

+9-8
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ github.com/agext/levenshtein
191191
# github.com/ahmetb/dlog v0.0.0-20170105205344-4fb5f8204f26
192192
## explicit
193193
github.com/ahmetb/dlog
194-
# github.com/alessio/shellescape v1.4.2
194+
# github.com/alessio/shellescape v1.5.1 => github.com/alessio/shellescape v1.4.2
195195
## explicit; go 1.14
196196
github.com/alessio/shellescape
197197
# github.com/apex/log v1.9.0
@@ -227,10 +227,10 @@ github.com/aws/aws-sdk-go-v2/internal/shareddefaults
227227
github.com/aws/aws-sdk-go-v2/internal/strings
228228
github.com/aws/aws-sdk-go-v2/internal/sync/singleflight
229229
github.com/aws/aws-sdk-go-v2/internal/timeconv
230-
# github.com/aws/aws-sdk-go-v2/config v1.28.10
230+
# github.com/aws/aws-sdk-go-v2/config v1.28.11
231231
## explicit; go 1.21
232232
github.com/aws/aws-sdk-go-v2/config
233-
# github.com/aws/aws-sdk-go-v2/credentials v1.17.51
233+
# github.com/aws/aws-sdk-go-v2/credentials v1.17.52
234234
## explicit; go 1.21
235235
github.com/aws/aws-sdk-go-v2/credentials
236236
github.com/aws/aws-sdk-go-v2/credentials/ec2rolecreds
@@ -252,7 +252,7 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2
252252
# github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1
253253
## explicit; go 1.21
254254
github.com/aws/aws-sdk-go-v2/internal/ini
255-
# github.com/aws/aws-sdk-go-v2/service/ecr v1.38.3
255+
# github.com/aws/aws-sdk-go-v2/service/ecr v1.38.4
256256
## explicit; go 1.21
257257
github.com/aws/aws-sdk-go-v2/service/ecr
258258
github.com/aws/aws-sdk-go-v2/service/ecr/internal/endpoints
@@ -278,7 +278,7 @@ github.com/aws/aws-sdk-go-v2/service/sso/types
278278
github.com/aws/aws-sdk-go-v2/service/ssooidc
279279
github.com/aws/aws-sdk-go-v2/service/ssooidc/internal/endpoints
280280
github.com/aws/aws-sdk-go-v2/service/ssooidc/types
281-
# github.com/aws/aws-sdk-go-v2/service/sts v1.33.6
281+
# github.com/aws/aws-sdk-go-v2/service/sts v1.33.7
282282
## explicit; go 1.21
283283
github.com/aws/aws-sdk-go-v2/service/sts
284284
github.com/aws/aws-sdk-go-v2/service/sts/internal/endpoints
@@ -978,7 +978,7 @@ github.com/heroku/color
978978
# github.com/huandu/xstrings v1.5.0
979979
## explicit; go 1.12
980980
github.com/huandu/xstrings
981-
# github.com/imdario/mergo v0.3.16
981+
# github.com/imdario/mergo v1.0.1 => github.com/imdario/mergo v0.3.16
982982
## explicit; go 1.13
983983
github.com/imdario/mergo
984984
# github.com/inconshreveable/mousetrap v1.1.0
@@ -1023,7 +1023,7 @@ github.com/klauspost/compress/zstd/internal/xxhash
10231023
# github.com/krishicks/yaml-patch v0.0.10
10241024
## explicit
10251025
github.com/krishicks/yaml-patch
1026-
# github.com/letsencrypt/boulder v0.0.0-20250114010515-bb9d82b85f7b
1026+
# github.com/letsencrypt/boulder v0.0.0-20250114215406-2e1f733c269b
10271027
## explicit; go 1.23.0
10281028
github.com/letsencrypt/boulder/core
10291029
github.com/letsencrypt/boulder/core/proto
@@ -1867,7 +1867,6 @@ google.golang.org/protobuf/types/known/wrapperspb
18671867
# gopkg.in/evanphx/json-patch.v4 v4.12.0
18681868
## explicit
18691869
gopkg.in/evanphx/json-patch.v4
1870-
# gopkg.in/go-jose/go-jose.v2 v2.6.3
18711870
# gopkg.in/inf.v0 v0.9.1
18721871
## explicit
18731872
gopkg.in/inf.v0
@@ -2412,3 +2411,5 @@ sigs.k8s.io/structured-merge-diff/v4/value
24122411
sigs.k8s.io/yaml
24132412
sigs.k8s.io/yaml/goyaml.v2
24142413
sigs.k8s.io/yaml/goyaml.v3
2414+
# github.com/alessio/shellescape => github.com/alessio/shellescape v1.4.2
2415+
# github.com/imdario/mergo => github.com/imdario/mergo v0.3.16

0 commit comments

Comments
 (0)