Skip to content

Commit 04d4764

Browse files
authored
fix(deps): remove ocm dependent pins from go mod (#739)
<!-- markdownlint-disable MD041 --> #### What this PR does / why we need it #### Which issue(s) this PR fixes <!-- Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`. --> Signed-off-by: Gergely Brautigam <[email protected]>
1 parent f082ebd commit 04d4764

File tree

3 files changed

+71
-38
lines changed

3 files changed

+71
-38
lines changed

controllers/resource_controller_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,11 @@ func TestResourceReconcilerVersionDefaulting(t *testing.T) {
271271
t.Log("setting up component version with different reconciled version")
272272
cv := DefaultComponent.DeepCopy()
273273
cv.Status.ReconciledVersion = "v0.9.9"
274-
274+
275275
t.Log("setting up component descriptor with different version")
276276
cd := DefaultComponentDescriptor.DeepCopy()
277277
cd.Spec.Version = "v1.2.3"
278-
278+
279279
cv.Status.ComponentDescriptor = v1alpha1.Reference{
280280
Name: resource.Spec.SourceRef.Name,
281281
Version: resource.Spec.SourceRef.GetVersion(),

go.mod

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,8 @@ module github.com/open-component-model/ocm-controller
22

33
go 1.24.4
44

5-
// ocm dependent re-writes.
6-
replace (
7-
github.com/google/go-containerregistry => github.com/google/go-containerregistry v0.14.1-0.20230409045903-ed5c185df419
8-
github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.1-0.20220411205349-bde1400a84be
9-
github.com/sigstore/cosign/v2 => github.com/sigstore/cosign/v2 v2.0.2
10-
// this is needed for OCM to compile
11-
github.com/texttheater/golang-levenshtein => github.com/texttheater/golang-levenshtein v0.0.0-20200805054039-cae8b0eaed6c
12-
)
5+
// flux dependent rewrite
6+
replace github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.1-0.20220411205349-bde1400a84be
137

148
require (
159
cuelang.org/go v0.14.0
@@ -63,7 +57,6 @@ require (
6357
cloud.google.com/go/compute/metadata v0.7.0 // indirect
6458
code.gitea.io/sdk/gitea v0.21.0 // indirect
6559
dario.cat/mergo v1.0.2 // indirect
66-
filippo.io/edwards25519 v1.1.0 // indirect
6760
github.com/42wim/httpsig v1.2.2 // indirect
6861
github.com/AliyunContainerService/ack-ram-tool/pkg/credentials/provider v0.15.2 // indirect
6962
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
@@ -164,6 +157,7 @@ require (
164157
github.com/docker/go-metrics v0.0.1 // indirect
165158
github.com/docker/go-units v0.5.0 // indirect
166159
github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960 // indirect
160+
github.com/dustin/go-humanize v1.0.1 // indirect
167161
github.com/elliotchance/orderedmap v1.8.0 // indirect
168162
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
169163
github.com/emicklei/proto v1.14.2 // indirect
@@ -222,7 +216,7 @@ require (
222216
github.com/google/gnostic-models v0.7.0 // indirect
223217
github.com/google/go-cmp v0.7.0 // indirect
224218
github.com/google/go-github/v45 v45.2.0 // indirect
225-
github.com/google/go-github/v50 v50.2.0 // indirect
219+
github.com/google/go-github/v72 v72.0.0 // indirect
226220
github.com/google/go-querystring v1.1.0 // indirect
227221
github.com/google/s2a-go v0.1.9 // indirect
228222
github.com/google/uuid v1.6.0 // indirect
@@ -244,6 +238,7 @@ require (
244238
github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect
245239
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
246240
github.com/hashicorp/vault-client-go v0.4.3 // indirect
241+
github.com/in-toto/attestation v1.1.1 // indirect
247242
github.com/in-toto/in-toto-golang v0.9.0 // indirect
248243
github.com/inconshreveable/mousetrap v1.1.0 // indirect
249244
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -287,6 +282,7 @@ require (
287282
github.com/mozillazg/docker-credential-acr-helper v0.4.0 // indirect
288283
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
289284
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
285+
github.com/nozzle/throttler v0.0.0-20180817012639-2ea982251481 // indirect
290286
github.com/oklog/ulid v1.3.1 // indirect
291287
github.com/oleiade/reflections v1.1.0 // indirect
292288
github.com/opencontainers/go-digest/blake3 v0.0.0-20250116041648-1e56c6daea3b // indirect
@@ -321,6 +317,7 @@ require (
321317
github.com/sigstore/protobuf-specs v0.4.3 // indirect
322318
github.com/sigstore/rekor v1.3.10 // indirect
323319
github.com/sigstore/sigstore v1.9.5 // indirect
320+
github.com/sigstore/sigstore-go v1.0.0 // indirect
324321
github.com/sigstore/timestamp-authority v1.2.8 // indirect
325322
github.com/sirupsen/logrus v1.9.3 // indirect
326323
github.com/skeema/knownhosts v1.3.1 // indirect
@@ -337,6 +334,7 @@ require (
337334
github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c // indirect
338335
github.com/thales-e-security/pool v0.0.2 // indirect
339336
github.com/theupdateframework/go-tuf v0.7.0 // indirect
337+
github.com/theupdateframework/go-tuf/v2 v2.1.1 // indirect
340338
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
341339
github.com/tjfoc/gmsm v1.4.1 // indirect
342340
github.com/tonglil/buflogr v1.1.1 // indirect
@@ -347,7 +345,6 @@ require (
347345
github.com/vbatts/tar-split v0.12.1 // indirect
348346
github.com/vladimirvivien/gexe v0.4.1 // indirect
349347
github.com/x448/float16 v0.8.4 // indirect
350-
github.com/xanzy/go-gitlab v0.114.0 // indirect
351348
github.com/xanzy/ssh-agent v0.3.3 // indirect
352349
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
353350
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
@@ -356,6 +353,7 @@ require (
356353
github.com/zeebo/assert v1.3.0 // indirect
357354
github.com/zeebo/blake3 v0.2.4 // indirect
358355
github.com/zeebo/errs v1.4.0 // indirect
356+
gitlab.com/gitlab-org/api/client-go v0.130.1 // indirect
359357
go.mongodb.org/mongo-driver v1.17.1 // indirect
360358
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
361359
go.opentelemetry.io/contrib/bridges/prometheus v0.57.0 // indirect
@@ -380,7 +378,6 @@ require (
380378
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
381379
go.opentelemetry.io/otel/trace v1.37.0 // indirect
382380
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
383-
go.step.sm/crypto v0.66.0 // indirect
384381
go.uber.org/multierr v1.11.0 // indirect
385382
go.uber.org/zap v1.27.0 // indirect
386383
go.yaml.in/yaml/v2 v2.4.2 // indirect

0 commit comments

Comments
 (0)