Add required sideEffects setting

Azure · Nov 23, 2020 · a352aa7 · a352aa7
1 parent 357ed9e
commit a352aa7
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/hack/generator/pkg/astmodel/armconversion/convert_from_arm_function_builder.go b/hack/generator/pkg/astmodel/armconversion/convert_from_arm_function_builder.go
@@ -157,7 +157,7 @@ func (builder *convertFromArmBuilder) namePropertyHandler(
 					Sel: ast.NewIdent("SetAzureName"),
 				},
 				Args: []ast.Expr{
-					astbuilder.CallQualifiedFuncByName(
+					astbuilder.CallQualifiedFunc(
 						astmodel.GenRuntimePackageName,
 						"ExtractKubernetesResourceNameFromArmName",
 						&ast.SelectorExpr{

diff --git a/hack/generator/pkg/astmodel/kubernetes_resource_interface.go b/hack/generator/pkg/astmodel/kubernetes_resource_interface.go
@@ -115,7 +115,7 @@ func AddKubernetesResourceInterfaceImpls(
 		// e.g.  "default.backendaddresspool.infra.azure.com"
 		name := fmt.Sprintf("default.%s.%s", resource, group)
 
-		annotation := fmt.Sprintf("+kubebuilder:webhook:path=/%s,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=%s,resources=%s,verbs=create;update,versions=%s,name=%s", path, group, resource, version, name)
+		annotation := fmt.Sprintf("+kubebuilder:webhook:path=/%s,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=%s,resources=%s,verbs=create;update,versions=%s,name=%s", path, group, resource, version, name)
 		r = r.WithInterface(NewInterfaceImplementation(
 			MakeTypeName(admissionPackageReference, "Defaulter"),
 			&objectFunction{

diff --git a/...nerator/pkg/codegen/testdata/ArmResource/Arm_test_dependent_resource_and_ownership.golden b/...nerator/pkg/codegen/testdata/ArmResource/Arm_test_dependent_resource_and_ownership.golden
@@ -19,7 +19,7 @@ type A struct {
 	Spec              A_Spec `json:"spec,omitempty"`
 }
 
-// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-a,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=a,verbs=create;update,versions=v20200101,name=default.a.test.infra.azure.com
+// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-a,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=a,verbs=create;update,versions=v20200101,name=default.a.test.infra.azure.com
 
 var _ admission.Defaulter = &A{}
 
@@ -86,7 +86,7 @@ type B struct {
 	Spec              B_Spec `json:"spec,omitempty"`
 }
 
-// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-b,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=b,verbs=create;update,versions=v20200101,name=default.b.test.infra.azure.com
+// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-b,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=b,verbs=create;update,versions=v20200101,name=default.b.test.infra.azure.com
 
 var _ admission.Defaulter = &B{}
 
@@ -153,7 +153,7 @@ type C struct {
 	Spec              C_Spec `json:"spec,omitempty"`
 }
 
-// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-c,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=c,verbs=create;update,versions=v20200101,name=default.c.test.infra.azure.com
+// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-c,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=c,verbs=create;update,versions=v20200101,name=default.c.test.infra.azure.com
 
 var _ admission.Defaulter = &C{}
 

diff --git a/...nerator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_array_properties.golden b/...nerator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_array_properties.golden
@@ -19,7 +19,7 @@ type FakeResource struct {
 	Spec              FakeResource_Spec `json:"spec,omitempty"`
 }
 
-// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com
+// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com
 
 var _ admission.Defaulter = &FakeResource{}
 

diff --git a/...rator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_complex_properties.golden b/...rator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_complex_properties.golden
@@ -19,7 +19,7 @@ type FakeResource struct {
 	Spec              FakeResource_Spec `json:"spec,omitempty"`
 }
 
-// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com
+// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com
 
 var _ admission.Defaulter = &FakeResource{}
 

diff --git a/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_json_fields.golden b/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_json_fields.golden
@@ -20,7 +20,7 @@ type FakeResource struct {
 	Spec              FakeResource_Spec `json:"spec,omitempty"`
 }
 
-// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com
+// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com
 
 var _ admission.Defaulter = &FakeResource{}
 

diff --git a/...generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_map_properties.golden b/...generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_map_properties.golden
@@ -19,7 +19,7 @@ type FakeResource struct {
 	Spec              FakeResource_Spec `json:"spec,omitempty"`
 }
 
-// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com
+// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com
 
 var _ admission.Defaulter = &FakeResource{}
 

diff --git a/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_renders_spec.golden b/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_renders_spec.golden
@@ -19,7 +19,7 @@ type FakeResource struct {
 	Spec              FakeResource_Spec `json:"spec,omitempty"`
 }
 
-// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com
+// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com
 
 var _ admission.Defaulter = &FakeResource{}
 

diff --git a/hack/generator/pkg/codegen/testdata/EmbeddedTypes/Embedded_type_simple_resource.golden b/hack/generator/pkg/codegen/testdata/EmbeddedTypes/Embedded_type_simple_resource.golden
@@ -19,7 +19,7 @@ type FakeResource struct {
 	Spec              FakeResource_Spec `json:"spec,omitempty"`
 }
 
-// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com
+// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com
 
 var _ admission.Defaulter = &FakeResource{}
 

diff --git a/hack/generator/pkg/codegen/testdata/EnumNames/Multi_valued_enum_name.golden b/hack/generator/pkg/codegen/testdata/EnumNames/Multi_valued_enum_name.golden
@@ -19,7 +19,7 @@ type AResource struct {
 	Spec              AResource_Spec `json:"spec,omitempty"`
 }
 
-// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-aresource,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=aresource,verbs=create;update,versions=v20200101,name=default.aresource.test.infra.azure.com
+// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-aresource,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=aresource,verbs=create;update,versions=v20200101,name=default.aresource.test.infra.azure.com
 
 var _ admission.Defaulter = &AResource{}