Skip to content

Commit 4729ef7

Browse files
authored
chore: fix golangci-lint warning (#3326)
1 parent 5677ef5 commit 4729ef7

File tree

122 files changed

+224
-31
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+224
-31
lines changed

.golangci.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ linters:
8888
- usetesting # Reports uses of functions with replacement inside the testing package. [auto-fix]
8989
- wastedassign # wastedassign finds wasted assignment statements. [fast: false, auto-fix: false]
9090
- whitespace # Tool for detection of leading and trailing whitespace [fast: true, auto-fix: true]
91-
- wsl # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false]
91+
- wsl_v5 # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false]
9292
- zerologlint # Detects the wrong usage of `zerolog` that a user forgets to dispatch with `Send` or `Msg` [fast: false, auto-fix: false]
9393

9494
disable:
@@ -141,6 +141,11 @@ linters:
141141
reject:
142142
- anon
143143

144+
wsl_v5:
145+
allow-first-in-block: true
146+
allow-whole-block: false
147+
branch-max-lines: 2
148+
144149
exclusions:
145150
rules:
146151
- path: _test\.go

internal/services/account/project_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ var DestroyWaitTimeout = 3 * time.Minute
2020
func TestAccProject_Basic(t *testing.T) {
2121
tt := acctest.NewTestTools(t)
2222
defer tt.Cleanup()
23+
2324
resource.ParallelTest(t, resource.TestCase{
2425
ProviderFactories: tt.ProviderFactories,
2526
CheckDestroy: isProjectDestroyed(tt),
@@ -57,6 +58,7 @@ func TestAccProject_Basic(t *testing.T) {
5758
func TestAccProject_NoUpdate(t *testing.T) {
5859
tt := acctest.NewTestTools(t)
5960
defer tt.Cleanup()
61+
6062
resource.ParallelTest(t, resource.TestCase{
6163
ProviderFactories: tt.ProviderFactories,
6264
CheckDestroy: isProjectDestroyed(tt),

internal/services/applesilicon/server_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
func TestAccServer_Basic(t *testing.T) {
1616
tt := acctest.NewTestTools(t)
1717
defer tt.Cleanup()
18+
1819
resource.ParallelTest(t, resource.TestCase{
1920
PreCheck: func() { acctest.PreCheck(t) },
2021
ProviderFactories: tt.ProviderFactories,
@@ -67,6 +68,7 @@ func TestAccServer_Basic(t *testing.T) {
6768
func TestAccServer_EnableDisabledVPC(t *testing.T) {
6869
tt := acctest.NewTestTools(t)
6970
defer tt.Cleanup()
71+
7072
resource.ParallelTest(t, resource.TestCase{
7173
PreCheck: func() { acctest.PreCheck(t) },
7274
ProviderFactories: tt.ProviderFactories,
@@ -121,6 +123,7 @@ func TestAccServer_EnableDisabledVPC(t *testing.T) {
121123
func TestAccServer_EnableVPC(t *testing.T) {
122124
tt := acctest.NewTestTools(t)
123125
defer tt.Cleanup()
126+
124127
resource.ParallelTest(t, resource.TestCase{
125128
PreCheck: func() { acctest.PreCheck(t) },
126129
ProviderFactories: tt.ProviderFactories,
@@ -265,6 +268,7 @@ func TestAccServer_Commitment(t *testing.T) {
265268

266269
tt := acctest.NewTestTools(t)
267270
defer tt.Cleanup()
271+
268272
resource.ParallelTest(t, resource.TestCase{
269273
PreCheck: func() { acctest.PreCheck(t) },
270274
ProviderFactories: tt.ProviderFactories,

internal/services/autoscaling/instance_group_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ func testAccCheckInstanceGroupDestroy(tt *acctest.TestTools) resource.TestCheckF
154154
InstanceGroupID: id,
155155
Zone: zone,
156156
})
157-
158157
if err == nil {
159158
return fmt.Errorf("autoscaling instance group (%s) still exists", rs.Primary.ID)
160159
}

internal/services/autoscaling/instance_policy_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ func testAccCheckInstancePolicyDestroy(tt *acctest.TestTools) resource.TestCheck
170170
PolicyID: id,
171171
Zone: zone,
172172
})
173-
174173
if err == nil {
175174
return fmt.Errorf("autoscaling instance policy (%s) still exists", rs.Primary.ID)
176175
}

internal/services/autoscaling/instance_template_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ func testAccCheckInstanceTemplateDestroy(tt *acctest.TestTools) resource.TestChe
166166
TemplateID: id,
167167
Zone: zone,
168168
})
169-
170169
if err == nil {
171170
return fmt.Errorf("autoscaling instance template (%s) still exists", rs.Primary.ID)
172171
}

internal/services/az/availability_zones_data_source_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
func TestAccDataSourceAvailabilityZones_Basic(t *testing.T) {
1111
tt := acctest.NewTestTools(t)
1212
defer tt.Cleanup()
13+
1314
resource.ParallelTest(t, resource.TestCase{
1415
PreCheck: func() { acctest.PreCheck(t) },
1516
ProviderFactories: tt.ProviderFactories,

internal/services/baremetal/server.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,7 @@ func ResourceServerUpdate(ctx context.Context, d *schema.ResourceData, m any) di
606606
}
607607

608608
var serverGetOptionIDs []*baremetal.ServerOption
609+
609610
serverGetOptionIDs = append(serverGetOptionIDs, server.Options...)
610611

611612
if d.HasChange("offer") {

internal/services/block/snapshot_data_source_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
func TestAccDataSourceSnapshot_Basic(t *testing.T) {
1212
tt := acctest.NewTestTools(t)
1313
defer tt.Cleanup()
14+
1415
resource.ParallelTest(t, resource.TestCase{
1516
PreCheck: func() { acctest.PreCheck(t) },
1617
ProviderFactories: tt.ProviderFactories,

internal/services/block/testfuncs/checks.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ func IsVolumeDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
7575
VolumeID: id,
7676
Zone: zone,
7777
})
78-
7978
if err == nil {
8079
return fmt.Errorf("block volume (%s) still exists", rs.Primary.ID)
8180
}
@@ -105,7 +104,6 @@ func IsSnapshotDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
105104
SnapshotID: id,
106105
Zone: zone,
107106
})
108-
109107
if err == nil {
110108
return fmt.Errorf("block snapshot (%s) still exists", rs.Primary.ID)
111109
}

0 commit comments

Comments
 (0)