From eec34886ab310e87c537174a3385a724e0f10a56 Mon Sep 17 00:00:00 2001 From: Dennis Pattmann Date: Sat, 10 Sep 2022 00:15:48 +0200 Subject: [PATCH 1/6] Adds missing anonymous_auth_enabled parameter to aws_opensearch_domain data resource --- internal/service/opensearch/domain_data_source.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/service/opensearch/domain_data_source.go b/internal/service/opensearch/domain_data_source.go index 4756f17a0403..dedda86bf8c9 100644 --- a/internal/service/opensearch/domain_data_source.go +++ b/internal/service/opensearch/domain_data_source.go @@ -31,6 +31,10 @@ func DataSourceDomain() *schema.Resource { Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ + "anonymous_auth_enabled": { + Type: schema.TypeBool, + Computed: true, + }, "enabled": { Type: schema.TypeBool, Computed: true, From d1c278af657e75b0b905ca09c475857c65f205b8 Mon Sep 17 00:00:00 2001 From: Dennis Pattmann Date: Sat, 10 Sep 2022 00:23:15 +0200 Subject: [PATCH 2/6] Adds changelog file for PR #26746 --- .changelog/26746.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/26746.txt diff --git a/.changelog/26746.txt b/.changelog/26746.txt new file mode 100644 index 000000000000..d9e0cc1dc79e --- /dev/null +++ b/.changelog/26746.txt @@ -0,0 +1,3 @@ +```release-note:bug +data/aws_opensearch_domain: Adds missing anonymous_auth_enabled parameter to aws_opensearch_domain data resource +``` \ No newline at end of file From adaae14c59175bd5c10051bb7f2e99c43a4bcdbf Mon Sep 17 00:00:00 2001 From: Dennis Pattmann Date: Mon, 12 Sep 2022 21:32:58 +0200 Subject: [PATCH 3/6] Fix test case --- internal/service/opensearch/domain_data_source_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/opensearch/domain_data_source_test.go b/internal/service/opensearch/domain_data_source_test.go index 4cfbcc20133c..3d9983b2eead 100644 --- a/internal/service/opensearch/domain_data_source_test.go +++ b/internal/service/opensearch/domain_data_source_test.go @@ -46,7 +46,6 @@ func TestAccOpenSearchDomainDataSource_Data_basic(t *testing.T) { resource.TestCheckResourceAttrPair(datasourceName, "ebs_options.0.iops", resourceName, "ebs_options.0.iops"), resource.TestCheckResourceAttrPair(datasourceName, "snapshot_options.#", resourceName, "snapshot_options.#"), resource.TestCheckResourceAttrPair(datasourceName, "snapshot_options.0.automated_snapshot_start_hour", resourceName, "snapshot_options.0.automated_snapshot_start_hour"), - resource.TestCheckResourceAttrPair(datasourceName, "advanced_security_options.#", resourceName, "advanced_security_options.#"), ), }, }, From e943cdfbf38a28557202218adbd2581ea47bff00 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 13 Mar 2023 11:05:54 -0400 Subject: [PATCH 4/6] Update .changelog/26746.txt Co-authored-by: Tim Bannister --- .changelog/26746.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/26746.txt b/.changelog/26746.txt index d9e0cc1dc79e..a33c1e38f351 100644 --- a/.changelog/26746.txt +++ b/.changelog/26746.txt @@ -1,3 +1,3 @@ ```release-note:bug -data/aws_opensearch_domain: Adds missing anonymous_auth_enabled parameter to aws_opensearch_domain data resource +data/aws_opensearch_domain: Add missing `anonymous_auth_enabled` parameter to `aws_opensearch_domain` data resource ``` \ No newline at end of file From 778b0d44356d762f6e5c7b580adf69fe5506b932 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 13 Mar 2023 11:09:24 -0400 Subject: [PATCH 5/6] Tweak CHANGELOG entry. --- .changelog/26746.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/26746.txt b/.changelog/26746.txt index a33c1e38f351..e9617b389579 100644 --- a/.changelog/26746.txt +++ b/.changelog/26746.txt @@ -1,3 +1,3 @@ ```release-note:bug -data/aws_opensearch_domain: Add missing `anonymous_auth_enabled` parameter to `aws_opensearch_domain` data resource +data-source/aws_opensearch_domain: Add missing `advanced_security_options.anonymous_auth_enabled` attribute ``` \ No newline at end of file From 31c51136424102d08073d695668c70c800fe878e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 13 Mar 2023 11:14:53 -0400 Subject: [PATCH 6/6] d/aws_opensearch_domain: Tidy up 'TestAccOpenSearchDomainDataSource_Data_advanced'. --- .../opensearch/domain_data_source_test.go | 43 ++++++------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/internal/service/opensearch/domain_data_source_test.go b/internal/service/opensearch/domain_data_source_test.go index 8ce46d83267d..1bbc6a0d9193 100644 --- a/internal/service/opensearch/domain_data_source_test.go +++ b/internal/service/opensearch/domain_data_source_test.go @@ -72,7 +72,9 @@ func TestAccOpenSearchDomainDataSource_Data_advanced(t *testing.T) { { Config: testAccDomainDataSourceConfig_advanced(rName, autoTuneStartAtTime), Check: resource.ComposeAggregateTestCheckFunc( - resource.TestCheckResourceAttrPair(datasourceName, "engine_version", resourceName, "engine_version"), + resource.TestCheckResourceAttrPair(datasourceName, "advanced_security_options.#", resourceName, "advanced_security_options.#"), + resource.TestCheckResourceAttrPair(datasourceName, "advanced_security_options.0.enabled", resourceName, "advanced_security_options.0.enabled"), + resource.TestCheckResourceAttrPair(datasourceName, "advanced_security_options.0.internal_user_database_enabled", resourceName, "advanced_security_options.0.internal_user_database_enabled"), resource.TestCheckResourceAttrPair(datasourceName, "auto_tune_options.#", resourceName, "auto_tune_options.#"), resource.TestCheckResourceAttrPair(datasourceName, "auto_tune_options.0.desired_state", resourceName, "auto_tune_options.0.desired_state"), resource.TestCheckResourceAttrPair(datasourceName, "auto_tune_options.0.maintenance_schedule", resourceName, "auto_tune_options.0.maintenance_schedule"), @@ -86,12 +88,11 @@ func TestAccOpenSearchDomainDataSource_Data_advanced(t *testing.T) { resource.TestCheckResourceAttrPair(datasourceName, "ebs_options.0.ebs_enabled", resourceName, "ebs_options.0.ebs_enabled"), resource.TestCheckResourceAttrPair(datasourceName, "ebs_options.0.volume_type", resourceName, "ebs_options.0.volume_type"), resource.TestCheckResourceAttrPair(datasourceName, "ebs_options.0.volume_size", resourceName, "ebs_options.0.volume_size"), + resource.TestCheckResourceAttrPair(datasourceName, "engine_version", resourceName, "engine_version"), + resource.TestCheckResourceAttrPair(datasourceName, "log_publishing_options.#", resourceName, "log_publishing_options.#"), resource.TestCheckResourceAttrPair(datasourceName, "snapshot_options.#", resourceName, "snapshot_options.#"), resource.TestCheckResourceAttrPair(datasourceName, "snapshot_options.0.automated_snapshot_start_hour", resourceName, "snapshot_options.0.automated_snapshot_start_hour"), - resource.TestCheckResourceAttrPair(datasourceName, "log_publishing_options.#", resourceName, "log_publishing_options.#"), resource.TestCheckResourceAttrPair(datasourceName, "vpc_options.#", resourceName, "vpc_options.#"), - resource.TestCheckResourceAttrPair(datasourceName, "advanced_security_options.0.enabled", resourceName, "advanced_security_options.0.enabled"), - resource.TestCheckResourceAttrPair(datasourceName, "advanced_security_options.0.internal_user_database_enabled", resourceName, "advanced_security_options.0.internal_user_database_enabled"), ), }, }, @@ -183,9 +184,7 @@ data "aws_opensearch_domain" "test" { } func testAccDomainDataSourceConfig_advanced(rName, autoTuneStartAtTime string) string { - return acctest.ConfigCompose( - acctest.ConfigAvailableAZsNoOptIn(), - fmt.Sprintf(` + return acctest.ConfigCompose(acctest.ConfigVPCWithSubnets(rName, 2), fmt.Sprintf(` data "aws_partition" "current" {} data "aws_region" "current" {} @@ -220,25 +219,13 @@ resource "aws_cloudwatch_log_resource_policy" "test" { CONFIG } -resource "aws_vpc" "test" { - cidr_block = "10.0.0.0/16" -} - -resource "aws_subnet" "test" { - availability_zone = data.aws_availability_zones.available.names[0] - cidr_block = "10.0.0.0/24" - vpc_id = aws_vpc.test.id -} - -resource "aws_subnet" "test2" { - availability_zone = data.aws_availability_zones.available.names[1] - cidr_block = "10.0.1.0/24" - vpc_id = aws_vpc.test.id -} - resource "aws_security_group" "test" { name = %[1]q vpc_id = aws_vpc.test.id + + tags = { + Name = %[1]q + } } resource "aws_security_group_rule" "test" { @@ -286,7 +273,6 @@ POLICY } rollback_on_disable = "NO_ROLLBACK" - } cluster_config { @@ -317,13 +303,8 @@ POLICY } vpc_options { - security_group_ids = [ - aws_security_group.test.id - ] - subnet_ids = [ - aws_subnet.test.id, - aws_subnet.test2.id - ] + security_group_ids = [aws_security_group.test.id] + subnet_ids = aws_subnet.test[*].id } advanced_security_options {