elasticsearch extra params

hashicorp · Feb 12, 2022 · 8d134c1 · 8d134c1
1 parent 307b74f
commit 8d134c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/vault/resource_database_secret_backend_connection.go b/vault/resource_database_secret_backend_connection.go
@@ -209,7 +209,7 @@ func databaseSecretBackendConnectionResource() *schema.Resource {
 				Sensitive:   true,
 			},
 
-			"elasticsearch": {
+			dbEngineElasticSearch.name: {
 				Type:        schema.TypeList,
 				Optional:    true,
 				Description: "Connection parameters for the elasticsearch-database-plugin.",

diff --git a/vault/resource_database_secret_backend_connection_test.go b/vault/resource_database_secret_backend_connection_test.go
@@ -699,7 +699,6 @@ func TestAccDatabaseSecretBackendConnection_elasticsearch(t *testing.T) {
 	backend := acctest.RandomWithPrefix("tf-test-db")
 	pluginName := dbEngineElasticSearch.DefaultPluginName()
 	name := acctest.RandomWithPrefix("db")
-	resourceName := "vault_database_secret_backend_connection.test"
 
 	resource.Test(t, resource.TestCase{
 		Providers:    testProviders,
@@ -708,9 +707,7 @@ func TestAccDatabaseSecretBackendConnection_elasticsearch(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDatabaseSecretBackendConnectionConfig_elasticsearch(name, backend, connURL, username, password),
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(testDefaultDatabaseSecretBackendResource, "name", name),
-					resource.TestCheckResourceAttr(testDefaultDatabaseSecretBackendResource, "backend", backend),
+				Check: testComposeCheckFuncCommonDatabaseSecretBackend(name, backend, pluginName,
 					resource.TestCheckResourceAttr(testDefaultDatabaseSecretBackendResource, "allowed_roles.#", "2"),
 					resource.TestCheckResourceAttr(testDefaultDatabaseSecretBackendResource, "allowed_roles.0", "dev"),
 					resource.TestCheckResourceAttr(testDefaultDatabaseSecretBackendResource, "allowed_roles.1", "prod"),
@@ -721,12 +718,6 @@ func TestAccDatabaseSecretBackendConnection_elasticsearch(t *testing.T) {
 					resource.TestCheckResourceAttr(testDefaultDatabaseSecretBackendResource, "elasticsearch.0.password", password),
 				),
 			},
-			{
-				ResourceName:            resourceName,
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"verify_connection", "elasticsearch.0.password"},
-			},
 		},
 	})
 }