fix format, modify acctest

atsushi-ishibashi · Mar 29, 2019 · d0bcda3 · d0bcda3
1 parent b756b54
commit d0bcda3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/aws/resource_aws_codepipeline_custom_action_type.go b/aws/resource_aws_codepipeline_custom_action_type.go
@@ -376,7 +376,10 @@ func flattenAwsCodePipelineActionConfigurationProperty(acps []*codepipeline.Acti
 		m["queryable"] = aws.BoolValue(acp.Queryable)
 		m["required"] = aws.BoolValue(acp.Required)
 		m["secret"] = aws.BoolValue(acp.Secret)
-		m["type"] = aws.StringValue(acp.Type)
+		// Currently AWS doesn't return type
+		if acp.Type != nil {
+			m["type"] = aws.StringValue(acp.Type)
+		}
 		result = append(result, m)
 	}
 	return result

diff --git a/aws/resource_aws_codepipeline_custom_action_type_test.go b/aws/resource_aws_codepipeline_custom_action_type_test.go
@@ -90,7 +90,6 @@ func TestAccAwsCodePipelineCustomActionType_configurationProperties(t *testing.T
 					resource.TestCheckResourceAttr(resourceName, "configuration_properties.0.queryable", "true"),
 					resource.TestCheckResourceAttr(resourceName, "configuration_properties.0.required", "true"),
 					resource.TestCheckResourceAttr(resourceName, "configuration_properties.0.secret", "false"),
-					resource.TestCheckResourceAttr(resourceName, "configuration_properties.0.type", "String"),
 				),
 			},
 			{
@@ -160,7 +159,7 @@ resource "aws_codepipeline_custom_action_type" "test" {
     maximum_count = 1
     minimum_count = 0
   }
-	provider_name = "tf-%s"
+  provider_name = "tf-%s"
   version = "1"
 }
 `, rName)
@@ -178,13 +177,13 @@ resource "aws_codepipeline_custom_action_type" "test" {
     maximum_count = 1
     minimum_count = 0
   }
-	provider_name = "tf-%s"
+  provider_name = "tf-%s"
   version = "1"
-	settings {
-		entity_url_template = "http://example.com"
-		execution_url_template = "http://example.com"
-		revision_url_template = "http://example.com"
-	}
+  settings {
+    entity_url_template = "http://example.com"
+    execution_url_template = "http://example.com"
+    revision_url_template = "http://example.com"
+  }
 }
 `, rName)
 }
@@ -201,17 +200,16 @@ resource "aws_codepipeline_custom_action_type" "test" {
     maximum_count = 1
     minimum_count = 0
   }
-	provider_name = "tf-%s"
+  provider_name = "tf-%s"
   version = "1"
-	configuration_properties {
-		description = "tf-test"
-		key = true
-		name = "tf-test-%s"
-		queryable = true
-		required = true
-		secret = false
-		type = "String"
-	}
+  configuration_properties {
+    description = "tf-test"
+    key = true
+    name = "tf-test-%s"
+    queryable = true
+    required = true
+    secret = false
+  }
 }
 `, rName, rName)
 }
diff --git a/website/docs/r/codepipeline_custom_action_type.html.markdown b/website/docs/r/codepipeline_custom_action_type.html.markdown
@@ -23,7 +23,7 @@ resource "aws_codepipeline_custom_action_type" "example" {
     maximum_count = 1
     minimum_count = 0
   }
-	provider_name = "example"
+  provider_name = "example"
   version = "1"
 }
 ```