Skip to content

Commit e2b6a5f

Browse files
h3adexh3adex
committed
review changes
1 parent 0493784 commit e2b6a5f

25 files changed

+346
-160
lines changed

‎docs/stackit_routing-table_delete.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ stackit routing-table delete ROUTING_TABLE_ARG [flags]
1414

1515
```
1616
Deletes a a routing-table
17-
$ stackit routing-table delete xxxx-xxxx-xxxx-xxxx --organization-id yyy --network-area-id zzz
17+
$ stackit routing-table delete xxx --organization-id yyy --network-area-id zzz
1818
```
1919

2020
### Options

‎docs/stackit_routing-table_describe.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ stackit routing-table describe ROUTING_TABLE_ID_ARG [flags]
1414

1515
```
1616
Describe a routing-table
17-
$ stackit routing-table describe xxxx-xxxx-xxxx-xxxx --organization-id xxx --network-area-id yyy
17+
$ stackit routing-table describe xxx --organization-id xxx --network-area-id yyy
1818
```
1919

2020
### Options

‎docs/stackit_routing-table_route_delete.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ stackit routing-table route delete routing-table-id [flags]
1414

1515
```
1616
Deletes a route within a routing-table
17-
$ stackit routing-table route delete xxxx-xxxx-xxxx-xxxx --routing-table-id xxx --organization-id yyy --network-area-id zzz
17+
$ stackit routing-table route delete xxx --routing-table-id xxx --organization-id yyy --network-area-id zzz
1818
```
1919

2020
### Options

‎docs/stackit_routing-table_route_describe.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ stackit routing-table route describe ROUTE_ID_ARG [flags]
1414

1515
```
1616
Describe a route within a routing-table
17-
$ stackit routing-table route describe xxxx-xxxx-xxxx-xxxx --routing-table-id xxx --organization-id yyy --network-area-id zzz
17+
$ stackit routing-table route describe xxx --routing-table-id xxx --organization-id yyy --network-area-id zzz
1818
```
1919

2020
### Options

‎internal/cmd/routingtable/create/create.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ type inputModel struct {
3333
*globalflags.GlobalFlagModel
3434
Description *string
3535
Labels *map[string]string
36-
Name *string
37-
NetworkAreaId *string
36+
Name string
37+
NetworkAreaId string
3838
NonSystemRoutes bool
3939
NonDynamicRoutes bool
40-
OrganizationId *string
40+
OrganizationId string
4141
}
4242

4343
func NewCmd(params *params.CmdParams) *cobra.Command {
@@ -77,7 +77,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
7777
}
7878

7979
if !model.AssumeYes {
80-
prompt := "Are you sure you want to create a routing-table?"
80+
prompt := fmt.Sprintf("Are you sure you want to create a routing-table with the name %s?", model.Name)
8181
if err := params.Printer.PromptForConfirmation(prompt); err != nil {
8282
return err
8383
}
@@ -121,9 +121,9 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
121121
Description: flags.FlagToStringPointer(p, cmd, descriptionFlag),
122122
NonDynamicRoutes: flags.FlagToBoolValue(p, cmd, nonDynamicRoutesFlag),
123123
Labels: flags.FlagToStringToStringPointer(p, cmd, labelFlag),
124-
Name: flags.FlagToStringPointer(p, cmd, nameFlag),
125-
NetworkAreaId: flags.FlagToStringPointer(p, cmd, networkAreaIdFlag),
126-
OrganizationId: flags.FlagToStringPointer(p, cmd, organizationIdFlag),
124+
Name: flags.FlagToStringValue(p, cmd, nameFlag),
125+
NetworkAreaId: flags.FlagToStringValue(p, cmd, networkAreaIdFlag),
126+
OrganizationId: flags.FlagToStringValue(p, cmd, organizationIdFlag),
127127
NonSystemRoutes: flags.FlagToBoolValue(p, cmd, nonSystemRoutesFlag),
128128
}
129129

@@ -144,16 +144,16 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
144144

