Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use tag-on-create for sfn #8395

Merged
merged 1 commit into from
May 15, 2019
Merged

Use tag-on-create for sfn #8395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions aws/resource_aws_sfn_activity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
}

Expand Down
12 changes: 1 addition & 11 deletions aws/resource_aws_sfn_state_machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
}

Expand Down