SDK migration Secrets-Manager

go.mod

@@ -30,7 +30,7 @@ require (
 	github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.5
 	github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.24.0
 	github.com/stackitcloud/stackit-sdk-go/services/runcommand v1.4.3
-	github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.14.3
+	github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.18.1
 	github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.8
 	github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.2.6
 	github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0

go.sum

@@ -640,8 +640,8 @@ github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.24.0 h1:JPP6a
 github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.24.0/go.mod h1:NEz3f+GV5G++BE9/MmZCsXJyCih7jtg0pZuSyG2sLEs=
 github.com/stackitcloud/stackit-sdk-go/services/runcommand v1.4.3 h1:AiGNJmpQ/f9cglaIQQ4SyePbtCI3K1DQLNvqVN9jKSo=
 github.com/stackitcloud/stackit-sdk-go/services/runcommand v1.4.3/go.mod h1:U/q0V89fvCF2O1ZJfi68/Chie9YY/5s7xBHI1Klq7wA=
-github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.14.3 h1:3hZSg3z+4AXa5LbR2Vl38VmSA83ABItE63E53LuyWv8=
-github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.14.3/go.mod h1:5unx5r0IgeFCtJDEgsWddtgKvYSw442FDNdhtfyJnQI=
+github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.18.1 h1:U5rstX5e6Am2t+Ukv5K1Sbftzxt5aFALMa9YS4jCJoo=
+github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.18.1/go.mod h1:2XA8PE05Qg6BL2YXO4XgfGI9qskJ3cicLE5Qq0aqDdY=
 github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.8 h1:LLyANBzE8sQa0/49tQBqq4sVLhNgwdqCeQm76srJHWw=
 github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.8/go.mod h1:/bmg57XZu+bGczzcoumrukiGMPGzI2mOyTT4BVIQUBs=
 github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.2.6 h1:sQ3fdtUjgIL2Ul8nRYVVacHOwi5aSMTGGbYVL30oQBU=

internal/cmd/secrets-manager/instance/create/create.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/types"
 
-	"github.com/stackitcloud/stackit-sdk-go/services/secretsmanager"
+	secretsmanager "github.com/stackitcloud/stackit-sdk-go/services/secretsmanager/v1api"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/args"
 	cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
@@ -16,7 +16,6 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/print"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/secrets-manager/client"
-	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
 	"github.com/spf13/cobra"
 )
