Add new columns to aws_ec2_ami table (#2774)

Author: StephenKing

aws-test/tests/aws_ec2_ami/test-get-expected.json

@@ -5,32 +5,41 @@
       {
         "DeviceName":"/dev/sda1",
         "Ebs": {
+          "AvailabilityZone": null,
+          "AvailabilityZoneId": null,
           "DeleteOnTermination":true,
           "Encrypted":true,
           "Iops":null,
           "KmsKeyId":null,
           "OutpostArn": null,
           "SnapshotId":"{{ output.snapshot_id.value }}",
           "Throughput": null,
+          "VolumeInitializationRate": null,
           "VolumeSize":8,
           "VolumeType":"standard"
         },
         "NoDevice":null,
         "VirtualName":null
       }
     ],
+    "deregistration_protection": "disabled",
     "description": "This is a test image.",
     "ena_support": false,
+    "free_tier_eligible": true,
     "hypervisor": "xen",
+    "image_allowed": null,
     "image_id": "{{ output.resource_id.value }}",
     "image_location": "{{ output.account_id.value }}/{{resourceName}}",
     "image_type": "machine",
+    "last_launched_time": null,
     "name": "{{resourceName}}",
     "owner_id": "{{ output.account_id.value }}",
     "platform_details": "Linux/UNIX",
     "public": false,
     "root_device_name": "/dev/sda1",
     "root_device_type": "ebs",
+    "source_image_id": null,
+    "source_image_region": null,
     "sriov_net_support": "simple",
     "tags_src": [
       {

aws-test/tests/aws_ec2_ami/test-get-query.sql

@@ -1,3 +1,3 @@
-select name, image_id, image_type, image_location, architecture, description, ena_support, hypervisor, owner_id, platform_details, public, root_device_name, root_device_type, sriov_net_support, usage_operation, virtualization_type, block_device_mappings, tags_src
+select name, image_id, image_type, image_location, architecture, description, ena_support, hypervisor, owner_id, platform_details, public, root_device_name, root_device_type, sriov_net_support, usage_operation, virtualization_type, block_device_mappings, tags_src, deregistration_protection, free_tier_eligible, image_allowed, source_image_id, source_image_region, last_launched_time
 from aws.aws_ec2_ami
 where image_id = '{{ output.resource_id.value }}'

aws/table_aws_ec2_ami.go

@@ -104,6 +104,37 @@ func tableAwsEc2Ami(_ context.Context) *plugin.Table {
 				Type:        proto.ColumnType_TIMESTAMP,
 				Transform:   transform.FromField("DeprecationTime").Transform(transform.NullIfZeroValue),
 			},
+			{
+				Name:        "last_launched_time",
+				Description: "The date and time, in ISO 8601 date-time format, when the AMI was last used to launch an EC2 instance. When the AMI is used to launch an instance, there is a 24-hour delay before that usage is reported.",
+				Type:        proto.ColumnType_TIMESTAMP,
+				Transform:   transform.FromField("LastLaunchedTime").Transform(transform.NullIfZeroValue),
+			},
+			{
+				Name:        "deregistration_protection",
+				Description: "Indicates whether deregistration protection is enabled for the AMI.",
+				Type:        proto.ColumnType_STRING,
+			},
+			{
+				Name:        "free_tier_eligible",
+				Description: "Indicates whether the image is eligible for Amazon Web Services Free Tier.",
+				Type:        proto.ColumnType_BOOL,
+			},
+			{
+				Name:        "image_allowed",
+				Description: "If true, the AMI satisfies the criteria for Allowed AMIs and can be discovered and used in the account.",
+				Type:        proto.ColumnType_BOOL,
+			},
+			{
+				Name:        "source_image_id",
+				Description: "The ID of the source AMI from which the AMI was created. Only appears if the AMI was created using CreateImage, CopyImage, or CreateRestoreImageTask.",
+				Type:        proto.ColumnType_STRING,
+			},
+			{
+				Name:        "source_image_region",
+				Description: "The Region of the source AMI. Only appears if the AMI was created using CreateImage, CopyImage, or CreateRestoreImageTask.",
+				Type:        proto.ColumnType_STRING,
+			},
 			{
 				Name:        "architecture",
 				Description: "The architecture of the image.",

docs/tables/aws_ec2_ami.md

@@ -98,6 +98,35 @@ where
   state = 'failed';
 ```
 
+### List AMIs not launched in the last 90 days
+Identify AMIs that haven't been used recently, helping you find candidates for deregistration to reduce storage costs and simplify your AMI inventory.
+
+```sql+postgres
+select
+  name,
+  image_id,
+  creation_date,
+  last_launched_time
+from
+  aws_ec2_ami
+where
+  last_launched_time < now() - interval '90 days'
+  or last_launched_time is null;
+```
+
+```sql+sqlite
+select
+  name,
+  image_id,
+  creation_date,
+  last_launched_time
+from
+  aws_ec2_ami
+where
+  last_launched_time < datetime('now', '-90 days')
+  or last_launched_time is null;
+```
+
 ### Get volume info for each AMI
 Explore the characteristics of each Amazon Machine Image (AMI), such as volume size and type, encryption status, and deletion policy. This information is vital for managing storage resources efficiently and ensuring data security within your AWS EC2 environment.