From 8937214f9c63a41cc73f58c539cc82ad0bfea352 Mon Sep 17 00:00:00 2001 From: aaron Date: Thu, 12 Nov 2020 14:49:16 -0500 Subject: [PATCH] Adding default vaultAuthRole to equal lambda name --- main.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 0aae645..88648e1 100644 --- a/main.go +++ b/main.go @@ -51,7 +51,12 @@ func initialiseExtension(logger *log.Logger) { logger.Println("Initialising") vaultAddr := os.Getenv("VAULT_ADDR") + vaultAuthRole := os.Getenv("VAULT_AUTH_ROLE") + if vaultAuthRole == "" { + vaultAuthRole = os.Getenv("AWS_LAMBDA_FUNCTION_NAME") + } + vaultAuthProvider := os.Getenv("VAULT_AUTH_PROVIDER") configuredSecrets, err := config.ParseConfiguredSecrets() @@ -59,8 +64,8 @@ func initialiseExtension(logger *log.Logger) { logger.Fatalf("Failed to parse configured secrets to read: %s", err) } - if vaultAddr == "" || vaultAuthProvider == "" || vaultAuthRole == "" || len(configuredSecrets) == 0 { - logger.Fatal("missing VAULT_ADDR, VAULT_AUTH_PROVIDER, VAULT_AUTH_ROLE, or VAULT_SECRET_ environment variables.") + if vaultAddr == "" || vaultAuthProvider == "" || len(configuredSecrets) == 0 { + logger.Fatal("missing VAULT_ADDR, VAULT_AUTH_PROVIDER, or VAULT_SECRET_ environment variables.") } client, err := vault.NewClient(logger, vaultAuthRole, vaultAuthProvider)