fix: make staticheck happy

supabase · Feb 6, 2025 · 9b3a1d1 · 9b3a1d1
1 parent 911954c
commit 9b3a1d1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/internal/conf/configuration_test.go b/internal/conf/configuration_test.go
@@ -874,15 +874,15 @@ func TestMethods(t *testing.T) {
 		}
 
 		got := val.AllAllowedHeaders(nil)
-		sort.Sort(sort.StringSlice(got))
+		sort.Strings(got)
 		require.Equal(t, []string{"X-Test1"}, got)
 
 		got = val.AllAllowedHeaders([]string{"X-Test2"})
-		sort.Sort(sort.StringSlice(got))
+		sort.Strings(got)
 		require.Equal(t, []string{"X-Test1", "X-Test2"}, got)
 
 		val.AllowedHeaders = nil
-		sort.Sort(sort.StringSlice(got))
+		sort.Strings(got)
 		got = val.AllAllowedHeaders([]string{"X-Test2"})
 		require.Equal(t, []string{"X-Test2"}, got)
 

diff --git a/internal/conf/jwk_test.go b/internal/conf/jwk_test.go
@@ -396,12 +396,6 @@ func TestJWTConfiguration(t *testing.T) {
 	}
 }
 
-func helpToJSON(t *testing.T, v any) string {
-	b, err := json.Marshal(v)
-	require.NoError(t, err)
-	return string(b)
-}
-
 func helpToMap(t *testing.T, str string) map[string]map[string]interface{} {
 	out := make(map[string]map[string]interface{})
 
@@ -420,6 +414,7 @@ func helpToMockKey(t *testing.T, mockErr error) *mockKey {
 	require.NoError(t, err)
 
 	privJwk, err := jwk.ParseKey(jwt)
+	require.NoError(t, err)
 	return &mockKey{Key: privJwk, err: mockErr}
 }
 

diff --git a/internal/conf/saml_test.go b/internal/conf/saml_test.go
@@ -44,7 +44,7 @@ func TestSAMLConfiguration(t *testing.T) {
 		err := c.PopulateFields("https://projectref.supabase.co")
 		require.NoError(t, err)
 
-		isSet := 0 != (c.Certificate.KeyUsage & x509.KeyUsageDataEncipherment)
+		isSet := (c.Certificate.KeyUsage & x509.KeyUsageDataEncipherment) != 0
 		require.False(t, isSet)
 		require.NotNil(t, c.RSAPrivateKey)
 		require.NotNil(t, c.RSAPublicKey)
@@ -60,7 +60,7 @@ func TestSAMLConfiguration(t *testing.T) {
 		err := c.PopulateFields("https://projectref.supabase.co")
 		require.NoError(t, err)
 
-		isSet := 0 != (c.Certificate.KeyUsage & x509.KeyUsageDataEncipherment)
+		isSet := (c.Certificate.KeyUsage & x509.KeyUsageDataEncipherment) != 0
 		require.True(t, isSet)
 		require.NotNil(t, c.RSAPrivateKey)
 		require.NotNil(t, c.RSAPublicKey)