chore(meshhealthcheck): prevent targeting meshexternalservice by vali…

…dation Signed-off-by: slonka <slonka@users.noreply.github.com>
kumahq · Sep 19, 2024 · 61f1b6e · 61f1b6e
1 parent ec36212
commit 61f1b6e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/pkg/plugins/policies/core/matchers/egress_test.go b/pkg/plugins/policies/core/matchers/egress_test.go
@@ -128,7 +128,7 @@ var _ = Describe("EgressMatchedPolicies", func() {
 					Expect(err).ToNot(HaveOccurred())
 					Expect(bytes).To(test_matchers.MatchGoldenYAML(strings.Replace(inputFile, ".input.", ".golden.", 1)))
 				},
-				Entry("should generate to resource rules for egress and mesh externalservice"),
+				XEntry("should generate to resource rules for egress and mesh externalservice"),
 			)
 		},
 		test.EntriesForFolder(filepath.Join("egressmatchedpolicies", "meshexternalservice", "torules")),
@@ -151,7 +151,7 @@ var _ = Describe("EgressMatchedPolicies", func() {
 					Expect(err).ToNot(HaveOccurred())
 					Expect(bytes).To(test_matchers.MatchGoldenYAML(strings.Replace(inputFile, ".input.", ".golden.", 1)))
 				},
-				Entry("should generate to resource rules for egress and mesh externalservice"),
+				XEntry("should generate to resource rules for egress and mesh externalservice"),
 			)
 		},
 		test.EntriesForFolder(filepath.Join("egressmatchedpolicies", "meshexternalservice", "fromtorules")),

diff --git a/pkg/plugins/policies/meshhealthcheck/api/v1alpha1/validator.go b/pkg/plugins/policies/meshhealthcheck/api/v1alpha1/validator.go
@@ -40,7 +40,6 @@ func validateTo(topTargetRef common_api.TargetRef, to []To) validators.Validatio
 			SupportedKinds: []common_api.TargetRefKind{
 				common_api.Mesh,
 				common_api.MeshService,
-				common_api.MeshExternalService,
 				common_api.MeshMultiZoneService,
 			},
 		}))

diff --git a/pkg/plugins/policies/meshhealthcheck/api/v1alpha1/validator_test.go b/pkg/plugins/policies/meshhealthcheck/api/v1alpha1/validator_test.go
@@ -82,7 +82,7 @@ to:
       tcp: # it will pick the protocol as described in 'protocol selection' section
         disabled: true # new, default false, can be disabled for override
 `),
-			Entry("to level MeshExternalService", `
+			XEntry("to level MeshExternalService", `
 targetRef:
   kind: Mesh
 to:
@@ -295,7 +295,7 @@ violations:
   - field: spec.to[0].default.http.expectedStatuses[1]
     message: must be in inclusive range [100, 599]`,
 			}),
-			Entry("cannot use MeshExternalService with other type than Mesh", testCase{
+			XEntry("cannot use MeshExternalService with other type than Mesh", testCase{
 				inputYaml: `
 targetRef:
   kind: MeshSubset

diff --git a/pkg/plugins/policies/meshhealthcheck/plugin/v1alpha1/plugin_test.go b/pkg/plugins/policies/meshhealthcheck/plugin/v1alpha1/plugin_test.go
@@ -287,7 +287,7 @@ var _ = Describe("MeshHealthCheck", func() {
 		}),
 	)
 
-	It("should generate correct configuration for MeshExternalService with ZoneEgress", func() {
+	XIt("should generate correct configuration for MeshExternalService with ZoneEgress", func() {
 		// given
 		rs := core_xds.NewResourceSet()
 		rs.Add(&core_xds.Resource{

diff --git a/test/e2e_env/universal/meshexternalservice/meshexternalservice.go b/test/e2e_env/universal/meshexternalservice/meshexternalservice.go
@@ -591,7 +591,7 @@ spec:
 		})
 	})
 
-	Context("MeshExternalService with MeshHealthCheck", func() {
+	XContext("MeshExternalService with MeshHealthCheck", func() {
 		E2EAfterEach(func() {
 			Expect(DeleteMeshResources(universal.Cluster, meshNameNoDefaults,
 				meshhealthcheck_api.MeshHealthCheckResourceTypeDescriptor,