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

Adds missing anonymous_auth_enabled parameter #26746

Merged
merged 7 commits into from
Mar 13, 2023
Merged

Adds missing anonymous_auth_enabled parameter #26746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eec3488
Adds missing anonymous_auth_enabled parameter to aws_opensearch_domai…
dpattmann Sep 9, 2022
d1c278a
Adds changelog file for PR #26746
dpattmann Sep 9, 2022
adaae14
Fix test case
dpattmann Sep 12, 2022
e943cdf
Update .changelog/26746.txt
ewbankkit Mar 13, 2023
acf7f66
Merge branch 'main' into HEAD
ewbankkit Mar 13, 2023
778b0d4
Tweak CHANGELOG entry.
ewbankkit Mar 13, 2023
31c5113
d/aws_opensearch_domain: Tidy up 'TestAccOpenSearchDomainDataSource_D…
ewbankkit Mar 13, 2023
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/26746.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
data-source/aws_opensearch_domain: Add missing `advanced_security_options.anonymous_auth_enabled` attribute
```
4 changes: 4 additions & 0 deletions internal/service/opensearch/domain_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,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,
Expand Down
44 changes: 12 additions & 32 deletions internal/service/opensearch/domain_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,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.#"),
),
},
},
Expand All @@ -73,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"),
Expand All @@ -87,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"),
),
},
},
Expand Down Expand Up @@ -184,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" {}
Expand Down Expand Up @@ -221,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" {
Expand Down Expand Up @@ -287,7 +273,6 @@ POLICY
}

rollback_on_disable = "NO_ROLLBACK"

}

cluster_config {
Expand Down Expand Up @@ -318,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 {
Expand Down