Merge pull request #8395 from Jukie/f-sfn_add-tag-on-create

Use tag-on-create for sfn
hashicorp · May 15, 2019 · 65960d7 · 65960d7
2 parents 4500bae + 2a3edc3
commit 65960d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git 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
@@ -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)
 }