bump component-spec dependency (#812)

* bump component-spec dependency (run-int-tests) * fix incompatible changes (run-int-tests)
gardener · Sep 5, 2023 · aa8cdb2 · aa8cdb2
1 parent b61300b
commit aa8cdb2
Show file tree

Hide file tree

Showing 14 changed files with 120 additions and 82 deletions.
diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/containerd/containerd v1.7.0
 	github.com/docker/cli v23.0.5+incompatible
 	github.com/gardener/component-cli v0.44.0
-	github.com/gardener/component-spec/bindings-go v0.0.66
+	github.com/gardener/component-spec/bindings-go v0.0.95
 	github.com/gardener/image-vector v0.10.0
 	github.com/gardener/landscaper/apis v0.0.0-00010101000000-000000000000
 	github.com/gardener/landscaper/controller-utils v0.0.0-00010101000000-000000000000

diff --git a/go.sum b/go.sum
@@ -184,8 +184,8 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS
 github.com/gardener/component-cli v0.44.0 h1:19w703QNyV0VRhoqbRv6NgibK/t6OZxoLqkBWO/JrFM=
 github.com/gardener/component-cli v0.44.0/go.mod h1:TMYFZYiopyvbgVzaMALgUcJvup3LP/qOl/NQpS7uvjM=
 github.com/gardener/component-spec/bindings-go v0.0.52/go.mod h1:kQFMTWowNAp9tOp6aImQa/NoLzfvX29jN5Qgud9rpQU=
-github.com/gardener/component-spec/bindings-go v0.0.66 h1:FvtnnTxXJi2ZCC/GgijUNJCcwwdlZAiEWpZTtyHviz0=
-github.com/gardener/component-spec/bindings-go v0.0.66/go.mod h1:qr7kADDXbXB0huul+ih/B43YkwyiMFYQepp/tqJ331c=
+github.com/gardener/component-spec/bindings-go v0.0.95 h1:0h9ZRfWo0d84PkC/reVRXALJsOiyuwP0nsFdrOCWXtk=
+github.com/gardener/component-spec/bindings-go v0.0.95/go.mod h1:qr7kADDXbXB0huul+ih/B43YkwyiMFYQepp/tqJ331c=
 github.com/gardener/image-vector v0.10.0 h1:Ysg3hxfiGUG/doajiZ0nQuUaJYwfO5BZCOcijL3tRuo=
 github.com/gardener/image-vector v0.10.0/go.mod h1:32SHGcbmmueeK9VkawsFcEbsoENXQPIuuYiFBUP+vMQ=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=

diff --git a/pkg/landscaper/installations/executions/template/template_test.go b/pkg/landscaper/installations/executions/template/template_test.go
@@ -198,7 +198,7 @@ func runTestSuite(testdataDir, sharedTestdataDir string) {
 						Version: "1.0.0",
 					},
 					RepositoryContexts: []*types.UnstructuredTypedObject{},
-					Provider:           cdv2.InternalProvider,
+					Provider:           "internal",
 					Resources: []types.Resource{
 						{
 							IdentityObjectMeta: cdv2.IdentityObjectMeta{
@@ -250,7 +250,7 @@ func runTestSuite(testdataDir, sharedTestdataDir string) {
 						Version: "1.0.0",
 					},
 					RepositoryContexts: []*types.UnstructuredTypedObject{},
-					Provider:           cdv2.InternalProvider,
+					Provider:           "internal",
 					ComponentReferences: []types.ComponentReference{
 						{
 							Name:          "my-referenced-component",
@@ -271,7 +271,7 @@ func runTestSuite(testdataDir, sharedTestdataDir string) {
 						Version: "1.0.0",
 					},
 					RepositoryContexts: []*types.UnstructuredTypedObject{},
-					Provider:           cdv2.InternalProvider,
+					Provider:           "internal",
 					Resources: []types.Resource{
 						{
 							IdentityObjectMeta: cdv2.IdentityObjectMeta{

diff --git a/pkg/landscaper/jsonschema/jsonschema_suite_test.go b/pkg/landscaper/jsonschema/jsonschema_suite_test.go
@@ -868,7 +868,7 @@ func buildAndUploadComponentDescriptorWithArtifacts(ctx context.Context, host, n
 
 	cd.Name = name
 	cd.Version = version
-	cd.Provider = cdv2.InternalProvider
+	cd.Provider = "internal"
 	cd.ComponentReferences = cdRefs
 	cd.Resources = cdRes
 	repoCtx := cdv2.OCIRegistryRepository{

diff --git a/pkg/landscaper/registry/components/cdutils/uri_test.go b/pkg/landscaper/registry/components/cdutils/uri_test.go
@@ -49,7 +49,7 @@ var _ = Describe("URI", func() {
 					Version: "1.0.0",
 				},
 				RepositoryContexts: repositoryContexts,
-				Provider:           cdv2.ExternalProvider,
+				Provider:           "external",
 				ComponentReferences: []types.ComponentReference{
 					{
 						Name:          "comp1",

diff --git a/test/integration/core/registry.go b/test/integration/core/registry.go
@@ -509,7 +509,7 @@ func buildAndUploadNginxComponentDescriptorWithArtifacts(ctx context.Context, f
 	)
 	cd.Name = name
 	cd.Version = version
-	cd.Provider = cdv2.InternalProvider
+	cd.Provider = "internal"
 	repoCtx := cdv2.OCIRegistryRepository{
 		ObjectType: cdv2.ObjectType{
 			Type: cdv2.OCIRegistryType,
@@ -592,7 +592,7 @@ func buildAndUploadComponentDescriptorsWithBlueprints(ctx context.Context, f *fr
 		cd := &cdv2.ComponentDescriptor{}
 		cd.Name = cdd.name
 		cd.Version = cdd.version
-		cd.Provider = cdv2.InternalProvider
+		cd.Provider = "internal"
 		utils.ExpectNoError(cdv2.InjectRepositoryContext(cd, &repoCtx))
 
 		// add blueprint

diff --git a/vendor/github.com/gardener/component-spec/bindings-go/apis/v2/componentdescriptor.go b/vendor/github.com/gardener/component-spec/bindings-go/apis/v2/componentdescriptor.go