Merge pull request #3 from terraform-providers/f-aws-snapshot-tags

resource/ebs_snapshot: Add support for tags
hashicorp · Jun 9, 2017 · b0d4180 · b0d4180
2 parents 064c229 + 02e780a
commit b0d4180
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 5 deletions.
diff --git a/aws/resource_aws_ami_test.go b/aws/resource_aws_ami_test.go
@@ -193,6 +193,10 @@ resource "aws_ebs_volume" "foo" {
 
 resource "aws_ebs_snapshot" "foo" {
   volume_id = "${aws_ebs_volume.foo.id}"
+
+  tags {
+    Name = "testAccAmiConfig_basic"
+  }
 }
 
 resource "aws_ami" "foo" {
@@ -219,6 +223,10 @@ resource "aws_ebs_volume" "foo" {
 
 resource "aws_ebs_snapshot" "foo" {
   volume_id = "${aws_ebs_volume.foo.id}"
+
+  tags {
+    Name = "TestAccAWSAMI_snapshotSize"
+  }
 }
 
 resource "aws_ami" "foo" {

diff --git a/aws/resource_aws_ebs_snapshot.go b/aws/resource_aws_ebs_snapshot.go
@@ -53,6 +53,12 @@ func resourceAwsEbsSnapshot() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
+			"tags": {
+				Type:     schema.TypeMap,
+				Optional: true,
+				ForceNew: true,
+			},
 		},
 	}
 }
@@ -79,6 +85,10 @@ func resourceAwsEbsSnapshotCreate(d *schema.ResourceData, meta interface{}) erro
 		return err
 	}
 
+	if err := setTags(conn, d); err != nil {
+		log.Printf("[WARN] error setting tags: %s", err)
+	}
+
 	return resourceAwsEbsSnapshotRead(d, meta)
 }
 
@@ -106,6 +116,10 @@ func resourceAwsEbsSnapshotRead(d *schema.ResourceData, meta interface{}) error
 	d.Set("kms_keey_id", snapshot.KmsKeyId)
 	d.Set("volume_size", snapshot.VolumeSize)
 
+	if err := d.Set("tags", tagsToMap(snapshot.Tags)); err != nil {
+		log.Printf("[WARN] error saving tags to state: %s", err)
+	}
+
 	return nil
 }
 

diff --git a/aws/resource_aws_ebs_snapshot_test.go b/aws/resource_aws_ebs_snapshot_test.go
@@ -20,6 +20,7 @@ func TestAccAWSEBSSnapshot_basic(t *testing.T) {
 				Config: testAccAwsEbsSnapshotConfig,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckSnapshotExists("aws_ebs_snapshot.test", &v),
+					testAccCheckTags(&v.Tags, "Name", "testAccAwsEbsSnapshotConfig"),
 				),
 			},
 		},
@@ -73,12 +74,16 @@ func testAccCheckSnapshotExists(n string, v *ec2.Snapshot) resource.TestCheckFun
 
 const testAccAwsEbsSnapshotConfig = `
 resource "aws_ebs_volume" "test" {
-	availability_zone = "us-west-2a"
-	size = 1
+  availability_zone = "us-west-2a"
+  size              = 1
 }
 
 resource "aws_ebs_snapshot" "test" {
-	volume_id = "${aws_ebs_volume.test.id}"
+  volume_id = "${aws_ebs_volume.test.id}"
+
+  tags {
+    Name = "testAccAwsEbsSnapshotConfig"
+  }
 }
 `
 

diff --git a/website/docs/r/ebs_snapshot.html.md b/website/docs/r/ebs_snapshot.html.md
@@ -22,7 +22,11 @@ resource "aws_ebs_volume" "example" {
 }
 
 resource "aws_ebs_snapshot" "example_snapshot" {
-	volume_id = "${aws_ebs_volume.example.id}"
+  volume_id = "${aws_ebs_volume.example.id}"
+
+  tags {
+    Name = "HelloWorld_snap"
+  }
 }
 ```
 
@@ -32,6 +36,7 @@ The following arguments are supported:
 
 * `volume_id` - (Required) The Volume ID of which to make a snapshot.
 * `description` - (Optional) A description of what the snapshot is.
+* `tags` - (Optional) A mapping of tags to assign to the snapshot
 
 
 ## Attributes Reference
@@ -45,4 +50,4 @@ The following attributes are exported:
 * `volume_size` - The size of the drive in GiBs.
 * `kms_key_id` - The ARN for the KMS encryption key.
 * `data_encryption_key_id` - The data encryption key identifier for the snapshot.
-* `tags` - A mapping of tags for the resource.
+* `tags` - A mapping of tags for the snapshot.