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]>
devfile · May 25, 2022 · 7ef1c6c · 7ef1c6c
1 parent 192202e
commit 7ef1c6c
Show file tree

Hide file tree

Showing 1,060 changed files with 88,877 additions and 48,394 deletions.
diff --git a/registry-library/go.mod b/registry-library/go.mod
@@ -3,12 +3,11 @@ module github.com/devfile/registry-support/registry-library
 go 1.14
 
 require (
-	github.com/containerd/containerd v1.5.2
+	github.com/containerd/containerd v1.5.9
 	github.com/devfile/registry-support/index/generator v0.0.0-20220222194908-7a90a4214f3e
 	github.com/hashicorp/go-version v1.4.0
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/spf13/cobra v1.1.1
-	github.com/spf13/viper v1.7.1
-	oras.land/oras-go v0.4.0
-	rsc.io/letsencrypt v0.0.3 // indirect
+	github.com/spf13/cobra v1.2.1
+	github.com/spf13/viper v1.8.1
+	oras.land/oras-go v1.1.0
 )
diff --git a/registry-library/go.sum b/registry-library/go.sum
diff --git a/registry-library/library/library.go b/registry-library/library/library.go
@@ -321,11 +321,11 @@ func PullStackByMediaTypesFromRegistry(registry string, stack string, allowedMed
 
 	resolver := docker.NewResolver(docker.ResolverOptions{Headers: headers, PlainHTTP: plainHTTP, Client: httpClient})
 	ref := path.Join(urlObj.Host, stackLink)
-	fileStore := content.NewFileStore(destDir)
+	fileStore := content.NewFile(destDir)
 	defer fileStore.Close()
 
 	// Pull stack from registry and save it to disk
-	_, _, err = oras.Pull(ctx, resolver, ref, fileStore, oras.WithAllowedMediaTypes(allowedMediaTypes))
+	_, err = oras.Copy(ctx, resolver, ref, fileStore, ref, oras.WithAllowedMediaTypes(allowedMediaTypes))
 	if err != nil {
 		return fmt.Errorf("failed to pull stack %s from %s with allowed media types %v: %v", stack, ref, allowedMediaTypes, err)
 	}

diff --git a/...ndor/github.com/Microsoft/hcsshim/LICENSE → ...ndor/github.com/Azure/go-ansiterm/LICENSE b/...ndor/github.com/Microsoft/hcsshim/LICENSE → ...ndor/github.com/Azure/go-ansiterm/LICENSE
diff --git a/registry-library/vendor/github.com/Azure/go-ansiterm/README.md b/registry-library/vendor/github.com/Azure/go-ansiterm/README.md
diff --git a/registry-library/vendor/github.com/Azure/go-ansiterm/constants.go b/registry-library/vendor/github.com/Azure/go-ansiterm/constants.go
diff --git a/registry-library/vendor/github.com/Azure/go-ansiterm/context.go b/registry-library/vendor/github.com/Azure/go-ansiterm/context.go
diff --git a/registry-library/vendor/github.com/Azure/go-ansiterm/csi_entry_state.go b/registry-library/vendor/github.com/Azure/go-ansiterm/csi_entry_state.go
diff --git a/registry-library/vendor/github.com/Azure/go-ansiterm/csi_param_state.go b/registry-library/vendor/github.com/Azure/go-ansiterm/csi_param_state.go
diff --git a/registry-library/vendor/github.com/Azure/go-ansiterm/escape_intermediate_state.go b/registry-library/vendor/github.com/Azure/go-ansiterm/escape_intermediate_state.go