@@ -34,7 +33,7 @@ const (
 type inputModel struct {
 	*globalflags.GlobalFlagModel
 
-	InstanceName *string
+	InstanceName string
 	Acls         *[]string
 
 	KmsKeyId               *string
@@ -92,7 +91,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("create Secrets Manager instance: %w", err)
 			}
-			instanceId := *resp.Id
+			instanceId := resp.Id
 
 			// Call API to create ACLs for instance, if ACLs are provided
 			if model.Acls != nil {
@@ -136,7 +135,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 
 	model := inputModel{
 		GlobalFlagModel:        globalFlags,
-		InstanceName:           flags.FlagToStringPointer(p, cmd, instanceNameFlag),
+		InstanceName:           flags.FlagToStringValue(p, cmd, instanceNameFlag),
 		Acls:                   flags.FlagToStringSlicePointer(p, cmd, aclFlag),
 		KmsKeyId:               flags.FlagToStringPointer(p, cmd, kmsKeyIdFlag),
 		KmsKeyringId:           flags.FlagToStringPointer(p, cmd, kmsKeyringIdFlag),
@@ -149,18 +148,18 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 }
 
 func buildCreateInstanceRequest(ctx context.Context, model *inputModel, apiClient *secretsmanager.APIClient) secretsmanager.ApiCreateInstanceRequest {
-	req := apiClient.CreateInstance(ctx, model.ProjectId)
+	req := apiClient.DefaultAPI.CreateInstance(ctx, model.ProjectId)
 
 	payload := secretsmanager.CreateInstancePayload{
 		Name: model.InstanceName,
 	}
 
-	if model.KmsKeyId != nil {
+	if model.KmsKeyId != nil && model.KmsKeyringId != nil && model.KmsKeyVersion != nil && model.KmsServiceAccountEmail != nil {
 		payload.KmsKey = &secretsmanager.KmsKeyPayload{
-			KeyId:               model.KmsKeyId,
-			KeyRingId:           model.KmsKeyringId,
-			KeyVersion:          model.KmsKeyVersion,
-			ServiceAccountEmail: model.KmsServiceAccountEmail,
+			KeyId:               *model.KmsKeyId,
+			KeyRingId:           *model.KmsKeyringId,
+			KeyVersion:          *model.KmsKeyVersion,
+			ServiceAccountEmail: *model.KmsServiceAccountEmail,
 		}
 	}
 
@@ -170,15 +169,15 @@ func buildCreateInstanceRequest(ctx context.Context, model *inputModel, apiClien
 }
 
 func buildUpdateACLsRequest(ctx context.Context, model *inputModel, instanceId string, apiClient *secretsmanager.APIClient) secretsmanager.ApiUpdateACLsRequest {
-	req := apiClient.UpdateACLs(ctx, model.ProjectId, instanceId)
+	req := apiClient.DefaultAPI.UpdateACLs(ctx, model.ProjectId, instanceId)
 
 	cidrs := make([]secretsmanager.UpdateACLPayload, len(*model.Acls))
 
 	for i, acl := range *model.Acls {
-		cidrs[i] = secretsmanager.UpdateACLPayload{Cidr: utils.Ptr(acl)}
+		cidrs[i] = secretsmanager.UpdateACLPayload{Cidr: acl}
 	}
 
-	req = req.UpdateACLsPayload(secretsmanager.UpdateACLsPayload{Cidrs: &cidrs})
+	req = req.UpdateACLsPayload(secretsmanager.UpdateACLsPayload{Cidrs: cidrs})
 
 	return req
 }

internal/cmd/secrets-manager/instance/create/create_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/google/uuid"
-	"github.com/stackitcloud/stackit-sdk-go/services/secretsmanager"
+	secretsmanager "github.com/stackitcloud/stackit-sdk-go/services/secretsmanager/v1api"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
@@ -20,7 +20,9 @@ var projectIdFlag = globalflags.ProjectIdFlag
 type testCtxKey struct{}
 
 var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
-var testClient = &secretsmanager.APIClient{}
+var testClient = &secretsmanager.APIClient{
+	DefaultAPI: secretsmanager.DefaultAPIServiceMock{},
+}
 var testProjectId = uuid.NewString()
 var testInstanceId = uuid.NewString()
 
@@ -49,7 +51,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 			ProjectId: testProjectId,
 			Verbosity: globalflags.VerbosityDefault,
 		},
-		InstanceName: utils.Ptr("example"),
+		InstanceName: "example",
 		Acls:         utils.Ptr([]string{"198.51.100.14/24"}),
 	}
 	for _, mod := range mods {
@@ -59,9 +61,9 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 }
 
 func fixtureRequest(mods ...func(request *secretsmanager.ApiCreateInstanceRequest)) secretsmanager.ApiCreateInstanceRequest {
-	request := testClient.CreateInstance(testCtx, testProjectId)
+	request := testClient.DefaultAPI.CreateInstance(testCtx, testProjectId)
 	request = request.CreateInstancePayload(secretsmanager.CreateInstancePayload{
-		Name: utils.Ptr("example"),
+		Name: "example",
 	})
 	for _, mod := range mods {
 		mod(&request)
@@ -70,11 +72,11 @@ func fixtureRequest(mods ...func(request *secretsmanager.ApiCreateInstanceReques
 }
 
 func fixtureUpdateACLsRequest(mods ...func(request *secretsmanager.ApiUpdateACLsRequest)) secretsmanager.ApiUpdateACLsRequest {
-	request := testClient.UpdateACLs(testCtx, testProjectId, testInstanceId)
+	request := testClient.DefaultAPI.UpdateACLs(testCtx, testProjectId, testInstanceId)
 	request = request.UpdateACLsPayload(secretsmanager.UpdateACLsPayload{
-		Cidrs: utils.Ptr([]secretsmanager.UpdateACLPayload{
-			{Cidr: utils.Ptr("198.51.100.14/24")},
-		})})
+		Cidrs: []secretsmanager.UpdateACLPayload{
+			{Cidr: "198.51.100.14/24"},
+		}})
 
 	for _, mod := range mods {
 		mod(&request)
@@ -115,7 +117,7 @@ func TestParseInput(t *testing.T) {
 					ProjectId: testProjectId,
 					Verbosity: globalflags.VerbosityDefault,
 				},
-				InstanceName: utils.Ptr(""),
+				InstanceName: "",
 				Acls:         &[]string{},
 			},
 		},
@@ -240,15 +242,15 @@ func TestBuildCreateInstanceRequest(t *testing.T) {
 			}),
 			expectedRequest: fixtureRequest(func(request *secretsmanager.ApiCreateInstanceRequest) {
 				payload := secretsmanager.CreateInstancePayload{
-					Name: utils.Ptr("example"),
+					Name: "example",
 					KmsKey: &secretsmanager.KmsKeyPayload{
-						KeyId:               utils.Ptr(testKmsKeyId),
-						KeyRingId:           utils.Ptr(testKmsKeyringId),
-						KeyVersion:          utils.Ptr(testKmsKeyVersion),
-						ServiceAccountEmail: utils.Ptr(testKmsServiceAccountEmail),
+						KeyId:               testKmsKeyId,
+						KeyRingId:           testKmsKeyringId,
+						KeyVersion:          testKmsKeyVersion,
+						ServiceAccountEmail: testKmsServiceAccountEmail,
 					},
 				}
-				*request = (*request).CreateInstancePayload(payload)
+				*request = request.CreateInstancePayload(payload)
 			}),
 		},
 	}
