Enable mock test for GKEHubfeatureMembership

gemmahou · Jun 10, 2024 · b61c20a · b61c20a
1 parent 0ab6cb6
commit b61c20a
Show file tree

Hide file tree

Showing 9 changed files with 1,494 additions and 192 deletions.
diff --git a/config/tests/samples/create/harness.go b/config/tests/samples/create/harness.go
@@ -637,6 +637,7 @@ func MaybeSkip(t *testing.T, name string, resources []*unstructured.Unstructured
 
 			case schema.GroupKind{Group: "gkehub.cnrm.cloud.google.com", Kind: "GKEHubFeature"}:
 			case schema.GroupKind{Group: "gkehub.cnrm.cloud.google.com", Kind: "GKEHubMembership"}:
+			case schema.GroupKind{Group: "gkehub.cnrm.cloud.google.com", Kind: "GKEHubFeatureMembership"}:
 
 			case schema.GroupKind{Group: "cloudbuild.cnrm.cloud.google.com", Kind: "CloudBuildWorkerPool"}:
 

diff --git a/mockgcp/generated/mockgcp/cloud/gkehub/servicemesh/v1beta/servicemesh.pb.go b/mockgcp/generated/mockgcp/cloud/gkehub/servicemesh/v1beta/servicemesh.pb.go
diff --git a/mockgcp/generated/mockgcp/cloud/gkehub/v1beta/configmanagement/configmanagement.pb.go b/mockgcp/generated/mockgcp/cloud/gkehub/v1beta/configmanagement/configmanagement.pb.go
diff --git a/mockgcp/generated/mockgcp/cloud/gkehub/v1beta/feature.pb.go b/mockgcp/generated/mockgcp/cloud/gkehub/v1beta/feature.pb.go
diff --git a/mockgcp/generated/mockgcp/cloud/gkehub/v1beta/metering/metering.pb.go b/mockgcp/generated/mockgcp/cloud/gkehub/v1beta/metering/metering.pb.go
diff --git a/mockgcp/generated/mockgcp/cloud/gkehub/v1beta/multiclusteringress/multiclusteringress.pb.go b/mockgcp/generated/mockgcp/cloud/gkehub/v1beta/multiclusteringress/multiclusteringress.pb.go
diff --git a/mockgcp/generated/mockgcp/cloud/gkehub/v1beta/service.pb.go b/mockgcp/generated/mockgcp/cloud/gkehub/v1beta/service.pb.go
diff --git a/mockgcp/generated/mockgcp/cloud/gkehub/v1beta1/membership.pb.go b/mockgcp/generated/mockgcp/cloud/gkehub/v1beta1/membership.pb.go
diff --git a/mockgcp/mockgkehub/gkehubfeature.go b/mockgcp/mockgkehub/gkehubfeature.go
@@ -87,8 +87,9 @@ func (s *GKEHubFeature) UpdateFeature(ctx context.Context, req *pb.UpdateFeature
 		switch path {
 		case "labels":
 			obj.Labels = req.Resource.GetLabels()
+		// Spec is in the GCP API, not a KRM Spec
 		case "spec":
-			obj.Spec.FeatureSpec = req.GetResource().Spec.GetFeatureSpec().(*pb.CommonFeatureSpec_Multiclusteringress)
+			obj.Spec = req.GetResource().Spec
 		case "membershipSpecs":
 			obj.MembershipSpecs = req.GetResource().GetMembershipSpecs()
 		default: