Skip to content

Commit da97439

Browse files
marceljkmarceljk
committed
adjust nic commands
1 parent d450cfb commit da97439

File tree

10 files changed

+69
-45
lines changed

10 files changed

+69
-45
lines changed

‎internal/cmd/network-interface/create/create.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const (
3838

3939
type inputModel struct {
4040
*globalflags.GlobalFlagModel
41-
NetworkId *string
41+
NetworkId string
4242
AllowedAddresses *[]iaas.AllowedAddressesInner
4343
Ipv4 *string
4444
Ipv6 *string
@@ -177,7 +177,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
177177

178178
model := inputModel{
179179
GlobalFlagModel: globalFlags,
180-
NetworkId: flags.FlagToStringPointer(p, cmd, networkIdFlag),
180+
NetworkId: flags.FlagToStringValue(p, cmd, networkIdFlag),
181181
Ipv4: flags.FlagToStringPointer(p, cmd, ipv4Flag),
182182
Ipv6: flags.FlagToStringPointer(p, cmd, ipv6Flag),
183183
Labels: flags.FlagToStringToStringPointer(p, cmd, labelFlag),
@@ -195,7 +195,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
195195
}
196196

197197
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiCreateNicRequest {
198-
req := apiClient.CreateNic(ctx, model.ProjectId, *model.NetworkId)
198+
req := apiClient.CreateNic(ctx, model.ProjectId, model.Region, model.NetworkId)
199199

200200
payload := iaas.CreateNicPayload{
201201
AllowedAddresses: model.AllowedAddresses,

‎internal/cmd/network-interface/create/create_test.go‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,24 @@ import (
1515
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
1616
)
1717

18+
const (
19+
testRegion = "eu01"
20+
)
21+
1822
type testCtxKey struct{}
1923

2024
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
2125
var testClient = &iaas.APIClient{}
2226

23-
var projectIdFlag = globalflags.ProjectIdFlag
2427
var testProjectId = uuid.NewString()
2528
var testNetworkId = uuid.NewString()
2629
var testSecurityGroup = uuid.NewString()
2730

2831
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
2932
flagValues := map[string]string{
30-
projectIdFlag: testProjectId,
33+
globalflags.ProjectIdFlag: testProjectId,
34+
globalflags.RegionFlag: testRegion,
35+
3136
networkIdFlag: testNetworkId,
3237
allowedAddressesFlag: "1.1.1.1,8.8.8.8,9.9.9.9",
3338
ipv4Flag: "1.2.3.4",
@@ -52,9 +57,10 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5257
model := &inputModel{
5358
GlobalFlagModel: &globalflags.GlobalFlagModel{
5459
ProjectId: testProjectId,
60+
Region: testRegion,
5561
Verbosity: globalflags.VerbosityDefault,
5662
},
57-
NetworkId: utils.Ptr(testNetworkId),
63+
NetworkId: testNetworkId,
5864
AllowedAddresses: utils.Ptr(allowedAddresses),
5965
Ipv4: utils.Ptr("1.2.3.4"),
6066
Ipv6: utils.Ptr("2001:0db8:85a3:08d3::0370:7344"),
@@ -72,7 +78,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
7278
}
7379

7480
func fixtureRequest(mods ...func(request *iaas.ApiCreateNicRequest)) iaas.ApiCreateNicRequest {
75-
request := testClient.CreateNic(testCtx, testProjectId, testNetworkId)
81+
request := testClient.CreateNic(testCtx, testProjectId, testRegion, testNetworkId)
7682
request = request.CreateNicPayload(fixturePayload())
7783
for _, mod := range mods {
7884
mod(&request)

‎internal/cmd/network-interface/delete/delete.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const (
2424

2525
type inputModel struct {
2626
*globalflags.GlobalFlagModel
27-
NetworkId *string
27+
NetworkId string
2828
NicId string
2929
}
3030

@@ -90,7 +90,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
9090

9191
model := inputModel{
9292
GlobalFlagModel: globalFlags,
93-
NetworkId: flags.FlagToStringPointer(p, cmd, networkIdFlag),
93+
NetworkId: flags.FlagToStringValue(p, cmd, networkIdFlag),
9494
NicId: nicId,
9595
}
9696

@@ -99,6 +99,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
9999
}
100100

101101
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiDeleteNicRequest {
102-
req := apiClient.DeleteNic(ctx, model.ProjectId, *model.NetworkId, model.NicId)
102+
req := apiClient.DeleteNic(ctx, model.ProjectId, model.Region, model.NetworkId, model.NicId)
103103
return req
104104
}

‎internal/cmd/network-interface/delete/delete_test.go‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,18 @@ import (
1010
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
1111
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1212
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
13-
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1413
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
1514
)
1615

16+
const (
17+
testRegion = "eu01"
18+
)
19+
1720
type testCtxKey struct{}
1821

1922
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
2023
var testClient = &iaas.APIClient{}
2124

22-
var projectIdFlag = globalflags.ProjectIdFlag
2325
var testProjectId = uuid.NewString()
2426
var testNetworkId = uuid.NewString()
2527
var testNicId = uuid.NewString()
@@ -36,8 +38,9 @@ func fixtureArgValues(mods ...func(argValues []string)) []string {
3638

3739
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3840
flagValues := map[string]string{
39-
projectIdFlag: testProjectId,
40-
networkIdFlag: testNetworkId,
41+
globalflags.ProjectIdFlag: testProjectId,
42+
globalflags.RegionFlag: testRegion,
43+
networkIdFlag: testNetworkId,
4144
}
4245
for _, mod := range mods {
4346
mod(flagValues)
@@ -50,8 +53,9 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5053
GlobalFlagModel: &globalflags.GlobalFlagModel{
5154
ProjectId: testProjectId,
5255
Verbosity: globalflags.VerbosityDefault,
56+
Region: testRegion,
5357
},
54-
NetworkId: utils.Ptr(testNetworkId),
58+
NetworkId: testNetworkId,
5559
NicId: testNicId,
5660
}
5761
for _, mod := range mods {
@@ -61,7 +65,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6165
}
6266

6367
func fixtureRequest(mods ...func(request *iaas.ApiDeleteNicRequest)) iaas.ApiDeleteNicRequest {
64-
request := testClient.DeleteNic(testCtx, testProjectId, testNetworkId, testNicId)
68+
request := testClient.DeleteNic(testCtx, testProjectId, testRegion, testNetworkId, testNicId)
6569
for _, mod := range mods {
6670
mod(&request)
6771
}

‎internal/cmd/network-interface/describe/describe.go‎

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

2828
type inputModel struct {
2929
*globalflags.GlobalFlagModel
30-
NetworkId *string
30+
NetworkId string
3131
NicId string
3232
}
3333

@@ -94,7 +94,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
9494

9595
model := inputModel{
9696
GlobalFlagModel: globalFlags,
97-
NetworkId: flags.FlagToStringPointer(p, cmd, networkIdFlag),
97+
NetworkId: flags.FlagToStringValue(p, cmd, networkIdFlag),
9898
NicId: nicId,
9999
}
100100

@@ -103,7 +103,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
103103
}
104104

105105
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiGetNicRequest {
106-
req := apiClient.GetNic(ctx, model.ProjectId, *model.NetworkId, model.NicId)
106+
req := apiClient.GetNic(ctx, model.ProjectId, model.Region, model.NetworkId, model.NicId)
107107
return req
108108
}
109109

‎internal/cmd/network-interface/describe/describe_test.go‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,18 @@ import (
1010
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
1111
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1212
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
13-
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1413
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
1514
)
1615

16+
const (
17+
testRegion = "eu01"
18+
)
19+
1720
type testCtxKey struct{}
1821

1922
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
2023
var testClient = &iaas.APIClient{}
2124

22-
var projectIdFlag = globalflags.ProjectIdFlag
2325
var testProjectId = uuid.NewString()
2426
var testNetworkId = uuid.NewString()
2527
var testNicId = uuid.NewString()
@@ -36,8 +38,9 @@ func fixtureArgValues(mods ...func(argValues []string)) []string {
3638

3739
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3840
flagValues := map[string]string{
39-
projectIdFlag: testProjectId,
40-
networkIdFlag: testNetworkId,
41+
globalflags.ProjectIdFlag: testProjectId,
42+
globalflags.RegionFlag: testRegion,
43+
networkIdFlag: testNetworkId,
4144
}
4245
for _, mod := range mods {
4346
mod(flagValues)
@@ -50,8 +53,9 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5053
GlobalFlagModel: &globalflags.GlobalFlagModel{
5154
ProjectId: testProjectId,
5255
Verbosity: globalflags.VerbosityDefault,
56+
Region: testRegion,
5357
},
54-
NetworkId: utils.Ptr(testNetworkId),
58+
NetworkId: testNetworkId,
5559
NicId: testNicId,
5660
}
5761
for _, mod := range mods {
@@ -61,7 +65,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6165
}
6266

6367
func fixtureRequest(mods ...func(request *iaas.ApiGetNicRequest)) iaas.ApiGetNicRequest {
64-
request := testClient.GetNic(testCtx, testProjectId, testNetworkId, testNicId)
68+
request := testClient.GetNic(testCtx, testProjectId, testRegion, testNetworkId, testNicId)
6569
for _, mod := range mods {
6670
mod(&request)
6771
}

‎internal/cmd/network-interface/list/list.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type inputModel struct {
2929
*globalflags.GlobalFlagModel
3030
Limit *int64
3131
LabelSelector *string
32-
NetworkId *string
32+
NetworkId string
3333
}
3434

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

7979
if resp.Items == nil || len(*resp.Items) == 0 {
80-
networkLabel, err := iaasUtils.GetNetworkName(ctx, apiClient, model.ProjectId, *model.NetworkId)
80+
networkLabel, err := iaasUtils.GetNetworkName(ctx, apiClient, model.ProjectId, model.Region, model.NetworkId)
8181
if err != nil {
8282
params.Printer.Debug(print.ErrorLevel, "get network name: %v", err)
83-
networkLabel = *model.NetworkId
83+
networkLabel = model.NetworkId
8484
} else if networkLabel == "" {
85-
networkLabel = *model.NetworkId
85+
networkLabel = model.NetworkId
8686
}
8787
params.Printer.Info("No network interfaces found for network %q\n", networkLabel)
8888
return nil
@@ -128,15 +128,15 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
128128
GlobalFlagModel: globalFlags,
129129
Limit: limit,
130130
LabelSelector: flags.FlagToStringPointer(p, cmd, labelSelectorFlag),
131-
NetworkId: flags.FlagToStringPointer(p, cmd, networkIdFlag),
131+
NetworkId: flags.FlagToStringValue(p, cmd, networkIdFlag),
132132
}
133133

134134
p.DebugInputModel(model)
135135
return &model, nil
136136
}
137137

138138
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiListNicsRequest {
139-
req := apiClient.ListNics(ctx, model.ProjectId, *model.NetworkId)
139+
req := apiClient.ListNics(ctx, model.ProjectId, model.Region, model.NetworkId)
140140
if model.LabelSelector != nil {
141141
req = req.LabelSelector(*model.LabelSelector)
142142
}

‎internal/cmd/network-interface/list/list_test.go‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ import (
1616
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
1717
)
1818

19-
var projectIdFlag = globalflags.ProjectIdFlag
19+
const (
20+
testRegion = "eu01"
21+
)
2022

2123
type testCtxKey struct{}
2224

@@ -28,7 +30,9 @@ var testLabelSelector = "label"
2830

2931
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3032
flagValues := map[string]string{
31-
projectIdFlag: testProjectId,
33+
globalflags.ProjectIdFlag: testProjectId,
34+
globalflags.RegionFlag: testRegion,
35+
3236
networkIdFlag: testNetworkId,
3337
limitFlag: "10",
3438
labelSelectorFlag: testLabelSelector,
@@ -44,10 +48,11 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4448
GlobalFlagModel: &globalflags.GlobalFlagModel{
4549
Verbosity: globalflags.VerbosityDefault,
4650
ProjectId: testProjectId,
51+
Region: testRegion,
4752
},
4853
Limit: utils.Ptr(int64(10)),
4954
LabelSelector: utils.Ptr(testLabelSelector),
50-
NetworkId: utils.Ptr(testNetworkId),
55+
NetworkId: testNetworkId,
5156
}
5257
for _, mod := range mods {
5358
mod(model)
@@ -56,7 +61,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5661
}
5762

5863
func fixtureRequest(mods ...func(request *iaas.ApiListNicsRequest)) iaas.ApiListNicsRequest {
59-
request := testClient.ListNics(testCtx, testProjectId, testNetworkId)
64+
request := testClient.ListNics(testCtx, testProjectId, testRegion, testNetworkId)
6065
request = request.LabelSelector(testLabelSelector)
6166
for _, mod := range mods {
6267
mod(&request)
@@ -91,21 +96,21 @@ func TestParseInput(t *testing.T) {
9196
{
9297
description: "project id missing",
9398
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
94-
delete(flagValues, projectIdFlag)
99+
delete(flagValues, globalflags.ProjectIdFlag)
95100
}),
96101
isValid: false,
97102
},
98103
{
99104
description: "project id invalid 1",
100105
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
101-
flagValues[projectIdFlag] = ""
106+
flagValues[globalflags.RegionFlag] = ""
102107
}),
103108
isValid: false,
104109
},
105110
{
106111
description: "project id invalid 2",
107112
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
108-
flagValues[projectIdFlag] = "invalid-uuid"
113+
flagValues[globalflags.ProjectIdFlag] = "invalid-uuid"
109114
}),
110115
isValid: false,
111116
},

‎internal/cmd/network-interface/update/update.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const (
3838
type inputModel struct {
3939
*globalflags.GlobalFlagModel
4040
NicId string
41-
NetworkId *string
41+
NetworkId string
4242
AllowedAddresses *[]iaas.AllowedAddressesInner
4343
Labels *map[string]string
4444
Name *string // <= 63 characters + regex ^[A-Za-z0-9]+((-|_|\s|\.)[A-Za-z0-9]+)*$
@@ -171,7 +171,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
171171
model := inputModel{
172172
GlobalFlagModel: globalFlags,
173173
NicId: nicId,
174-
NetworkId: flags.FlagToStringPointer(p, cmd, networkIdFlag),
174+
NetworkId: flags.FlagToStringValue(p, cmd, networkIdFlag),
175175
Labels: flags.FlagToStringToStringPointer(p, cmd, labelFlag),
176176
Name: name,
177177
NicSecurity: flags.FlagToBoolPointer(p, cmd, nicSecurityFlag),
@@ -187,7 +187,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
187187
}
188188

189189
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiUpdateNicRequest {
190-
req := apiClient.UpdateNic(ctx, model.ProjectId, *model.NetworkId, model.NicId)
190+
req := apiClient.UpdateNic(ctx, model.ProjectId, model.Region, model.NetworkId, model.NicId)
191191

192192
payload := iaas.UpdateNicPayload{
193193
AllowedAddresses: model.AllowedAddresses,

0 commit comments

Comments
 (0)