fix: Omit versionId unless specified

argoproj-labs · Sep 7, 2021 · f7c18ea · f7c18ea
1 parent 733d62d
commit f7c18ea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/pkg/backends/awssecretsmanager.go b/pkg/backends/awssecretsmanager.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/IBM/argocd-vault-plugin/pkg/types"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/secretsmanager"
 	"github.com/aws/aws-sdk-go/service/secretsmanager/secretsmanageriface"
@@ -30,12 +29,11 @@ func (a *AWSSecretsManager) Login() error {
 // GetSecrets gets secrets from aws secrets manager and returns the formatted data
 func (a *AWSSecretsManager) GetSecrets(path string, version string, annotations map[string]string) (map[string]interface{}, error) {
 	input := &secretsmanager.GetSecretValueInput{
-		SecretId:  aws.String(path),
-		VersionId: aws.String(types.AWSCurrentSecretVersion),
+		SecretId: aws.String(path),
 	}
 
 	if version != "" {
-		input.VersionId = aws.String(version)
+		input.SetVersionId(version)
 	}
 
 	result, err := a.Client.GetSecretValue(input)

diff --git a/pkg/backends/awssecretsmanager_test.go b/pkg/backends/awssecretsmanager_test.go
@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	"github.com/IBM/argocd-vault-plugin/pkg/backends"
-	"github.com/IBM/argocd-vault-plugin/pkg/types"
 	"github.com/aws/aws-sdk-go/service/secretsmanager"
 	"github.com/aws/aws-sdk-go/service/secretsmanager/secretsmanageriface"
 )
@@ -19,7 +18,7 @@ func (m *mockSecretsManagerClient) GetSecretValue(input *secretsmanager.GetSecre
 
 	switch *input.SecretId {
 	case "test":
-		if *input.VersionId == types.AWSCurrentSecretVersion {
+		if input.VersionId == nil {
 			string := "{\"test-secret\":\"current-value\"}"
 			data.SecretString = &string
 		} else {

diff --git a/pkg/types/constants.go b/pkg/types/constants.go
@@ -27,7 +27,6 @@ const (
 	GithubAuth               = "github"
 	IAMAuth                  = "iam"
 	AwsDefaultRegion         = "us-east-2"
-	AWSCurrentSecretVersion  = "AWSCURRENT"
 	GCPCurrentSecretVersion  = "latest"
 
 	// Supported annotations