145145
payload := iaas.AddRoutingTableToAreaPayload{
146146
Description: model.Description,
147-
Name: model.Name,
147+
Name: utils.Ptr(model.Name),
148148
Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),
149149
SystemRoutes: utils.Ptr(systemRoutes),
150150
DynamicRoutes: utils.Ptr(dynamicRoutes),
151151
}
152152

153153
return apiClient.AddRoutingTableToArea(
154154
ctx,
155-
*model.OrganizationId,
156-
*model.NetworkAreaId,
155+
model.OrganizationId,
156+
model.NetworkAreaId,
157157
model.Region,
158158
).AddRoutingTableToAreaPayload(payload), nil
159159
}

‎internal/cmd/routingtable/create/create_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6161
Verbosity: globalflags.VerbosityDefault,
6262
Region: testRegion,
6363
},
64-
OrganizationId: utils.Ptr(testOrgId),
65-
NetworkAreaId: utils.Ptr(testNetworkAreaId),
66-
Name: utils.Ptr(testRoutingTableName),
64+
OrganizationId: testOrgId,
65+
NetworkAreaId: testNetworkAreaId,
66+
Name: testRoutingTableName,
6767
Description: utils.Ptr(testRoutingTableDescription),
6868
NonSystemRoutes: systemRoutesDisabled,
6969
NonDynamicRoutes: dynamicRoutesDisabled,

