Merge pull request #371 from A-Hilaly/fieldname-normalization

Normalize field names specific to comparison in generator config

Author: jljaco

pkg/generate/code/compare.go

@@ -112,7 +112,13 @@ func CompareResource(
 		secondResAdaptedVarName += "." + specField.Names.Camel
 
 		var compareConfig *ackgenconfig.CompareFieldConfig
-		fieldConfig := fieldConfigs[fieldName]
+
+		// TODO(amine,john): This is fragile. We actually need to have a way of
+		// normalizing names in a lossless fashion...
+		//
+		// We chose to normalize names as camel case.
+		fieldNameCamel := names.New(fieldName).Camel
+		fieldConfig := fieldConfigs[fieldNameCamel]
 		if fieldConfig != nil {
 			compareConfig = fieldConfig.Compare
 		}

pkg/generate/code/compare_test.go

@@ -476,6 +476,35 @@ func TestCompareResource_APIGatewayv2_Route(t *testing.T) {
 	)
 }
 
+func TestCompareResource_IAM_OIDC_URL(t *testing.T) {
+	assert := assert.New(t)
+	require := require.New(t)
+
+	g := testutil.NewModelForServiceWithOptions(t, "iam", &testutil.TestingModelOptions{
+		GeneratorConfigFile: "generator-oidc-url.yaml",
+	})
+
+	crd := testutil.GetCRDByName(t, g, "OpenIDConnectProvider")
+	require.NotNil(crd)
+	expected := `
+	if !ackcompare.SliceStringPEqual(a.ko.Spec.ClientIDList, b.ko.Spec.ClientIDList) {
+		delta.Add("Spec.ClientIDList", a.ko.Spec.ClientIDList, b.ko.Spec.ClientIDList)
+	}
+	if !reflect.DeepEqual(a.ko.Spec.Tags, b.ko.Spec.Tags) {
+		delta.Add("Spec.Tags", a.ko.Spec.Tags, b.ko.Spec.Tags)
+	}
+	if !ackcompare.SliceStringPEqual(a.ko.Spec.ThumbprintList, b.ko.Spec.ThumbprintList) {
+		delta.Add("Spec.ThumbprintList", a.ko.Spec.ThumbprintList, b.ko.Spec.ThumbprintList)
+	}
+`
+	assert.Equal(
+		expected,
+		code.CompareResource(
+			crd.Config(), crd, "delta", "a.ko", "b.ko", 1,
+		),
+	)
+}
+
 func TestCompareResource_MemoryDB_User(t *testing.T) {
 	assert := assert.New(t)
 	require := require.New(t)
@@ -520,4 +549,4 @@ func TestCompareResource_MemoryDB_User(t *testing.T) {
 			crd.Config(), crd, "delta", "a.ko", "b.ko", 1,
 		),
 	)
-}
+}

pkg/testdata/models/apis/iam/0000-00-00/generator-oidc-url.yaml

@@ -0,0 +1,22 @@
+ignore:
+  resource_names:
+   - AccessKey
+   - AccountAlias
+   - Group
+   - InstanceProfile
+   - LoginProfile
+   #  OpenIDConnectProvider
+   - Policy
+   - PolicyVersion
+   - Role
+   - SAMLProvider
+   - ServiceLinkedRole
+   - ServiceSpecificCredential
+   - User
+   - VirtualMFADevice
+resources:
+  OpenIDConnectProvider:
+    fields:
+      URL:
+        compare:
+          is_ignored: true