Skip to content

Commit 591b73c

Browse files
Arta AsadiArta Asadi
authored andcommitted
fix: remove junk vault variables
1 parent d713594 commit 591b73c

File tree

3 files changed

+0
-31
lines changed

3 files changed

+0
-31
lines changed

services/core/http_handler.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -147,23 +147,6 @@ func InitializeHttpHandler(
147147
h.dexClient = dexClient
148148
h.viewCheckpoint = time.Now().Add(-time.Hour * 2)
149149
switch cfg.Vault.Provider {
150-
case vault.AwsKMS:
151-
h.vault, err = vault.NewKMSVaultSourceConfig(ctx, cfg.Vault.Aws, cfg.Vault.KeyId)
152-
if err != nil {
153-
logger.Error("new kms vaultClient source config", zap.Error(err))
154-
return nil, fmt.Errorf("new kms vaultClient source config: %w", err)
155-
}
156-
case vault.AzureKeyVault:
157-
h.vault, err = vault.NewAzureVaultClient(ctx, logger, cfg.Vault.Azure, cfg.Vault.KeyId)
158-
if err != nil {
159-
logger.Error("new azure vaultClient source config", zap.Error(err))
160-
return nil, fmt.Errorf("new azure vaultClient source config: %w", err)
161-
}
162-
h.vaultSecretHandler, err = vault.NewAzureVaultSecretHandler(logger, cfg.Vault.Azure)
163-
if err != nil {
164-
logger.Error("new azure vaultClient secret handler", zap.Error(err))
165-
return nil, fmt.Errorf("new azure vaultClient secret handler: %w", err)
166-
}
167150
case vault.HashiCorpVault:
168151
h.vaultSecretHandler, err = vault.NewHashiCorpVaultSecretHandler(ctx, logger, cfg.Vault.HashiCorp)
169152
if err != nil {

services/integration/cmd.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -118,18 +118,6 @@ func Command() *cobra.Command {
118118

119119
var vaultSc vault.VaultSourceConfig
120120
switch cnf.Vault.Provider {
121-
case vault.AwsKMS:
122-
vaultSc, err = vault.NewKMSVaultSourceConfig(ctx, cnf.Vault.Aws, cnf.Vault.KeyId)
123-
if err != nil {
124-
logger.Error("failed to create vault source config", zap.Error(err))
125-
return err
126-
}
127-
case vault.AzureKeyVault:
128-
vaultSc, err = vault.NewAzureVaultClient(ctx, logger, cnf.Vault.Azure, cnf.Vault.KeyId)
129-
if err != nil {
130-
logger.Error("failed to create vault source config", zap.Error(err))
131-
return err
132-
}
133121
case vault.HashiCorpVault:
134122
vaultSc, err = vault.NewHashiCorpVaultClient(ctx, logger, cnf.Vault.HashiCorp, cnf.Vault.KeyId)
135123
if err != nil {

services/tasks/config/model.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ package config
33
import (
44
"github.com/opengovern/og-util/pkg/config"
55
"github.com/opengovern/og-util/pkg/koanf"
6-
"github.com/opengovern/og-util/pkg/vault"
76
)
87

98
type Config struct {
109
Postgres koanf.Postgres `yaml:"postgres" koanf:"postgres"`
1110
Http koanf.HttpServer `yaml:"http" koanf:"http"`
1211
NATS config.NATS `yaml:"nats" koanf:"nats"`
13-
Vault vault.Config `yaml:"vault" koanf:"vault"`
1412
ElasticSearch config.ElasticSearch
1513

1614
ESSinkEndpoint string `yaml:"essink_endpoint" koanf:"essink_endpoint"`

0 commit comments

Comments
 (0)