Skip to content

Commit 7ef1c6c

Browse files
What does does this PR do / why we need it:
Updates the ORAS dependency to oras.land/oras-go v1.1.0 to fix the dependency collision between devfile and ODC. Which issue(s) this PR fixes: Fixes devfile/api#854 Signed-off-by: David Peraza <[email protected]>
1 parent 192202e commit 7ef1c6c

File tree

1,060 files changed

+88877
-48394
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,060 files changed

+88877
-48394
lines changed

registry-library/go.mod

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ module github.com/devfile/registry-support/registry-library
33
go 1.14
44

55
require (
6-
github.com/containerd/containerd v1.5.2
6+
github.com/containerd/containerd v1.5.9
77
github.com/devfile/registry-support/index/generator v0.0.0-20220222194908-7a90a4214f3e
88
github.com/hashicorp/go-version v1.4.0
99
github.com/mitchellh/go-homedir v1.1.0
10-
github.com/spf13/cobra v1.1.1
11-
github.com/spf13/viper v1.7.1
12-
oras.land/oras-go v0.4.0
13-
rsc.io/letsencrypt v0.0.3 // indirect
10+
github.com/spf13/cobra v1.2.1
11+
github.com/spf13/viper v1.8.1
12+
oras.land/oras-go v1.1.0
1413
)

registry-library/go.sum

+298-37
Large diffs are not rendered by default.

registry-library/library/library.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,11 @@ func PullStackByMediaTypesFromRegistry(registry string, stack string, allowedMed
321321

322322
resolver := docker.NewResolver(docker.ResolverOptions{Headers: headers, PlainHTTP: plainHTTP, Client: httpClient})
323323
ref := path.Join(urlObj.Host, stackLink)
324-
fileStore := content.NewFileStore(destDir)
324+
fileStore := content.NewFile(destDir)
325325
defer fileStore.Close()
326326

327327
// Pull stack from registry and save it to disk
328-
_, _, err = oras.Pull(ctx, resolver, ref, fileStore, oras.WithAllowedMediaTypes(allowedMediaTypes))
328+
_, err = oras.Copy(ctx, resolver, ref, fileStore, ref, oras.WithAllowedMediaTypes(allowedMediaTypes))
329329
if err != nil {
330330
return fmt.Errorf("failed to pull stack %s from %s with allowed media types %v: %v", stack, ref, allowedMediaTypes, err)
331331
}

registry-library/vendor/github.com/Microsoft/hcsshim/LICENSE renamed to registry-library/vendor/github.com/Azure/go-ansiterm/LICENSE

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

registry-library/vendor/github.com/Azure/go-ansiterm/README.md

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

registry-library/vendor/github.com/Azure/go-ansiterm/constants.go

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

registry-library/vendor/github.com/Azure/go-ansiterm/context.go

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

registry-library/vendor/github.com/Azure/go-ansiterm/csi_entry_state.go

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

registry-library/vendor/github.com/Azure/go-ansiterm/csi_param_state.go

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

registry-library/vendor/github.com/Azure/go-ansiterm/escape_intermediate_state.go

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

0 commit comments

Comments
 (0)