Fix field type casting for ARNs

Author: Nicholas Thomson

pkg/generate/code/resource_reference.go

@@ -243,7 +243,7 @@ func ResolveReferencesForField(field *model.Field, sourceVarName string, indentL
 				// see https://github.com/aws-controllers-k8s/community/issues/1291
 				panic(fmt.Errorf("references within lists inside lists aren't supported. crd: %q, path: %q", r.Kind, field.Path))
 			}
-			fieldAccessPrefix = fmt.Sprintf("%s.%s", fieldAccessPrefix, fp.At(idx))
+			fieldAccessPrefix = fmt.Sprintf("%s.%s", fieldAccessPrefix, cur.GetReferenceFieldName().Camel)
 
 			iterVarName := fmt.Sprintf("iter%d", idx)
 
@@ -282,7 +282,7 @@ func ResolveReferencesForField(field *model.Field, sourceVarName string, indentL
 			outPrefix += fmt.Sprintf("%s\tif err := getReferencedResourceState_%s(ctx, apiReader, obj, *arr.Name, namespace); err != nil {\n", indent, field.FieldConfig.References.Resource)
 			outPrefix += fmt.Sprintf("%s\t\treturn err\n", indent)
 			outPrefix += fmt.Sprintf("%s\t}\n", indent)
-			outPrefix += fmt.Sprintf("%s\t%s = obj.%s\n", indent, targetVarName, field.FieldConfig.References.Path)
+			outPrefix += fmt.Sprintf("%s\t%s = (%s)(obj.%s)\n", indent, targetVarName, field.GoType, field.FieldConfig.References.Path)
 			outPrefix += fmt.Sprintf("%s}\n", indent)
 		}
 	}

pkg/generate/code/resource_reference_test.go

@@ -214,20 +214,49 @@ func Test_ResolveReferencesForField_SingleReference(t *testing.T) {
 		`	if ko.Spec.APIRef != nil && ko.Spec.APIRef.From != nil {
 		arr := ko.Spec.APIRef.From
 		if arr == nil || arr.Name == nil || *arr.Name == "" {
-			return fmt.Errorf("provided resource reference is nil or empty: \"APIRef"\")
+			return fmt.Errorf("provided resource reference is nil or empty: APIRef")
 		}
 		obj := &svcapitypes.API{}
 		if err := getReferencedResourceState_API(ctx, apiReader, obj, *arr.Name, namespace); err != nil {
 			return err
 		}
-		ko.Spec.APIID = obj.Status.APIID
+		ko.Spec.APIID = (*string)(obj.Status.APIID)
 	}
 `
 
 	field := crd.Fields["APIID"]
 	assert.Equal(expected, code.ResolveReferencesForField(field, "ko", 1))
 }
 
