Skip to content

Commit 907cfa7

Browse files
authored
Require a valid version of github.com/openshift/api (elastic#5132)
* Require a valid version of github.com/openshift/api If you run go mod tidy it fails with: go: downloading github.com/openshift/api v3.9.0+incompatible unknown revision v3.9.0 The go.sum points to github.com/openshift/api@v3.9.0 but this version does not exist, it was retracted in openshift/api#1515 Added a replace directive to pin the library to a known commit that points to the now retracted v3.9.0 release. * add comment to replace directive * make notice
1 parent 3f363ff commit 907cfa7

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

.golangci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ linters-settings:
117117
- github.com/dop251/goja
118118
- github.com/dop251/goja_nodejs
119119
- github.com/fsnotify/fsnotify
120+
- github.com/openshift/api
120121
- github.com/tonistiigi/fifo
121122

122123
gosimple:

NOTICE.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -38403,11 +38403,11 @@ Contents of probable licence file $GOMODCACHE/github.com/opencontainers/image-sp
3840338403

3840438404
--------------------------------------------------------------------------------
3840538405
Dependency : github.com/openshift/api
38406-
Version: v3.9.0+incompatible
38406+
Version: v0.0.0-20180801171038-322a19404e37
3840738407
Licence type (autodetected): Apache-2.0
3840838408
--------------------------------------------------------------------------------
3840938409

38410-
Contents of probable licence file $GOMODCACHE/github.com/openshift/api@v3.9.0+incompatible/LICENSE:
38410+
Contents of probable licence file $GOMODCACHE/github.com/openshift/api@v0.0.0-20180801171038-322a19404e37/LICENSE:
3841138411

3841238412
Apache License
3841338413
Version 2.0, January 2004

go.mod

+3
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,9 @@ replace (
340340
github.com/Shopify/sarama => github.com/elastic/sarama v1.19.1-0.20220310193331-ebc2b0d8eef3
341341
github.com/dop251/goja => github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20
342342
github.com/dop251/goja_nodejs => github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6
343+
// openshift removed all tags from their repo, use the pseudoversion from the release-3.9 branch HEAD
344+
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/12d41f40b0d408b0167633d8095160d3343d46ac/go.mod#L38
345+
github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20180801171038-322a19404e37
343346
github.com/tonistiigi/fifo => github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c
344347
)
345348

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1345,9 +1345,9 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
13451345
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
13461346
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
13471347
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
1348+
github.com/openshift/api v0.0.0-20180801171038-322a19404e37 h1:05irGU4HK4IauGGDbsk+ZHrm1wOzMLYjMlfaiqMrBYc=
1349+
github.com/openshift/api v0.0.0-20180801171038-322a19404e37/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY=
13481350
github.com/openshift/api v0.0.0-20210521075222-e273a339932a/go.mod h1:izBmoXbUu3z5kUa4FjZhvekTsyzIWiOoaIgJiZBBMQs=
1349-
github.com/openshift/api v3.9.0+incompatible h1:fJ/KsefYuZAjmrr3+5U9yZIZbTOpVkDDLDLFresAeYs=
1350-
github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY=
13511351
github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
13521352
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 h1:ZHRIMCFIJN1p9LsJt4HQ+akDrys4PrYnXzOWI5LK03I=
13531353
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142/go.mod h1:fjS8r9mqDVsPb5td3NehsNOAWa4uiFkYEfVZioQ2gH0=

0 commit comments

Comments
 (0)