Improved resource import

README.md

@@ -496,12 +496,13 @@ In that case terraformer will not know with which region resources are associate
     * `aws_iam_group_policy_attachment`
     * `aws_iam_instance_profile`
     * `aws_iam_policy`
-    * `aws_iam_policy_attachment`
     * `aws_iam_role`
     * `aws_iam_role_policy`
+    * `aws_iam_role_policy_attachment`
     * `aws_iam_user`
     * `aws_iam_user_group_membership`
     * `aws_iam_user_policy`
+    * `aws_iam_user_policy_attachment`
 *   `igw`
     * `aws_internet_gateway`
 *   `iot`

providers/aws/iam.go

@@ -96,6 +96,28 @@ func (g *IamGenerator) getRoles(svc *iam.Client) error {
 				log.Println(err)
 				continue
 			}
+			roleAttachedPoliciesPage := iam.NewListAttachedRolePoliciesPaginator(svc.ListAttachedRolePoliciesRequest(&iam.ListAttachedRolePoliciesInput{
+				RoleName: &roleName,
+			}))
+			for roleAttachedPoliciesPage.Next(context.Background()) {
+				for _, attachedPolicy := range roleAttachedPoliciesPage.CurrentPage().AttachedPolicies {
+					g.Resources = append(g.Resources, terraformutils.NewResource(
+						roleName+"/"+*attachedPolicy.PolicyArn,
+						roleName+"_"+*attachedPolicy.PolicyName,
+						"aws_iam_role_policy_attachment",
+						"aws",
+						map[string]string{
+							"role":       roleName,
+							"policy_arn": *attachedPolicy.PolicyArn,
+						},
+						IamAllowEmptyValues,
+						map[string]interface{}{}))
+				}
+			}
+			if err := roleAttachedPoliciesPage.Err(); err != nil {
+				log.Println(err)
+				continue
+			}
 		}
 	}
 	return p.Err()
@@ -120,6 +142,10 @@ func (g *IamGenerator) getUsers(svc *iam.Client) error {
 			if err != nil {
 				log.Println(err)
 			}
+			err = g.getUserPolicyAttachment(svc, user.UserName)
+			if err != nil {
+				log.Println(err)
+			}
 			err = g.getUserGroup(svc, user.UserName)
 			if err != nil {
 				log.Println(err)
@@ -170,24 +196,35 @@ func (g *IamGenerator) getUserPolices(svc *iam.Client, userName *string) error {
 	return p.Err()
 }
 
+func (g *IamGenerator) getUserPolicyAttachment(svc *iam.Client, userName *string) error {
+	p := iam.NewListAttachedUserPoliciesPaginator(svc.ListAttachedUserPoliciesRequest(&iam.ListAttachedUserPoliciesInput{
+		UserName: userName,
+	}))
+	for p.Next(context.Background()) {
+		for _, attachedPolicy := range p.CurrentPage().AttachedPolicies {
+			g.Resources = append(g.Resources, terraformutils.NewResource(
+				*userName+"/"+*attachedPolicy.PolicyArn,
+				*userName+"_"+*attachedPolicy.PolicyName,
+				"aws_iam_user_policy_attachment",
+				"aws",
+				map[string]string{
+					"user":       *userName,
+					"policy_arn": *attachedPolicy.PolicyArn,
+				},
+				IamAllowEmptyValues,
+				map[string]interface{}{}))
+		}
+	}
+	return p.Err()
+}
+
 func (g *IamGenerator) getPolicies(svc *iam.Client) error {
 	p := iam.NewListPoliciesPaginator(svc.ListPoliciesRequest(&iam.ListPoliciesInput{Scope: iam.PolicyScopeTypeLocal}))
 	for p.Next(context.Background()) {
 		for _, policy := range p.CurrentPage().Policies {
 			resourceName := aws.StringValue(policy.PolicyName)
 			policyARN := aws.StringValue(policy.Arn)
 
-			g.Resources = append(g.Resources, terraformutils.NewResource(
-				policyARN,
-				resourceName,
-				"aws_iam_policy_attachment",
-				"aws",
-				map[string]string{
-					"policy_arn": policyARN,
-					"name":       resourceName,
-				},
-				IamAllowEmptyValues,
-				IamAdditionalFields))
 			g.Resources = append(g.Resources, terraformutils.NewSimpleResource(
 				policyARN,
 				resourceName,

terraformutils/providerwrapper/provider.go

@@ -26,8 +26,6 @@ import (
 
 	"github.com/GoogleCloudPlatform/terraformer/terraformutils/terraformerstring"
 
-	"github.com/zclconf/go-cty/cty/gocty"
-
 	"github.com/zclconf/go-cty/cty"
 
 	"github.com/hashicorp/go-hclog"
@@ -155,19 +153,18 @@ func (p *ProviderWrapper) Refresh(info *terraform.InstanceInfo, state *terraform
 	})
 
 	if resp.Diagnostics.HasErrors() {
-		// retry with different serialization mechanism
-		priorState, err = gocty.ToCtyValue(state, impliedType)
-		if err != nil {
-			return nil, err
-		}
-		resp = p.Provider.ReadResource(providers.ReadResourceRequest{
-			TypeName:   info.Type,
-			PriorState: priorState,
-			Private:    []byte{},
+		// retry with regular import command - without resource attributes
+		importResponse := p.Provider.ImportResourceState(providers.ImportResourceStateRequest{
+			TypeName: info.Type,
+			ID:       state.ID,
 		})
-		if resp.Diagnostics.HasErrors() {
+		if importResponse.Diagnostics.HasErrors() {
 			return nil, resp.Diagnostics.Err()
 		}
+		if len(importResponse.ImportedResources) == 0 {
+			return nil, errors.New("not able to import resource for a given ID")
+		}
+		return terraform.NewInstanceStateShimmedFromValue(importResponse.ImportedResources[0].State, int(schema.ResourceTypes[info.Type].Version)), nil
 	}
 
 	if resp.NewState.IsNull() {