Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make encryption persistence timeout configurable via env var #25636

Merged
merged 6 commits into from
Feb 27, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use ParseDurationSecond
sgmiller committed Feb 27, 2024
commit d2b69a671a5276ec1ed4a820693a62937cadda30
4 changes: 3 additions & 1 deletion vault/barrier_aes_gcm.go
Original file line number Diff line number Diff line change
@@ -20,6 +20,8 @@ import (
"sync"
"time"

"github.com/hashicorp/go-secure-stdlib/parseutil"

"github.com/armon/go-metrics"
"github.com/hashicorp/go-secure-stdlib/strutil"
"github.com/hashicorp/vault/sdk/helper/jsonutil"
@@ -122,7 +124,7 @@ func NewAESGCMBarrier(physical physical.Backend) (*AESGCMBarrier, error) {
keyringTimeout := defaultKeyringTimeout
keyringTimeoutStr := os.Getenv(bestEffortKeyringTimeoutOverride)
if keyringTimeoutStr != "" {
t, err := time.ParseDuration(keyringTimeoutStr)
t, err := parseutil.ParseDurationSecond(keyringTimeoutStr)
if err != nil {
return nil, err
sgmiller marked this conversation as resolved.
Show resolved Hide resolved
}