Skip to content

Commit 4662c64

Browse files
authored
fix(instance): ignore bootscript deprecated lint error (#2764)
1 parent 700899b commit 4662c64

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

internal/namespaces/instance/v1/custom_server_create.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ type instanceCreateServerRequest struct {
3232
Stopped bool
3333
SecurityGroupID string
3434
PlacementGroupID string
35-
BootscriptID string
36-
CloudInit string
37-
BootType string
35+
// Deprecated
36+
BootscriptID string
37+
CloudInit string
38+
BootType string
3839

3940
// Deprecated, use project-id instead
4041
OrganizationID *string
@@ -340,6 +341,7 @@ func instanceServerCreateRun(ctx context.Context, argsI interface{}) (i interfac
340341
if !validation.IsUUID(args.BootscriptID) {
341342
return nil, fmt.Errorf("bootscript ID %s is not a valid UUID", args.BootscriptID)
342343
}
344+
//nolint: staticcheck // Bootscript is deprecated
343345
_, err := apiInstance.GetBootscript(&instance.GetBootscriptRequest{
344346
Zone: args.Zone,
345347
BootscriptID: args.BootscriptID,
@@ -348,6 +350,7 @@ func instanceServerCreateRun(ctx context.Context, argsI interface{}) (i interfac
348350
return nil, fmt.Errorf("bootscript ID %s does not exist", args.BootscriptID)
349351
}
350352

353+
//nolint: staticcheck // Bootscript is deprecated
351354
serverReq.Bootscript = scw.StringPtr(args.BootscriptID)
352355
bootType := instance.BootTypeBootscript
353356
serverReq.BootType = &bootType

internal/namespaces/instance/v1/custom_server_create_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ func Test_CreateServer(t *testing.T) {
7474
Cmd: "scw instance server create image=ubuntu_bionic bootscript-id=eb760e3c-30d8-49a3-b3ad-ad10c3aa440b stopped=true",
7575
Check: core.TestCheckCombine(
7676
func(t *testing.T, ctx *core.CheckFuncCtx) {
77+
//nolint: staticcheck // Bootscript is deprecated
7778
assert.Equal(t, "eb760e3c-30d8-49a3-b3ad-ad10c3aa440b", ctx.Result.(*instance.Server).Bootscript.ID)
7879
assert.Equal(t, instance.BootTypeBootscript, ctx.Result.(*instance.Server).BootType)
7980
},

0 commit comments

Comments
 (0)