Skip to content

Commit 17d851b

Browse files
ctrombleyctrombley
committed
chore: appease linter
1 parent 562985e commit 17d851b

8 files changed

+68
-55
lines changed

‎helper_test.go‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1899,15 +1899,17 @@ func createPlanExport(t *testing.T, client *Client, r *Run) (*PlanExport, func()
18991899
t.Fatal(err)
19001900
}
19011901

1902-
if pe.Status == PlanExportFinished || pe.Status == PlanExportQueued {
1902+
switch pe.Status {
1903+
case PlanExportFinished, PlanExportQueued:
19031904
return pe, func() {
19041905
if rCleanup != nil {
19051906
rCleanup()
19061907
}
19071908
}
1908-
} else if pe.Status == PlanExportErrored {
1909+
case PlanExportErrored:
19091910
t.Fatal("Plan export failed")
1910-
} else {
1911+
1912+
default:
19111913
t.Logf("Waiting for plan export finished or queued but was %s", pe.Status)
19121914
}
19131915
}
@@ -3115,20 +3117,26 @@ func retryTimesIf[T any](maxRetries, secondsBetween int, f retryableFn, c func(T
31153117

31163118
defer tick.Stop()
31173119

3118-
for { //nolint
3119-
select {
3120-
case <-tick.C:
3121-
res, err := f()
3122-
if err == nil && !c(res.(T)) {
3123-
return res.(T), nil
3124-
}
3120+
var zero T
3121+
for {
3122+
<-tick.C
31253123

3126-
if retries >= maxRetries {
3127-
return res.(T), err
3128-
}
3124+
res, err := f()
31293125

3130-
retries += 1
3126+
obj, ok := res.(T)
3127+
if !ok {
3128+
return zero, fmt.Errorf("type assertion failed in retryTimesIf")
3129+
}
3130+
3131+
if err == nil && !c(obj) {
3132+
return obj, nil
31313133
}
3134+
3135+
if retries >= maxRetries {
3136+
return zero, err
3137+
}
3138+
3139+
retries += 1
31323140
}
31333141
}
31343142

‎logreader_integration_test.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ func TestLogReader_withMarkersSingle(t *testing.T) {
5454
logReads := 0
5555
ts, lr := testLogReader(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
5656
logReads++
57-
switch {
58-
case logReads == 2:
57+
switch logReads {
58+
case 2:
5959
checkedWrite(t, w, []byte("\x02Terraform run started - logs - Terraform run finished\x03"))
6060
}
6161
}))
@@ -93,10 +93,10 @@ func TestLogReader_withMarkersDouble(t *testing.T) {
9393
logReads := 0
9494
ts, lr := testLogReader(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
9595
logReads++
96-
switch {
97-
case logReads == 2:
96+
switch logReads {
97+
case 2:
9898
checkedWrite(t, w, []byte("\x02Terraform run started"))
99-
case logReads == 3:
99+
case 3:
100100
checkedWrite(t, w, []byte(" - logs - Terraform run finished\x03"))
101101
}
102102
}))
@@ -134,16 +134,16 @@ func TestLogReader_withMarkersMulti(t *testing.T) {
134134
logReads := 0
135135
ts, lr := testLogReader(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
136136
logReads++
137-
switch {
138-
case logReads == 2:
137+
switch logReads {
138+
case 2:
139139
checkedWrite(t, w, []byte("\x02"))
140-
case logReads == 3:
140+
case 3:
141141
checkedWrite(t, w, []byte("Terraform run started"))
142-
case logReads == 16:
142+
case 16:
143143
checkedWrite(t, w, []byte(" - logs - "))
144-
case logReads == 30:
144+
case 30:
145145
checkedWrite(t, w, []byte("Terraform run finished"))
146-
case logReads == 31:
146+
case 31:
147147
checkedWrite(t, w, []byte("\x03"))
148148
}
149149
}))
@@ -181,12 +181,12 @@ func TestLogReader_withoutMarkers(t *testing.T) {
181181
logReads := 0
182182
ts, lr := testLogReader(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
183183
logReads++
184-
switch {
185-
case logReads == 2:
184+
switch logReads {
185+
case 2:
186186
checkedWrite(t, w, []byte("Terraform run started"))
187-
case logReads == 16:
187+
case 16:
188188
checkedWrite(t, w, []byte(" - logs - "))
189-
case logReads == 31:
189+
case 31:
190190
checkedWrite(t, w, []byte("Terraform run finished"))
191191
}
192192
}))
@@ -224,14 +224,14 @@ func TestLogReader_withoutEndOfTextMarker(t *testing.T) {
224224
logReads := 0
225225
ts, lr := testLogReader(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
226226
logReads++
227-
switch {
228-
case logReads == 2:
227+
switch logReads {
228+
case 2:
229229
checkedWrite(t, w, []byte("\x02"))
230-
case logReads == 3:
230+
case 3:
231231
checkedWrite(t, w, []byte("Terraform run started"))
232-
case logReads == 16:
232+
case 16:
233233
checkedWrite(t, w, []byte(" - logs - "))
234-
case logReads == 31:
234+
case 31:
235235
checkedWrite(t, w, []byte("Terraform run finished"))
236236
}
237237
}))

‎projects_integration_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -499,11 +499,12 @@ func TestProjectsUpdate(t *testing.T) {
499499

500500
assert.Len(t, wsEffectiveBindings, 2)
501501
for _, b := range wsEffectiveBindings {
502-
if b.Key == "foo" {
502+
switch b.Key {
503+
case "foo":
503504
assert.Equal(t, "bar", b.Value)
504-
} else if b.Key == "baz" {
505+
case "baz":
505506
assert.Equal(t, "qux", b.Value)
506-
} else {
507+
default:
507508
assert.Fail(t, "unexpected tag binding %q", b.Key)
508509
}
509510
}

‎registry_provider_platform.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ func (r *registryProviderPlatforms) List(ctx context.Context, versionID Registry
126126
// GET /organizations/:organization_name/registry-providers/:registry_name/:namespace/:name/versions/:version/platforms
127127
u := fmt.Sprintf(
128128
"organizations/%s/registry-providers/%s/%s/%s/versions/%s/platforms",
129-
url.PathEscape(versionID.RegistryProviderID.OrganizationName),
130-
url.PathEscape(string(versionID.RegistryProviderID.RegistryName)),
131-
url.PathEscape(versionID.RegistryProviderID.Namespace),
132-
url.PathEscape(versionID.RegistryProviderID.Name),
129+
url.PathEscape(versionID.OrganizationName),
130+
url.PathEscape(string(versionID.RegistryName)),
131+
url.PathEscape(versionID.Namespace),
132+
url.PathEscape(versionID.Name),
133133
url.PathEscape(versionID.Version),
134134
)
135135
req, err := r.client.NewRequest("GET", u, options)
@@ -155,11 +155,11 @@ func (r *registryProviderPlatforms) Read(ctx context.Context, platformID Registr
155155
// GET /organizations/:organization_name/registry-providers/:registry_name/:namespace/:name/versions/:version/platforms/:os/:arch
156156
u := fmt.Sprintf(
157157
"organizations/%s/registry-providers/%s/%s/%s/versions/%s/platforms/%s/%s",
158-
url.PathEscape(platformID.RegistryProviderID.OrganizationName),
159-
url.PathEscape(string(platformID.RegistryProviderID.RegistryName)),
160-
url.PathEscape(platformID.RegistryProviderID.Namespace),
161-
url.PathEscape(platformID.RegistryProviderID.Name),
162-
url.PathEscape(platformID.RegistryProviderVersionID.Version),
158+
url.PathEscape(platformID.OrganizationName),
159+
url.PathEscape(string(platformID.RegistryName)),
160+
url.PathEscape(platformID.Namespace),
161+
url.PathEscape(platformID.Name),
162+
url.PathEscape(platformID.Version),
163163
url.PathEscape(platformID.OS),
164164
url.PathEscape(platformID.Arch),
165165
)

‎run_integration_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,11 +344,12 @@ func TestRunsCreate_RunDependent(t *testing.T) {
344344
assert.Equal(t, len(vars), len(r.Variables))
345345

346346
for _, v := range r.Variables {
347-
if v.Key == "test_foo" {
347+
switch v.Key {
348+
case "test_foo":
348349
assert.Equal(t, v.Value, "Hello, Foo!")
349-
} else if v.Key == "test_variable" {
350+
case "test_variable":
350351
assert.Equal(t, v.Value, "Hello, World!")
351-
} else {
352+
default:
352353
t.Fatalf("Unexpected variable key: %s", v.Key)
353354
}
354355
}

‎stack_integration_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ func TestStackCreateAndList(t *testing.T) {
125125
require.NoError(t, err)
126126

127127
assert.Len(t, stackList.Items, 1)
128-
assert.Equal(t, 2, stackList.Pagination.TotalPages)
129-
assert.Equal(t, 2, stackList.Pagination.TotalCount)
128+
assert.Equal(t, 2, stackList.TotalPages)
129+
assert.Equal(t, 2, stackList.TotalCount)
130130
})
131131
}
132132

‎tfe_integration_test.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,34 +361,36 @@ func TestClient_requestBodySerialization(t *testing.T) {
361361
}
362362
})
363363

364+
expectedErr := "go-tfe bug: DELETE/PATCH/POST body must be nil, ptr, or ptr slice"
365+
364366
t.Run("non-pointer request", func(t *testing.T) {
365367
body := InvalidBody{}
366368
_, err := createRequest(body)
367-
if err == nil || err.Error() != "go-tfe bug: DELETE/PATCH/POST body must be nil, ptr, or ptr slice" {
369+
if err == nil || err.Error() != expectedErr {
368370
t.Fatalf("unexpected error: %v", err)
369371
}
370372
})
371373

372374
t.Run("slice of non-pointer request", func(t *testing.T) {
373375
body := []InvalidBody{{}}
374376
_, err := createRequest(body)
375-
if err == nil || err.Error() != "go-tfe bug: DELETE/PATCH/POST body must be nil, ptr, or ptr slice" {
377+
if err == nil || err.Error() != expectedErr {
376378
t.Fatalf("unexpected error: %v", err)
377379
}
378380
})
379381

380382
t.Run("map request", func(t *testing.T) {
381383
body := make(map[string]string)
382384
_, err := createRequest(body)
383-
if err == nil || err.Error() != "go-tfe bug: DELETE/PATCH/POST body must be nil, ptr, or ptr slice" {
385+
if err == nil || err.Error() != expectedErr {
384386
t.Fatalf("unexpected error: %v", err)
385387
}
386388
})
387389

388390
t.Run("string request", func(t *testing.T) {
389391
body := "foo"
390392
_, err := createRequest(body)
391-
if err == nil || err.Error() != "go-tfe bug: DELETE/PATCH/POST body must be nil, ptr, or ptr slice" {
393+
if err == nil || err.Error() != expectedErr {
392394
t.Fatalf("unexpected error: %v", err)
393395
}
394396
})

‎workspace_resources_integration_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313

1414
func TestWorkspaceResourcesList(t *testing.T) {
1515
t.Parallel()
16+
1617
client := testClient(t)
1718
ctx := context.Background()
1819

0 commit comments

Comments
 (0)