Set up generic function to execute aws-vault's LoadConfigFromEnv func…

…tion silently, without outputting any logs to the console

plugins/aws/sts_provisioner.go

@@ -3,8 +3,6 @@ package aws
 import (
  "context"
  "fmt"
- "io"
- "log"
  "os"
  "time"
 
@@ -182,18 +180,12 @@ func (m CacheProviderFactory) NewAccessKeysProvider() aws.CredentialsProvider {
 
 // getAWSAuthConfigurationForProfile loads specified configurations from both config file and environment
 func getAWSAuthConfigurationForProfile(profile string) (*confighelpers.Config, error) {
- // Disable log output produced by AWS Vault code
- log.SetOutput(io.Discard)
-
  // Read config file from the location set in AWS_CONFIG_FILE env var or from ~/.aws/config
- configFile, err := confighelpers.LoadConfigFromEnv()
+ configFile, err := ExecuteSilently(confighelpers.LoadConfigFromEnv)()
  if err != nil {
  return nil, err
  }
 
- // Re-enable log output
- log.SetOutput(os.Stderr)
-
  configLoader := confighelpers.ConfigLoader{
  File: configFile,
  ActiveProfile: profile,

plugins/aws/utils.go

@@ -2,7 +2,11 @@ package aws
 
 import (
  "fmt"
+ "io"
+ "log"
+ "os"
 
+ "github.com/99designs/aws-vault/v7/vault"
  "gopkg.in/ini.v1"
 )
 
@@ -20,3 +24,12 @@ func getConfigSectionByProfile(configFile *ini.File, profileName string) *ini.Se
 
  return nil
 }
+
+func ExecuteSilently(f func() (*vault.ConfigFile, error)) func() (*vault.ConfigFile, error) {
+ return func() (*vault.ConfigFile, error) {
+ log.SetOutput(io.Discard)
+ vaultConfig, err := f()
+ defer log.SetOutput(os.Stderr)
+ return vaultConfig, err
+ }
+}