fix: Renamed model.GlobalFlagModel.Region to model.Region to stay consistent

marceljk · marceljk · commit 71a4c65eb06b · 2025-02-07T09:54:05.000+01:00
diff --git a/internal/cmd/object-storage/bucket/create/create.go b/internal/cmd/object-storage/bucket/create/create.go
@@ -122,7 +122,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *objectstorage.APIClient) objectstorage.ApiCreateBucketRequest {
-	req := apiClient.CreateBucket(ctx, model.ProjectId, model.GlobalFlagModel.Region, model.BucketName)
+	req := apiClient.CreateBucket(ctx, model.ProjectId, model.Region, model.BucketName)
 	return req
 }
 
diff --git a/internal/cmd/object-storage/credentials-group/delete/delete.go b/internal/cmd/object-storage/credentials-group/delete/delete.go
@@ -104,6 +104,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *objectstorage.APIClient) objectstorage.ApiDeleteCredentialsGroupRequest {
-	req := apiClient.DeleteCredentialsGroup(ctx, model.ProjectId, model.GlobalFlagModel.Region, model.CredentialsGroupId)
+	req := apiClient.DeleteCredentialsGroup(ctx, model.ProjectId, model.Region, model.CredentialsGroupId)
 	return req
 }
diff --git a/internal/cmd/object-storage/credentials/create/create.go b/internal/cmd/object-storage/credentials/create/create.go
@@ -129,7 +129,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *objectstorage.APIClient) objectstorage.ApiCreateAccessKeyRequest {
-	req := apiClient.CreateAccessKey(ctx, model.ProjectId, model.GlobalFlagModel.Region)
+	req := apiClient.CreateAccessKey(ctx, model.ProjectId, model.Region)
 	req = req.CredentialsGroup(model.CredentialsGroupId)
 	req = req.CreateAccessKeyPayload(objectstorage.CreateAccessKeyPayload{
 		Expires: model.ExpireDate,
diff --git a/internal/cmd/object-storage/credentials/delete/delete.go b/internal/cmd/object-storage/credentials/delete/delete.go
@@ -120,7 +120,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *objectstorage.APIClient) objectstorage.ApiDeleteAccessKeyRequest {
-	req := apiClient.DeleteAccessKey(ctx, model.ProjectId, model.GlobalFlagModel.Region, model.CredentialsId)
+	req := apiClient.DeleteAccessKey(ctx, model.ProjectId, model.Region, model.CredentialsId)
 	req = req.CredentialsGroup(model.CredentialsGroupId)
 	return req
 }
diff --git a/internal/cmd/object-storage/credentials/list/list.go b/internal/cmd/object-storage/credentials/list/list.go
@@ -131,7 +131,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *objectstorage.APIClient) objectstorage.ApiListAccessKeysRequest {
-	req := apiClient.ListAccessKeys(ctx, model.ProjectId, model.GlobalFlagModel.Region)
+	req := apiClient.ListAccessKeys(ctx, model.ProjectId, model.Region)
 	req = req.CredentialsGroup(model.CredentialsGroupId)
 	return req
 }

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ func parseInput(p print.Printer, cmd cobra.Command, inputArgs []string) (*inpu`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`func buildRequest(ctx context.Context, model inputModel, apiClient objectstorage.APIClient) objectstorage.ApiCreateBucketRequest {`
`125`		`- req := apiClient.CreateBucket(ctx, model.ProjectId, model.GlobalFlagModel.Region, model.BucketName)`
	`125`	`+ req := apiClient.CreateBucket(ctx, model.ProjectId, model.Region, model.BucketName)`
`126`	`126`	`return req`
`127`	`127`	`}`
`128`	`128`
Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,6 @@ func parseInput(p print.Printer, cmd cobra.Command, inputArgs []string) (*inpu`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`func buildRequest(ctx context.Context, model inputModel, apiClient objectstorage.APIClient) objectstorage.ApiDeleteCredentialsGroupRequest {`
`107`		`- req := apiClient.DeleteCredentialsGroup(ctx, model.ProjectId, model.GlobalFlagModel.Region, model.CredentialsGroupId)`
	`107`	`+ req := apiClient.DeleteCredentialsGroup(ctx, model.ProjectId, model.Region, model.CredentialsGroupId)`
`108`	`108`	`return req`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ func parseInput(p print.Printer, cmd cobra.Command) (*inputModel, error) {`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`func buildRequest(ctx context.Context, model inputModel, apiClient objectstorage.APIClient) objectstorage.ApiCreateAccessKeyRequest {`
`132`		`- req := apiClient.CreateAccessKey(ctx, model.ProjectId, model.GlobalFlagModel.Region)`
	`132`	`+ req := apiClient.CreateAccessKey(ctx, model.ProjectId, model.Region)`
`133`	`133`	`req = req.CredentialsGroup(model.CredentialsGroupId)`
`134`	`134`	`req = req.CreateAccessKeyPayload(objectstorage.CreateAccessKeyPayload{`
`135`	`135`	`Expires: model.ExpireDate,`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ func parseInput(p print.Printer, cmd cobra.Command, inputArgs []string) (*inpu`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`func buildRequest(ctx context.Context, model inputModel, apiClient objectstorage.APIClient) objectstorage.ApiDeleteAccessKeyRequest {`
`123`		`- req := apiClient.DeleteAccessKey(ctx, model.ProjectId, model.GlobalFlagModel.Region, model.CredentialsId)`
	`123`	`+ req := apiClient.DeleteAccessKey(ctx, model.ProjectId, model.Region, model.CredentialsId)`
`124`	`124`	`req = req.CredentialsGroup(model.CredentialsGroupId)`
`125`	`125`	`return req`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func parseInput(p print.Printer, cmd cobra.Command) (*inputModel, error) {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`func buildRequest(ctx context.Context, model inputModel, apiClient objectstorage.APIClient) objectstorage.ApiListAccessKeysRequest {`
`134`		`- req := apiClient.ListAccessKeys(ctx, model.ProjectId, model.GlobalFlagModel.Region)`
	`134`	`+ req := apiClient.ListAccessKeys(ctx, model.ProjectId, model.Region)`
`135`	`135`	`req = req.CredentialsGroup(model.CredentialsGroupId)`
`136`	`136`	`return req`
`137`	`137`	`}`