Skip to content

Commit f8379c3

Browse files
tstirrat15James9074
tstirrat15
and
James9074
authored
Lint fixes part 8 (#2644)
Co-authored-by: James Thomas <[email protected]>
1 parent 9638aca commit f8379c3

File tree

9 files changed

+28
-19
lines changed

9 files changed

+28
-19
lines changed

‎internal/middleware/perfinsights/perfinsights_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func TestObserveShapeLatency(t *testing.T) {
9696
require.Equal(t, io_prometheus_client.MetricType_HISTOGRAM, metric.GetType())
9797

9898
require.Equal(t, uint64(1), metric.GetMetric()[0].Histogram.GetSampleCount())
99-
require.Equal(t, float64(0.1), metric.GetMetric()[0].Histogram.GetSampleSum())
99+
require.Equal(t, float64(0.1), metric.GetMetric()[0].Histogram.GetSampleSum()) //nolint:testifylint this value is set directly by test code
100100
require.Equal(t, "testMethod", metric.GetMetric()[0].Label[0].GetValue())
101101

102102
for _, label := range metric.GetMetric()[0].Label {

‎internal/middleware/usagemetrics/usagemetrics_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func (s *metricsMiddlewareTestSuite) TestTrailers_Stream() {
114114
if errors.Is(err, io.EOF) {
115115
break
116116
}
117-
s.NoError(err, "no error on messages sent occurred")
117+
s.Require().NoError(err, "no error on messages sent occurred")
118118
}
119119

120120
dispatchCount, err := responsemeta.GetIntResponseTrailerMetadata(

‎internal/namespace/canonicalization_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ func TestCanonicalizationComparison(t *testing.T) {
580580

581581
cacheKeys, cerr := computeCanonicalCacheKeys(vts, aliases)
582582
require.NoError(cerr)
583-
require.Equal((cacheKeys["first"] == cacheKeys["second"]), tc.expectedSame)
583+
require.Equal(tc.expectedSame, cacheKeys["first"] == cacheKeys["second"])
584584
})
585585
}
586586
}

‎internal/services/integrationtesting/cert_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ func TestCertRotation(t *testing.T) {
180180
).Complete(ctx)
181181
require.NoError(t, err)
182182

183-
wait := make(chan struct{}, 1)
183+
wait := make(chan error, 1)
184184
go func() {
185-
require.NoError(t, srv.Run(ctx))
186-
wait <- struct{}{}
185+
err := srv.Run(ctx)
186+
wait <- err
187187
}()
188188

189189
// If previous code takes more than initialValidDuration*2 to execute, the cert
@@ -279,7 +279,8 @@ func TestCertRotation(t *testing.T) {
279279
cancel()
280280
cancelDial()
281281
select {
282-
case <-wait:
282+
case err := <-wait:
283+
require.NoError(t, err)
283284
return
284285
case <-time.After(30 * time.Second):
285286
require.Fail(t, "ungraceful server termination")

‎internal/services/v1/permissions_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ func TestCheckPermissionWithDebugInfoInError(t *testing.T) {
398398
return tf.DatastoreFromSchemaAndTestRelationships(
399399
ds,
400400
`definition user {}
401-
401+
402402
definition document {
403403
relation viewer: user | document#view
404404
permission view = viewer
@@ -1106,7 +1106,7 @@ func TestCheckWithCaveatErrors(t *testing.T) {
11061106
caveat somecaveat(somemap map<any>) {
11071107
somemap.first == 42 && somemap.second < 56
11081108
}
1109-
1109+
11101110
definition document {
11111111
relation viewer: user with somecaveat
11121112
permission view = viewer
@@ -2043,7 +2043,7 @@ func TestCheckBulkPermissions(t *testing.T) {
20432043
if pair.GetItem() != nil {
20442044
parsed := tuple.MustParse(tt.requests[index])
20452045
require.NotNil(t, pair.GetItem().DebugTrace, "missing debug trace in response for item %v", pair.GetItem())
2046-
require.NotEqual(t, pair.GetItem().DebugTrace.Check, nil, "missing check trace in response for item %v", pair.GetItem())
2046+
require.NotNil(t, pair.GetItem().DebugTrace.Check, "missing check trace in response for item %v", pair.GetItem())
20472047
require.Equal(t, parsed.Resource.ObjectID, pair.GetItem().DebugTrace.Check.Resource.ObjectId, "resource in debug trace does not match")
20482048
require.NotEmpty(t, pair.GetItem().DebugTrace.Check.TraceOperationId, "trace operation ID in debug trace is empty")
20492049
require.NotEmpty(t, pair.GetItem().DebugTrace.Check.Source, "source in debug trace is empty")

‎internal/telemetry/reporter_test.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ func TestWriteTimeSeries(t *testing.T) {
5858

5959
for _, tt := range tests {
6060
t.Run(tt.name, func(t *testing.T) {
61+
var handlerWriteErr error
6162
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
6263
if tt.validateReq != nil {
6364
tt.validateReq(t, r)
6465
}
6566
w.WriteHeader(tt.statusCode)
6667
if tt.responseBody != "" {
67-
_, err := w.Write([]byte(tt.responseBody))
68-
require.NoError(t, err)
68+
_, handlerWriteErr = w.Write([]byte(tt.responseBody))
6969
}
7070
}))
7171
defer server.Close()
@@ -90,6 +90,7 @@ func TestWriteTimeSeries(t *testing.T) {
9090
} else {
9191
require.NoError(t, err)
9292
}
93+
require.NoError(t, handlerWriteErr)
9394
})
9495
}
9596
}
@@ -128,9 +129,10 @@ func TestDiscoverTimeseries(t *testing.T) {
128129
func TestDiscoverAndWriteMetrics(t *testing.T) {
129130
receivedData := make(chan []byte, 1)
130131

132+
errChan := make(chan error, 1)
131133
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
132134
body, err := io.ReadAll(r.Body)
133-
require.NoError(t, err)
135+
errChan <- err
134136
receivedData <- body
135137
w.WriteHeader(200)
136138
}))
@@ -143,13 +145,15 @@ func TestDiscoverAndWriteMetrics(t *testing.T) {
143145
})
144146
gauge.Set(100)
145147
registry.MustRegister(gauge)
146-
147148
client := &http.Client{}
148149
err := discoverAndWriteMetrics(t.Context(), registry, client, server.URL)
149150
require.NoError(t, err)
150151

151152
select {
152153
case data := <-receivedData:
154+
// Check for error from handler
155+
handlerErr := <-errChan
156+
require.NoError(t, handlerErr)
153157
require.NotEmpty(t, data)
154158

155159
// Verify the data can be decompressed

‎internal/testfixtures/datastore.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ func (tc RelationshipChecker) VerifyOrderedIteratorResults(iter datastore.Relati
342342
expectedStr := tuple.MustString(rel)
343343

344344
if index > len(expected)-1 {
345-
tc.Require.Fail("expected %s, but found no additional results", expectedStr)
345+
tc.Require.Fail("expected more results, but found no additional results", expectedStr)
346346
}
347347

348348
foundStr := tuple.MustString(expected[index])

‎internal/testserver/cluster.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,15 @@ func TestClusterWithDispatchAndCacheConfig(t testing.TB, size uint, ds datastore
220220
srv, err := server.NewConfigWithOptionsAndDefaults(serverOptions...).Complete(ctx)
221221
require.NoError(t, err)
222222

223+
errCh := make(chan error, 1)
223224
go func() {
224-
require.NoError(t, srv.Run(ctx))
225+
errCh <- srv.Run(ctx)
225226
}()
226-
cancelFuncs = append(cancelFuncs, cancel)
227+
cancelFuncs = append(cancelFuncs, func() {
228+
cancel()
229+
err := <-errCh
230+
require.NoError(t, err)
231+
})
227232

228233
dialers = append(dialers, srv.DispatchNetDialContext)
229234

‎pkg/caveats/types/ipaddress.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ func (ipa IPAddress) SerializedString() string {
3737
}
3838

3939
func (ipa IPAddress) ConvertToNative(typeDesc reflect.Type) (any, error) {
40-
switch typeDesc {
41-
case reflect.TypeOf(""):
40+
if typeDesc == reflect.TypeOf("") {
4241
return ipa.ip.String(), nil
4342
}
4443
return nil, fmt.Errorf("type conversion error from 'IPAddress' to '%v'", typeDesc)

0 commit comments

Comments
 (0)