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.

Sign up for GitHub

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

(API) Remove sync.Once as init is executed only once #1505

Merged
merged 1 commit into from
May 20, 2024
Merged

(API) Remove sync.Once as init is executed only once #1505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
83 changes: 39 additions & 44 deletions api/secrets/secrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package secrets
import (
"context"
"os"
"sync"

vault "github.com/hashicorp/vault/api"
auth "github.com/hashicorp/vault/api/auth/kubernetes"
Expand All @@ -12,58 +11,54 @@ import (

var secretData map[string]interface{}
var initialized bool = false
var once sync.Once

func init() {
once.Do(func() {
ctx := context.Background()
ctx := context.Background()

vaultRole := os.Getenv("VAULT_ROLE")
jwtPath := os.Getenv("JWT_PATH")
vaultSecretPath := os.Getenv("VAULT_SECRET_PATH")
vaultKeyName := os.Getenv("VAULT_KEY_NAME")
vaultRole := os.Getenv("VAULT_ROLE")
jwtPath := os.Getenv("JWT_PATH")
vaultSecretPath := os.Getenv("VAULT_SECRET_PATH")
vaultKeyName := os.Getenv("VAULT_KEY_NAME")

if vaultRole == "" || jwtPath == "" || vaultSecretPath == "" || vaultKeyName == "" {
log.Error().Msg("Missing required environment variables for Vault initialization")
return
}

config := vault.DefaultConfig()
client, err := vault.NewClient(config)
if err != nil {
log.Error().Err(err).Msg("unable to initialize Vault client")
return
}
if vaultRole == "" || jwtPath == "" || vaultSecretPath == "" || vaultKeyName == "" {
log.Error().Msg("Missing required environment variables for Vault initialization")
return
}

k8sAuth, err := auth.NewKubernetesAuth(
vaultRole,
auth.WithServiceAccountTokenPath(jwtPath),
)
if err != nil {
log.Error().Err(err).Msg("unable to initialize Kubernetes auth method")
return
}
config := vault.DefaultConfig()
client, err := vault.NewClient(config)
if err != nil {
log.Error().Err(err).Msg("unable to initialize Vault client")
return
}

authInfo, err := client.Auth().Login(ctx, k8sAuth)
if err != nil {
log.Error().Err(err).Msg("unable to log in with Kubernetes auth")
return
}
if authInfo == nil {
log.Error().Err(err).Msg("no auth info was returned after login")
return
}
k8sAuth, err := auth.NewKubernetesAuth(
vaultRole,
auth.WithServiceAccountTokenPath(jwtPath),
)
if err != nil {
log.Error().Err(err).Msg("unable to initialize Kubernetes auth method")
return
}

secrets, err := client.KVv2(vaultSecretPath).Get(ctx, vaultKeyName)
if err != nil {
log.Error().Err(err).Msg("unable to read secret")
return
}
authInfo, err := client.Auth().Login(ctx, k8sAuth)
if err != nil {
log.Error().Err(err).Msg("unable to log in with Kubernetes auth")
return
}
if authInfo == nil {
log.Error().Err(err).Msg("no auth info was returned after login")
return
}

secretData = secrets.Data
initialized = true
secrets, err := client.KVv2(vaultSecretPath).Get(ctx, vaultKeyName)
if err != nil {
log.Error().Err(err).Msg("unable to read secret")
return
}

})
secretData = secrets.Data
initialized = true
}

func GetSecret(key string) string {
Expand Down
Loading