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

Add support for tags for aws_sfn_state_machine and aws_sfn_activity #7024

Merged
merged 6 commits into from
Jan 10, 2019
Merged

Add support for tags for aws_sfn_state_machine and aws_sfn_activity #7024

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
50b1dc7
add tags for aws_sfn_state_machine
Jan 3, 2019
e17a10d
add documentation for tag support for aws_sfn_state_machine
Jan 3, 2019
1567a56
add tags for aws_sfn_activity
Jan 3, 2019
c814a12
add documentation for tag support for aws_sfn_activity
Jan 3, 2019
13e32d9
handle PR feedbacks
Jan 8, 2019
bac0aa9
add drift detection logic for tags
Jan 10, 2019
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
44 changes: 44 additions & 0 deletions aws/resource_aws_sfn_activity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ func resourceAwsSfnActivity() *schema.Resource {
return &schema.Resource{
Create: resourceAwsSfnActivityCreate,
Read: resourceAwsSfnActivityRead,
Update: resourceAwsSfnActivityUpdate,
Delete: resourceAwsSfnActivityDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
Expand All @@ -34,6 +35,7 @@ func resourceAwsSfnActivity() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"tags": tagsSchema(),
sunilkumarmohanty marked this conversation as resolved.
Show resolved Hide resolved
},
}
}
Expand All @@ -53,6 +55,48 @@ func resourceAwsSfnActivityCreate(d *schema.ResourceData, meta interface{}) erro

d.SetId(*activity.ActivityArn)

return resourceAwsSfnActivityUpdate(d, meta)
sunilkumarmohanty marked this conversation as resolved.
Show resolved Hide resolved
}

func resourceAwsSfnActivityUpdate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).sfnconn

if d.HasChange("tags") {
oldTagsRaw, newTagsRaw := d.GetChange("tags")
oldTagsMap := oldTagsRaw.(map[string]interface{})
newTagsMap := newTagsRaw.(map[string]interface{})
createTags, removeTags := diffTagsSfn(tagsFromMapSfn(oldTagsMap), tagsFromMapSfn(newTagsMap))

if len(removeTags) > 0 {
removeTagKeys := make([]*string, len(removeTags))
for i, removeTag := range removeTags {
removeTagKeys[i] = removeTag.Key
}

input := &sfn.UntagResourceInput{
ResourceArn: aws.String(d.Id()),
TagKeys: removeTagKeys,
}

log.Printf("[DEBUG] Untagging State Function Activity: %s", input)
if _, err := conn.UntagResource(input); err != nil {
return fmt.Errorf("error untagging State Function Activity (%s): %s", d.Id(), err)
}
}

if len(createTags) > 0 {
input := &sfn.TagResourceInput{
ResourceArn: aws.String(d.Id()),
Tags: createTags,
}

log.Printf("[DEBUG] Tagging State Function Activity: %s", input)
if _, err := conn.TagResource(input); err != nil {
return fmt.Errorf("error tagging State Function Activity (%s): %s", d.Id(), err)
}
}
}

return resourceAwsSfnActivityRead(d, meta)
}

Expand Down
60 changes: 60 additions & 0 deletions aws/resource_aws_sfn_activity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,43 @@ func TestAccAWSSfnActivity_basic(t *testing.T) {
})
}

func TestAccAWSSfnActivity_Tags(t *testing.T) {
name := acctest.RandString(10)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSSfnActivityDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSSfnActivityBasicConfigTags1(name, "key1", "value1"),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSSfnActivityExists("aws_sfn_activity.foo"),
resource.TestCheckResourceAttr("aws_sfn_activity.foo", "tags.%", "1"),
resource.TestCheckResourceAttr("aws_sfn_activity.foo", "tags.key1", "value1"),
),
},
{
Config: testAccAWSSfnActivityBasicConfigTags2(name, "key1", "value1updated", "key2", "value2"),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSSfnActivityExists("aws_sfn_activity.foo"),
resource.TestCheckResourceAttr("aws_sfn_activity.foo", "tags.%", "2"),
resource.TestCheckResourceAttr("aws_sfn_activity.foo", "tags.key1", "value1updated"),
resource.TestCheckResourceAttr("aws_sfn_activity.foo", "tags.key2", "value2"),
),
},
{
Config: testAccAWSSfnActivityBasicConfigTags1(name, "key2", "value2"),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSSfnActivityExists("aws_sfn_activity.foo"),
resource.TestCheckResourceAttr("aws_sfn_activity.foo", "tags.%", "1"),
resource.TestCheckResourceAttr("aws_sfn_activity.foo", "tags.key2", "value2"),
),
},
},
})
}

