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

f-aws_instance: support for launch time #37002

Merged
merged 5 commits into from
May 10, 2024
Merged

f-aws_instance: support for launch time #37002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c985013
f-aws_instance: support for launch time
nikhil-goenka Apr 19, 2024
518e48b
f-support for network_card_index
nikhil-goenka Apr 19, 2024
b3c5fa0
f-aws_instance: support for launch time
nikhil-goenka Apr 19, 2024
a29a417
f-aws_instance: support launch time
nikhil-goenka Apr 20, 2024
92fc09f
resolve merge conflicts
johnsonaj May 10, 2024
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
3 changes: 3 additions & 0 deletions .changelog/37002.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
data-source/aws_instance: Add `launch_time` attribute
```
5 changes: 5 additions & 0 deletions internal/service/ec2/ec2_instance_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,10 @@ func DataSourceInstance() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"launch_time": {
Type: schema.TypeString,
Computed: true,
},
"maintenance_options": {
Type: schema.TypeList,
Computed: true,
Expand Down Expand Up @@ -479,6 +483,7 @@ func instanceDescriptionAttributes(ctx context.Context, d *schema.ResourceData,
d.Set("ami", instance.ImageId)
d.Set(names.AttrInstanceType, instanceType)
d.Set("key_name", instance.KeyName)
d.Set("launch_time", instance.LaunchTime.Format(time.RFC3339))
d.Set("outpost_arn", instance.OutpostArn)
d.Set("private_dns", instance.PrivateDnsName)
d.Set("private_ip", instance.PrivateIpAddress)
Expand Down
17 changes: 17 additions & 0 deletions internal/service/ec2/ec2_instance_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ func TestAccEC2InstanceDataSource_basic(t *testing.T) {
resource.TestCheckResourceAttrPair(datasourceName, names.AttrARN, resourceName, names.AttrARN),
resource.TestCheckNoResourceAttr(datasourceName, "user_data_base64"),
resource.TestCheckResourceAttr(datasourceName, "outpost_arn", ""),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
),
},
},
Expand All @@ -56,6 +57,7 @@ func TestAccEC2InstanceDataSource_tags(t *testing.T) {
resource.TestCheckResourceAttrPair(datasourceName, "ami", resourceName, "ami"),
resource.TestCheckResourceAttrPair(datasourceName, "tags.%", resourceName, "tags.%"),
resource.TestCheckResourceAttrPair(datasourceName, names.AttrInstanceType, resourceName, names.AttrInstanceType),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
),
},
},
Expand All @@ -81,6 +83,7 @@ func TestAccEC2InstanceDataSource_azUserData(t *testing.T) {
resource.TestCheckResourceAttrPair(datasourceName, names.AttrInstanceType, resourceName, names.AttrInstanceType),
resource.TestCheckResourceAttrPair(datasourceName, names.AttrAvailabilityZone, resourceName, names.AttrAvailabilityZone),
resource.TestCheckResourceAttrPair(datasourceName, "user_data", resourceName, "user_data"),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
),
},
},
Expand All @@ -103,6 +106,7 @@ func TestAccEC2InstanceDataSource_gp2IopsDevice(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(datasourceName, "ami", resourceName, "ami"),
resource.TestCheckResourceAttrPair(datasourceName, names.AttrInstanceType, resourceName, names.AttrInstanceType),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.#", resourceName, "root_block_device.#"),
resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.0.volume_size", resourceName, "root_block_device.0.volume_size"),
resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.0.volume_type", resourceName, "root_block_device.0.volume_type"),
Expand Down Expand Up @@ -130,6 +134,7 @@ func TestAccEC2InstanceDataSource_gp3ThroughputDevice(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(datasourceName, "ami", resourceName, "ami"),
resource.TestCheckResourceAttrPair(datasourceName, names.AttrInstanceType, resourceName, names.AttrInstanceType),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.#", resourceName, "root_block_device.#"),
resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.0.volume_size", resourceName, "root_block_device.0.volume_size"),
resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.0.volume_type", resourceName, "root_block_device.0.volume_type"),
Expand Down Expand Up @@ -157,6 +162,7 @@ func TestAccEC2InstanceDataSource_blockDevices(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(datasourceName, "ami", resourceName, "ami"),
resource.TestCheckResourceAttrPair(datasourceName, names.AttrInstanceType, resourceName, names.AttrInstanceType),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.#", resourceName, "root_block_device.#"),
resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.0.volume_size", resourceName, "root_block_device.0.volume_size"),
resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.0.volume_type", resourceName, "root_block_device.0.volume_type"),
Expand Down Expand Up @@ -220,6 +226,7 @@ func TestAccEC2InstanceDataSource_rootInstanceStore(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(datasourceName, "ami", resourceName, "ami"),
resource.TestCheckResourceAttrPair(datasourceName, names.AttrInstanceType, resourceName, names.AttrInstanceType),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
resource.TestCheckResourceAttrPair(datasourceName, "ebs_block_device.#", resourceName, "ebs_block_device.#"),
resource.TestCheckResourceAttrPair(datasourceName, "ebs_optimized", resourceName, "ebs_optimized"),
resource.TestCheckResourceAttrPair(datasourceName, "root_block_device.#", resourceName, "root_block_device.#"),
Expand All @@ -245,6 +252,7 @@ func TestAccEC2InstanceDataSource_privateIP(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(datasourceName, "ami", resourceName, "ami"),
resource.TestCheckResourceAttrPair(datasourceName, names.AttrInstanceType, resourceName, names.AttrInstanceType),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
resource.TestCheckResourceAttrPair(datasourceName, "private_dns_name_options.#", resourceName, "private_dns_name_options.#"),
resource.TestCheckResourceAttrPair(datasourceName, "private_dns_name_options.0.enable_resource_name_dns_aaaa_record", resourceName, "private_dns_name_options.0.enable_resource_name_dns_aaaa_record"),
resource.TestCheckResourceAttrPair(datasourceName, "private_dns_name_options.0.enable_resource_name_dns_a_record", resourceName, "private_dns_name_options.0.enable_resource_name_dns_a_record"),
Expand Down Expand Up @@ -272,6 +280,7 @@ func TestAccEC2InstanceDataSource_secondaryPrivateIPs(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(datasourceName, "ami", resourceName, "ami"),
resource.TestCheckResourceAttrPair(datasourceName, names.AttrInstanceType, resourceName, names.AttrInstanceType),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
resource.TestCheckResourceAttrPair(datasourceName, "secondary_private_ips", resourceName, "secondary_private_ips"),
),
},
Expand All @@ -295,6 +304,7 @@ func TestAccEC2InstanceDataSource_ipv6Addresses(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(datasourceName, "ami", resourceName, "ami"),
resource.TestCheckResourceAttrPair(datasourceName, names.AttrInstanceType, resourceName, names.AttrInstanceType),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
resource.TestCheckResourceAttrPair(datasourceName, "ipv6_addresses.#", resourceName, "ipv6_address_count"),
),
},
Expand Down Expand Up @@ -324,6 +334,7 @@ func TestAccEC2InstanceDataSource_keyPair(t *testing.T) {
resource.TestCheckResourceAttrPair(datasourceName, "ami", resourceName, "ami"),
resource.TestCheckResourceAttrPair(datasourceName, "tags.%", resourceName, "tags.%"),
resource.TestCheckResourceAttrPair(datasourceName, names.AttrInstanceType, resourceName, names.AttrInstanceType),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
resource.TestCheckResourceAttrPair(datasourceName, "key_name", resourceName, "key_name"),
),
},
Expand All @@ -347,6 +358,7 @@ func TestAccEC2InstanceDataSource_vpc(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(datasourceName, "ami", resourceName, "ami"),
resource.TestCheckResourceAttrPair(datasourceName, names.AttrInstanceType, resourceName, names.AttrInstanceType),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
resource.TestCheckResourceAttrPair(datasourceName, "user_data", resourceName, "user_data"),
resource.TestCheckResourceAttrPair(datasourceName, "associate_public_ip_address", resourceName, "associate_public_ip_address"),
resource.TestCheckResourceAttrPair(datasourceName, "tenancy", resourceName, "tenancy"),
Expand Down Expand Up @@ -393,6 +405,7 @@ func TestAccEC2InstanceDataSource_securityGroups(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(datasourceName, "ami", resourceName, "ami"),
resource.TestCheckResourceAttrPair(datasourceName, names.AttrInstanceType, resourceName, names.AttrInstanceType),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
resource.TestCheckResourceAttrPair(datasourceName, "user_data", resourceName, "user_data"),
resource.TestCheckResourceAttrPair(datasourceName, "vpc_security_group_ids.#", resourceName, "vpc_security_group_ids.#"),
resource.TestCheckResourceAttrPair(datasourceName, "security_groups.#", resourceName, "security_groups.#"),
Expand All @@ -418,6 +431,7 @@ func TestAccEC2InstanceDataSource_vpcSecurityGroups(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(datasourceName, "ami", resourceName, "ami"),
resource.TestCheckResourceAttrPair(datasourceName, names.AttrInstanceType, resourceName, names.AttrInstanceType),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
resource.TestCheckResourceAttrPair(datasourceName, "vpc_security_group_ids.#", resourceName, "vpc_security_group_ids.#"),
resource.TestCheckResourceAttrPair(datasourceName, "security_groups.#", resourceName, "security_groups.#"),
),
Expand Down Expand Up @@ -610,6 +624,7 @@ func TestAccEC2InstanceDataSource_creditSpecification(t *testing.T) {
Config: testAccInstanceDataSourceConfig_creditSpecification(rName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(datasourceName, names.AttrInstanceType, resourceName, names.AttrInstanceType),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
resource.TestCheckResourceAttrPair(datasourceName, "credit_specification.#", resourceName, "credit_specification.#"),
resource.TestCheckResourceAttrPair(datasourceName, "credit_specification.0.cpu_credits", resourceName, "credit_specification.0.cpu_credits"),
),
Expand Down Expand Up @@ -681,6 +696,7 @@ func TestAccEC2InstanceDataSource_blockDeviceTags(t *testing.T) {
Config: testAccInstanceDataSourceConfig_blockDeviceTags(rName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(datasourceName, names.AttrInstanceType, resourceName, names.AttrInstanceType),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
),
},
},
Expand Down Expand Up @@ -731,6 +747,7 @@ func TestAccEC2InstanceDataSource_timeout(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(datasourceName, "ami", resourceName, "ami"),
resource.TestCheckResourceAttrPair(datasourceName, "tags.%", resourceName, "tags.%"),
resource.TestCheckResourceAttrSet(datasourceName, "launch_time"),
resource.TestCheckResourceAttrPair(datasourceName, names.AttrInstanceType, resourceName, names.AttrInstanceType),
resource.TestCheckResourceAttrPair(datasourceName, names.AttrARN, resourceName, names.AttrARN),
),
Expand Down
1 change: 1 addition & 0 deletions website/docs/d/instance.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ interpolation.
* `instance_type` - Type of the Instance.
* `ipv6_addresses` - IPv6 addresses associated to the Instance, if applicable. **NOTE**: Unlike the IPv4 address, this doesn't change if you attach an EIP to the instance.
* `key_name` - Key name of the Instance.
* `launch_time` - Time the instance was launched.
* `maintenance_options` - Maintenance and recovery options for the instance.
* `auto_recovery` - Automatic recovery behavior of the instance.
* `metadata_options` - Metadata options of the Instance.
Expand Down
Loading