+func Test_ResolveReferencesForField_ReferencingARN(t *testing.T) {
+	assert := assert.New(t)
+	require := require.New(t)
+
+	g := testutil.NewModelForServiceWithOptions(t, "iam",
+		&testutil.TestingModelOptions{
+			GeneratorConfigFile: "generator.yaml",
+		})
+
+	crd := testutil.GetCRDByName(t, g, "User")
+	require.NotNil(crd)
+	expected :=
+		`	if ko.Spec.PermissionsBoundaryRef != nil && ko.Spec.PermissionsBoundaryRef.From != nil {
+		arr := ko.Spec.PermissionsBoundaryRef.From
+		if arr == nil || arr.Name == nil || *arr.Name == "" {
+			return fmt.Errorf("provided resource reference is nil or empty: PermissionsBoundaryRef")
+		}
+		obj := &svcapitypes.Policy{}
+		if err := getReferencedResourceState_Policy(ctx, apiReader, obj, *arr.Name, namespace); err != nil {
+			return err
+		}
+		ko.Spec.PermissionsBoundary = (*string)(obj.Status.ACKResourceMetadata.ARN)
+	}
+`
+
+	field := crd.Fields["PermissionsBoundary"]
+	assert.Equal(expected, code.ResolveReferencesForField(field, "ko", 1))
+}
+
 func Test_ResolveReferencesForField_SliceOfReferences(t *testing.T) {
 	assert := assert.New(t)
 	require := require.New(t)
@@ -241,10 +270,10 @@ func Test_ResolveReferencesForField_SliceOfReferences(t *testing.T) {
 	require.NotNil(crd)
 	expected :=
 		`	ko.Spec.SecurityGroupIDs = []*string{}
-	for _, iter0 := range ko.Spec.SecurityGroupIDs {
+	for _, iter0 := range ko.Spec.SecurityGroupRefs {
 		arr := iter0.From
 		if arr == nil || arr.Name == nil || *arr.Name == "" {
-			return fmt.Errorf("provided resource reference is nil or empty: \"SecurityGroupRefs"\")
+			return fmt.Errorf("provided resource reference is nil or empty: SecurityGroupRefs")
 		}
 		if err := getReferencedResourceState_SecurityGroup(ctx, apiReader, obj, *arr.Name, namespace); err != nil {
 			return err
@@ -273,13 +302,13 @@ func Test_ResolveReferencesForField_NestedSingleReference(t *testing.T) {
 		if ko.Spec.JWTConfiguration.IssuerRef != nil && ko.Spec.JWTConfiguration.IssuerRef.From != nil {
 			arr := ko.Spec.JWTConfiguration.IssuerRef.From
 			if arr == nil || arr.Name == nil || *arr.Name == "" {
-				return fmt.Errorf("provided resource reference is nil or empty: \"JWTConfiguration.IssuerRef"\")
+				return fmt.Errorf("provided resource reference is nil or empty: JWTConfiguration.IssuerRef")
 			}
 			obj := &svcapitypes.API{}
 			if err := getReferencedResourceState_API(ctx, apiReader, obj, *arr.Name, namespace); err != nil {
 				return err
 			}
-			ko.Spec.JWTConfiguration.Issuer = obj.Status.APIID
+			ko.Spec.JWTConfiguration.Issuer = (*string)(obj.Status.APIID)
 		}
 	}
 `
@@ -307,13 +336,13 @@ func Test_ResolveReferencesForField_SingleReference_DeeplyNested(t *testing.T) {
 			if ko.Spec.Logging.LoggingEnabled.TargetBucketRef != nil && ko.Spec.Logging.LoggingEnabled.TargetBucketRef.From != nil {
 				arr := ko.Spec.Logging.LoggingEnabled.TargetBucketRef.From
 				if arr == nil || arr.Name == nil || *arr.Name == "" {
-					return fmt.Errorf("provided resource reference is nil or empty: \"Logging.LoggingEnabled.TargetBucketRef"\")
+					return fmt.Errorf("provided resource reference is nil or empty: Logging.LoggingEnabled.TargetBucketRef")
 				}
 				obj := &svcapitypes.Bucket{}
 				if err := getReferencedResourceState_Bucket(ctx, apiReader, obj, *arr.Name, namespace); err != nil {
 					return err
 				}
-				ko.Spec.Logging.LoggingEnabled.TargetBucket = obj.Spec.Name
+				ko.Spec.Logging.LoggingEnabled.TargetBucket = (*string)(obj.Spec.Name)
 			}
 		}
 	}

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

@@ -12,7 +12,7 @@ ignore:
    - SAMLProvider
    - ServiceLinkedRole
    - ServiceSpecificCredential
-   - User
+   #- User
    - VirtualMFADevice
 resources:
   Role:
@@ -43,3 +43,28 @@ resources:
         type: "map[string]*bool"
       MyCustomInteger:
         type: "*int64"
+  User:
+    renames:
+      operations:
+        CreateUser:
+          input_fields:
+            UserName: Name
+    fields:
+      PermissionsBoundary:
+        references:
+          resource: Policy
+          path: Status.ACKResourceMetadata.ARN
+        set:
+          # The input and output shapes are different...
+          - from: PermissionsBoundary.PermissionsBoundaryArn
+      # In order to support attaching zero or more policies to a user, we use
+      # custom update code path code that uses the Attach/DetachUserPolicy API
+      # calls to manage the set of PolicyARNs attached to this User.
+      Policies:
+        type: "[]*string"
+        references:
+          resource: Policy
+          path: Status.ACKResourceMetadata.ARN
+      Tags:
+        compare:
+          is_ignored: true