Browse Source

fixing local changes

Kian 4 years ago
parent
commit
7be8db468e
2 changed files with 6 additions and 4 deletions
  1. 0 1
      e2e/suite/common/common.go
  2. 6 3
      pkg/provider/vault/vault.go

+ 0 - 1
e2e/suite/common/common.go

@@ -380,7 +380,6 @@ func SSHKeySync(f *framework.Framework) (string, func(*framework.TestCase)) {
 func SSHKeySyncDataProperty(f *framework.Framework) (string, func(*framework.TestCase)) {
 	return "[common] should sync ssh key with provider.", func(tc *framework.TestCase) {
 		cloudSecretName := fmt.Sprintf("%s-%s", f.Namespace.Name, "docker-config-example")
-		//SSHKey := "EY2NNWddRADTFdNvEojrCwo+DUxy6va2JltQAbxmhyvSZsL1eYsutunsKEwonGSru0Zd+m z5DHJOOQdHEsH3AAAACmFub3RoZXJvbmU= -----END OPENSSH PRIVATE KEY-----"
 		SSHKey := `-----BEGIN OPENSSH PRIVATE KEY-----
 		b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABlwAAAAdzc2gtcn
 		NhAAAAAwEAAQAAAYEAsARoZUqo6L5dd0WRjZ2QPq/kKlbjtUY1njzJ01UtdC1u1eSJFUnV

+ 6 - 3
pkg/provider/vault/vault.go

@@ -52,6 +52,9 @@ const (
 	errReadSecret     = "cannot read secret data from Vault: %w"
 	errAuthFormat     = "cannot initialize Vault client: no valid auth method specified: %w"
 	errVaultData      = "cannot parse Vault response data: %w"
+	errDataField      = "failed to find data field: %v"
+	errJSONUnmarshall = "failed to unmarshall JSON: %v"
+	errSecretFormat   = "Secret data not in expected format: %v"
 	errVaultToken     = "cannot parse Vault authentication token: %w"
 	errVaultReqParams = "cannot set Vault request parameters: %w"
 	errVaultRequest   = "error from Vault request: %w"
@@ -190,11 +193,11 @@ func (v *client) readSecret(ctx context.Context, path, version string) (map[stri
 		dataInt, ok := vaultSecret.Data["data"]
 
 		if !ok {
-			return nil, errors.New(fmt.Sprintf("failed to find data field: %v", vaultSecret.Data))
+			return nil, errors.New(fmt.Sprintf(errDataField, vaultSecret.Data))
 		}
 		secretData, ok = dataInt.(map[string]interface{})
 		if !ok {
-			return nil, errors.New(fmt.Sprintf("failed to unmarshall JSON: %v", dataInt))
+			return nil, errors.New(fmt.Sprintf(errJSONUnmarshall, dataInt))
 		}
 	}
 
@@ -213,7 +216,7 @@ func (v *client) readSecret(ctx context.Context, path, version string) (map[stri
 			}
 
 		default:
-			return nil, errors.New(fmt.Sprintf("Secret data not in expected format: %v", secretData))
+			return nil, errors.New(fmt.Sprintf(errSecretFormat, secretData))
 		}
 	}