db: add fields for skip auto rotation of static roles

hashicorp · Jan 3, 2025 · bb8a648 · bb8a648
1 parent 78f2eda
commit bb8a648
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/vault/resource_database_secret_backend_connection.go b/vault/resource_database_secret_backend_connection.go
@@ -1863,6 +1863,10 @@ func writeDatabaseSecretConfig(d *schema.ResourceData, client *api.Client,
 		}
 	}
 
+	if v, ok := d.Get(prefix + consts.FieldSkipStaticRoleImportRotation).(bool); ok {
+		data[consts.FieldSkipStaticRoleImportRotation] = v
+	}
+
 	log.Printf("[DEBUG] Writing connection config to %q", path)
 	_, err = client.Logical().Write(path, data)
 	if err != nil {

diff --git a/vault/resource_database_secret_backend_connection_test.go b/vault/resource_database_secret_backend_connection_test.go
@@ -820,6 +820,7 @@ func TestAccDatabaseSecretBackendConnection_postgresql(t *testing.T) {
 					resource.TestCheckResourceAttr(testDefaultDatabaseSecretBackendResource, "postgresql.0.password", password),
 					resource.TestCheckResourceAttr(testDefaultDatabaseSecretBackendResource, "postgresql.0.disable_escaping", "true"),
 					resource.TestCheckResourceAttr(testDefaultDatabaseSecretBackendResource, "postgresql.0.username_template", userTempl),
+					resource.TestCheckResourceAttr(testDefaultDatabaseSecretBackendResource, "postgresql.0.skip_static_role_import_rotation", "true"),
 				),
 			},
 			{
@@ -1753,6 +1754,8 @@ resource "vault_database_secret_backend_connection" "test" {
       password                = "%s"
       username_template       = "%s"
       disable_escaping        = true
+
+      skip_static_role_import_rotation = true
   }
 }
 `, path, name, parsedURL.String(), openConn, idleConn, maxConnLifetime, username, password, userTempl)

diff --git a/vault/resource_database_secrets_mount.go b/vault/resource_database_secrets_mount.go
@@ -181,6 +181,11 @@ func getCommonDatabaseSchema() schemaMap {
 			Description: "Specifies if the connection is verified during initial configuration.",
 			Default:     true,
 		},
+		consts.FieldSkipStaticRoleImportRotation: {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Description: "Skip rotation of static role secrets on import.",
+		},
 		"allowed_roles": {
 			Type:        schema.TypeList,
 			Optional:    true,