From 38b37421ed78b587fd5c9f20ce7a3c5a7b3e9e0b Mon Sep 17 00:00:00 2001 From: Albert Silva Date: Thu, 14 Jul 2022 21:51:22 +0000 Subject: [PATCH 1/6] update docs --- website/docs/d/outposts_asset.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/d/outposts_asset.html.markdown b/website/docs/d/outposts_asset.html.markdown index 0c0d2ae9b107..ad9df30d4ea1 100644 --- a/website/docs/d/outposts_asset.html.markdown +++ b/website/docs/d/outposts_asset.html.markdown @@ -38,4 +38,5 @@ In addition to all arguments above, the following attributes are exported: * `asset_type` - The type of the asset. * `host_id` - The host ID of the Dedicated Hosts on the asset, if a Dedicated Host is provisioned. +* `rack_elevation` - The position of an asset in a rack measured in rack units. * `rack_id` - The rack ID of the asset. From d10ace2ae895d56d89f43051a5ae27b9e24dea58 Mon Sep 17 00:00:00 2001 From: Albert Silva Date: Thu, 14 Jul 2022 21:55:08 +0000 Subject: [PATCH 2/6] update changelog --- .changelog/25822.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/25822.txt diff --git a/.changelog/25822.txt b/.changelog/25822.txt new file mode 100644 index 000000000000..8448e3052847 --- /dev/null +++ b/.changelog/25822.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +data/aws_outposts_asset: Add `rack_elevation` attribute +``` \ No newline at end of file From 7805c9963527fd406b8eb8efc763fb16e3f24bb4 Mon Sep 17 00:00:00 2001 From: Albert Silva Date: Thu, 14 Jul 2022 22:09:49 +0000 Subject: [PATCH 3/6] add rack_elevation to outpost_asset --- internal/service/outposts/outpost_asset_data_source.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/internal/service/outposts/outpost_asset_data_source.go b/internal/service/outposts/outpost_asset_data_source.go index b35083639c6d..389abbcf34c7 100644 --- a/internal/service/outposts/outpost_asset_data_source.go +++ b/internal/service/outposts/outpost_asset_data_source.go @@ -32,6 +32,10 @@ func DataSourceOutpostAsset() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "rack_elevation": { + Type: schema.TypeInt, + Computed: true, + }, "rack_id": { Type: schema.TypeString, Computed: true, @@ -78,6 +82,7 @@ func DataSourceOutpostAssetRead(d *schema.ResourceData, meta interface{}) error d.Set("asset_id", asset.AssetId) d.Set("asset_type", asset.AssetType) d.Set("host_id", asset.ComputeAttributes.HostId) + d.Set("rack_elevation", asset.AssetLocation.RackElevation) d.Set("rack_id", asset.RackId) return nil } From e277335cc567e6a29881ca29be8f5d08c79945ec Mon Sep 17 00:00:00 2001 From: Albert Silva Date: Thu, 14 Jul 2022 22:16:09 +0000 Subject: [PATCH 4/6] cleanup + update test for rack_elevation attribute --- .../service/outposts/outpost_asset_data_source_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/service/outposts/outpost_asset_data_source_test.go b/internal/service/outposts/outpost_asset_data_source_test.go index c7a56f74cba6..7af01bba9039 100644 --- a/internal/service/outposts/outpost_asset_data_source_test.go +++ b/internal/service/outposts/outpost_asset_data_source_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/acctest" ) -func TestAccOutpostsAssetDataSource_id(t *testing.T) { +func TestAccOutpostsAssetDataSource_basic(t *testing.T) { dataSourceName := "data.aws_outposts_asset.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t); acctest.PreCheckOutpostsOutposts(t) }, @@ -17,11 +17,12 @@ func TestAccOutpostsAssetDataSource_id(t *testing.T) { ProviderFactories: acctest.ProviderFactories, Steps: []resource.TestStep{ { - Config: testAccOutpostAssetDataSourceConfig_id(), + Config: testAccOutpostAssetDataSourceConfig_basic(), Check: resource.ComposeTestCheckFunc( acctest.MatchResourceAttrRegionalARN(dataSourceName, "arn", "outposts", regexp.MustCompile(`outpost/.+`)), resource.TestMatchResourceAttr(dataSourceName, "asset_id", regexp.MustCompile(`^(\w+)$`)), resource.TestCheckResourceAttrSet(dataSourceName, "asset_type"), + resource.TestMatchResourceAttr(dataSourceName, "rack_elevation", regexp.MustCompile(`^[\S \n]+$`)), resource.TestMatchResourceAttr(dataSourceName, "rack_id", regexp.MustCompile(`^[\S \n]+$`)), ), }, @@ -29,7 +30,7 @@ func TestAccOutpostsAssetDataSource_id(t *testing.T) { }) } -func testAccOutpostAssetDataSourceConfig_id() string { +func testAccOutpostAssetDataSourceConfig_basic() string { return ` data "aws_outposts_outposts" "test" {} From d50126195d94a90900789221060d02efbba1d4db Mon Sep 17 00:00:00 2001 From: Albert Silva Date: Thu, 14 Jul 2022 23:12:51 +0000 Subject: [PATCH 5/6] retrigger checks From 0a01b58bd88d06f2de4006db37ec7231767ee31c Mon Sep 17 00:00:00 2001 From: Albert Silva Date: Fri, 15 Jul 2022 12:00:19 +0000 Subject: [PATCH 6/6] retrigger checks