chore(resourcemanager): migrate to multi version SDK

go.mod

@@ -28,7 +28,7 @@ require (
 	github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.5.8
 	github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.6
 	github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.5
-	github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.18.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/serverbackup v1.3.8

go.sum

@@ -596,8 +596,6 @@ github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YE
 github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I=
 github.com/stackitcloud/stackit-sdk-go/core v0.26.0 h1:jQEb9gkehfp6VCP6TcYk7BI10cz4l0KM2L6hqYBH2QA=
 github.com/stackitcloud/stackit-sdk-go/core v0.26.0/go.mod h1:WU1hhxnjXw2EV7CYa1nlEvNpMiRY6CvmIOaHuL3pOaA=
-github.com/stackitcloud/stackit-sdk-go/services/alb v0.10.0 h1:V9+885qkSv621rZZatg1YE5ENM1ElALxQDJsh+hDIUg=
-github.com/stackitcloud/stackit-sdk-go/services/alb v0.10.0/go.mod h1:V6+MolxM/M2FWyWZA+FRFKEzzUe10MU9eEVfMvxHGi8=
 github.com/stackitcloud/stackit-sdk-go/services/alb v0.14.2 h1:hGzfOJjlCRoFpri5eYIiwhE27qu02pKZLprKvbsTC/w=
 github.com/stackitcloud/stackit-sdk-go/services/alb v0.14.2/go.mod h1:eK6oRB5Tmpt6KbXQ4UYBGg2LgW5bPtVoncL9E8JSRww=
 github.com/stackitcloud/stackit-sdk-go/services/authorization v0.12.0 h1:HxPgBu04j5tj6nfZ2r0l6v4VXC0/tYOGe4sA5Addra8=
@@ -638,8 +636,8 @@ github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.26.0 h1:/8lmviszgrB+
 github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.26.0/go.mod h1:hnhvlLX1Y71R8KIQqLBeoSZqkU5ZJOG0J4wz0LeUdaw=
 github.com/stackitcloud/stackit-sdk-go/services/redis v0.25.6 h1:CXM9cZ9WeTyJd+Aw/hnJnDsKRVAQi4qgtd0RJ3zoPwo=
 github.com/stackitcloud/stackit-sdk-go/services/redis v0.25.6/go.mod h1:KJNceOHRefjku1oVBoHG7idCS/SeW42WJ+55bN3AxrQ=
-github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.18.5 h1:MZ5aTO2NQ1Jecmi67ByGskve5nKXHl91fE+z+vFjxt4=
-github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.18.5/go.mod h1:CJLmdqWvJm5/3+lXPDKu8k4WXs2UG8euGoqQX5xE79k=
+github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.24.0 h1:JPP6a0ME1tZXr4iB69d/LtJsCAr58ENBadFaK9f48/c=
+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=

internal/cmd/network-area/create/create.go

@@ -103,7 +103,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			var orgLabel string
 			rmApiClient, err := rmClient.ConfigureClient(params.Printer, params.CliVersion)
 			if err == nil {
-				orgLabel, err = rmUtils.GetOrganizationName(ctx, rmApiClient, model.OrganizationId)
+				orgLabel, err = rmUtils.GetOrganizationName(ctx, rmApiClient.DefaultAPI, model.OrganizationId)
 				if err != nil {
 					params.Printer.Debug(print.ErrorLevel, "get organization name: %v", err)
 					orgLabel = model.OrganizationId

internal/cmd/network-area/list/list.go

@@ -85,7 +85,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			var orgLabel string
 			rmApiClient, err := rmClient.ConfigureClient(params.Printer, params.CliVersion)
 			if err == nil {
-				orgLabel, err = rmUtils.GetOrganizationName(ctx, rmApiClient, model.OrganizationId)
+				orgLabel, err = rmUtils.GetOrganizationName(ctx, rmApiClient.DefaultAPI, model.OrganizationId)
 				if err != nil {
 					params.Printer.Debug(print.ErrorLevel, "get organization name: %v", err)
 					orgLabel = model.OrganizationId

internal/cmd/network-area/update/update.go

@@ -92,7 +92,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			var orgLabel string
 			rmApiClient, err := rmClient.ConfigureClient(params.Printer, params.CliVersion)
 			if err == nil {
-				orgLabel, err = rmUtils.GetOrganizationName(ctx, rmApiClient, *model.OrganizationId)
+				orgLabel, err = rmUtils.GetOrganizationName(ctx, rmApiClient.DefaultAPI, *model.OrganizationId)
 				if err != nil {
 					params.Printer.Debug(print.ErrorLevel, "get organization name: %v", err)
 					orgLabel = *model.OrganizationId

internal/cmd/organization/describe/describe.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/resourcemanager"
+	resourcemanager "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager/v0api"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/args"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
@@ -84,7 +84,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *resourcemanager.APIClient) resourcemanager.ApiGetOrganizationRequest {
-	req := apiClient.GetOrganization(ctx, model.OrganizationId)
+	req := apiClient.DefaultAPI.GetOrganization(ctx, model.OrganizationId)
 	return req
 }
 
@@ -97,17 +97,17 @@ func outputResult(p *print.Printer, outputFormat string, organization *resourcem
 
 		table := tables.NewTable()
 
-		table.AddRow("ORGANIZATION ID", utils.PtrString(organization.OrganizationId))
+		table.AddRow("ORGANIZATION ID", organization.OrganizationId)
 		table.AddSeparator()
-		table.AddRow("NAME", utils.PtrString(organization.Name))
+		table.AddRow("NAME", organization.Name)
 		table.AddSeparator()
-		table.AddRow("CONTAINER ID", utils.PtrString(organization.ContainerId))
+		table.AddRow("CONTAINER ID", organization.ContainerId)
 		table.AddSeparator()
-		table.AddRow("STATUS", utils.PtrString(organization.LifecycleState))
+		table.AddRow("STATUS", organization.LifecycleState)
 		table.AddSeparator()
-		table.AddRow("CREATION TIME", utils.PtrString(organization.CreationTime))
+		table.AddRow("CREATION TIME", organization.CreationTime)
 		table.AddSeparator()
-		table.AddRow("UPDATE TIME", utils.PtrString(organization.UpdateTime))
+		table.AddRow("UPDATE TIME", organization.UpdateTime)
 		table.AddSeparator()
 		table.AddRow("LABELS", utils.JoinStringMap(utils.PtrValue(organization.Labels), ": ", ", "))
 

internal/cmd/organization/describe/describe_test.go

@@ -14,13 +14,13 @@ 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/resourcemanager"
+	resourcemanager "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager/v0api"
 )
 
 type testCtxKey struct{}
 
 var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
-var testClient = &resourcemanager.APIClient{}
+var testClient = &resourcemanager.APIClient{DefaultAPI: &resourcemanager.DefaultAPIService{}}
 
 var (
 	testOrganizationId = uuid.NewString()
@@ -50,7 +50,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 }
 
 func fixtureRequest(mods ...func(request *resourcemanager.ApiGetOrganizationRequest)) resourcemanager.ApiGetOrganizationRequest {
-	request := testClient.GetOrganization(testCtx, testOrganizationId)
+	request := testClient.DefaultAPI.GetOrganization(testCtx, testOrganizationId)
 	for _, mod := range mods {
 		mod(&request)
 	}
@@ -120,7 +120,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx),
+				cmpopts.EquateComparable(testCtx, resourcemanager.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
@@ -162,12 +162,12 @@ func TestOutputResult(t *testing.T) {
 			name: "full response",
 			args: args{
 				organization: utils.Ptr(resourcemanager.OrganizationResponse{
-					OrganizationId: utils.Ptr(uuid.NewString()),
-					Name:           utils.Ptr("foo bar"),
-					LifecycleState: utils.Ptr(resourcemanager.LIFECYCLESTATE_ACTIVE),
-					ContainerId:    utils.Ptr("foo-bar-organization"),
-					CreationTime:   utils.Ptr(time.Now()),
-					UpdateTime:     utils.Ptr(time.Now()),
+					OrganizationId: uuid.NewString(),
+					Name:           "foo bar",
+					LifecycleState: resourcemanager.LIFECYCLESTATE_ACTIVE,
+					ContainerId:    "foo-bar-organization",
+					CreationTime:   time.Now(),
+					UpdateTime:     time.Now(),
 					Labels: utils.Ptr(map[string]string{
 						"foo": "true",
 						"bar": "false",

internal/cmd/organization/list/list.go

@@ -9,7 +9,7 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/types"
 
 	"github.com/spf13/cobra"
-	"github.com/stackitcloud/stackit-sdk-go/services/resourcemanager"
+	resourcemanager "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager/v0api"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/args"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
@@ -19,7 +19,6 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/print"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/resourcemanager/client"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
-	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 )
 
 const (
@@ -78,7 +77,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				return fmt.Errorf("list organizations: empty response")
 			}
 
-			return outputResult(params.Printer, model.OutputFormat, utils.PtrValue(resp.Items))
+			return outputResult(params.Printer, model.OutputFormat, resp.Items)
 		},
 	}
 	configureFlags(cmd)
@@ -110,7 +109,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *resourcemanager.APIClient) resourcemanager.ApiListOrganizationsRequest {
-	req := apiClient.ListOrganizations(ctx)
+	req := apiClient.DefaultAPI.ListOrganizations(ctx)
 	req = req.Member(model.Member)
 	if model.Limit != nil {
 		req = req.Limit(float32(*model.Limit))
@@ -130,9 +129,9 @@ func outputResult(p *print.Printer, outputFormat string, organizations []resourc
 
 		for _, organization := range organizations {
 			table.AddRow(
-				utils.PtrString(organization.OrganizationId),
-				utils.PtrString(organization.Name),
-				utils.PtrString(organization.ContainerId),
+				organization.OrganizationId,
+				organization.Name,
+				organization.ContainerId,
 			)
 			table.AddSeparator()
 		}

internal/cmd/organization/list/list_test.go

@@ -12,13 +12,13 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/stackitcloud/stackit-sdk-go/services/resourcemanager"
+	resourcemanager "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager/v0api"
 )
 
 type testCtxKey struct{}
 
 var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
-var testClient = &resourcemanager.APIClient{}
+var testClient = &resourcemanager.APIClient{DefaultAPI: &resourcemanager.DefaultAPIService{}}
 
 const (
 	testEmail = "foo@bar"
@@ -27,7 +27,7 @@ const (
 
 func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
 	flagValues := map[string]string{
-		limitFlag: strconv.Itoa(int(testLimit)),
+		limitFlag: strconv.Itoa(testLimit),
 	}
 	for _, mod := range mods {
 		mod(flagValues)
@@ -50,7 +50,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 }
 
 func fixtureRequest(mods ...func(request *resourcemanager.ApiListOrganizationsRequest)) resourcemanager.ApiListOrganizationsRequest {
-	request := testClient.ListOrganizations(testCtx)
+	request := testClient.DefaultAPI.ListOrganizations(testCtx)
 	request = request.Limit(testLimit)
 	request = request.Member(testEmail)
 	for _, mod := range mods {
@@ -128,7 +128,7 @@ func TestBuildRequest(t *testing.T) {
 				model.Member = ""
 				model.Limit = nil
 			}),
-			expectedRequest: testClient.ListOrganizations(testCtx).Member(""),
+			expectedRequest: testClient.DefaultAPI.ListOrganizations(testCtx).Member(""),
 		},
 	}
 
@@ -138,7 +138,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx),
+				cmpopts.EquateComparable(testCtx, resourcemanager.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)

internal/cmd/project/create/create.go

@@ -15,10 +15,9 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/print"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/resourcemanager/client"
-	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
 	"github.com/spf13/cobra"
-	"github.com/stackitcloud/stackit-sdk-go/services/resourcemanager"
+	resourcemanager "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager/v0api"
 )
 
 const (
@@ -35,8 +34,8 @@ const (
 
 type inputModel struct {
 	*globalflags.GlobalFlagModel
-	ParentId      *string
-	Name          *string
+	ParentId      string
+	Name          string
 	Labels        *map[string]string
 	NetworkAreaId *string
 }
@@ -77,7 +76,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				return err
 			}
 
-			prompt := fmt.Sprintf("Are you sure you want to create a project under the parent with ID %q?", *model.ParentId)
+			prompt := fmt.Sprintf("Are you sure you want to create a project under the parent with ID %q?", model.ParentId)
 			err = params.Printer.PromptForConfirmation(prompt)
 			if err != nil {
 				return err
@@ -136,8 +135,8 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 
 	model := inputModel{
 		GlobalFlagModel: globalFlags,
-		ParentId:        flags.FlagToStringPointer(p, cmd, parentIdFlag),
-		Name:            flags.FlagToStringPointer(p, cmd, nameFlag),
+		ParentId:        flags.FlagToStringValue(p, cmd, parentIdFlag),
+		Name:            flags.FlagToStringValue(p, cmd, nameFlag),
 		Labels:          labels,
 		NetworkAreaId:   flags.FlagToStringPointer(p, cmd, networkAreaIdFlag),
 	}
@@ -147,7 +146,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *resourcemanager.APIClient) (resourcemanager.ApiCreateProjectRequest, error) {
-	req := apiClient.CreateProject(ctx)
+	req := apiClient.DefaultAPI.CreateProject(ctx)
 
 	authFlow, err := auth.GetAuthFlow()
 	if err != nil {
@@ -191,10 +190,10 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *resourceman
 		ContainerParentId: model.ParentId,
 		Name:              model.Name,
 		Labels:            labels,
-		Members: &[]resourcemanager.Member{
+		Members: []resourcemanager.Member{
 			{
-				Role:    utils.Ptr(ownerRole),
-				Subject: utils.Ptr(email),
+				Role:    ownerRole,
+				Subject: email,
 			},
 		},
 	})
@@ -210,7 +209,7 @@ func outputResult(p *print.Printer, model inputModel, resp *resourcemanager.Proj
 		return fmt.Errorf("globalflags are empty")
 	}
 	return p.OutputResult(model.OutputFormat, resp, func() error {
-		p.Outputf("Created project under the parent with ID %q. Project ID: %s\n", utils.PtrString(model.ParentId), utils.PtrString(resp.ProjectId))
+		p.Outputf("Created project under the parent with ID %q. Project ID: %s\n", model.ParentId, resp.ProjectId)
 		return nil
 	})
 }

internal/cmd/project/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/resourcemanager"
+	resourcemanager "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager/v0api"
 	"github.com/zalando/go-keyring"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/auth"
@@ -20,7 +20,7 @@ import (
 type testCtxKey struct{}
 
 var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
-var testClient = &resourcemanager.APIClient{}
+var testClient = &resourcemanager.APIClient{DefaultAPI: &resourcemanager.DefaultAPIService{}}
 var testParentId = uuid.NewString()
 var testNetworkAreaId = uuid.NewString()
 var testEmail = "email"
@@ -41,8 +41,8 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
 func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 	model := &inputModel{
 		GlobalFlagModel: &globalflags.GlobalFlagModel{Verbosity: globalflags.VerbosityDefault},
-		ParentId:        utils.Ptr(testParentId),
-		Name:            utils.Ptr(nameFlag),
+		ParentId:        testParentId,
+		Name:            nameFlag,
 		Labels: utils.Ptr(map[string]string{
 			"key": "value",
 		}),
@@ -56,16 +56,16 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 
 func fixturePayload(mods ...func(payload *resourcemanager.CreateProjectPayload)) resourcemanager.CreateProjectPayload {
 	payload := resourcemanager.CreateProjectPayload{
-		ContainerParentId: utils.Ptr(testParentId),
-		Name:              utils.Ptr(nameFlag),
+		ContainerParentId: testParentId,
+		Name:              nameFlag,
 		Labels: utils.Ptr(map[string]string{
 			"key":            "value",
 			networkAreaLabel: testNetworkAreaId,
 		}),
-		Members: &[]resourcemanager.Member{
+		Members: []resourcemanager.Member{
 			{
-				Role:    utils.Ptr(ownerRole),
-				Subject: utils.Ptr(testEmail),
+				Role:    ownerRole,
+				Subject: testEmail,
 			},
 		},
 	}
@@ -76,7 +76,7 @@ func fixturePayload(mods ...func(payload *resourcemanager.CreateProjectPayload))
 }
 
 func fixtureRequest(mods ...func(request *resourcemanager.ApiCreateProjectRequest)) resourcemanager.ApiCreateProjectRequest {
-	request := testClient.CreateProject(testCtx)
+	request := testClient.DefaultAPI.CreateProject(testCtx)
 	request = request.CreateProjectPayload(fixturePayload())
 	for _, mod := range mods {
 		mod(&request)
@@ -306,7 +306,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx),
+				cmpopts.EquateComparable(testCtx, resourcemanager.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)