Skip to content

Commit a236ac9

Browse files
committed
chore(logme): make syslog desired type in model
1 parent d7521e3 commit a236ac9

4 files changed

Lines changed: 10 additions & 14 deletions

File tree

internal/cmd/logme/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

@@ -177,7 +177,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
177177
MetricsFrequency: flags.FlagToInt32Pointer(p, cmd, metricsFrequencyFlag),
178178
MetricsPrefix: flags.FlagToStringPointer(p, cmd, metricsPrefixFlag),
179179
SgwAcl: flags.FlagToStringSlicePointer(p, cmd, sgwAclFlag),
180-
Syslog: flags.FlagToStringSlicePointer(p, cmd, syslogFlag),
180+
Syslog: flags.FlagToStringSliceValue(p, cmd, syslogFlag),
181181
PlanId: planId,
182182
PlanName: planName,
183183
Version: version,
@@ -229,7 +229,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient logme.Defaul
229229
MetricsFrequency: model.MetricsFrequency,
230230
MetricsPrefix: model.MetricsPrefix,
231231
SgwAcl: sgwAcl,
232-
Syslog: utils.GetSliceFromPointer(model.Syslog),
232+
Syslog: model.Syslog,
233233
},
234234
PlanId: utils.PtrValue(planId),
235235
})

internal/cmd/logme/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: &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: &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/logme/instance/update/update.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ type inputModel struct {
5252
MetricsPrefix *string
5353
MonitoringInstanceId *string
5454
SgwAcl *[]string
55-
Syslog *[]string
55+
Syslog []string
5656
PlanId *string
5757
InstanceName *string
5858
}
@@ -162,7 +162,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
162162
metricsFrequency := flags.FlagToInt32Pointer(p, cmd, metricsFrequencyFlag)
163163
metricsPrefix := flags.FlagToStringPointer(p, cmd, metricsPrefixFlag)
164164
sgwAcl := flags.FlagToStringSlicePointer(p, cmd, sgwAclFlag)
165-
syslog := flags.FlagToStringSlicePointer(p, cmd, syslogFlag)
165+
syslog := flags.FlagToStringSliceValue(p, cmd, syslogFlag)
166166
planId := flags.FlagToStringPointer(p, cmd, planIdFlag)
167167
planName := flags.FlagToStringValue(p, cmd, planNameFlag)
168168
version := flags.FlagToStringValue(p, cmd, versionFlag)
@@ -246,7 +246,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient logme.Defaul
246246
MetricsFrequency: model.MetricsFrequency,
247247
MetricsPrefix: model.MetricsPrefix,
248248
SgwAcl: sgwAcl,
249-
Syslog: utils.GetSliceFromPointer(model.Syslog),
249+
Syslog: model.Syslog,
250250
},
251251
PlanId: planId,
252252
})

internal/cmd/logme/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: &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: &testPlanId,
9191
}
9292
for _, mod := range mods {
@@ -257,9 +257,7 @@ func TestParseInput(t *testing.T) {
257257
syslogValues: []string{"example-syslog-1", "example-syslog-2"},
258258
isValid: true,
259259
expectedModel: fixtureInputModel(func(model *inputModel) {
260-
model.Syslog = utils.Ptr(
261-
append(*model.Syslog, "example-syslog-1", "example-syslog-2"),
262-
)
260+
model.Syslog = append(model.Syslog, "example-syslog-1", "example-syslog-2")
263261
}),
264262
},
265263
}

0 commit comments

Comments
 (0)