scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-01 19:17:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to pester from go-retryablehttp to avoid swallowing 500 error messages

Browse Source
This commit is contained in:
Jeff Mitchell
2016-07-11 21:37:46 +00:00
parent dc5b4a052e
commit 7129fd5785
10 changed files with 298 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
api/client_test.go
View File

@@ -107,25 +107,19 @@ func TestClientEnvSettings(t *testing.T) {
oldClientCert := os.Getenv(EnvVaultClientCert)
oldClientKey := os.Getenv(EnvVaultClientKey)
oldSkipVerify := os.Getenv(EnvVaultInsecure)
oldRetryWaitMin := os.Getenv(EnvVaultRetryWaitMin)
oldRetryWaitMax := os.Getenv(EnvVaultRetryWaitMax)
oldRetryMax := os.Getenv(EnvVaultRetryMax)
oldMaxRetries := os.Getenv(EnvVaultMaxRetries)
os.Setenv(EnvVaultCACert, cwd+"/test-fixtures/keys/cert.pem")
os.Setenv(EnvVaultCAPath, cwd+"/test-fixtures/keys")
os.Setenv(EnvVaultClientCert, cwd+"/test-fixtures/keys/cert.pem")
os.Setenv(EnvVaultClientKey, cwd+"/test-fixtures/keys/key.pem")
os.Setenv(EnvVaultInsecure, "true")
os.Setenv(EnvVaultRetryWaitMin, "20s")
os.Setenv(EnvVaultRetryWaitMax, "25s")
os.Setenv(EnvVaultRetryMax, "20")
os.Setenv(EnvVaultMaxRetries, "5")
defer os.Setenv(EnvVaultCACert, oldCACert)
defer os.Setenv(EnvVaultCAPath, oldCAPath)
defer os.Setenv(EnvVaultClientCert, oldClientCert)
defer os.Setenv(EnvVaultClientKey, oldClientKey)
defer os.Setenv(EnvVaultInsecure, oldSkipVerify)
defer os.Setenv(EnvVaultRetryWaitMin, oldRetryWaitMin)
defer os.Setenv(EnvVaultRetryWaitMax, oldRetryWaitMax)
defer os.Setenv(EnvVaultRetryMax, oldRetryMax)
defer os.Setenv(EnvVaultMaxRetries, oldMaxRetries)
config := DefaultConfig()
if err := config.ReadEnvironment(); err != nil {
@@ -142,9 +136,4 @@ func TestClientEnvSettings(t *testing.T) {
if tlsConfig.InsecureSkipVerify != true {
t.Fatalf("bad: %v", tlsConfig.InsecureSkipVerify)
}
os.Setenv(EnvVaultRetryWaitMax, "15s")
if err := config.ReadEnvironment(); err == nil {
t.Fatal("expected error due to max retry time being less than min")
}
}