‎internal/cmd/routingtable/delete/delete.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ const (
2323

2424
type inputModel struct {
2525
*globalflags.GlobalFlagModel
26-
NetworkAreaId *string
27-
OrganizationId *string
28-
RoutingTableId *string
26+
NetworkAreaId string
27+
OrganizationId string
28+
RoutingTableId string
2929
}
3030

3131
func NewCmd(params *params.CmdParams) *cobra.Command {
@@ -37,7 +37,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
3737
Example: examples.Build(
3838
examples.NewExample(
3939
`Deletes a a routing-table`,
40-
`$ stackit routing-table delete xxxx-xxxx-xxxx-xxxx --organization-id yyy --network-area-id zzz`,
40+
`$ stackit routing-table delete xxx --organization-id yyy --network-area-id zzz`,
4141
),
4242
),
4343
RunE: func(cmd *cobra.Command, args []string) error {
@@ -54,7 +54,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
5454
}
5555

5656
if !model.AssumeYes {
57-
prompt := fmt.Sprintf("Are you sure you want to delete the routing-table %q for network-area-id %q?", *model.RoutingTableId, *model.OrganizationId)
57+
prompt := fmt.Sprintf("Are you sure you want to delete the routing-table %q for network-area-id %q?", model.RoutingTableId, model.OrganizationId)
5858
err = params.Printer.PromptForConfirmation(prompt)
5959
if err != nil {
6060
return err
@@ -64,17 +64,17 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
6464
// Call API
6565
req := apiClient.DeleteRoutingTableFromArea(
6666
ctx,
67-
*model.OrganizationId,
68-
*model.NetworkAreaId,
67+
model.OrganizationId,
68+
model.NetworkAreaId,
6969
model.Region,
70-
*model.RoutingTableId,
70+
model.RoutingTableId,
7171
)
7272
err = req.Execute()
7373
if err != nil {
7474
return fmt.Errorf("delete routing-table: %w", err)
7575
}
7676

77-
params.Printer.Outputf("Routing-table %q deleted.", *model.RoutingTableId)
77+
params.Printer.Outputf("Routing-table %q deleted.", model.RoutingTableId)
7878
return nil
7979
},
8080
}
@@ -101,9 +101,9 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
101101

102102
model := inputModel{
103103
GlobalFlagModel: globalFlags,
104-
NetworkAreaId: flags.FlagToStringPointer(p, cmd, networkAreaIdFlag),
105-
OrganizationId: flags.FlagToStringPointer(p, cmd, organizationIdFlag),
106-
RoutingTableId: &routingTableId,
104+
NetworkAreaId: flags.FlagToStringValue(p, cmd, networkAreaIdFlag),
105+
OrganizationId: flags.FlagToStringValue(p, cmd, organizationIdFlag),
106+
RoutingTableId: routingTableId,
107107
}
108108

109109
p.DebugInputModel(model)

‎internal/cmd/routingtable/delete/delete_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"github.com/google/uuid"
77
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
88
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
9-
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
109
)
1110

1211
const testRegion = "eu01"
@@ -35,9 +34,9 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
3534
Verbosity: globalflags.VerbosityDefault,
3635
Region: testRegion,
3736
},
38-
OrganizationId: utils.Ptr(testOrgId),
39-
NetworkAreaId: utils.Ptr(testNetworkAreaId),
40-
RoutingTableId: utils.Ptr(testRoutingTableId),
37+
OrganizationId: testOrgId,
38+
NetworkAreaId: testNetworkAreaId,
39+
RoutingTableId: testRoutingTableId,
4140
}
4241
for _, mod := range mods {
4342
mod(model)
@@ -59,7 +58,7 @@ func TestParseInput(t *testing.T) {
5958
flagValues: fixtureFlagValues(),
6059
isValid: true,
6160
expectedModel: fixtureInputModel(func(m *inputModel) {
62-
m.RoutingTableId = &testRoutingTableId
61+
m.RoutingTableId = testRoutingTableId
6362
}),
6463
},
6564
{

‎internal/cmd/routingtable/describe/describe.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ const (
2727

2828
type inputModel struct {
2929
*globalflags.GlobalFlagModel
30-
NetworkAreaId *string
31-
OrganizationId *string
32-
RoutingTableId *string
30+
NetworkAreaId string
31+
OrganizationId string
32+
RoutingTableId string
3333
}
3434

3535
func NewCmd(params *params.CmdParams) *cobra.Command {
@@ -41,7 +41,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
4141
Example: examples.Build(
4242
examples.NewExample(
4343
`Describe a routing-table`,
44-
`$ stackit routing-table describe xxxx-xxxx-xxxx-xxxx --organization-id xxx --network-area-id yyy`,
44+
`$ stackit routing-table describe xxx --organization-id xxx --network-area-id yyy`,
4545
),
4646
),
4747
RunE: func(cmd *cobra.Command, args []string) error {
@@ -60,10 +60,10 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
6060
// Call API
6161
request := apiClient.GetRoutingTableOfArea(
6262
ctx,
63-
*model.OrganizationId,
64-
*model.NetworkAreaId,
63+
model.OrganizationId,
64+
model.NetworkAreaId,
6565
model.Region,
66-
*model.RoutingTableId,
66+
model.RoutingTableId,
6767
)
6868

6969
response, err := request.Execute()
@@ -97,9 +97,9 @@ func parseInput(p *print.Printer, cmd *cobra.Command, args []string) (*inputMode
9797

9898
model := inputModel{
9999
GlobalFlagModel: globalFlags,
100-
NetworkAreaId: flags.FlagToStringPointer(p, cmd, networkAreaIdFlag),
101-
OrganizationId: flags.FlagToStringPointer(p, cmd, organizationIdFlag),
102-
RoutingTableId: &routingTableId,
100+
NetworkAreaId: flags.FlagToStringValue(p, cmd, networkAreaIdFlag),
101+
OrganizationId: flags.FlagToStringValue(p, cmd, organizationIdFlag),
102+
RoutingTableId: routingTableId,
103103
}
104104

105105
p.DebugInputModel(model)

‎internal/cmd/routingtable/describe/describe_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4242
Verbosity: globalflags.VerbosityDefault,
4343
Region: testRegion,
4444
},
45-
OrganizationId: utils.Ptr(testOrgId),
46-
NetworkAreaId: utils.Ptr(testNetworkAreaId),
47-
RoutingTableId: utils.Ptr(testRoutingTableId),
45+
OrganizationId: testOrgId,
46+
NetworkAreaId: testNetworkAreaId,
47+
RoutingTableId: testRoutingTableId,
4848
}
4949
for _, mod := range mods {
5050
mod(model)

0 commit comments

Comments
 (0)