@@ -284,10 +286,10 @@ func TestBuildCreateACLRequests(t *testing.T) {
 				*model.Acls = append(*model.Acls, "1.2.3.4/32")
 			}),
 			expectedRequest: fixtureUpdateACLsRequest().UpdateACLsPayload(secretsmanager.UpdateACLsPayload{
-				Cidrs: utils.Ptr([]secretsmanager.UpdateACLPayload{
-					{Cidr: utils.Ptr("198.51.100.14/24")},
-					{Cidr: utils.Ptr("1.2.3.4/32")},
-				})}),
+				Cidrs: []secretsmanager.UpdateACLPayload{
+					{Cidr: "198.51.100.14/24"},
+					{Cidr: "1.2.3.4/32"},
+				}}),
 		},
 	}
 

internal/cmd/secrets-manager/instance/delete/delete.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/types"
 
 	"github.com/spf13/cobra"
-	"github.com/stackitcloud/stackit-sdk-go/services/secretsmanager"
+	secretsmanager "github.com/stackitcloud/stackit-sdk-go/services/secretsmanager/v1api"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/args"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
@@ -52,7 +52,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				return err
 			}
 
-			instanceLabel, err := secretsmanagerUtils.GetInstanceName(ctx, apiClient, model.ProjectId, model.InstanceId)
+			instanceLabel, err := secretsmanagerUtils.GetInstanceName(ctx, apiClient.DefaultAPI, model.ProjectId, model.InstanceId)
 			if err != nil {
 				params.Printer.Debug(print.ErrorLevel, "get instance name: %v", err)
 				instanceLabel = model.InstanceId
@@ -96,6 +96,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *secretsmanager.APIClient) secretsmanager.ApiDeleteInstanceRequest {
-	req := apiClient.DeleteInstance(ctx, model.ProjectId, model.InstanceId)
+	req := apiClient.DefaultAPI.DeleteInstance(ctx, model.ProjectId, model.InstanceId)
 	return req
 }

internal/cmd/secrets-manager/instance/delete/delete_test.go

@@ -10,15 +10,17 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/google/uuid"
-	"github.com/stackitcloud/stackit-sdk-go/services/secretsmanager"
+	secretsmanager "github.com/stackitcloud/stackit-sdk-go/services/secretsmanager/v1api"
 )
 
 var projectIdFlag = globalflags.ProjectIdFlag
 
 type testCtxKey struct{}
 
 var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
-var testClient = &secretsmanager.APIClient{}
+var testClient = &secretsmanager.APIClient{
+	DefaultAPI: secretsmanager.DefaultAPIServiceMock{},
+}
 var testProjectId = uuid.NewString()
 var testInstanceId = uuid.NewString()
 
