-
Notifications
You must be signed in to change notification settings - Fork 9.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support resource tags for aws_media_store_container resource
- Loading branch information
1 parent
f945137
commit 3bf1c52
Showing
5 changed files
with
342 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "log" | ||
| "regexp" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/service/mediastore" | ||
| "github.com/hashicorp/terraform/helper/schema" | ||
| ) | ||
|
|
||
| // setTags is a helper to set the tags for a resource. It expects the | ||
| // tags field to be named "tags" | ||
| func setTagsMediaStore(conn *mediastore.MediaStore, d *schema.ResourceData, arn string) error { | ||
| if d.HasChange("tags") { | ||
| oraw, nraw := d.GetChange("tags") | ||
| o := oraw.(map[string]interface{}) | ||
| n := nraw.(map[string]interface{}) | ||
| create, remove := diffTagsMediaStore(tagsFromMapMediaStore(o), tagsFromMapMediaStore(n)) | ||
|
|
||
| // Set tags | ||
| if len(remove) > 0 { | ||
| log.Printf("[DEBUG] Removing tags: %s", remove) | ||
| k := make([]*string, len(remove)) | ||
| for i, t := range remove { | ||
| k[i] = t.Key | ||
| } | ||
|
|
||
| _, err := conn.UntagResource(&mediastore.UntagResourceInput{ | ||
| Resource: aws.String(arn), | ||
| TagKeys: k, | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
| if len(create) > 0 { | ||
| log.Printf("[DEBUG] Creating tags: %s", create) | ||
| _, err := conn.TagResource(&mediastore.TagResourceInput{ | ||
| Resource: aws.String(arn), | ||
| Tags: create, | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // diffTags takes our tags locally and the ones remotely and returns | ||
| // the set of tags that must be created, and the set of tags that must | ||
| // be destroyed. | ||
| func diffTagsMediaStore(oldTags, newTags []*mediastore.Tag) ([]*mediastore.Tag, []*mediastore.Tag) { | ||
| // First, we're creating everything we have | ||
| create := make(map[string]interface{}) | ||
| for _, t := range newTags { | ||
| create[aws.StringValue(t.Key)] = aws.StringValue(t.Value) | ||
| } | ||
|
|
||
| // Build the list of what to remove | ||
| var remove []*mediastore.Tag | ||
| for _, t := range oldTags { | ||
| old, ok := create[aws.StringValue(t.Key)] | ||
| if !ok || old != aws.StringValue(t.Value) { | ||
| // Delete it! | ||
| remove = append(remove, t) | ||
| } else if ok { | ||
| delete(create, aws.StringValue(t.Key)) | ||
| } | ||
| } | ||
|
|
||
| return tagsFromMapMediaStore(create), remove | ||
| } | ||
|
|
||
| // tagsFromMap returns the tags for the given map of data. | ||
| func tagsFromMapMediaStore(m map[string]interface{}) []*mediastore.Tag { | ||
| result := make([]*mediastore.Tag, 0, len(m)) | ||
| for k, v := range m { | ||
| t := &mediastore.Tag{ | ||
| Key: aws.String(k), | ||
| Value: aws.String(v.(string)), | ||
| } | ||
| if !tagIgnoredMediaStore(t) { | ||
| result = append(result, t) | ||
| } | ||
| } | ||
|
|
||
| return result | ||
| } | ||
|
|
||
| // tagsToMap turns the list of tags into a map. | ||
| func tagsToMapMediaStore(ts []*mediastore.Tag) map[string]string { | ||
| result := make(map[string]string) | ||
| for _, t := range ts { | ||
| if !tagIgnoredMediaStore(t) { | ||
| result[aws.StringValue(t.Key)] = aws.StringValue(t.Value) | ||
| } | ||
| } | ||
|
|
||
| return result | ||
| } | ||
|
|
||
| // compare a tag against a list of strings and checks if it should | ||
| // be ignored or not | ||
| func tagIgnoredMediaStore(t *mediastore.Tag) bool { | ||
| filter := []string{"^aws:"} | ||
| for _, v := range filter { | ||
| log.Printf("[DEBUG] Matching %v with %v\n", v, aws.StringValue(t.Key)) | ||
| r, _ := regexp.MatchString(v, aws.StringValue(t.Key)) | ||
| if r { | ||
| log.Printf("[DEBUG] Found AWS specific tag %s (val: %s), ignoring.\n", aws.StringValue(t.Key), aws.StringValue(t.Value)) | ||
| return true | ||
| } | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func saveTagsMediaStore(conn *mediastore.MediaStore, d *schema.ResourceData, arn string) error { | ||
| resp, err := conn.ListTagsForResource(&mediastore.ListTagsForResourceInput{ | ||
| Resource: aws.String(arn), | ||
| }) | ||
|
|
||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| var dt []*mediastore.Tag | ||
| if len(resp.Tags) > 0 { | ||
| dt = resp.Tags | ||
| } | ||
|
|
||
| return d.Set("tags", tagsToMapMediaStore(dt)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "reflect" | ||
| "testing" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/service/mediastore" | ||
| ) | ||
|
|
||
| // go test -v -run="TestDiffMediaStoreTags" | ||
| func TestDiffMediaStoreTags(t *testing.T) { | ||
| cases := []struct { | ||
| Old, New map[string]interface{} | ||
| Create, Remove map[string]string | ||
| }{ | ||
| // Basic add/remove | ||
| { | ||
| Old: map[string]interface{}{ | ||
| "foo": "bar", | ||
| }, | ||
| New: map[string]interface{}{ | ||
| "bar": "baz", | ||
| }, | ||
| Create: map[string]string{ | ||
| "bar": "baz", | ||
| }, | ||
| Remove: map[string]string{ | ||
| "foo": "bar", | ||
| }, | ||
| }, | ||
|
|
||
| // Modify | ||
| { | ||
| Old: map[string]interface{}{ | ||
| "foo": "bar", | ||
| }, | ||
| New: map[string]interface{}{ | ||
| "foo": "baz", | ||
| }, | ||
| Create: map[string]string{ | ||
| "foo": "baz", | ||
| }, | ||
| Remove: map[string]string{ | ||
| "foo": "bar", | ||
| }, | ||
| }, | ||
|
|
||
| // Overlap | ||
| { | ||
| Old: map[string]interface{}{ | ||
| "foo": "bar", | ||
| "hello": "world", | ||
| }, | ||
| New: map[string]interface{}{ | ||
| "foo": "baz", | ||
| "hello": "world", | ||
| }, | ||
| Create: map[string]string{ | ||
| "foo": "baz", | ||
| }, | ||
| Remove: map[string]string{ | ||
| "foo": "bar", | ||
| }, | ||
| }, | ||
|
|
||
| // Remove | ||
| { | ||
| Old: map[string]interface{}{ | ||
| "foo": "bar", | ||
| "bar": "baz", | ||
| }, | ||
| New: map[string]interface{}{ | ||
| "foo": "bar", | ||
| }, | ||
| Create: map[string]string{}, | ||
| Remove: map[string]string{ | ||
| "bar": "baz", | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for i, tc := range cases { | ||
| c, r := diffTagsMediaStore(tagsFromMapMediaStore(tc.Old), tagsFromMapMediaStore(tc.New)) | ||
| cm := tagsToMapMediaStore(c) | ||
| rm := tagsToMapMediaStore(r) | ||
| if !reflect.DeepEqual(cm, tc.Create) { | ||
| t.Fatalf("%d: bad create: %#v", i, cm) | ||
| } | ||
| if !reflect.DeepEqual(rm, tc.Remove) { | ||
| t.Fatalf("%d: bad remove: %#v", i, rm) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // go test -v -run="TestIgnoringTagsMediaStore" | ||
| func TestIgnoringTagsMediaStore(t *testing.T) { | ||
| var ignoredTags []*mediastore.Tag | ||
| ignoredTags = append(ignoredTags, &mediastore.Tag{ | ||
| Key: aws.String("aws:cloudformation:logical-id"), | ||
| Value: aws.String("foo"), | ||
| }) | ||
| ignoredTags = append(ignoredTags, &mediastore.Tag{ | ||
| Key: aws.String("aws:foo:bar"), | ||
| Value: aws.String("baz"), | ||
| }) | ||
| for _, tag := range ignoredTags { | ||
| if !tagIgnoredMediaStore(tag) { | ||
| t.Fatalf("Tag %v with value %v not ignored, but should be!", *tag.Key, *tag.Value) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.