Skip to content

Commit d619d0b

Browse files
j1n-o9rFyusel
authored andcommitted
chore(mariadb): make syslog desired type in model (like in logme)
1 parent 2982b4f commit d619d0b

4 files changed

Lines changed: 10 additions & 14 deletions

File tree

internal/cmd/mariadb/instance/create/create.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ type inputModel struct {
5151
MetricsPrefix *string
5252
MonitoringInstanceId *string
5353
SgwAcl *[]string
54-
Syslog *[]string
54+
Syslog []string
5555
PlanId *string
5656
}
5757

@@ -176,7 +176,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
176176
MetricsFrequency: flags.FlagToInt32Pointer(p, cmd, metricsFrequencyFlag),
177177
MetricsPrefix: flags.FlagToStringPointer(p, cmd, metricsPrefixFlag),
178178
SgwAcl: flags.FlagToStringSlicePointer(p, cmd, sgwAclFlag),
179-
Syslog: flags.FlagToStringSlicePointer(p, cmd, syslogFlag),
179+
Syslog: flags.FlagToStringSliceValue(p, cmd, syslogFlag),
180180
PlanId: planId,
181181
PlanName: planName,
182182
Version: version,
@@ -227,7 +227,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient mariadb.Defa
227227
MetricsFrequency: model.MetricsFrequency,
228228
MetricsPrefix: model.MetricsPrefix,
229229
SgwAcl: sgwAcl,
230-
Syslog: utils.GetSliceFromPointer(model.Syslog),
230+
Syslog: model.Syslog,
231231
},
232232
PlanId: utils.PtrString(planId),
233233
})

internal/cmd/mariadb/instance/create/create_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
7575
MetricsPrefix: utils.Ptr("example-prefix"),
7676
MonitoringInstanceId: utils.Ptr(testMonitoringInstanceId),
7777
SgwAcl: utils.Ptr([]string{"198.51.100.14/24"}),
78-
Syslog: utils.Ptr([]string{"example-syslog"}),
78+
Syslog: []string{"example-syslog"},
7979
PlanId: utils.Ptr(testPlanId),
8080
}
8181
for _, mod := range mods {
@@ -254,9 +254,7 @@ func TestParseInput(t *testing.T) {
254254
syslogValues: []string{"example-syslog-1", "example-syslog-2"},
255255
isValid: true,
256256
expectedModel: fixtureInputModel(func(model *inputModel) {
257-
model.Syslog = utils.Ptr(
258-
append(*model.Syslog, "example-syslog-1", "example-syslog-2"),
259-
)
257+
model.Syslog = append(model.Syslog, "example-syslog-1", "example-syslog-2")
260258
}),
261259
},
262260
}

internal/cmd/mariadb/instance/update/update.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ type inputModel struct {
5151
MetricsPrefix *string
5252
MonitoringInstanceId *string
5353
SgwAcl *[]string
54-
Syslog *[]string
54+
Syslog []string
5555
PlanId *string
5656
}
5757

@@ -159,7 +159,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
159159
metricsFrequency := flags.FlagToInt32Pointer(p, cmd, metricsFrequencyFlag)
160160
metricsPrefix := flags.FlagToStringPointer(p, cmd, metricsPrefixFlag)
161161
sgwAcl := flags.FlagToStringSlicePointer(p, cmd, sgwAclFlag)
162-
syslog := flags.FlagToStringSlicePointer(p, cmd, syslogFlag)
162+
syslog := flags.FlagToStringSliceValue(p, cmd, syslogFlag)
163163
planId := flags.FlagToStringPointer(p, cmd, planIdFlag)
164164
planName := flags.FlagToStringValue(p, cmd, planNameFlag)
165165
version := flags.FlagToStringValue(p, cmd, versionFlag)
@@ -241,7 +241,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient mariadb.Defa
241241
MetricsFrequency: model.MetricsFrequency,
242242
MetricsPrefix: model.MetricsPrefix,
243243
SgwAcl: sgwAcl,
244-
Syslog: utils.GetSliceFromPointer(model.Syslog),
244+
Syslog: model.Syslog,
245245
},
246246
PlanId: planId,
247247
})

internal/cmd/mariadb/instance/update/update_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
8686
MetricsPrefix: utils.Ptr("example-prefix"),
8787
MonitoringInstanceId: utils.Ptr(testMonitoringInstanceId),
8888
SgwAcl: utils.Ptr([]string{"198.51.100.14/24"}),
89-
Syslog: utils.Ptr([]string{"example-syslog"}),
89+
Syslog: []string{"example-syslog"},
9090
PlanId: utils.Ptr(testPlanId),
9191
}
9292
for _, mod := range mods {
@@ -268,9 +268,7 @@ func TestParseInput(t *testing.T) {
268268
syslogValues: []string{"example-syslog-1", "example-syslog-2"},
269269
isValid: true,
270270
expectedModel: fixtureInputModel(func(model *inputModel) {
271-
model.Syslog = utils.Ptr(
272-
append(*model.Syslog, "example-syslog-1", "example-syslog-2"),
273-
)
271+
model.Syslog = append(model.Syslog, "example-syslog-1", "example-syslog-2")
274272
}),
275273
},
276274
}

0 commit comments

Comments
 (0)