@@ -57,7 +59,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 }
 
 func fixtureRequest(mods ...func(request *secretsmanager.ApiDeleteInstanceRequest)) secretsmanager.ApiDeleteInstanceRequest {
-	request := testClient.DeleteInstance(testCtx, testProjectId, testInstanceId)
+	request := testClient.DefaultAPI.DeleteInstance(testCtx, testProjectId, testInstanceId)
 	for _, mod := range mods {
 		mod(&request)
 	}

internal/cmd/secrets-manager/instance/describe/describe.go

@@ -17,7 +17,7 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
 	"github.com/spf13/cobra"
-	"github.com/stackitcloud/stackit-sdk-go/services/secretsmanager"
+	secretsmanager "github.com/stackitcloud/stackit-sdk-go/services/secretsmanager/v1api"
 )
 
 const (
@@ -93,12 +93,12 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 }
 
 func buildGetInstanceRequest(ctx context.Context, model *inputModel, apiClient *secretsmanager.APIClient) secretsmanager.ApiGetInstanceRequest {
-	req := apiClient.GetInstance(ctx, model.ProjectId, model.InstanceId)
+	req := apiClient.DefaultAPI.GetInstance(ctx, model.ProjectId, model.InstanceId)
 	return req
 }
 
 func buildListACLsRequest(ctx context.Context, model *inputModel, apiClient *secretsmanager.APIClient) secretsmanager.ApiListACLsRequest {
-	req := apiClient.ListACLs(ctx, model.ProjectId, model.InstanceId)
+	req := apiClient.DefaultAPI.ListACLs(ctx, model.ProjectId, model.InstanceId)
 	return req
 }
 
@@ -116,38 +116,37 @@ func outputResult(p *print.Printer, outputFormat string, instance *secretsmanage
 
 	return p.OutputResult(outputFormat, output, func() error {
 		table := tables.NewTable()
-		table.AddRow("ID", utils.PtrString(instance.Id))
+		table.AddRow("ID", instance.Id)
 		table.AddSeparator()
-		table.AddRow("NAME", utils.PtrString(instance.Name))
+		table.AddRow("NAME", instance.Name)
 		table.AddSeparator()
-		table.AddRow("STATE", utils.PtrString(instance.State))
+		table.AddRow("STATE", instance.State)
 		table.AddSeparator()
-		table.AddRow("SECRETS", utils.PtrString(instance.SecretCount))
+		table.AddRow("SECRETS", instance.SecretCount)
 		table.AddSeparator()
-		table.AddRow("ENGINE", utils.PtrString(instance.SecretsEngine))
+		table.AddRow("ENGINE", instance.SecretsEngine)
 		table.AddSeparator()
-		table.AddRow("CREATION DATE", utils.PtrString(instance.CreationStartDate))
+		table.AddRow("CREATION DATE", instance.CreationStartDate)
 		table.AddSeparator()
 		kmsKey := instance.KmsKey
-		showKms := kmsKey != nil && (kmsKey.KeyId != nil || kmsKey.KeyRingId != nil || kmsKey.KeyVersion != nil || kmsKey.ServiceAccountEmail != nil)
-		if showKms {
-			table.AddRow("KMS KEY ID", utils.PtrString(kmsKey.KeyId))
+		if kmsKey != nil {
+			table.AddRow("KMS KEY ID", kmsKey.KeyId)
 			table.AddSeparator()
-			table.AddRow("KMS KEYRING ID", utils.PtrString(kmsKey.KeyRingId))
+			table.AddRow("KMS KEYRING ID", kmsKey.KeyRingId)
 			table.AddSeparator()
-			table.AddRow("KMS KEY VERSION", utils.PtrString(kmsKey.KeyVersion))
+			table.AddRow("KMS KEY VERSION", kmsKey.KeyVersion)
 			table.AddSeparator()
-			table.AddRow("KMS SERVICE ACCOUNT EMAIL", utils.PtrString(kmsKey.ServiceAccountEmail))
+			table.AddRow("KMS SERVICE ACCOUNT EMAIL", kmsKey.ServiceAccountEmail)
 		}
 		// Only show ACL if it's present and not empty
-		if aclList.Acls != nil && len(*aclList.Acls) > 0 {
+		if len(aclList.Acls) > 0 {
 			var cidrs []string
 
-			for _, acl := range *aclList.Acls {
-				cidrs = append(cidrs, *acl.Cidr)
+			for _, acl := range aclList.Acls {
+				cidrs = append(cidrs, acl.Cidr)
 			}
 
-			if showKms {
+			if kmsKey != nil {
 				table.AddSeparator()
 			}
 			table.AddRow("ACL", strings.Join(cidrs, ","))