fix: IBM SM SDK removed CertificateSecretData struct

argoproj-labs · Jan 4, 2022 · 87ae722 · 87ae722
1 parent 6dafe06
commit 87ae722
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/pkg/backends/ibmsecretsmanager.go b/pkg/backends/ibmsecretsmanager.go
@@ -1,7 +1,6 @@
 package backends
 
 import (
-	"encoding/json"
 	"fmt"
 	"regexp"
 	"sync"
@@ -63,10 +62,7 @@ func (i *IBMSecretsManager) getSecretVersionedOrNot(secret *ibmsm.SecretResource
 			return nil, fmt.Errorf("Could not retrieve secret %s after %d retries, statuscode %d", *secret.ID, types.IBMMaxRetries, httpResponse.GetStatusCode())
 		}
 
-		// Versioned certificate secret_data comes back in a special struct and we want a map
-		certData := (secretVersion.Resources[0].(*ibmsm.SecretVersion)).SecretData
-		certJson, _ := json.Marshal(&certData)
-		_ = json.Unmarshal(certJson, &result)
+		result = (secretVersion.Resources[0].(*ibmsm.SecretVersion)).SecretData.(map[string]interface{})
 	} else {
 		secretRes, httpResponse, err := i.Client.GetSecret(&ibmsm.GetSecretOptions{
 			SecretType: secret.SecretType,

diff --git a/pkg/backends/ibmsecretsmanager_test.go b/pkg/backends/ibmsecretsmanager_test.go
@@ -150,8 +150,8 @@ func (m *MockIBMSMClient) GetSecretVersion(getSecretOptions *ibmsm.GetSecretVers
 		Resources: []ibmsm.SecretVersionIntf{
 			&ibmsm.SecretVersion{
 				ID: &id,
-				SecretData: &ibmsm.CertificateSecretData{
-					Certificate: &data,
+				SecretData: map[string]interface{}{
+					"certificate": data,
 				},
 			},
 		},