Skip to content

Commit 10231b7

Browse files
SerseusWasTakenSerseusWasTaken
committed
refactor(rabbitmq): rename regionId parameters to region
1 parent 4febd48 commit 10231b7

13 files changed

Lines changed: 55 additions & 55 deletions

File tree

‎internal/cmd/rabbitmq/credentials/create/create_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
2020
var testClient = &rabbitmq.APIClient{DefaultAPI: &rabbitmq.DefaultAPIService{}}
2121
var testProjectId = uuid.NewString()
2222
var testInstanceId = uuid.NewString()
23-
var testRegionId = "eu01"
23+
var testRegion = "eu01"
2424

2525
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
2626
flagValues := map[string]string{
2727
globalflags.ProjectIdFlag: testProjectId,
28-
globalflags.RegionFlag: testRegionId,
28+
globalflags.RegionFlag: testRegion,
2929
instanceIdFlag: testInstanceId,
3030
}
3131
for _, mod := range mods {
@@ -38,7 +38,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
3838
model := &inputModel{
3939
GlobalFlagModel: &globalflags.GlobalFlagModel{
4040
ProjectId: testProjectId,
41-
Region: testRegionId,
41+
Region: testRegion,
4242
Verbosity: globalflags.VerbosityDefault,
4343
},
4444
InstanceId: testInstanceId,
@@ -50,7 +50,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5050
}
5151

5252
func fixtureRequest(mods ...func(request *rabbitmq.ApiCreateCredentialsRequest)) rabbitmq.ApiCreateCredentialsRequest {
53-
request := testClient.DefaultAPI.CreateCredentials(testCtx, testProjectId, testRegionId, testInstanceId)
53+
request := testClient.DefaultAPI.CreateCredentials(testCtx, testProjectId, testRegion, testInstanceId)
5454
for _, mod := range mods {
5555
mod(&request)
5656
}

‎internal/cmd/rabbitmq/credentials/delete/delete_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type testCtxKey struct{}
1818
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
1919
var testClient = &rabbitmq.APIClient{DefaultAPI: &rabbitmq.DefaultAPIService{}}
2020
var testProjectId = uuid.NewString()
21-
var testRegionId = "eu01"
21+
var testRegion = "eu01"
2222
var testInstanceId = uuid.NewString()
2323
var testCredentialsId = uuid.NewString()
2424

@@ -35,7 +35,7 @@ func fixtureArgValues(mods ...func(argValues []string)) []string {
3535
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3636
flagValues := map[string]string{
3737
globalflags.ProjectIdFlag: testProjectId,
38-
globalflags.RegionFlag: testRegionId,
38+
globalflags.RegionFlag: testRegion,
3939
instanceIdFlag: testInstanceId,
4040
}
4141
for _, mod := range mods {
@@ -48,7 +48,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4848
model := &inputModel{
4949
GlobalFlagModel: &globalflags.GlobalFlagModel{
5050
ProjectId: testProjectId,
51-
Region: testRegionId,
51+
Region: testRegion,
5252
Verbosity: globalflags.VerbosityDefault,
5353
},
5454
InstanceId: testInstanceId,
@@ -61,7 +61,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6161
}
6262

6363
func fixtureRequest(mods ...func(request *rabbitmq.ApiDeleteCredentialsRequest)) rabbitmq.ApiDeleteCredentialsRequest {
64-
request := testClient.DefaultAPI.DeleteCredentials(testCtx, testProjectId, testRegionId, testInstanceId, testCredentialsId)
64+
request := testClient.DefaultAPI.DeleteCredentials(testCtx, testProjectId, testRegion, testInstanceId, testCredentialsId)
6565
for _, mod := range mods {
6666
mod(&request)
6767
}

‎internal/cmd/rabbitmq/credentials/describe/describe_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ type testCtxKey struct{}
1919
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
2020
var testClient = &rabbitmq.APIClient{DefaultAPI: &rabbitmq.DefaultAPIService{}}
2121
var testProjectId = uuid.NewString()
22-
var testRegionId = "eu01"
22+
var testRegion = "eu01"
2323
var testInstanceId = uuid.NewString()
2424
var testCredentialsId = uuid.NewString()
2525

@@ -36,7 +36,7 @@ func fixtureArgValues(mods ...func(argValues []string)) []string {
3636
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3737
flagValues := map[string]string{
3838
globalflags.ProjectIdFlag: testProjectId,
39-
globalflags.RegionFlag: testRegionId,
39+
globalflags.RegionFlag: testRegion,
4040
instanceIdFlag: testInstanceId,
4141
}
4242
for _, mod := range mods {
@@ -49,7 +49,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4949
model := &inputModel{
5050
GlobalFlagModel: &globalflags.GlobalFlagModel{
5151
ProjectId: testProjectId,
52-
Region: testRegionId,
52+
Region: testRegion,
5353
Verbosity: globalflags.VerbosityDefault,
5454
},
5555
InstanceId: testInstanceId,
@@ -62,7 +62,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6262
}
6363

6464
func fixtureRequest(mods ...func(request *rabbitmq.ApiGetCredentialsRequest)) rabbitmq.ApiGetCredentialsRequest {
65-
request := testClient.DefaultAPI.GetCredentials(testCtx, testProjectId, testRegionId, testInstanceId, testCredentialsId)
65+
request := testClient.DefaultAPI.GetCredentials(testCtx, testProjectId, testRegion, testInstanceId, testCredentialsId)
6666
for _, mod := range mods {
6767
mod(&request)
6868
}

‎internal/cmd/rabbitmq/credentials/list/list_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ type testCtxKey struct{}
2020
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
2121
var testClient = &rabbitmq.APIClient{DefaultAPI: &rabbitmq.DefaultAPIService{}}
2222
var testProjectId = uuid.NewString()
23-
var testRegionId = "eu01"
23+
var testRegion = "eu01"
2424
var testInstanceId = uuid.NewString()
2525

2626
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
2727
flagValues := map[string]string{
2828
globalflags.ProjectIdFlag: testProjectId,
29-
globalflags.RegionFlag: testRegionId,
29+
globalflags.RegionFlag: testRegion,
3030
instanceIdFlag: testInstanceId,
3131
limitFlag: "10",
3232
}
@@ -40,7 +40,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4040
model := &inputModel{
4141
GlobalFlagModel: &globalflags.GlobalFlagModel{
4242
ProjectId: testProjectId,
43-
Region: testRegionId,
43+
Region: testRegion,
4444
Verbosity: globalflags.VerbosityDefault,
4545
},
4646
InstanceId: testInstanceId,
@@ -53,7 +53,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5353
}
5454

5555
func fixtureRequest(mods ...func(request *rabbitmq.ApiListCredentialsRequest)) rabbitmq.ApiListCredentialsRequest {
56-
request := testClient.DefaultAPI.ListCredentials(testCtx, testProjectId, testRegionId, testInstanceId)
56+
request := testClient.DefaultAPI.ListCredentials(testCtx, testProjectId, testRegion, testInstanceId)
5757
for _, mod := range mods {
5858
mod(&request)
5959
}

‎internal/cmd/rabbitmq/instance/create/create.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
192192
}
193193

194194
type rabbitMQClient interface {
195-
CreateInstance(ctx context.Context, projectId, regionId string) rabbitmq.ApiCreateInstanceRequest
196-
ListOfferings(ctx context.Context, projectId, regionId string) rabbitmq.ApiListOfferingsRequest
195+
CreateInstance(ctx context.Context, projectId, region string) rabbitmq.ApiCreateInstanceRequest
196+
ListOfferings(ctx context.Context, projectId, region string) rabbitmq.ApiListOfferingsRequest
197197
}
198198

199199
func buildRequest(ctx context.Context, model *inputModel, apiClient rabbitMQClient) (rabbitmq.ApiCreateInstanceRequest, error) {

‎internal/cmd/rabbitmq/instance/create/create_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ var testPlanId = uuid.NewString()
4343
var testMonitoringInstanceId = uuid.NewString()
4444
var testInstanceName = utils.Ptr("instance")
4545

46-
const testRegionId = "eu01"
46+
const testRegion = "eu01"
4747

4848
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
4949
flagValues := map[string]string{
5050
globalflags.ProjectIdFlag: testProjectId,
51-
globalflags.RegionFlag: testRegionId,
51+
globalflags.RegionFlag: testRegion,
5252
instanceNameFlag: "example-name",
5353
enableMonitoringFlag: "true",
5454
graphiteFlag: "example-graphite",
@@ -70,7 +70,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
7070
model := &inputModel{
7171
GlobalFlagModel: &globalflags.GlobalFlagModel{
7272
ProjectId: testProjectId,
73-
Region: testRegionId,
73+
Region: testRegion,
7474
Verbosity: globalflags.VerbosityDefault,
7575
},
7676
InstanceName: utils.Ptr("example-name"),
@@ -91,7 +91,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
9191
}
9292

9393
func fixtureRequest(mods ...func(request *rabbitmq.ApiCreateInstanceRequest)) rabbitmq.ApiCreateInstanceRequest {
94-
request := testClient.DefaultAPI.CreateInstance(testCtx, testProjectId, testRegionId)
94+
request := testClient.DefaultAPI.CreateInstance(testCtx, testProjectId, testRegion)
9595
request = request.CreateInstancePayload(rabbitmq.CreateInstancePayload{
9696
InstanceName: "example-name",
9797
Parameters: &rabbitmq.InstanceParameters{
@@ -383,7 +383,7 @@ func TestBuildRequest(t *testing.T) {
383383
InstanceName: testInstanceName,
384384
GlobalFlagModel: &globalflags.GlobalFlagModel{
385385
ProjectId: testProjectId,
386-
Region: testRegionId,
386+
Region: testRegion,
387387
Verbosity: globalflags.VerbosityDefault,
388388
},
389389
PlanId: utils.Ptr(testPlanId),
@@ -401,7 +401,7 @@ func TestBuildRequest(t *testing.T) {
401401
},
402402
},
403403
},
404-
expectedRequest: testClient.DefaultAPI.CreateInstance(testCtx, testProjectId, testRegionId).
404+
expectedRequest: testClient.DefaultAPI.CreateInstance(testCtx, testProjectId, testRegion).
405405
CreateInstancePayload(rabbitmq.CreateInstancePayload{InstanceName: *testInstanceName, PlanId: testPlanId, Parameters: &rabbitmq.InstanceParameters{}}),
406406
},
407407
}

‎internal/cmd/rabbitmq/instance/delete/delete_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var testClient = &rabbitmq.APIClient{DefaultAPI: &rabbitmq.DefaultAPIService{}}
2020
var testProjectId = uuid.NewString()
2121
var testInstanceId = uuid.NewString()
2222

23-
const testRegionId = "eu01"
23+
const testRegion = "eu01"
2424

2525
func fixtureArgValues(mods ...func(argValues []string)) []string {
2626
argValues := []string{
@@ -35,7 +35,7 @@ func fixtureArgValues(mods ...func(argValues []string)) []string {
3535
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3636
flagValues := map[string]string{
3737
globalflags.ProjectIdFlag: testProjectId,
38-
globalflags.RegionFlag: testRegionId,
38+
globalflags.RegionFlag: testRegion,
3939
}
4040
for _, mod := range mods {
4141
mod(flagValues)
@@ -47,7 +47,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4747
model := &inputModel{
4848
GlobalFlagModel: &globalflags.GlobalFlagModel{
4949
ProjectId: testProjectId,
50-
Region: testRegionId,
50+
Region: testRegion,
5151
Verbosity: globalflags.VerbosityDefault,
5252
},
5353
InstanceId: testInstanceId,
@@ -59,7 +59,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5959
}
6060

6161
func fixtureRequest(mods ...func(request *rabbitmq.ApiDeleteInstanceRequest)) rabbitmq.ApiDeleteInstanceRequest {
62-
request := testClient.DefaultAPI.DeleteInstance(testCtx, testProjectId, testRegionId, testInstanceId)
62+
request := testClient.DefaultAPI.DeleteInstance(testCtx, testProjectId, testRegion, testInstanceId)
6363
for _, mod := range mods {
6464
mod(&request)
6565
}

‎internal/cmd/rabbitmq/instance/describe/describe_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ type testCtxKey struct{}
1919
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
2020
var testClient = &rabbitmq.APIClient{DefaultAPI: &rabbitmq.DefaultAPIService{}}
2121
var testProjectId = uuid.NewString()
22-
var testRegionId = "eu01"
22+
var testRegion = "eu01"
2323
var testInstanceId = uuid.NewString()
2424

2525
func fixtureArgValues(mods ...func(argValues []string)) []string {
@@ -35,7 +35,7 @@ func fixtureArgValues(mods ...func(argValues []string)) []string {
3535
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3636
flagValues := map[string]string{
3737
globalflags.ProjectIdFlag: testProjectId,
38-
globalflags.RegionFlag: testRegionId,
38+
globalflags.RegionFlag: testRegion,
3939
}
4040
for _, mod := range mods {
4141
mod(flagValues)
@@ -47,7 +47,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4747
model := &inputModel{
4848
GlobalFlagModel: &globalflags.GlobalFlagModel{
4949
ProjectId: testProjectId,
50-
Region: testRegionId,
50+
Region: testRegion,
5151
Verbosity: globalflags.VerbosityDefault,
5252
},
5353
InstanceId: testInstanceId,
@@ -59,7 +59,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5959
}
6060

6161
func fixtureRequest(mods ...func(request *rabbitmq.ApiGetInstanceRequest)) rabbitmq.ApiGetInstanceRequest {
62-
request := testClient.DefaultAPI.GetInstance(testCtx, testProjectId, testRegionId, testInstanceId)
62+
request := testClient.DefaultAPI.GetInstance(testCtx, testProjectId, testRegion, testInstanceId)
6363
for _, mod := range mods {
6464
mod(&request)
6565
}

‎internal/cmd/rabbitmq/instance/list/list_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ type testCtxKey struct{}
2020
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
2121
var testClient = &rabbitmq.APIClient{DefaultAPI: &rabbitmq.DefaultAPIService{}}
2222
var testProjectId = uuid.NewString()
23-
var testRegionId = "eu01"
23+
var testRegion = "eu01"
2424

2525
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
2626
flagValues := map[string]string{
2727
globalflags.ProjectIdFlag: testProjectId,
28-
globalflags.RegionFlag: testRegionId,
28+
globalflags.RegionFlag: testRegion,
2929
limitFlag: "10",
3030
}
3131
for _, mod := range mods {
@@ -38,7 +38,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
3838
model := &inputModel{
3939
GlobalFlagModel: &globalflags.GlobalFlagModel{
4040
ProjectId: testProjectId,
41-
Region: testRegionId,
41+
Region: testRegion,
4242
Verbosity: globalflags.VerbosityDefault,
4343
},
4444
Limit: utils.Ptr(int64(10)),
@@ -50,7 +50,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5050
}
5151

5252
func fixtureRequest(mods ...func(request *rabbitmq.ApiListInstancesRequest)) rabbitmq.ApiListInstancesRequest {
53-
request := testClient.DefaultAPI.ListInstances(testCtx, testProjectId, testRegionId)
53+
request := testClient.DefaultAPI.ListInstances(testCtx, testProjectId, testRegion)
5454
for _, mod := range mods {
5555
mod(&request)
5656
}

‎internal/cmd/rabbitmq/instance/update/update_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func newAPIMock(settings mockSettings) rabbitmq.DefaultAPI {
3939
var (
4040
testProjectId = uuid.NewString()
4141
testInstanceId = uuid.NewString()
42-
testRegionId = "eu01"
42+
testRegion = "eu01"
4343
testPlanId = uuid.NewString()
4444
testMonitoringInstanceId = uuid.NewString()
4545
)
@@ -57,7 +57,7 @@ func fixtureArgValues(mods ...func(argValues []string)) []string {
5757
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
5858
flagValues := map[string]string{
5959
globalflags.ProjectIdFlag: testProjectId,
60-
globalflags.RegionFlag: testRegionId,
60+
globalflags.RegionFlag: testRegion,
6161
enableMonitoringFlag: "true",
6262
graphiteFlag: "example-graphite",
6363
metricsFrequencyFlag: "100",
@@ -78,7 +78,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
7878
model := &inputModel{
7979
GlobalFlagModel: &globalflags.GlobalFlagModel{
8080
ProjectId: testProjectId,
81-
Region: testRegionId,
81+
Region: testRegion,
8282
Verbosity: globalflags.VerbosityDefault,
8383
},
8484
InstanceId: testInstanceId,
@@ -99,7 +99,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
9999
}
100100

101101
func fixtureRequest(mods ...func(request *rabbitmq.ApiPartialUpdateInstanceRequest)) rabbitmq.ApiPartialUpdateInstanceRequest {
102-
request := testClient.DefaultAPI.PartialUpdateInstance(testCtx, testProjectId, testRegionId, testInstanceId)
102+
request := testClient.DefaultAPI.PartialUpdateInstance(testCtx, testProjectId, testRegion, testInstanceId)
103103
request = request.PartialUpdateInstancePayload(rabbitmq.PartialUpdateInstancePayload{
104104
Parameters: &rabbitmq.InstanceParameters{
105105
EnableMonitoring: utils.Ptr(true),
@@ -466,12 +466,12 @@ func TestBuildRequest(t *testing.T) {
466466
model: &inputModel{
467467
GlobalFlagModel: &globalflags.GlobalFlagModel{
468468
ProjectId: testProjectId,
469-
Region: testRegionId,
469+
Region: testRegion,
470470
Verbosity: globalflags.VerbosityDefault,
471471
},
472472
InstanceId: testInstanceId,
473473
},
474-
expectedRequest: testClient.DefaultAPI.PartialUpdateInstance(testCtx, testProjectId, testRegionId, testInstanceId).
474+
expectedRequest: testClient.DefaultAPI.PartialUpdateInstance(testCtx, testProjectId, testRegion, testInstanceId).
475475
PartialUpdateInstancePayload(rabbitmq.PartialUpdateInstancePayload{Parameters: &rabbitmq.InstanceParameters{}}),
476476
},
477477
}

0 commit comments

Comments
 (0)