Merge b861d8b into backport/vault-31163-db-rotation-schedule-tz/heavi…

…ly-gorgeous-hippo
hashicorp · Sep 25, 2024 · c613246 · c613246
2 parents 2618435 + b861d8b
commit c613246
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/builtin/logical/database/path_creds_create.go b/builtin/logical/database/path_creds_create.go
@@ -268,6 +268,10 @@ func (b *databaseBackend) pathStaticCredsRead() framework.OperationFunc {
 			if role.StaticAccount.RotationWindow.Seconds() != 0 {
 				respData["rotation_window"] = role.StaticAccount.RotationWindow.Seconds()
 			}
+
+			// The schedule is in UTC, but we want to convert it to the local time
+			role.StaticAccount.Schedule.Location = time.Local
+			respData["ttl"] = role.StaticAccount.CredentialTTL().Seconds()
 		}
 
 		switch role.CredentialType {

diff --git a/changelog/28509.txt b/changelog/28509.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+databases: fix issue where local timezone was getting lost when using a rotation schedule cron
+```