From e929dfffdca0c9eeb58f050fbe11db19939f58a0 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 24 May 2023 16:54:21 -0400 Subject: [PATCH 1/6] r/aws_opensearch_domain: remove engine_version default --- internal/service/opensearch/domain.go | 11 +++++++---- internal/service/opensearch/domain_test.go | 5 +++-- website/docs/r/opensearch_domain.html.markdown | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/internal/service/opensearch/domain.go b/internal/service/opensearch/domain.go index d5250a902fc..c2edb879559 100644 --- a/internal/service/opensearch/domain.go +++ b/internal/service/opensearch/domain.go @@ -453,7 +453,7 @@ func ResourceDomain() *schema.Resource { "engine_version": { Type: schema.TypeString, Optional: true, - Default: "OpenSearch_1.1", + Computed: true, }, "kibana_endpoint": { Type: schema.TypeString, @@ -568,9 +568,12 @@ func resourceDomainCreate(ctx context.Context, d *schema.ResourceData, meta inte } inputCreateDomain := opensearchservice.CreateDomainInput{ - DomainName: aws.String(d.Get("domain_name").(string)), - EngineVersion: aws.String(d.Get("engine_version").(string)), - TagList: GetTagsIn(ctx), + DomainName: aws.String(d.Get("domain_name").(string)), + TagList: GetTagsIn(ctx), + } + + if v, ok := d.GetOk("engine_version"); ok { + inputCreateDomain.EngineVersion = aws.String(v.(string)) } if v, ok := d.GetOk("access_policies"); ok { diff --git a/internal/service/opensearch/domain_test.go b/internal/service/opensearch/domain_test.go index 77b15b59668..fb4c8be24f1 100644 --- a/internal/service/opensearch/domain_test.go +++ b/internal/service/opensearch/domain_test.go @@ -150,7 +150,7 @@ func TestAccOpenSearchDomain_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckDomainExists(ctx, resourceName, &domain), resource.TestMatchResourceAttr(resourceName, "dashboard_endpoint", regexp.MustCompile(`.*(opensearch|es)\..*/_dashboards`)), - resource.TestCheckResourceAttr(resourceName, "engine_version", "OpenSearch_1.1"), + resource.TestCheckResourceAttrSet(resourceName, "engine_version"), resource.TestMatchResourceAttr(resourceName, "kibana_endpoint", regexp.MustCompile(`.*(opensearch|es)\..*/_plugin/kibana/`)), resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), resource.TestCheckResourceAttr(resourceName, "vpc_options.#", "0"), @@ -543,7 +543,8 @@ func TestAccOpenSearchDomain_duplicate(t *testing.T) { Config: testAccDomainConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDomainExists(ctx, resourceName, &domain), - resource.TestCheckResourceAttr(resourceName, "engine_version", "OpenSearch_1.1")), + resource.TestCheckResourceAttrSet(resourceName, "engine_version"), + ), ExpectError: regexp.MustCompile(`OpenSearch Domain ".+" already exists`), }, }, diff --git a/website/docs/r/opensearch_domain.html.markdown b/website/docs/r/opensearch_domain.html.markdown index 4af36ce3f90..2eff90469eb 100644 --- a/website/docs/r/opensearch_domain.html.markdown +++ b/website/docs/r/opensearch_domain.html.markdown @@ -328,7 +328,7 @@ The following arguments are optional: * `cognito_options` - (Optional) Configuration block for authenticating dashboard with Cognito. Detailed below. * `domain_endpoint_options` - (Optional) Configuration block for domain endpoint HTTP(S) related options. Detailed below. * `ebs_options` - (Optional) Configuration block for EBS related options, may be required based on chosen [instance size](https://aws.amazon.com/opensearch-service/pricing/). Detailed below. -* `engine_version` - (Optional) Either `Elasticsearch_X.Y` or `OpenSearch_X.Y` to specify the engine version for the Amazon OpenSearch Service domain. For example, `OpenSearch_1.0` or `Elasticsearch_7.9`. See [Creating and managing Amazon OpenSearch Service domains](http://docs.aws.amazon.com/opensearch-service/latest/developerguide/createupdatedomains.html#createdomains). Defaults to `OpenSearch_1.1`. +* `engine_version` - (Optional) Either `Elasticsearch_X.Y` or `OpenSearch_X.Y` to specify the engine version for the Amazon OpenSearch Service domain. For example, `OpenSearch_1.0` or `Elasticsearch_7.9`. See [Creating and managing Amazon OpenSearch Service domains](http://docs.aws.amazon.com/opensearch-service/latest/developerguide/createupdatedomains.html#createdomains). * `encrypt_at_rest` - (Optional) Configuration block for encrypt at rest options. Only available for [certain instance types](https://docs.aws.amazon.com/opensearch-service/latest/developerguide/encryption-at-rest.html). Detailed below. * `log_publishing_options` - (Optional) Configuration block for publishing slow and application logs to CloudWatch Logs. This block can be declared multiple times, for each log_type, within the same resource. Detailed below. * `node_to_node_encryption` - (Optional) Configuration block for node-to-node encryption options. Detailed below. From 8d165dbc53d10d8db509ec98f216e3022ffa3d04 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 24 May 2023 17:03:43 -0400 Subject: [PATCH 2/6] docs: aws_opensearch_domain v5 engine_version upgrade guide --- website/docs/guides/version-5-upgrade.html.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/docs/guides/version-5-upgrade.html.md b/website/docs/guides/version-5-upgrade.html.md index 98dc7181dd3..312e418b17c 100644 --- a/website/docs/guides/version-5-upgrade.html.md +++ b/website/docs/guides/version-5-upgrade.html.md @@ -404,7 +404,8 @@ Remove `policy_document` from configurations as it no longer exists. Use the `aw ## resource/aws_opensearch_domain -The `kibana_endpoint` attribute has been deprecated. All configurations using `kibana_endpoint` should be updated to use the `dashboard_endpoint` attribute instead. +* The `kibana_endpoint` attribute has been deprecated. All configurations using `kibana_endpoint` should be updated to use the `dashboard_endpoint` attribute instead. +* The `engine_version` attribute no longer has a default value. Omitting this attribute will now create a domain with the latest OpenSearch version, consistent with the behavior of the AWS API. ## resource/aws_rds_cluster From d417a8a0579d65ddc4d4422c0f79dd4dedd5d869 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 24 May 2023 13:58:01 -0700 Subject: [PATCH 3/6] Updates `engine_version` in tests and documentation --- internal/service/opensearch/domain_test.go | 14 ++++----- internal/service/opensearch/wait.go | 30 ++++++++++--------- .../docs/r/opensearch_domain.html.markdown | 4 ++- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/internal/service/opensearch/domain_test.go b/internal/service/opensearch/domain_test.go index fb4c8be24f1..18957d634a1 100644 --- a/internal/service/opensearch/domain_test.go +++ b/internal/service/opensearch/domain_test.go @@ -1304,14 +1304,14 @@ func TestAccOpenSearchDomain_Encryption_atRestEnable(t *testing.T) { CheckDestroy: testAccCheckDomainDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccDomainConfig_encryptAtRestDefaultKey(rName, "OpenSearch_1.1", false), + Config: testAccDomainConfig_encryptAtRestDefaultKey(rName, "OpenSearch_2.5", false), Check: resource.ComposeTestCheckFunc( testAccCheckDomainExists(ctx, resourceName, &domain1), testAccCheckDomainEncrypted(false, &domain1), ), }, { - Config: testAccDomainConfig_encryptAtRestDefaultKey(rName, "OpenSearch_1.1", true), + Config: testAccDomainConfig_encryptAtRestDefaultKey(rName, "OpenSearch_2.5", true), Check: resource.ComposeTestCheckFunc( testAccCheckDomainExists(ctx, resourceName, &domain2), testAccCheckDomainEncrypted(true, &domain2), @@ -1319,7 +1319,7 @@ func TestAccOpenSearchDomain_Encryption_atRestEnable(t *testing.T) { ), }, { - Config: testAccDomainConfig_encryptAtRestDefaultKey(rName, "OpenSearch_1.1", false), + Config: testAccDomainConfig_encryptAtRestDefaultKey(rName, "OpenSearch_2.5", false), Check: resource.ComposeTestCheckFunc( testAccCheckDomainExists(ctx, resourceName, &domain1), testAccCheckDomainEncrypted(false, &domain1), @@ -1413,14 +1413,14 @@ func TestAccOpenSearchDomain_Encryption_nodeToNodeEnable(t *testing.T) { CheckDestroy: testAccCheckDomainDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccDomainConfig_nodeToNodeEncryption(rName, "OpenSearch_1.1", false), + Config: testAccDomainConfig_nodeToNodeEncryption(rName, "OpenSearch_2.5", false), Check: resource.ComposeTestCheckFunc( testAccCheckDomainExists(ctx, resourceName, &domain1), testAccCheckNodeToNodeEncrypted(false, &domain1), ), }, { - Config: testAccDomainConfig_nodeToNodeEncryption(rName, "OpenSearch_1.1", true), + Config: testAccDomainConfig_nodeToNodeEncryption(rName, "OpenSearch_2.5", true), Check: resource.ComposeTestCheckFunc( testAccCheckDomainExists(ctx, resourceName, &domain2), testAccCheckNodeToNodeEncrypted(true, &domain2), @@ -1428,7 +1428,7 @@ func TestAccOpenSearchDomain_Encryption_nodeToNodeEnable(t *testing.T) { ), }, { - Config: testAccDomainConfig_nodeToNodeEncryption(rName, "OpenSearch_1.1", false), + Config: testAccDomainConfig_nodeToNodeEncryption(rName, "OpenSearch_2.5", false), Check: resource.ComposeTestCheckFunc( testAccCheckDomainExists(ctx, resourceName, &domain1), testAccCheckNodeToNodeEncrypted(false, &domain1), @@ -3325,8 +3325,6 @@ resource "aws_iam_role_policy_attachment" "test" { resource "aws_opensearch_domain" "test" { domain_name = %[1]q - engine_version = "OpenSearch_1.1" - %[2]s ebs_options { diff --git a/internal/service/opensearch/wait.go b/internal/service/opensearch/wait.go index 943beb14d24..eee7404745c 100644 --- a/internal/service/opensearch/wait.go +++ b/internal/service/opensearch/wait.go @@ -38,7 +38,7 @@ func waitUpgradeSucceeded(ctx context.Context, conn *opensearchservice.OpenSearc func WaitForDomainCreation(ctx context.Context, conn *opensearchservice.OpenSearchService, domainName string, timeout time.Duration) error { var out *opensearchservice.DomainStatus - err := retry.RetryContext(ctx, timeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, timeout, func() *retry.RetryError { var err error out, err = FindDomainByName(ctx, conn, domainName) if err != nil { @@ -50,26 +50,27 @@ func WaitForDomainCreation(ctx context.Context, conn *opensearchservice.OpenSear } return retry.RetryableError( - fmt.Errorf("%q: Timeout while waiting for the domain to be created", domainName)) - }) + fmt.Errorf("%q: Timeout while waiting for OpenSearch Domain to be created", domainName)) + }, tfresource.WithDelay(10*time.Minute), tfresource.WithPollInterval(10*time.Second)) + if tfresource.TimedOut(err) { out, err = FindDomainByName(ctx, conn, domainName) if err != nil { - return fmt.Errorf("Error describing OpenSearch domain: %w", err) + return fmt.Errorf("describing OpenSearch Domain: %w", err) } if !aws.BoolValue(out.Processing) && (out.Endpoint != nil || out.Endpoints != nil) { return nil } } if err != nil { - return fmt.Errorf("Error waiting for OpenSearch domain to be created: %w", err) + return fmt.Errorf("waiting for OpenSearch Domain to be created: %w", err) } return nil } func waitForDomainUpdate(ctx context.Context, conn *opensearchservice.OpenSearchService, domainName string, timeout time.Duration) error { var out *opensearchservice.DomainStatus - err := retry.RetryContext(ctx, timeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, timeout, func() *retry.RetryError { var err error out, err = FindDomainByName(ctx, conn, domainName) if err != nil { @@ -82,25 +83,26 @@ func waitForDomainUpdate(ctx context.Context, conn *opensearchservice.OpenSearch return retry.RetryableError( fmt.Errorf("%q: Timeout while waiting for changes to be processed", domainName)) - }) + }, tfresource.WithDelay(10*time.Minute), tfresource.WithPollInterval(10*time.Second)) + if tfresource.TimedOut(err) { out, err = FindDomainByName(ctx, conn, domainName) if err != nil { - return fmt.Errorf("Error describing OpenSearch domain: %w", err) + return fmt.Errorf("describing OpenSearch Domain: %w", err) } if !aws.BoolValue(out.Processing) { return nil } } if err != nil { - return fmt.Errorf("Error waiting for OpenSearch domain changes to be processed: %w", err) + return fmt.Errorf("waiting for OpenSearch Domain changes to be processed: %w", err) } return nil } func waitForDomainDelete(ctx context.Context, conn *opensearchservice.OpenSearchService, domainName string, timeout time.Duration) error { var out *opensearchservice.DomainStatus - err := retry.RetryContext(ctx, timeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, timeout, func() *retry.RetryError { var err error out, err = FindDomainByName(ctx, conn, domainName) @@ -115,8 +117,8 @@ func waitForDomainDelete(ctx context.Context, conn *opensearchservice.OpenSearch return nil } - return retry.RetryableError(fmt.Errorf("timeout while waiting for the OpenSearch domain %q to be deleted", domainName)) - }) + return retry.RetryableError(fmt.Errorf("timeout while waiting for the OpenSearch Domain %q to be deleted", domainName)) + }, tfresource.WithDelay(10*time.Minute), tfresource.WithPollInterval(10*time.Second)) if tfresource.TimedOut(err) { out, err = FindDomainByName(ctx, conn, domainName) @@ -124,7 +126,7 @@ func waitForDomainDelete(ctx context.Context, conn *opensearchservice.OpenSearch if tfresource.NotFound(err) { return nil } - return fmt.Errorf("Error describing OpenSearch domain: %s", err) + return fmt.Errorf("describing OpenSearch Domain: %s", err) } if out != nil && !aws.BoolValue(out.Processing) { return nil @@ -132,7 +134,7 @@ func waitForDomainDelete(ctx context.Context, conn *opensearchservice.OpenSearch } if err != nil { - return fmt.Errorf("Error waiting for OpenSearch domain to be deleted: %s", err) + return fmt.Errorf("waiting for OpenSearch Domain to be deleted: %s", err) } // opensearch maintains information about the domain in multiple (at least 2) places that need diff --git a/website/docs/r/opensearch_domain.html.markdown b/website/docs/r/opensearch_domain.html.markdown index 2eff90469eb..86ff7464983 100644 --- a/website/docs/r/opensearch_domain.html.markdown +++ b/website/docs/r/opensearch_domain.html.markdown @@ -328,7 +328,9 @@ The following arguments are optional: * `cognito_options` - (Optional) Configuration block for authenticating dashboard with Cognito. Detailed below. * `domain_endpoint_options` - (Optional) Configuration block for domain endpoint HTTP(S) related options. Detailed below. * `ebs_options` - (Optional) Configuration block for EBS related options, may be required based on chosen [instance size](https://aws.amazon.com/opensearch-service/pricing/). Detailed below. -* `engine_version` - (Optional) Either `Elasticsearch_X.Y` or `OpenSearch_X.Y` to specify the engine version for the Amazon OpenSearch Service domain. For example, `OpenSearch_1.0` or `Elasticsearch_7.9`. See [Creating and managing Amazon OpenSearch Service domains](http://docs.aws.amazon.com/opensearch-service/latest/developerguide/createupdatedomains.html#createdomains). +* `engine_version` - (Optional) Either `Elasticsearch_X.Y` or `OpenSearch_X.Y` to specify the engine version for the Amazon OpenSearch Service domain. For example, `OpenSearch_1.0` or `Elasticsearch_7.9`. + See [Creating and managing Amazon OpenSearch Service domains](http://docs.aws.amazon.com/opensearch-service/latest/developerguide/createupdatedomains.html#createdomains). + Defaults to the lastest version of OpenSearch. * `encrypt_at_rest` - (Optional) Configuration block for encrypt at rest options. Only available for [certain instance types](https://docs.aws.amazon.com/opensearch-service/latest/developerguide/encryption-at-rest.html). Detailed below. * `log_publishing_options` - (Optional) Configuration block for publishing slow and application logs to CloudWatch Logs. This block can be declared multiple times, for each log_type, within the same resource. Detailed below. * `node_to_node_encryption` - (Optional) Configuration block for node-to-node encryption options. Detailed below. From 1898f46b66bf39500f8880d4621a5c058cad096c Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 24 May 2023 15:40:46 -0700 Subject: [PATCH 4/6] Removes `OpenSearch_1.1` from associated tests and documentation --- internal/service/cognitoidp/managed_user_pool_client_test.go | 2 -- internal/service/opensearch/domain_policy_test.go | 2 -- internal/service/opensearch/inbound_connection_accepter_test.go | 2 -- internal/service/opensearch/outbound_connection_test.go | 2 -- 4 files changed, 8 deletions(-) diff --git a/internal/service/cognitoidp/managed_user_pool_client_test.go b/internal/service/cognitoidp/managed_user_pool_client_test.go index 6f893f20e43..038b05dee08 100644 --- a/internal/service/cognitoidp/managed_user_pool_client_test.go +++ b/internal/service/cognitoidp/managed_user_pool_client_test.go @@ -1045,8 +1045,6 @@ resource "aws_cognito_identity_pool" "test" { resource "aws_opensearch_domain" "test" { domain_name = %[1]q - engine_version = "OpenSearch_1.1" - cognito_options { enabled = true user_pool_id = aws_cognito_user_pool.test.id diff --git a/internal/service/opensearch/domain_policy_test.go b/internal/service/opensearch/domain_policy_test.go index be98d77722b..72455b1ef0a 100644 --- a/internal/service/opensearch/domain_policy_test.go +++ b/internal/service/opensearch/domain_policy_test.go @@ -57,7 +57,6 @@ func TestAccOpenSearchDomainPolicy_basic(t *testing.T) { Config: testAccDomainPolicyConfig_basic(ri, policy), Check: resource.ComposeTestCheckFunc( testAccCheckDomainExists(ctx, "aws_opensearch_domain.test", &domain), - resource.TestCheckResourceAttr("aws_opensearch_domain.test", "engine_version", "OpenSearch_1.1"), func(s *terraform.State) error { awsClient := acctest.Provider.Meta().(*conns.AWSClient) expectedArn, err := buildDomainARN(name, awsClient.Partition, awsClient.AccountID, awsClient.Region) @@ -118,7 +117,6 @@ func testAccDomainPolicyConfig_basic(randInt int, policy string) string { return fmt.Sprintf(` resource "aws_opensearch_domain" "test" { domain_name = "tf-test-%d" - engine_version = "OpenSearch_1.1" cluster_config { instance_type = "t2.small.search" # supported in both aws and aws-us-gov diff --git a/internal/service/opensearch/inbound_connection_accepter_test.go b/internal/service/opensearch/inbound_connection_accepter_test.go index 7cc681aa10e..d8a08a8f03c 100644 --- a/internal/service/opensearch/inbound_connection_accepter_test.go +++ b/internal/service/opensearch/inbound_connection_accepter_test.go @@ -73,7 +73,6 @@ func testAccInboundConnectionAccepterConfig(name string) string { return fmt.Sprintf(` resource "aws_opensearch_domain" "domain_1" { domain_name = "%s-1" - engine_version = "OpenSearch_1.1" cluster_config { instance_type = "t3.small.search" # supported in both aws and aws-us-gov @@ -110,7 +109,6 @@ resource "aws_opensearch_domain" "domain_1" { resource "aws_opensearch_domain" "domain_2" { domain_name = "%s-2" - engine_version = "OpenSearch_1.1" cluster_config { instance_type = "t3.small.search" # supported in both aws and aws-us-gov diff --git a/internal/service/opensearch/outbound_connection_test.go b/internal/service/opensearch/outbound_connection_test.go index bcef6d1cdd7..5b2eae5323a 100644 --- a/internal/service/opensearch/outbound_connection_test.go +++ b/internal/service/opensearch/outbound_connection_test.go @@ -73,7 +73,6 @@ func testAccOutboundConnectionConfig(name string) string { return fmt.Sprintf(` resource "aws_opensearch_domain" "domain_1" { domain_name = "%s-1" - engine_version = "OpenSearch_1.1" cluster_config { instance_type = "t3.small.search" # supported in both aws and aws-us-gov @@ -110,7 +109,6 @@ resource "aws_opensearch_domain" "domain_1" { resource "aws_opensearch_domain" "domain_2" { domain_name = "%s-2" - engine_version = "OpenSearch_1.1" cluster_config { instance_type = "t3.small.search" # supported in both aws and aws-us-gov From 8a50eb927462dbad492fc15720f39edffda91ed2 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 24 May 2023 16:02:56 -0700 Subject: [PATCH 5/6] `terrafmt` --- internal/service/opensearch/domain_policy_test.go | 2 +- .../service/opensearch/inbound_connection_accepter_test.go | 4 ++-- internal/service/opensearch/outbound_connection_test.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/opensearch/domain_policy_test.go b/internal/service/opensearch/domain_policy_test.go index 72455b1ef0a..515618d4b7e 100644 --- a/internal/service/opensearch/domain_policy_test.go +++ b/internal/service/opensearch/domain_policy_test.go @@ -116,7 +116,7 @@ func buildDomainARN(name, partition, accId, region string) (string, error) { func testAccDomainPolicyConfig_basic(randInt int, policy string) string { return fmt.Sprintf(` resource "aws_opensearch_domain" "test" { - domain_name = "tf-test-%d" + domain_name = "tf-test-%d" cluster_config { instance_type = "t2.small.search" # supported in both aws and aws-us-gov diff --git a/internal/service/opensearch/inbound_connection_accepter_test.go b/internal/service/opensearch/inbound_connection_accepter_test.go index d8a08a8f03c..58422dfb846 100644 --- a/internal/service/opensearch/inbound_connection_accepter_test.go +++ b/internal/service/opensearch/inbound_connection_accepter_test.go @@ -72,7 +72,7 @@ func testAccInboundConnectionAccepterConfig(name string) string { pw := fmt.Sprintf("Aa1-%s", sdkacctest.RandString(10)) return fmt.Sprintf(` resource "aws_opensearch_domain" "domain_1" { - domain_name = "%s-1" + domain_name = "%s-1" cluster_config { instance_type = "t3.small.search" # supported in both aws and aws-us-gov @@ -108,7 +108,7 @@ resource "aws_opensearch_domain" "domain_1" { } resource "aws_opensearch_domain" "domain_2" { - domain_name = "%s-2" + domain_name = "%s-2" cluster_config { instance_type = "t3.small.search" # supported in both aws and aws-us-gov diff --git a/internal/service/opensearch/outbound_connection_test.go b/internal/service/opensearch/outbound_connection_test.go index 5b2eae5323a..b20d437291e 100644 --- a/internal/service/opensearch/outbound_connection_test.go +++ b/internal/service/opensearch/outbound_connection_test.go @@ -72,7 +72,7 @@ func testAccOutboundConnectionConfig(name string) string { pw := fmt.Sprintf("Aa1-%s", sdkacctest.RandString(10)) return fmt.Sprintf(` resource "aws_opensearch_domain" "domain_1" { - domain_name = "%s-1" + domain_name = "%s-1" cluster_config { instance_type = "t3.small.search" # supported in both aws and aws-us-gov @@ -108,7 +108,7 @@ resource "aws_opensearch_domain" "domain_1" { } resource "aws_opensearch_domain" "domain_2" { - domain_name = "%s-2" + domain_name = "%s-2" cluster_config { instance_type = "t3.small.search" # supported in both aws and aws-us-gov From d68aa1dddc9d412109323f1d554a744098c4ec3c Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Thu, 25 May 2023 09:32:02 -0400 Subject: [PATCH 6/6] chore: changelog --- .changelog/31568.txt | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .changelog/31568.txt diff --git a/.changelog/31568.txt b/.changelog/31568.txt new file mode 100644 index 00000000000..30a91965303 --- /dev/null +++ b/.changelog/31568.txt @@ -0,0 +1,8 @@ + +```release-note:enhancement +resource/aws_opensearch_domain: Removed `engine_version` default value +``` + +```release-note:note +resource/aws_opensearch_domain: The `engine_version` attribute no longer has a default value. When omitted, the underlying AWS API will use the latest OpenSearch engine version. +```