From 2ecd837ca82cdc6ea92d3840eb2272f687ed59a0 Mon Sep 17 00:00:00 2001 From: Carlo Goetz Date: Tue, 2 Jun 2026 11:49:34 +0200 Subject: [PATCH] chore(resourcemanager): migrate to multi version SDK --- go.mod | 2 +- go.sum | 6 +-- internal/cmd/network-area/create/create.go | 2 +- internal/cmd/network-area/list/list.go | 2 +- internal/cmd/network-area/update/update.go | 2 +- .../cmd/organization/describe/describe.go | 16 +++---- .../organization/describe/describe_test.go | 20 ++++---- internal/cmd/organization/list/list.go | 13 +++--- internal/cmd/organization/list/list_test.go | 12 ++--- internal/cmd/project/create/create.go | 23 +++++----- internal/cmd/project/create/create_test.go | 22 ++++----- internal/cmd/project/delete/delete.go | 4 +- internal/cmd/project/delete/delete_test.go | 8 ++-- internal/cmd/project/describe/describe.go | 16 +++---- .../cmd/project/describe/describe_test.go | 19 ++++---- internal/cmd/project/list/list.go | 17 +++---- internal/cmd/project/list/list_test.go | 46 +++++++++---------- internal/cmd/project/update/update.go | 4 +- internal/cmd/project/update/update_test.go | 10 ++-- internal/pkg/projectname/project_name.go | 2 +- .../services/resourcemanager/client/client.go | 2 +- .../services/resourcemanager/utils/utils.go | 19 +++----- .../resourcemanager/utils/utils_test.go | 35 +++++++------- 23 files changed, 144 insertions(+), 158 deletions(-) diff --git a/go.mod b/go.mod index bbeb1c719..0c86b177a 100644 --- a/go.mod +++ b/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 diff --git a/go.sum b/go.sum index a7ea442e3..bfce03556 100644 --- a/go.sum +++ b/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= diff --git a/internal/cmd/network-area/create/create.go b/internal/cmd/network-area/create/create.go index af3568850..2141af68e 100644 --- a/internal/cmd/network-area/create/create.go +++ b/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 diff --git a/internal/cmd/network-area/list/list.go b/internal/cmd/network-area/list/list.go index f473fc981..fcbf96b05 100644 --- a/internal/cmd/network-area/list/list.go +++ b/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 diff --git a/internal/cmd/network-area/update/update.go b/internal/cmd/network-area/update/update.go index 4ba577cf0..672213669 100644 --- a/internal/cmd/network-area/update/update.go +++ b/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 diff --git a/internal/cmd/organization/describe/describe.go b/internal/cmd/organization/describe/describe.go index 74ad1a2dc..6f11f1458 100644 --- a/internal/cmd/organization/describe/describe.go +++ b/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), ": ", ", ")) diff --git a/internal/cmd/organization/describe/describe_test.go b/internal/cmd/organization/describe/describe_test.go index 2b01c00d4..f16371f6b 100644 --- a/internal/cmd/organization/describe/describe_test.go +++ b/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", diff --git a/internal/cmd/organization/list/list.go b/internal/cmd/organization/list/list.go index 050d265f0..49b62c956 100644 --- a/internal/cmd/organization/list/list.go +++ b/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() } diff --git a/internal/cmd/organization/list/list_test.go b/internal/cmd/organization/list/list_test.go index 76d36253b..10e33beba 100644 --- a/internal/cmd/organization/list/list_test.go +++ b/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) diff --git a/internal/cmd/project/create/create.go b/internal/cmd/project/create/create.go index c18e083fc..ef95167e9 100644 --- a/internal/cmd/project/create/create.go +++ b/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 }) } diff --git a/internal/cmd/project/create/create_test.go b/internal/cmd/project/create/create_test.go index 99b3ba9a0..e063c6990 100644 --- a/internal/cmd/project/create/create_test.go +++ b/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) diff --git a/internal/cmd/project/delete/delete.go b/internal/cmd/project/delete/delete.go index 14de5b63f..8975bad8d 100644 --- a/internal/cmd/project/delete/delete.go +++ b/internal/cmd/project/delete/delete.go @@ -15,7 +15,7 @@ import ( "github.com/stackitcloud/stackit-cli/internal/pkg/services/resourcemanager/client" "github.com/spf13/cobra" - "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager" + resourcemanager "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager/v0api" ) type inputModel struct { @@ -94,6 +94,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, } func buildRequest(ctx context.Context, model *inputModel, apiClient *resourcemanager.APIClient) resourcemanager.ApiDeleteProjectRequest { - req := apiClient.DeleteProject(ctx, model.ProjectId) + req := apiClient.DefaultAPI.DeleteProject(ctx, model.ProjectId) return req } diff --git a/internal/cmd/project/delete/delete_test.go b/internal/cmd/project/delete/delete_test.go index f14e83869..32c09895a 100644 --- a/internal/cmd/project/delete/delete_test.go +++ b/internal/cmd/project/delete/delete_test.go @@ -10,14 +10,14 @@ 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 projectIdFlag = globalflags.ProjectIdFlag var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo") -var testClient = &resourcemanager.APIClient{} +var testClient = &resourcemanager.APIClient{DefaultAPI: &resourcemanager.DefaultAPIService{}} var testProjectId = uuid.NewString() func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string { @@ -44,7 +44,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { } func fixtureRequest(mods ...func(request *resourcemanager.ApiDeleteProjectRequest)) resourcemanager.ApiDeleteProjectRequest { - request := testClient.DeleteProject(testCtx, testProjectId) + request := testClient.DefaultAPI.DeleteProject(testCtx, testProjectId) for _, mod := range mods { mod(&request) } @@ -98,7 +98,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) diff --git a/internal/cmd/project/describe/describe.go b/internal/cmd/project/describe/describe.go index 52dc280b3..7498cd78c 100644 --- a/internal/cmd/project/describe/describe.go +++ b/internal/cmd/project/describe/describe.go @@ -16,7 +16,7 @@ import ( "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 ( @@ -105,7 +105,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu } func buildRequest(ctx context.Context, model *inputModel, apiClient *resourcemanager.APIClient) resourcemanager.ApiGetProjectRequest { - req := apiClient.GetProject(ctx, model.ArgProjectId) + req := apiClient.DefaultAPI.GetProject(ctx, model.ArgProjectId) req.IncludeParents(model.IncludeParents) return req } @@ -117,17 +117,15 @@ func outputResult(p *print.Printer, outputFormat string, project *resourcemanage return p.OutputResult(outputFormat, project, func() error { table := tables.NewTable() - table.AddRow("ID", utils.PtrString(project.ProjectId)) + table.AddRow("ID", project.ProjectId) table.AddSeparator() - table.AddRow("NAME", utils.PtrString(project.Name)) + table.AddRow("NAME", project.Name) table.AddSeparator() - table.AddRow("CREATION", utils.PtrString(project.CreationTime)) + table.AddRow("CREATION", project.CreationTime) table.AddSeparator() - table.AddRow("STATE", utils.PtrString(project.LifecycleState)) + table.AddRow("STATE", project.LifecycleState) table.AddSeparator() - if project.Parent != nil { - table.AddRow("PARENT ID", utils.PtrString(project.Parent.Id)) - } + table.AddRow("PARENT ID", project.Parent.Id) err := table.Display(p) if err != nil { return fmt.Errorf("render table: %w", err) diff --git a/internal/cmd/project/describe/describe_test.go b/internal/cmd/project/describe/describe_test.go index 2a1feb619..92f07d0d7 100644 --- a/internal/cmd/project/describe/describe_test.go +++ b/internal/cmd/project/describe/describe_test.go @@ -8,12 +8,11 @@ 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/stackitcloud/stackit-cli/internal/pkg/globalflags" "github.com/stackitcloud/stackit-cli/internal/pkg/testparams" "github.com/stackitcloud/stackit-cli/internal/pkg/testutils" - "github.com/stackitcloud/stackit-cli/internal/pkg/utils" ) var projectIdFlag = globalflags.ProjectIdFlag @@ -21,7 +20,7 @@ var projectIdFlag = globalflags.ProjectIdFlag type testCtxKey struct{} var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo") -var testClient = &resourcemanager.APIClient{} +var testClient = &resourcemanager.APIClient{DefaultAPI: &resourcemanager.DefaultAPIService{}} var testProjectId = uuid.NewString() var testProjectId2 = uuid.NewString() @@ -61,7 +60,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { } func fixtureRequest(mods ...func(request *resourcemanager.ApiGetProjectRequest)) resourcemanager.ApiGetProjectRequest { - request := testClient.GetProject(testCtx, testProjectId) + request := testClient.DefaultAPI.GetProject(testCtx, testProjectId) for _, mod := range mods { mod(&request) } @@ -162,7 +161,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) @@ -184,11 +183,11 @@ func Test_outputResult(t *testing.T) { {"empty", args{}, true}, {"base", args{"", &resourcemanager.GetProjectResponse{}}, false}, {"complete", args{"", &resourcemanager.GetProjectResponse{ - ProjectId: utils.Ptr("4711"), - Name: utils.Ptr("name"), - CreationTime: utils.Ptr(time.Now()), - LifecycleState: utils.Ptr(resourcemanager.LIFECYCLESTATE_CREATING), - Parent: &resourcemanager.Parent{Id: utils.Ptr("parent id")}, + ProjectId: "4711", + Name: "name", + CreationTime: time.Now(), + LifecycleState: resourcemanager.LIFECYCLESTATE_CREATING, + Parent: resourcemanager.Parent{Id: "parent id"}, }, }, false}, } diff --git a/internal/cmd/project/list/list.go b/internal/cmd/project/list/list.go index a04ae6077..82f4f19ee 100644 --- a/internal/cmd/project/list/list.go +++ b/internal/cmd/project/list/list.go @@ -8,7 +8,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/auth" @@ -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 { } // Fetch projects - projects, err := fetchProjects(ctx, model, apiClient) + projects, err := fetchProjects(ctx, model, apiClient.DefaultAPI) if err != nil { return err } @@ -219,15 +218,11 @@ func outputResult(p *print.Printer, outputFormat string, projects []resourcemana for i := range projects { p := projects[i] - var parentId *string - if p.Parent != nil { - parentId = p.Parent.Id - } table.AddRow( - utils.PtrString(p.ProjectId), - utils.PtrString(p.Name), - utils.PtrString(p.LifecycleState), - utils.PtrString(parentId), + p.ProjectId, + p.Name, + p.LifecycleState, + p.Parent.Id, ) } diff --git a/internal/cmd/project/list/list_test.go b/internal/cmd/project/list/list_test.go index 72e8a42f2..a656b2e5d 100644 --- a/internal/cmd/project/list/list_test.go +++ b/internal/cmd/project/list/list_test.go @@ -16,7 +16,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/google/uuid" sdkConfig "github.com/stackitcloud/stackit-sdk-go/core/config" - "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" @@ -27,7 +27,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 testProjectIdLike = uuid.NewString() var testCreationTimeAfter = "2023-01-01T00:00:00Z" @@ -64,12 +64,12 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { } func fixtureRequest(mods ...func(request *resourcemanager.ApiListProjectsRequest)) resourcemanager.ApiListProjectsRequest { - request := testClient.ListProjects(testCtx) + request := testClient.DefaultAPI.ListProjects(testCtx) request = request.ContainerParentId(testParentId) testCreationTimeAfter, err := time.Parse(creationTimeAfterFormat, testCreationTimeAfter) if err != nil { - return resourcemanager.ListProjectsRequest{} + return resourcemanager.ApiListProjectsRequest{} } request = request.CreationTimeStart(testCreationTimeAfter) request = request.Member("member") @@ -246,7 +246,7 @@ func TestBuildRequest(t *testing.T) { PageSize: pageSizeDefault, }, offset: 1, - expectedRequest: testClient.ListProjects(testCtx).Offset(1).Limit(pageSizeDefault).Member(authUserEmail), + expectedRequest: testClient.DefaultAPI.ListProjects(testCtx).Offset(1).Limit(pageSizeDefault).Member(authUserEmail), }, { description: "projectIdLike set", @@ -262,14 +262,14 @@ func TestBuildRequest(t *testing.T) { if tt.projectIdLike != nil { tt.model.ProjectIdLike = tt.projectIdLike } - request, err := buildRequest(testCtx, tt.model, testClient, tt.offset) + request, err := buildRequest(testCtx, tt.model, testClient.DefaultAPI, tt.offset) if err != nil { t.Fatalf("Failed to build request: %v", err) } 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) @@ -404,7 +404,7 @@ func TestFetchProjects(t *testing.T) { projects := make([]resourcemanager.Project, numItemsToReturn) mockedResp := resourcemanager.ListProjectsResponse{ - Items: &projects, + Items: projects, } mockedRespBytes, err := json.Marshal(mockedResp) @@ -427,7 +427,7 @@ func TestFetchProjects(t *testing.T) { t.Fatalf("Failed to initialize client: %v", err) } - projects, err := fetchProjects(testCtx, tt.model, client) + projects, err := fetchProjects(testCtx, tt.model, client.DefaultAPI) if err != nil { if !tt.apiCallFails { t.Fatalf("did not fail on invalid input") @@ -461,26 +461,26 @@ func Test_outputResult(t *testing.T) { {"base", args{"", []resourcemanager.Project{{}}}, false}, {"complete", args{"", []resourcemanager.Project{ { - ContainerId: utils.Ptr("container-id1"), - CreationTime: utils.Ptr(time.Now()), + ContainerId: "container-id1", + CreationTime: time.Now(), Labels: &map[string]string{"foo": "bar"}, - LifecycleState: utils.Ptr(resourcemanager.LIFECYCLESTATE_CREATING), - Name: utils.Ptr("some name"), - Parent: &resourcemanager.Parent{ - Id: utils.Ptr("parent-id"), + LifecycleState: resourcemanager.LIFECYCLESTATE_CREATING, + Name: "some name", + Parent: resourcemanager.Parent{ + Id: "parent-id", }, - ProjectId: utils.Ptr("project-id1"), + ProjectId: "project-id1", }, { - ContainerId: utils.Ptr("container-id2"), - CreationTime: utils.Ptr(time.Now()), + ContainerId: "container-id2", + CreationTime: time.Now(), Labels: &map[string]string{"foo": "bar"}, - LifecycleState: utils.Ptr(resourcemanager.LIFECYCLESTATE_CREATING), - Name: utils.Ptr("some name"), - Parent: &resourcemanager.Parent{ - Id: utils.Ptr("parent-id"), + LifecycleState: resourcemanager.LIFECYCLESTATE_CREATING, + Name: "some name", + Parent: resourcemanager.Parent{ + Id: "parent-id", }, - ProjectId: utils.Ptr("project-id2"), + ProjectId: "project-id2", }, }}, false}, } diff --git a/internal/cmd/project/update/update.go b/internal/cmd/project/update/update.go index a0ee9ae4f..3c139b03c 100644 --- a/internal/cmd/project/update/update.go +++ b/internal/cmd/project/update/update.go @@ -17,7 +17,7 @@ import ( "github.com/stackitcloud/stackit-cli/internal/pkg/services/resourcemanager/client" "github.com/spf13/cobra" - "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager" + resourcemanager "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager/v0api" ) const ( @@ -147,7 +147,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, } func buildRequest(ctx context.Context, model *inputModel, apiClient *resourcemanager.APIClient) resourcemanager.ApiPartialUpdateProjectRequest { - req := apiClient.PartialUpdateProject(ctx, model.ProjectId) + req := apiClient.DefaultAPI.PartialUpdateProject(ctx, model.ProjectId) req = req.PartialUpdateProjectPayload(resourcemanager.PartialUpdateProjectPayload{ ContainerParentId: model.ParentId, Name: model.Name, diff --git a/internal/cmd/project/update/update_test.go b/internal/cmd/project/update/update_test.go index a2f70d560..04338e8d8 100644 --- a/internal/cmd/project/update/update_test.go +++ b/internal/cmd/project/update/update_test.go @@ -11,7 +11,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" ) var projectIdFlag = globalflags.ProjectIdFlag @@ -19,7 +19,7 @@ var projectIdFlag = globalflags.ProjectIdFlag type testCtxKey struct{} var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo") -var testClient = &resourcemanager.APIClient{} +var testClient = &resourcemanager.APIClient{DefaultAPI: &resourcemanager.DefaultAPIService{}} var testProjectId = uuid.NewString() var testParentId = uuid.NewString() @@ -51,7 +51,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { } func fixtureRequest(mods ...func(request *resourcemanager.ApiPartialUpdateProjectRequest)) resourcemanager.ApiPartialUpdateProjectRequest { - request := testClient.PartialUpdateProject(testCtx, testProjectId) + request := testClient.DefaultAPI.PartialUpdateProject(testCtx, testProjectId) request = request.PartialUpdateProjectPayload(resourcemanager.PartialUpdateProjectPayload{ ContainerParentId: utils.Ptr(testParentId), Name: utils.Ptr(nameFlag), @@ -157,7 +157,7 @@ func TestBuildRequest(t *testing.T) { Verbosity: globalflags.VerbosityDefault, }, }, - expectedRequest: testClient.PartialUpdateProject(testCtx, testProjectId). + expectedRequest: testClient.DefaultAPI.PartialUpdateProject(testCtx, testProjectId). PartialUpdateProjectPayload(resourcemanager.PartialUpdateProjectPayload{}), }, } @@ -168,7 +168,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) diff --git a/internal/pkg/projectname/project_name.go b/internal/pkg/projectname/project_name.go index b2c77117f..232255d29 100644 --- a/internal/pkg/projectname/project_name.go +++ b/internal/pkg/projectname/project_name.go @@ -35,7 +35,7 @@ func GetProjectName(ctx context.Context, p *print.Printer, cliVersion string, cm return "", fmt.Errorf("configure resource manager client: %w", err) } - projectName, err := utils.GetProjectName(ctx, apiClient, projectId) + projectName, err := utils.GetProjectName(ctx, apiClient.DefaultAPI, projectId) if err != nil { return "", fmt.Errorf("get project name: %w", err) } diff --git a/internal/pkg/services/resourcemanager/client/client.go b/internal/pkg/services/resourcemanager/client/client.go index 199b2a2e1..a430b059e 100644 --- a/internal/pkg/services/resourcemanager/client/client.go +++ b/internal/pkg/services/resourcemanager/client/client.go @@ -6,7 +6,7 @@ import ( "github.com/stackitcloud/stackit-cli/internal/pkg/print" "github.com/spf13/viper" - "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager" + resourcemanager "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager/v0api" ) func ConfigureClient(p *print.Printer, cliVersion string) (*resourcemanager.APIClient, error) { diff --git a/internal/pkg/services/resourcemanager/utils/utils.go b/internal/pkg/services/resourcemanager/utils/utils.go index bf8724b06..b6144e4e2 100644 --- a/internal/pkg/services/resourcemanager/utils/utils.go +++ b/internal/pkg/services/resourcemanager/utils/utils.go @@ -4,29 +4,24 @@ import ( "context" "fmt" - "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager" + resourcemanager "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager/v0api" ) -type ResourceManagerClient interface { - GetOrganizationExecute(ctx context.Context, organizationId string) (*resourcemanager.OrganizationResponse, error) - GetProjectExecute(ctx context.Context, projectId string) (*resourcemanager.GetProjectResponse, error) -} - // GetOrganizationName returns the name of an organization by its ID. -func GetOrganizationName(ctx context.Context, apiClient ResourceManagerClient, orgId string) (string, error) { - resp, err := apiClient.GetOrganizationExecute(ctx, orgId) +func GetOrganizationName(ctx context.Context, apiClient resourcemanager.DefaultAPI, orgId string) (string, error) { + resp, err := apiClient.GetOrganization(ctx, orgId).Execute() if err != nil { return "", fmt.Errorf("get organization details: %w", err) } - return *resp.Name, nil + return resp.Name, nil } -func GetProjectName(ctx context.Context, apiClient ResourceManagerClient, projectId string) (string, error) { - resp, err := apiClient.GetProjectExecute(ctx, projectId) +func GetProjectName(ctx context.Context, apiClient resourcemanager.DefaultAPI, projectId string) (string, error) { + resp, err := apiClient.GetProject(ctx, projectId).Execute() if err != nil { return "", fmt.Errorf("get project details: %w", err) } - return *resp.Name, nil + return resp.Name, nil } diff --git a/internal/pkg/services/resourcemanager/utils/utils_test.go b/internal/pkg/services/resourcemanager/utils/utils_test.go index 5c79c7354..ec53935a7 100644 --- a/internal/pkg/services/resourcemanager/utils/utils_test.go +++ b/internal/pkg/services/resourcemanager/utils/utils_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/google/uuid" - "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/utils" ) @@ -26,18 +26,21 @@ type resourceManagerClientMocked struct { getProjectResp *resourcemanager.GetProjectResponse } -func (s *resourceManagerClientMocked) GetOrganizationExecute(_ context.Context, _ string) (*resourcemanager.OrganizationResponse, error) { - if s.getOrganizationFails { - return nil, fmt.Errorf("could not get organization") - } - return s.getOrganizationResp, nil -} - -func (s *resourceManagerClientMocked) GetProjectExecute(_ context.Context, _ string) (*resourcemanager.GetProjectResponse, error) { - if s.getProjectFails { - return nil, fmt.Errorf("could not get project") +func (s *resourceManagerClientMocked) newMock() resourcemanager.DefaultAPI { + return resourcemanager.DefaultAPIServiceMock{ + GetOrganizationExecuteMock: utils.Ptr(func(_ resourcemanager.ApiGetOrganizationRequest) (*resourcemanager.OrganizationResponse, error) { + if s.getOrganizationFails { + return nil, fmt.Errorf("could not get organization") + } + return s.getOrganizationResp, nil + }), + GetProjectExecuteMock: utils.Ptr(func(_ resourcemanager.ApiGetProjectRequest) (*resourcemanager.GetProjectResponse, error) { + if s.getProjectFails { + return nil, fmt.Errorf("could not get project") + } + return s.getProjectResp, nil + }), } - return s.getProjectResp, nil } func TestGetOrganizationName(t *testing.T) { @@ -51,7 +54,7 @@ func TestGetOrganizationName(t *testing.T) { { description: "base", getOrganizationResp: &resourcemanager.OrganizationResponse{ - Name: utils.Ptr(testOrgName), + Name: testOrgName, }, isValid: true, expectedOutput: testOrgName, @@ -70,7 +73,7 @@ func TestGetOrganizationName(t *testing.T) { getOrganizationResp: tt.getOrganizationResp, } - output, err := GetOrganizationName(context.Background(), client, testOrgId) + output, err := GetOrganizationName(context.Background(), client.newMock(), testOrgId) if tt.isValid && err != nil { t.Errorf("failed on valid input") @@ -99,7 +102,7 @@ func TestGetProjectName(t *testing.T) { { description: "base", getProjectResp: &resourcemanager.GetProjectResponse{ - Name: utils.Ptr("project"), + Name: "project", }, isValid: true, expectedOutput: "project", @@ -118,7 +121,7 @@ func TestGetProjectName(t *testing.T) { getProjectResp: tt.getProjectResp, } - output, err := GetProjectName(context.Background(), client, testOrgId) + output, err := GetProjectName(context.Background(), client.newMock(), testOrgId) if tt.isValid && err != nil { t.Errorf("failed on valid input")