From 1ab2de728c2b7f32055cc55c3cb19732525521f5 Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 8 Dec 2023 17:23:29 +0100 Subject: [PATCH 01/11] chore: update docs to add `region` to the target table --- website/docs/r/glue_catalog_table.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/r/glue_catalog_table.html.markdown b/website/docs/r/glue_catalog_table.html.markdown index 7598ebf5722..6773b76b049 100644 --- a/website/docs/r/glue_catalog_table.html.markdown +++ b/website/docs/r/glue_catalog_table.html.markdown @@ -190,6 +190,7 @@ To add an index to an existing table, see the [`glue_partition_index` resource]( * `catalog_id` - (Required) ID of the Data Catalog in which the table resides. * `database_name` - (Required) Name of the catalog database that contains the target table. * `name` - (Required) Name of the target table. +* `region` - (Optional) Region of the target table. ## Attribute Reference From cc7123797d4f838db10a3b5460a08147b76a55a8 Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 8 Dec 2023 17:23:37 +0100 Subject: [PATCH 02/11] chore: add `region` to `target_table` --- internal/service/glue/catalog_table.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/internal/service/glue/catalog_table.go b/internal/service/glue/catalog_table.go index 7933d91e4f0..07640b7b7e4 100644 --- a/internal/service/glue/catalog_table.go +++ b/internal/service/glue/catalog_table.go @@ -342,6 +342,9 @@ func ResourceCatalogTable() *schema.Resource { Type: schema.TypeString, Required: true, }, + "region": { + Type: schema.TypeString, + Optional: true, }, }, }, @@ -1119,6 +1122,10 @@ func expandTableTargetTable(tfMap map[string]interface{}) *glue.TableIdentifier apiObject.Name = aws.String(v) } + if v, ok := tfMap["region"].(string); ok && v != "" { + apiObject.Region = aws.String(v) + } + return apiObject } @@ -1141,6 +1148,10 @@ func flattenTableTargetTable(apiObject *glue.TableIdentifier) map[string]interfa tfMap["name"] = aws.StringValue(v) } + if v := apiObject.Region; v != nil { + tfMap["region"] = aws.StringValue(v) + } + return tfMap } From 77162d67bf8792cd96c54f3188405d0eabed3e7a Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 8 Dec 2023 17:27:42 +0100 Subject: [PATCH 03/11] chore: add `region` argument to `target_table` in data source --- internal/service/glue/catalog_table_data_source.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/service/glue/catalog_table_data_source.go b/internal/service/glue/catalog_table_data_source.go index 9eeba51b8eb..2c56a525fc4 100644 --- a/internal/service/glue/catalog_table_data_source.go +++ b/internal/service/glue/catalog_table_data_source.go @@ -299,6 +299,10 @@ func DataSourceCatalogTable() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "region": { + Type: schema.TypeString, + Computed: true, + }, }, }, }, From 23ecfbdbf0fc44d84262056b15e7c2e7015c4417 Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 8 Dec 2023 17:28:17 +0100 Subject: [PATCH 04/11] chore: update data source docs to add `region` to the target table --- website/docs/d/glue_catalog_table.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/d/glue_catalog_table.html.markdown b/website/docs/d/glue_catalog_table.html.markdown index d0479f12ba8..d318a39870c 100644 --- a/website/docs/d/glue_catalog_table.html.markdown +++ b/website/docs/d/glue_catalog_table.html.markdown @@ -115,3 +115,4 @@ This data source exports the following attributes in addition to the arguments a * `catalog_id` - ID of the Data Catalog in which the table resides. * `database_name` - Name of the catalog database that contains the target table. * `name` - Name of the target table. +* `region` - Region of the target table. From d2fcaf872fa9b2c5be155a02336f7c7e682e8129 Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 8 Dec 2023 17:29:43 +0100 Subject: [PATCH 05/11] Create 34817.txt --- .changelog/34817.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changelog/34817.txt diff --git a/.changelog/34817.txt b/.changelog/34817.txt new file mode 100644 index 00000000000..7301500b1f8 --- /dev/null +++ b/.changelog/34817.txt @@ -0,0 +1,6 @@ +```release-note:enhancement +resource/aws_glue_catalog_table: Add `region` attribute to `target_table` block. +``` +```release-note:enhancement +data-source//aws_glue_catalog_table: Add `region` attribute to `target_table` block. +``` From 9dcbc7511f4b89c6e8810fdca0be27bdb46ce199 Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 8 Dec 2023 17:30:28 +0100 Subject: [PATCH 06/11] chore: rm extra slash --- .changelog/34817.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/34817.txt b/.changelog/34817.txt index 7301500b1f8..1601ccf42d3 100644 --- a/.changelog/34817.txt +++ b/.changelog/34817.txt @@ -2,5 +2,5 @@ resource/aws_glue_catalog_table: Add `region` attribute to `target_table` block. ``` ```release-note:enhancement -data-source//aws_glue_catalog_table: Add `region` attribute to `target_table` block. +data-source/aws_glue_catalog_table: Add `region` attribute to `target_table` block. ``` From b5aaf42fc6bf5fc067bee28b412d1f02399c4962 Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 8 Dec 2023 17:38:59 +0100 Subject: [PATCH 07/11] chore: fix missing curly brace --- internal/service/glue/catalog_table.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/service/glue/catalog_table.go b/internal/service/glue/catalog_table.go index 07640b7b7e4..663223cfc64 100644 --- a/internal/service/glue/catalog_table.go +++ b/internal/service/glue/catalog_table.go @@ -345,6 +345,7 @@ func ResourceCatalogTable() *schema.Resource { "region": { Type: schema.TypeString, Optional: true, + }, }, }, }, From 51790fea25071473c3a395fd8c81925411fedc39 Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 8 Dec 2023 17:41:26 +0100 Subject: [PATCH 08/11] chore: add `region` on `target_table` test check resource attribute pair --- internal/service/glue/catalog_table_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/service/glue/catalog_table_test.go b/internal/service/glue/catalog_table_test.go index f6daa12a853..0d1939e9db9 100644 --- a/internal/service/glue/catalog_table_test.go +++ b/internal/service/glue/catalog_table_test.go @@ -645,6 +645,7 @@ func TestAccGlueCatalogTable_targetTable(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "target_table.0.catalog_id", "aws_glue_catalog_table.test2", "catalog_id"), resource.TestCheckResourceAttrPair(resourceName, "target_table.0.database_name", "aws_glue_catalog_table.test2", "database_name"), resource.TestCheckResourceAttrPair(resourceName, "target_table.0.name", "aws_glue_catalog_table.test2", "name"), + resource.TestCheckResourceAttrPair(resourceName, "target_table.0.region", "aws_glue_catalog_table.test2", "region"), ), }, { From 43bddcb452e3567a163c234572ef1ab80d247b7d Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 8 Dec 2023 17:43:14 +0100 Subject: [PATCH 09/11] chore: add region to `target_table` --- internal/service/glue/catalog_table_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/service/glue/catalog_table_test.go b/internal/service/glue/catalog_table_test.go index 0d1939e9db9..467247da347 100644 --- a/internal/service/glue/catalog_table_test.go +++ b/internal/service/glue/catalog_table_test.go @@ -1416,6 +1416,8 @@ resource "aws_glue_catalog_table" "test" { func testAccCatalogTableConfig_target(rName string) string { return fmt.Sprintf(` +data "aws_region" "current" {} + resource "aws_glue_catalog_database" "test" { name = %[1]q } @@ -1428,6 +1430,7 @@ resource "aws_glue_catalog_table" "test" { catalog_id = aws_glue_catalog_table.test2.catalog_id database_name = aws_glue_catalog_table.test2.database_name name = aws_glue_catalog_table.test2.name + region = data.aws_region.current.name } } From 5df861d4c41b6f3ff2f6d5ae6d81d55d05e33a96 Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 8 Dec 2023 17:47:37 +0100 Subject: [PATCH 10/11] chore: remove resource attribute test --- internal/service/glue/catalog_table_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/glue/catalog_table_test.go b/internal/service/glue/catalog_table_test.go index 467247da347..aef89b7bc8c 100644 --- a/internal/service/glue/catalog_table_test.go +++ b/internal/service/glue/catalog_table_test.go @@ -645,7 +645,6 @@ func TestAccGlueCatalogTable_targetTable(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "target_table.0.catalog_id", "aws_glue_catalog_table.test2", "catalog_id"), resource.TestCheckResourceAttrPair(resourceName, "target_table.0.database_name", "aws_glue_catalog_table.test2", "database_name"), resource.TestCheckResourceAttrPair(resourceName, "target_table.0.name", "aws_glue_catalog_table.test2", "name"), - resource.TestCheckResourceAttrPair(resourceName, "target_table.0.region", "aws_glue_catalog_table.test2", "region"), ), }, { From 0d1f768d1fc733ec9351059ed795b324fa40cd15 Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 8 Dec 2023 17:48:31 +0100 Subject: [PATCH 11/11] chore: use spaces --- internal/service/glue/catalog_table_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/glue/catalog_table_test.go b/internal/service/glue/catalog_table_test.go index aef89b7bc8c..8c68ba2ec85 100644 --- a/internal/service/glue/catalog_table_test.go +++ b/internal/service/glue/catalog_table_test.go @@ -1429,7 +1429,7 @@ resource "aws_glue_catalog_table" "test" { catalog_id = aws_glue_catalog_table.test2.catalog_id database_name = aws_glue_catalog_table.test2.database_name name = aws_glue_catalog_table.test2.name - region = data.aws_region.current.name + region = data.aws_region.current.name } }