From 2a3edc3fd01803d681743aa8a5c306c8d4d24388 Mon Sep 17 00:00:00 2001 From: Jukie Date: Sat, 20 Apr 2019 15:10:03 -0400 Subject: [PATCH] Use tag-on-create for sfn --- aws/resource_aws_sfn_activity.go | 12 +----------- aws/resource_aws_sfn_state_machine.go | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/aws/resource_aws_sfn_activity.go b/aws/resource_aws_sfn_activity.go index 496b7a8bd315..6a88e5348e61 100644 --- a/aws/resource_aws_sfn_activity.go +++ b/aws/resource_aws_sfn_activity.go @@ -46,6 +46,7 @@ func resourceAwsSfnActivityCreate(d *schema.ResourceData, meta interface{}) erro params := &sfn.CreateActivityInput{ Name: aws.String(d.Get("name").(string)), + Tags: tagsFromMapSfn(d.Get("tags").(map[string]interface{})), } activity, err := conn.CreateActivity(params) @@ -55,17 +56,6 @@ func resourceAwsSfnActivityCreate(d *schema.ResourceData, meta interface{}) erro d.SetId(*activity.ActivityArn) - if v, ok := d.GetOk("tags"); ok { - input := &sfn.TagResourceInput{ - ResourceArn: aws.String(d.Id()), - Tags: tagsFromMapSfn(v.(map[string]interface{})), - } - log.Printf("[DEBUG] Tagging SFN Activity: %s", input) - _, err := conn.TagResource(input) - if err != nil { - return fmt.Errorf("error tagging SFN Activity (%s): %s", d.Id(), input) - } - } return resourceAwsSfnActivityRead(d, meta) } diff --git a/aws/resource_aws_sfn_state_machine.go b/aws/resource_aws_sfn_state_machine.go index c0d3148c4264..2c9302319620 100644 --- a/aws/resource_aws_sfn_state_machine.go +++ b/aws/resource_aws_sfn_state_machine.go @@ -65,6 +65,7 @@ func resourceAwsSfnStateMachineCreate(d *schema.ResourceData, meta interface{}) Definition: aws.String(d.Get("definition").(string)), Name: aws.String(d.Get("name").(string)), RoleArn: aws.String(d.Get("role_arn").(string)), + Tags: tagsFromMapSfn(d.Get("tags").(map[string]interface{})), } var activity *sfn.CreateStateMachineOutput @@ -93,17 +94,6 @@ func resourceAwsSfnStateMachineCreate(d *schema.ResourceData, meta interface{}) d.SetId(*activity.StateMachineArn) - if v, ok := d.GetOk("tags"); ok { - input := &sfn.TagResourceInput{ - ResourceArn: aws.String(d.Id()), - Tags: tagsFromMapSfn(v.(map[string]interface{})), - } - log.Printf("[DEBUG] Tagging SFN State Machine: %s", input) - _, err := conn.TagResource(input) - if err != nil { - return fmt.Errorf("error tagging SFN State Machine (%s): %s", d.Id(), input) - } - } return resourceAwsSfnStateMachineRead(d, meta) }