Add tag support for aws_codestarconnections_connection resource

aws/internal/keyvaluetags/generators/listtags/main.go

@@ -40,6 +40,7 @@ var serviceNames = []string{
 	"codecommit",
 	"codedeploy",
 	"codepipeline",
+	"codestarconnections",
 	"codestarnotifications",
 	"cognitoidentity",
 	"cognitoidentityprovider",

aws/internal/keyvaluetags/generators/servicetags/main.go

@@ -34,6 +34,7 @@ var sliceServiceNames = []string{
 	"codebuild",
 	"codedeploy",
 	"codepipeline",
+	"codestarconnections",
 	"configservice",
 	"databasemigrationservice",
 	"datapipeline",

aws/internal/keyvaluetags/generators/updatetags/main.go

@@ -41,6 +41,7 @@ var serviceNames = []string{
 	"codecommit",
 	"codedeploy",
 	"codepipeline",
+	"codestarconnections",
 	"codestarnotifications",
 	"cognitoidentity",
 	"cognitoidentityprovider",

aws/internal/keyvaluetags/service_generation_customizations.go

@@ -30,6 +30,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/codecommit"
 	"github.com/aws/aws-sdk-go/service/codedeploy"
 	"github.com/aws/aws-sdk-go/service/codepipeline"
+	"github.com/aws/aws-sdk-go/service/codestarconnections"
 	"github.com/aws/aws-sdk-go/service/codestarnotifications"
 	"github.com/aws/aws-sdk-go/service/cognitoidentity"
 	"github.com/aws/aws-sdk-go/service/cognitoidentityprovider"
@@ -175,6 +176,8 @@ func ServiceClientType(serviceName string) string {
 		funcType = reflect.TypeOf(codedeploy.New)
 	case "codepipeline":
 		funcType = reflect.TypeOf(codepipeline.New)
+	case "codestarconnections":
+		funcType = reflect.TypeOf(codestarconnections.New)
 	case "codestarnotifications":
 		funcType = reflect.TypeOf(codestarnotifications.New)
 	case "cognitoidentity":

aws/resource_aws_codestarconnections_connection.go

@@ -9,6 +9,7 @@ import (
 	"github.com/hashicorp/aws-sdk-go-base/tfawserr"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+	"github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags"
 )
 
 func resourceAwsCodeStarConnectionsConnection() *schema.Resource {
@@ -43,6 +44,13 @@ func resourceAwsCodeStarConnectionsConnection() *schema.Resource {
 				ForceNew:     true,
 				ValidateFunc: validation.StringInSlice(codestarconnections.ProviderType_Values(), false),
 			},
+
+			"tags": {
+				Type:     schema.TypeMap,
+				Optional: true,
+				ForceNew: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 		},
 	}
 }
@@ -55,6 +63,10 @@ func resourceAwsCodeStarConnectionsConnectionCreate(d *schema.ResourceData, meta
 		ProviderType:   aws.String(d.Get("provider_type").(string)),
 	}
 
+	if v, ok := d.GetOk("tags"); ok {
+		params.Tags = keyvaluetags.New(v.(map[string]interface{})).IgnoreAws().CodestarconnectionsTags()
+	}
+
 	resp, err := conn.CreateConnection(params)
 	if err != nil {
 		return fmt.Errorf("error creating CodeStar connection: %w", err)
@@ -67,6 +79,7 @@ func resourceAwsCodeStarConnectionsConnectionCreate(d *schema.ResourceData, meta
 
 func resourceAwsCodeStarConnectionsConnectionRead(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).codestarconnectionsconn
+	ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig
 
 	resp, err := conn.GetConnection(&codestarconnections.GetConnectionInput{
 		ConnectionArn: aws.String(d.Id()),
@@ -84,12 +97,22 @@ func resourceAwsCodeStarConnectionsConnectionRead(d *schema.ResourceData, meta i
 		return fmt.Errorf("error reading CodeStar connection (%s): empty response", d.Id())
 	}
 
-	d.SetId(aws.StringValue(resp.Connection.ConnectionArn))
+	arn := aws.StringValue(resp.Connection.ConnectionArn)
+	d.SetId(arn)
 	d.Set("arn", resp.Connection.ConnectionArn)
 	d.Set("name", resp.Connection.ConnectionName)
 	d.Set("connection_status", resp.Connection.ConnectionStatus)
 	d.Set("provider_type", resp.Connection.ProviderType)
 
+	tags, err := keyvaluetags.CodestarconnectionsListTags(conn, arn)
+	if err != nil {
+		return fmt.Errorf("error listing tags for CodeStar connection (%s): %w", arn, err)
+	}
+
+	if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil {
+		return fmt.Errorf("error setting tags for CodeStar connection (%s): %w", arn, err)
+	}
+
 	return nil
 }
 

aws/resource_aws_codestarconnections_connection_test.go

@@ -65,6 +65,33 @@ func TestAccAWSCodeStarConnectionsConnection_disappears(t *testing.T) {
 	})
 }
 
+func TestAccAWSCodeStarConnectionsConnection_tags(t *testing.T) {
+	var v codestarconnections.Connection
+	resourceName := "aws_codestarconnections_connection.test"
+	rName := acctest.RandomWithPrefix("tf-acc-test")
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck(codestarconnections.EndpointsID, t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAWSCodeStarConnectionsConnectionDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAWSCodeStarConnectionsConnectionConfigTags(rName),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckAWSCodeStarConnectionsConnectionExists(resourceName, &v),
+					resource.TestCheckResourceAttr(resourceName, "tags.Name", rName),
+					resource.TestCheckResourceAttr(resourceName, "tags.Environment", "production"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func testAccCheckAWSCodeStarConnectionsConnectionExists(n string, v *codestarconnections.Connection) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
@@ -118,3 +145,17 @@ resource "aws_codestarconnections_connection" "test" {
 }
 `, rName)
 }
+
+func testAccAWSCodeStarConnectionsConnectionConfigTags(rName string) string {
+	return fmt.Sprintf(`
+resource "aws_codestarconnections_connection" "test" {
+  name          = %[1]q
+  provider_type = "Bitbucket"
+
+  tags = {
+    Name        = %[1]q
+    Environment = "production"
+  }
+}
+`, rName)
+}

website/docs/r/codestarconnections_connection.markdown

@@ -68,6 +68,7 @@ The following arguments are supported:
 
 * `name` - (Required) The name of the connection to be created. The name must be unique in the calling AWS account. Changing `name` will create a new resource.
 * `provider_type` - (Required) The name of the external provider where your third-party code repository is configured. Valid values are `Bitbucket`, `GitHub`, or `GitHubEnterpriseServer`. Changing `provider_type` will create a new resource.
+* `tags` - (Optional) An array of key:value pairs to associate with the resource.
 
 ## Attributes Reference