Skip to content

Commit b146f03

Browse files
author
Syeda Haya Fatima
committed
Fix: model experiment list retrieval and response parsing, STACKITMLO-1718
1 parent 45d8640 commit b146f03

15 files changed

Lines changed: 27 additions & 52 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
123123
}
124124

125125
func buildCreateInstanceRequest(ctx context.Context, model *inputModel, apiClient *modelexperiments.APIClient) modelexperiments.ApiCreateInstanceRequest {
126-
req := apiClient.DefaultAPI.CreateInstance(ctx, model.ProjectId, model.GlobalFlagModel.Region)
126+
req := apiClient.DefaultAPI.CreateInstance(ctx, model.ProjectId, model.Region)
127127

128128
payload := modelexperiments.CreateInstancePayload{
129129
Name: model.Name,

‎internal/cmd/modelexperiments/instance/delete/delete.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,9 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
7272
},
7373
}
7474

75-
configureFlags(cmd)
76-
7775
return cmd
7876
}
7977

80-
func configureFlags(cmd *cobra.Command) {
81-
}
82-
8378
func parseInput(
8479
p *print.Printer,
8580
cmd *cobra.Command,
@@ -109,7 +104,7 @@ func buildDeleteInstanceRequest(
109104
return apiClient.DefaultAPI.DeleteInstance(
110105
ctx,
111106
model.ProjectId,
112-
model.GlobalFlagModel.Region,
107+
model.Region,
113108
model.InstanceId,
114109
)
115110
}

‎internal/cmd/modelexperiments/instance/get/get.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,9 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
6464
},
6565
}
6666

67-
configureFlags(cmd)
68-
6967
return cmd
7068
}
7169

72-
func configureFlags(cmd *cobra.Command) {
73-
}
74-
7570
func parseInput(
7671
p *print.Printer,
7772
cmd *cobra.Command,
@@ -101,7 +96,7 @@ func buildGetInstanceRequest(
10196
return apiClient.DefaultAPI.GetInstance(
10297
ctx,
10398
model.ProjectId,
104-
model.GlobalFlagModel.Region,
99+
model.Region,
105100
model.InstanceId,
106101
)
107102
}

‎internal/cmd/modelexperiments/instance/list/list.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,9 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
5858
},
5959
}
6060

61-
configureFlags(cmd)
62-
6361
return cmd
6462
}
6563

