Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(meshexternalservice): prevent targeting mesh circuit breaker by validation #11476

Merged
merged 1 commit into from
Sep 20, 2024
Merged

chore(meshexternalservice): prevent targeting mesh circuit breaker by validation #11476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/plugins/policies/core/matchers/egress_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")),
Expand All @@ -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")),
Expand Down
1 change: 0 additions & 1 deletion pkg/plugins/policies/meshcircuitbreaker/api/v1alpha1/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,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,
},
}))
Expand Down
4 changes: 2 additions & 2 deletions pkg/plugins/policies/meshcircuitbreaker/api/v1alpha1/validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ to:
name: web-backend
default:
connectionLimits: { }`),
Entry("with MeshExternalService example", `
XEntry("with MeshExternalService example", `
targetRef:
kind: Mesh
to:
Expand Down Expand Up @@ -490,7 +490,7 @@ violations:
- field: spec.to[0].default.outlierDetection.detectors.successRate.standardDeviationFactor
message: 'invalid number'`,
}),
Entry("status codes out of range in expectedStatuses", testCase{
XEntry("status codes out of range in expectedStatuses", testCase{
inputYaml: `
targetRef:
kind: MeshService
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugins/policies/meshcircuitbreaker/plugin/v1alpha1/plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ var _ = Describe("MeshCircuitBreaker", 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{
Expand Down
2 changes: 1 addition & 1 deletion test/e2e_env/universal/meshexternalservice/meshexternalservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ spec:
})
})

Context("MeshExternalService with MeshCircuitBreaker", func() {
XContext("MeshExternalService with MeshCircuitBreaker", func() {
E2EAfterEach(func() {
Expect(DeleteMeshResources(universal.Cluster, meshNameNoDefaults,
meshcircuitbreaker_api.MeshCircuitBreakerResourceTypeDescriptor,
Expand Down
Loading