Add owner_id to resource_aws_ami

hashicorp · Jan 20, 2021 · 6fbbd8b · 6fbbd8b
1 parent 62da40c
commit 6fbbd8b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 0 deletions.
diff --git a/aws/resource_aws_ami.go b/aws/resource_aws_ami.go
@@ -190,6 +190,10 @@ func resourceAwsAmi() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"owner_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"ramdisk_id": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -376,6 +380,7 @@ func resourceAwsAmiRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("image_location", image.ImageLocation)
 	d.Set("architecture", image.Architecture)
 	d.Set("kernel_id", image.KernelId)
+	d.Set("owner_id", image.OwnerId)
 	d.Set("ramdisk_id", image.RamdiskId)
 	d.Set("root_device_name", image.RootDeviceName)
 	d.Set("root_snapshot_id", amiRootSnapshotId(image))

diff --git a/aws/resource_aws_ami_copy.go b/aws/resource_aws_ami_copy.go
@@ -155,6 +155,10 @@ func resourceAwsAmiCopy() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"owner_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"ramdisk_id": {
 				Type:     schema.TypeString,
 				Computed: true,

diff --git a/aws/resource_aws_ami_from_instance.go b/aws/resource_aws_ami_from_instance.go
@@ -142,6 +142,10 @@ func resourceAwsAmiFromInstance() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"owner_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"ramdisk_id": {
 				Type:     schema.TypeString,
 				Computed: true,

diff --git a/aws/resource_aws_ami_test.go b/aws/resource_aws_ami_test.go
@@ -47,6 +47,7 @@ func TestAccAWSAMI_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "ephemeral_block_device.#", "0"),
 					resource.TestCheckResourceAttr(resourceName, "kernel_id", ""),
 					resource.TestCheckResourceAttr(resourceName, "name", rName),
+					testAccCheckResourceAttrAccountID(resourceName, "owner_id"),
 					resource.TestCheckResourceAttr(resourceName, "ramdisk_id", ""),
 					resource.TestCheckResourceAttr(resourceName, "root_device_name", "/dev/sda1"),
 					resource.TestCheckResourceAttrPair(resourceName, "root_snapshot_id", snapshotResourceName, "id"),
@@ -102,6 +103,7 @@ func TestAccAWSAMI_description(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "ephemeral_block_device.#", "0"),
 					resource.TestCheckResourceAttr(resourceName, "kernel_id", ""),
 					resource.TestCheckResourceAttr(resourceName, "name", rName),
+					testAccCheckResourceAttrAccountID(resourceName, "owner_id"),
 					resource.TestCheckResourceAttr(resourceName, "ramdisk_id", ""),
 					resource.TestCheckResourceAttr(resourceName, "root_device_name", "/dev/sda1"),
 					resource.TestCheckResourceAttrPair(resourceName, "root_snapshot_id", snapshotResourceName, "id"),
@@ -140,6 +142,7 @@ func TestAccAWSAMI_description(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "ephemeral_block_device.#", "0"),
 					resource.TestCheckResourceAttr(resourceName, "kernel_id", ""),
 					resource.TestCheckResourceAttr(resourceName, "name", rName),
+					testAccCheckResourceAttrAccountID(resourceName, "owner_id"),
 					resource.TestCheckResourceAttr(resourceName, "ramdisk_id", ""),
 					resource.TestCheckResourceAttr(resourceName, "root_device_name", "/dev/sda1"),
 					resource.TestCheckResourceAttrPair(resourceName, "root_snapshot_id", snapshotResourceName, "id"),
@@ -214,6 +217,7 @@ func TestAccAWSAMI_EphemeralBlockDevices(t *testing.T) {
 					}),
 					resource.TestCheckResourceAttr(resourceName, "kernel_id", ""),
 					resource.TestCheckResourceAttr(resourceName, "name", rName),
+					testAccCheckResourceAttrAccountID(resourceName, "owner_id"),
 					resource.TestCheckResourceAttr(resourceName, "ramdisk_id", ""),
 					resource.TestCheckResourceAttr(resourceName, "root_device_name", "/dev/sda1"),
 					resource.TestCheckResourceAttrPair(resourceName, "root_snapshot_id", snapshotResourceName, "id"),
@@ -276,6 +280,7 @@ func TestAccAWSAMI_Gp3BlockDevice(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "ephemeral_block_device.#", "0"),
 					resource.TestCheckResourceAttr(resourceName, "kernel_id", ""),
 					resource.TestCheckResourceAttr(resourceName, "name", rName),
+					testAccCheckResourceAttrAccountID(resourceName, "owner_id"),
 					resource.TestCheckResourceAttr(resourceName, "ramdisk_id", ""),
 					resource.TestCheckResourceAttr(resourceName, "root_device_name", "/dev/sda1"),
 					resource.TestCheckResourceAttrPair(resourceName, "root_snapshot_id", snapshotResourceName, "id"),

diff --git a/website/docs/r/ami.html.markdown b/website/docs/r/ami.html.markdown
@@ -110,6 +110,7 @@ In addition to all arguments above, the following attributes are exported:
 
 * `arn` - The ARN of the AMI.
 * `id` - The ID of the created AMI.
+* `owner_id` - The AWS account ID of the image owner.
 * `root_snapshot_id` - The Snapshot ID for the root volume (for EBS-backed AMIs)
 
 ## Import