Skip to content

Commit 6972cdb

Browse files
committed
return the config when initializing
1 parent 720f1f6 commit 6972cdb

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

vault.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,26 @@ type Provider interface {
2323
type Option func(*Config)
2424

2525
// New creates a new vault instance with the provided ID and options
26-
func New(id string, opts ...Option) (Provider, error) {
26+
func New(id string, opts ...Option) (Provider, *Config, error) {
2727
config := &Config{ID: id}
2828
for _, opt := range opts {
2929
opt(config)
3030
}
3131
if err := config.Validate(); err != nil {
32-
return nil, err
32+
return nil, config, err
3333
}
3434

3535
switch config.Type {
3636
case ProviderTypeAge:
37-
return NewAgeVault(config)
37+
provider, err := NewAgeVault(config)
38+
return provider, config, err
3839
case ProviderTypeAES256:
39-
return NewAES256Vault(config)
40+
provider, err := NewAES256Vault(config)
41+
return provider, config, err
4042
case ProviderTypeExternal:
41-
return nil, fmt.Errorf("external vault provider not implemented yet")
43+
return nil, nil, fmt.Errorf("external vault provider not implemented yet")
4244
}
43-
return nil, fmt.Errorf("unsupported vault type: %s", config.Type)
45+
return nil, nil, fmt.Errorf("unsupported vault type: %s", config.Type)
4446
}
4547

4648
// WithProvider sets the vault provider type

vault_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func setupAESVault(t *testing.T, dir string) vault.Provider {
5353
t.Setenv(vault.DefaultVaultKeyEnv, key)
5454
}
5555

56-
v, err := vault.New("test-aes",
56+
v, _, err := vault.New("test-aes",
5757
vault.WithProvider(vault.ProviderTypeAES256),
5858
vault.WithAESPath(dir),
5959
vault.WithAESKeyFromEnv(vault.DefaultVaultKeyEnv),
@@ -75,7 +75,7 @@ func setupAgeVault(t *testing.T, dir string) vault.Provider {
7575
t.Fatalf("Failed to write test key file: %v", err)
7676
}
7777

78-
v, err := vault.New("test-age",
78+
v, _, err := vault.New("test-age",
7979
vault.WithProvider(vault.ProviderTypeAge),
8080
vault.WithAgePath(dir),
8181
vault.WithAgeIdentityFromFile(keyFile),

0 commit comments

Comments
 (0)