66-
func configureFlags(cmd *cobra.Command) {
67-
}
68-
6964
func parseInput(
7065
p *print.Printer,
7166
cmd *cobra.Command,
@@ -94,7 +89,7 @@ func buildListInstancesRequest(
9489
return apiClient.DefaultAPI.ListInstances(
9590
ctx,
9691
model.ProjectId,
97-
model.GlobalFlagModel.Region,
92+
model.Region,
9893
)
9994
}
10095

‎internal/cmd/modelexperiments/instance/patch/patch.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ func buildPatchInstanceRequest(
159159
req := apiClient.DefaultAPI.PartialUpdateInstance(
160160
ctx,
161161
model.ProjectId,
162-
model.GlobalFlagModel.Region,
162+
model.Region,
163163
model.InstanceId,
164164
)
165165

‎internal/cmd/modelexperiments/token/create/create.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020

2121
const (
2222
instanceIDFlag = "instance-id"
23-
regionFlag = "region"
2423
nameFlag = "name"
2524
descriptionFlag = "description"
2625
labelFlag = "label"
@@ -30,7 +29,6 @@ const (
3029
type inputModel struct {
3130
*globalflags.GlobalFlagModel
3231
InstanceID string
33-
Region string
3432
Name string
3533
Description *string
3634
Labels *map[string]string
@@ -63,7 +61,7 @@ func configureFlags(cmd *cobra.Command) {
6361
cmd.Flags().String(descriptionFlag, "", "Token description")
6462
cmd.Flags().StringToString(labelFlag, nil, `Labels as key-value pairs, e.g. "--label env=prod"`)
6563
cmd.Flags().String(ttlDurationFlag, "", "Token time to live duration")
66-
_ = flags.MarkFlagsRequired(cmd, instanceIDFlag, regionFlag, nameFlag)
64+
_ = flags.MarkFlagsRequired(cmd, instanceIDFlag, nameFlag)
6765
}
6866

6967
func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) {
@@ -79,7 +77,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
7977
if len(labels) > 0 {
8078
labelsPtr = &labels
8179
}
82-
model := &inputModel{GlobalFlagModel: globalFlags, InstanceID: flags.FlagToStringValue(p, cmd, instanceIDFlag), Region: flags.FlagToStringValue(p, cmd, regionFlag), Name: flags.FlagToStringValue(p, cmd, nameFlag), Description: flags.FlagToStringPointer(p, cmd, descriptionFlag), Labels: labelsPtr, TTLDuration: flags.FlagToStringPointer(p, cmd, ttlDurationFlag)}
80+
model := &inputModel{GlobalFlagModel: globalFlags, InstanceID: flags.FlagToStringValue(p, cmd, instanceIDFlag), Name: flags.FlagToStringValue(p, cmd, nameFlag), Description: flags.FlagToStringPointer(p, cmd, descriptionFlag), Labels: labelsPtr, TTLDuration: flags.FlagToStringPointer(p, cmd, ttlDurationFlag)}
8381
if model.Name == "" {
8482
return nil, fmt.Errorf("%s flag is required", nameFlag)
8583
}
@@ -89,7 +87,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
8987

9088
func buildRequest(ctx context.Context, model *inputModel, apiClient *modelexperiments.APIClient) modelexperiments.ApiCreateInstanceTokenRequest {
9189
payload := modelexperiments.CreateInstanceTokenPayload{Name: model.Name, Description: model.Description, Labels: model.Labels, TtlDuration: model.TTLDuration}
92-
return apiClient.DefaultAPI.CreateInstanceToken(ctx, model.ProjectId, model.Region, model.InstanceID).CreateInstanceTokenPayload(payload)
90+
return apiClient.DefaultAPI.CreateInstanceToken(ctx, model.ProjectId, model.GlobalFlagModel.Region, model.InstanceID).CreateInstanceTokenPayload(payload)
9391
}
9492

9593
func outputResult(p *print.Printer, outputFormat string, resp *modelexperiments.CreateInstanceTokenResponse) error {

‎internal/cmd/modelexperiments/token/create/create_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ var testProjectID = uuid.NewString()
2626
var testInstanceID = uuid.NewString()
2727

2828
func fixtureFlagValues(mods ...func(map[string]string)) map[string]string {
29-
values := map[string]string{projectIDFlag: testProjectID, instanceIDFlag: testInstanceID, regionFlag: "eu01", nameFlag: "example"}
29+
values := map[string]string{projectIDFlag: testProjectID, instanceIDFlag: testInstanceID, globalflags.RegionFlag: "eu01", nameFlag: "example"}
3030
for _, mod := range mods {
3131
mod(values)
3232
}
3333
return values
3434
}
3535

3636
func fixtureInputModel(mods ...func(*inputModel)) *inputModel {
37-
model := &inputModel{GlobalFlagModel: &globalflags.GlobalFlagModel{ProjectId: testProjectID, Region: "eu01", Verbosity: globalflags.VerbosityDefault}, InstanceID: testInstanceID, Region: "eu01", Name: "example"}
37+
model := &inputModel{GlobalFlagModel: &globalflags.GlobalFlagModel{ProjectId: testProjectID, Region: "eu01", Verbosity: globalflags.VerbosityDefault}, InstanceID: testInstanceID, Name: "example"}
3838
for _, mod := range mods {
3939
mod(model)
4040
}

‎internal/cmd/modelexperiments/token/delete/delete.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@ import (
2222
const (
2323
tokenIDArg = "TOKEN_ID"
2424
instanceIDFlag = "instance-id"
25-
regionFlag = "region"
2625
)
2726

2827
type inputModel struct {
2928
*globalflags.GlobalFlagModel
3029
TokenID string
3130
InstanceID string
32-
Region string
3331
}
3432

3533
func NewCmd(params *types.CmdParams) *cobra.Command {
@@ -64,15 +62,15 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
6462

6563
func configureFlags(cmd *cobra.Command) {
6664
cmd.Flags().Var(flags.UUIDFlag(), instanceIDFlag, "ID of the instance")
67-
_ = flags.MarkFlagsRequired(cmd, instanceIDFlag, regionFlag)
65+
_ = flags.MarkFlagsRequired(cmd, instanceIDFlag)
6866
}
6967

7068
func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
7169
globalFlags := globalflags.Parse(p, cmd)
7270
if globalFlags.ProjectId == "" {
7371
return nil, &cliErr.ProjectIdError{}
7472
}
75-
model := &inputModel{GlobalFlagModel: globalFlags, TokenID: inputArgs[0], InstanceID: flags.FlagToStringValue(p, cmd, instanceIDFlag), Region: flags.FlagToStringValue(p, cmd, regionFlag)}
73+
model := &inputModel{GlobalFlagModel: globalFlags, TokenID: inputArgs[0], InstanceID: flags.FlagToStringValue(p, cmd, instanceIDFlag)}
7674
p.DebugInputModel(model)
7775
return model, nil
7876
}

‎internal/cmd/modelexperiments/token/delete/delete_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ var testInstanceID = uuid.NewString()
2525
var testTokenID = uuid.NewString()
2626

2727
func fixtureFlagValues(mods ...func(map[string]string)) map[string]string {
28-
values := map[string]string{projectIDFlag: testProjectID, instanceIDFlag: testInstanceID, regionFlag: "eu01"}
28+
values := map[string]string{projectIDFlag: testProjectID, instanceIDFlag: testInstanceID, globalflags.RegionFlag: "eu01"}
2929
for _, mod := range mods {
3030
mod(values)
3131
}
3232
return values
3333
}
3434
func fixtureInputModel() *inputModel {
35-
return &inputModel{GlobalFlagModel: &globalflags.GlobalFlagModel{ProjectId: testProjectID, Region: "eu01", Verbosity: globalflags.VerbosityDefault}, TokenID: testTokenID, InstanceID: testInstanceID, Region: "eu01"}
35+
return &inputModel{GlobalFlagModel: &globalflags.GlobalFlagModel{ProjectId: testProjectID, Region: "eu01", Verbosity: globalflags.VerbosityDefault}, TokenID: testTokenID, InstanceID: testInstanceID}
3636
}
3737
func fixtureRequest() modelexperiments.ApiDeleteInstanceTokenRequest {
3838
return testClient.DefaultAPI.DeleteInstanceToken(testContext, testProjectID, "eu01", testTokenID, testInstanceID)

‎internal/cmd/modelexperiments/token/get/get.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@ import (
2222
const (
2323
tokenIDArg = "TOKEN_ID"
2424
instanceIDFlag = "instance-id"
25-
regionFlag = "region"
2625
)
2726

2827
type inputModel struct {
2928
*globalflags.GlobalFlagModel
3029
TokenID string
3130
InstanceID string
32-
Region string
3331
}
3432

3533
func NewCmd(params *types.CmdParams) *cobra.Command {
@@ -61,15 +59,15 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
6159

6260
func configureFlags(cmd *cobra.Command) {
6361
cmd.Flags().Var(flags.UUIDFlag(), instanceIDFlag, "ID of the instance")
64-
_ = flags.MarkFlagsRequired(cmd, instanceIDFlag, regionFlag)
62+
_ = flags.MarkFlagsRequired(cmd, instanceIDFlag)
6563
}
6664

6765
func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
6866
globalFlags := globalflags.Parse(p, cmd)
6967
if globalFlags.ProjectId == "" {
7068
return nil, &cliErr.ProjectIdError{}
7169
}
72-
model := &inputModel{GlobalFlagModel: globalFlags, TokenID: inputArgs[0], InstanceID: flags.FlagToStringValue(p, cmd, instanceIDFlag), Region: flags.FlagToStringValue(p, cmd, regionFlag)}
70+
model := &inputModel{GlobalFlagModel: globalFlags, TokenID: inputArgs[0], InstanceID: flags.FlagToStringValue(p, cmd, instanceIDFlag)}
7371
p.DebugInputModel(model)
7472
return model, nil
7573
}

0 commit comments

Comments
 (0)