func testAccCheckAWSSfnActivityExists(n string) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
Expand Down Expand Up @@ -126,3 +163,26 @@ resource "aws_sfn_activity" "foo" {
}
`, rName)
}

func testAccAWSSfnActivityBasicConfigTags1(rName, tag1Key, tag1Value string) string {
return fmt.Sprintf(`
resource "aws_sfn_activity" "foo" {
name = "%s"
tags = {
%q = %q
}
}
`, rName, tag1Key, tag1Value)
}

func testAccAWSSfnActivityBasicConfigTags2(rName, tag1Key, tag1Value, tag2Key, tag2Value string) string {
return fmt.Sprintf(`
resource "aws_sfn_activity" "foo" {
name = "%s"
tags = {
%q = %q
%q = %q
}
}
`, rName, tag1Key, tag1Value, tag2Key, tag2Value)
}
49 changes: 48 additions & 1 deletion aws/resource_aws_sfn_state_machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ func resourceAwsSfnStateMachine() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"tags": tagsSchema(),
},
}
}
Expand Down Expand Up @@ -92,7 +93,7 @@ func resourceAwsSfnStateMachineCreate(d *schema.ResourceData, meta interface{})

d.SetId(*activity.StateMachineArn)

return resourceAwsSfnStateMachineRead(d, meta)
return resourceAwsSfnStateMachineUpdate(d, meta)
sunilkumarmohanty marked this conversation as resolved.
Show resolved Hide resolved
}

func resourceAwsSfnStateMachineRead(d *schema.ResourceData, meta interface{}) error {
Expand Down Expand Up @@ -121,6 +122,16 @@ func resourceAwsSfnStateMachineRead(d *schema.ResourceData, meta interface{}) er
if err := d.Set("creation_date", sm.CreationDate.Format(time.RFC3339)); err != nil {
log.Printf("[DEBUG] Error setting creation_date: %s", err)
}
tagsResp, err := conn.ListTagsForResource(
&sfn.ListTagsForResourceInput{
ResourceArn: aws.String(d.Id()),
},
)
if err != nil {
log.Printf("[DEBUG] Error retrieving tags for Step Function: %s. %s", aws.StringValue(sm.Name), err)
sunilkumarmohanty marked this conversation as resolved.
Show resolved Hide resolved
} else {
d.Set("tags", tagsToMapSfn(tagsResp.Tags))
}

return nil
}
Expand All @@ -145,6 +156,42 @@ func resourceAwsSfnStateMachineUpdate(d *schema.ResourceData, meta interface{})
return err
}

if d.HasChange("tags") {
oldTagsRaw, newTagsRaw := d.GetChange("tags")
oldTagsMap := oldTagsRaw.(map[string]interface{})
newTagsMap := newTagsRaw.(map[string]interface{})
createTags, removeTags := diffTagsSfn(tagsFromMapSfn(oldTagsMap), tagsFromMapSfn(newTagsMap))

if len(removeTags) > 0 {
removeTagKeys := make([]*string, len(removeTags))
for i, removeTag := range removeTags {
removeTagKeys[i] = removeTag.Key
}

input := &sfn.UntagResourceInput{
ResourceArn: aws.String(d.Id()),
TagKeys: removeTagKeys,
}

log.Printf("[DEBUG] Untagging State Function: %s", input)
if _, err := conn.UntagResource(input); err != nil {
return fmt.Errorf("error untagging State Function (%s): %s", d.Id(), err)
}
}

if len(createTags) > 0 {
input := &sfn.TagResourceInput{
ResourceArn: aws.String(d.Id()),
Tags: createTags,
}

log.Printf("[DEBUG] Tagging State Function: %s", input)
if _, err := conn.TagResource(input); err != nil {
return fmt.Errorf("error tagging State Function (%s): %s", d.Id(), err)
}
}
}

return resourceAwsSfnStateMachineRead(d, meta)
}

Expand Down
Loading