Test validation entirely instead of subfunction

stackitcloud · Aug 2, 2024 · e9f6c6b · e9f6c6b
1 parent 8db0c3a
commit e9f6c6b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pkg/apis/flux/v1alpha1/validation/fluxconfig_test.go b/pkg/apis/flux/v1alpha1/validation/fluxconfig_test.go
@@ -346,7 +346,7 @@ var _ = Describe("FluxConfig validation", func() {
 	Describe("additionalSecretResources validation", func() {
 		It("should allow specifying nothing", func() {
 			fluxConfig.AdditionalSecretResources = nil
-			Expect(ValidateAdditionalSecretResources(fluxConfig.AdditionalSecretResources, shoot, rootFldPath)).To(BeEmpty())
+			Expect(ValidateFluxConfig(fluxConfig, shoot, rootFldPath)).To(BeEmpty())
 		})
 		It("should find all errors", func() {
 			fluxConfig.AdditionalSecretResources = []AdditionalResource{
@@ -370,21 +370,21 @@ var _ = Describe("FluxConfig validation", func() {
 				},
 			}
 			Expect(
-				ValidateAdditionalSecretResources(fluxConfig.AdditionalSecretResources, shoot, rootFldPath),
+				ValidateFluxConfig(fluxConfig, shoot, rootFldPath),
 			).To(ConsistOf(
 				PointTo(MatchFields(IgnoreExtras, Fields{
 					"Type":   Equal(field.ErrorTypeInvalid),
-					"Field":  Equal("root[1].name"),
+					"Field":  Equal("root.additionalSecretResources[1].name"),
 					"Detail": ContainSubstring("is not a secret"),
 				})),
 				PointTo(MatchFields(IgnoreExtras, Fields{
 					"Type":   Equal(field.ErrorTypeInvalid),
-					"Field":  Equal("root[2].name"),
+					"Field":  Equal("root.additionalSecretResources[2].name"),
 					"Detail": ContainSubstring("does not match any of the resource names"),
 				})),
 				PointTo(MatchFields(IgnoreExtras, Fields{
 					"Type":   Equal(field.ErrorTypeInvalid),
-					"Field":  Equal("root[3].targetName"),
+					"Field":  Equal("root.additionalSecretResources[3].targetName"),
 					"Detail": ContainSubstring("must be a valid resource name"),
 				})),
 			))