Merge pull request #30652 from hashicorp/b-opensearch-acctests

Fixes OpenSearch and Elasticsearch acceptance tests
hashicorp · Apr 12, 2023 · 1b7c93a · 1b7c93a
2 parents b4ef753 + 817f3de
commit 1b7c93a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/internal/service/elasticsearch/domain_data_source_test.go b/internal/service/elasticsearch/domain_data_source_test.go
@@ -152,7 +152,6 @@ POLICY
   }
 
   cluster_config {
-    instance_type            = "t3.small.elasticsearch"
     instance_count           = 2
     dedicated_master_enabled = false
 
@@ -276,7 +275,6 @@ POLICY
   }
 
   cluster_config {
-    instance_type            = "t2.small.elasticsearch"
     instance_count           = 2
     dedicated_master_enabled = false
 

diff --git a/internal/service/opensearch/domain_data_source_test.go b/internal/service/opensearch/domain_data_source_test.go
@@ -153,7 +153,6 @@ POLICY
   }
 
   cluster_config {
-    instance_type            = "t3.small.search"
     instance_count           = 2
     dedicated_master_enabled = false
 
@@ -276,7 +275,6 @@ POLICY
   }
 
   cluster_config {
-    instance_type            = "t2.small.search"
     instance_count           = 2
     dedicated_master_enabled = false
 

diff --git a/internal/service/opensearch/domain_test.go b/internal/service/opensearch/domain_test.go
@@ -544,7 +544,7 @@ func TestAccOpenSearchDomain_duplicate(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckDomainExists(ctx, resourceName, &domain),
 					resource.TestCheckResourceAttr(resourceName, "engine_version", "OpenSearch_1.1")),
-				ExpectError: regexp.MustCompile(`domain .+ already exists`),
+				ExpectError: regexp.MustCompile(`OpenSearch Domain ".+" already exists`),
 			},
 		},
 	})