Browse Source

fix(akeyless): Upgrade Akeyless Provider Go SDK to v4 (#5263)

* upgrade akeyless go sdk version to v4

Signed-off-by: Kobbi Gal <kobbi.g@akeyless.io>

* update e2e go sum

Signed-off-by: Kobbi Gal <kobbi.g@akeyless.io>

---------

Signed-off-by: Kobbi Gal <kobbi.g@akeyless.io>
kgal-akl 8 months ago
parent
commit
9dbecd6333

+ 9 - 1
.gitignore

@@ -68,4 +68,12 @@ terraform.rc
 
 tmp/
 tests/crds/*.yml
-.tilt-tmp
+.tilt-tmp
+
+# Common environment variables
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+.envrc

+ 1 - 1
e2e/go.mod

@@ -46,7 +46,7 @@ require (
 	github.com/DelineaXPM/dsv-sdk-go/v2 v2.2.0
 	github.com/DelineaXPM/tss-sdk-go/v2 v2.0.3
 	github.com/akeylesslabs/akeyless-go-cloud-id v0.3.5
-	github.com/akeylesslabs/akeyless-go/v3 v3.6.3
+	github.com/akeylesslabs/akeyless-go/v4 v4.0.0
 	github.com/aliyun/alibaba-cloud-sdk-go v1.62.271
 	github.com/aws/aws-sdk-go-v2 v1.38.3
 	github.com/aws/aws-sdk-go-v2/config v1.31.6

+ 2 - 2
e2e/go.sum

@@ -117,8 +117,8 @@ github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1
 github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/akeylesslabs/akeyless-go-cloud-id v0.3.5 h1:ly0WKARATneFzwBlTZ2lUyjtLqoOEYqt1vOlf89za/4=
 github.com/akeylesslabs/akeyless-go-cloud-id v0.3.5/go.mod h1:W6DMNwPyIE3jpXDaJOvCKUT/kHPZrpl/BGiIVUILbMk=
-github.com/akeylesslabs/akeyless-go/v3 v3.6.3 h1:fMF8SMDiBL9CufVjLUyF1Z+Z04t5CC3KGOROSjaJ/eA=
-github.com/akeylesslabs/akeyless-go/v3 v3.6.3/go.mod h1:xcSXQWFRzKupIPCFRd9/mFYW0lHnDnWVvMD/pQ0x7sU=
+github.com/akeylesslabs/akeyless-go/v4 v4.0.0 h1:D7MPse5KZKETigJ+efbft/xmN/FDfvd3DRJ2pnSORzg=
+github.com/akeylesslabs/akeyless-go/v4 v4.0.0/go.mod h1:WBMaWCcgX5LWbRaAAY0+uSLc7mjNC/dxuS5+RX+EhJI=
 github.com/aliyun/alibaba-cloud-sdk-go v1.62.271 h1:0QmSDMovuCyUbYp70MZHoTi/GYnHb/wYEIIBqoVsCjs=
 github.com/aliyun/alibaba-cloud-sdk-go v1.62.271/go.mod h1:Api2AkmMgGaSUAhmk76oaFObkoeCPc/bKAqcyplPODs=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=

+ 1 - 1
e2e/suites/provider/cases/akeyless/provider.go

@@ -26,7 +26,7 @@ import (
 	aws_cloud_id "github.com/akeylesslabs/akeyless-go-cloud-id/cloudprovider/aws"
 	azure_cloud_id "github.com/akeylesslabs/akeyless-go-cloud-id/cloudprovider/azure"
 	gcp_cloud_id "github.com/akeylesslabs/akeyless-go-cloud-id/cloudprovider/gcp"
-	"github.com/akeylesslabs/akeyless-go/v3"
+	"github.com/akeylesslabs/akeyless-go/v4"
 
 	//nolint
 	. "github.com/onsi/ginkgo/v2"

+ 1 - 1
go.mod

@@ -71,7 +71,7 @@ require (
 	github.com/DelineaXPM/dsv-sdk-go/v2 v2.2.0
 	github.com/DelineaXPM/tss-sdk-go/v2 v2.0.3
 	github.com/Onboardbase/go-cryptojs-aes-decrypt v0.0.0-20230430095000-27c0d3a9016d
-	github.com/akeylesslabs/akeyless-go/v3 v3.6.3
+	github.com/akeylesslabs/akeyless-go/v4 v4.0.0
 	github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.11
 	github.com/alibabacloud-go/kms-20160120/v3 v3.3.1
 	github.com/alibabacloud-go/openapi-util v0.1.1

+ 2 - 2
go.sum

@@ -156,8 +156,8 @@ github.com/ahmetb/gen-crd-api-reference-docs v0.3.0 h1:+XfOU14S4bGuwyvCijJwhhBIj
 github.com/ahmetb/gen-crd-api-reference-docs v0.3.0/go.mod h1:TdjdkYhlOifCQWPs1UdTma97kQQMozf5h26hTuG70u8=
 github.com/akeylesslabs/akeyless-go-cloud-id v0.3.5 h1:ly0WKARATneFzwBlTZ2lUyjtLqoOEYqt1vOlf89za/4=
 github.com/akeylesslabs/akeyless-go-cloud-id v0.3.5/go.mod h1:W6DMNwPyIE3jpXDaJOvCKUT/kHPZrpl/BGiIVUILbMk=
-github.com/akeylesslabs/akeyless-go/v3 v3.6.3 h1:fMF8SMDiBL9CufVjLUyF1Z+Z04t5CC3KGOROSjaJ/eA=
-github.com/akeylesslabs/akeyless-go/v3 v3.6.3/go.mod h1:xcSXQWFRzKupIPCFRd9/mFYW0lHnDnWVvMD/pQ0x7sU=
+github.com/akeylesslabs/akeyless-go/v4 v4.0.0 h1:D7MPse5KZKETigJ+efbft/xmN/FDfvd3DRJ2pnSORzg=
+github.com/akeylesslabs/akeyless-go/v4 v4.0.0/go.mod h1:WBMaWCcgX5LWbRaAAY0+uSLc7mjNC/dxuS5+RX+EhJI=
 github.com/alibabacloud-go/alibabacloud-gateway-pop v0.0.6/go.mod h1:4EUIoxs/do24zMOGGqYVWgw0s9NtiylnJglOeEB5UJo=
 github.com/alibabacloud-go/alibabacloud-gateway-pop v0.0.8/go.mod h1:e3etxyckfZ4sHJsmA2uBz07BUMKQWyPeZNP0dqi/5kw=
 github.com/alibabacloud-go/alibabacloud-gateway-pop v0.1.0 h1:mEERsrxPQR1ogokCvpukQV7lug3Pwt5UTLwaIIIMRmU=

+ 1 - 1
pkg/provider/akeyless/akeyless.go

@@ -29,7 +29,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/akeylesslabs/akeyless-go/v3"
+	"github.com/akeylesslabs/akeyless-go/v4"
 	"github.com/tidwall/gjson"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"

+ 6 - 2
pkg/provider/akeyless/akeyless_api.go

@@ -27,7 +27,7 @@ import (
 	aws_cloud_id "github.com/akeylesslabs/akeyless-go-cloud-id/cloudprovider/aws"
 	azure_cloud_id "github.com/akeylesslabs/akeyless-go-cloud-id/cloudprovider/azure"
 	gcp_cloud_id "github.com/akeylesslabs/akeyless-go-cloud-id/cloudprovider/gcp"
-	"github.com/akeylesslabs/akeyless-go/v3"
+	"github.com/akeylesslabs/akeyless-go/v4"
 	authenticationv1 "k8s.io/api/authentication/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -272,7 +272,11 @@ func (a *akeylessBase) GetStaticSecret(ctx context.Context, secretName string, v
 	if !ok {
 		return "", fmt.Errorf("can't get secret: %v", secretName)
 	}
-	return val, nil
+	valStr, ok := val.(string)
+	if !ok {
+		return "", fmt.Errorf("can't convert secret value to string: %v", val)
+	}
+	return valStr, nil
 }
 
 func (a *akeylessBase) getCloudID(provider, accTypeParam string) (string, error) {

+ 1 - 1
pkg/provider/akeyless/akeyless_test.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/akeylesslabs/akeyless-go/v3"
+	"github.com/akeylesslabs/akeyless-go/v4"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 

+ 1 - 1
pkg/provider/akeyless/fake/fake.go

@@ -17,7 +17,7 @@ package fake
 import (
 	"context"
 
-	akeyless "github.com/akeylesslabs/akeyless-go/v3"
+	akeyless "github.com/akeylesslabs/akeyless-go/v4"
 )
 
 type AkeylessMockClient struct {