chore: fix golint casting lints

supabase · Oct 14, 2024 · cfada5b · cfada5b
1 parent bf03ef7
commit cfada5b
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 10 deletions.
diff --git a/internal/link/link.go b/internal/link/link.go
@@ -14,6 +14,7 @@ import (
 	"github.com/spf13/afero"
 	"github.com/spf13/viper"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/cast"
 	"github.com/supabase/cli/internal/utils/credentials"
 	"github.com/supabase/cli/internal/utils/diff"
 	"github.com/supabase/cli/internal/utils/flags"
@@ -136,7 +137,7 @@ func linkPostgrestVersion(ctx context.Context, api tenant.TenantAPI, fsys afero.
 }
 
 func updateApiConfig(config api.PostgrestConfigWithJWTSecretResponse) {
-	utils.Config.Api.MaxRows = uint(config.MaxRows)
+	utils.Config.Api.MaxRows = cast.IntToUint(config.MaxRows)
 	utils.Config.Api.ExtraSearchPath = readCsv(config.DbExtraSearchPath)
 	utils.Config.Api.Schemas = readCsv(config.DbSchema)
 }

diff --git a/internal/utils/cast/cast.go b/internal/utils/cast/cast.go
@@ -0,0 +1,21 @@
+package cast
+
+import "math"
+
+// UintToInt converts a uint to an *int, handling potential overflow
+func UintToInt(value uint) int {
+	if value <= math.MaxInt {
+		result := int(value)
+		return result
+	}
+	maxInt := math.MaxInt
+	return maxInt
+}
+
+// IntToUint converts an int to a uint, handling negative values
+func IntToUint(value int) uint {
+	if value < 0 {
+		return 0
+	}
+	return uint(value)
+}
diff --git a/pkg/config/api.go b/pkg/config/api.go
@@ -3,6 +3,7 @@ package config
 import (
 	"strings"
 
+	"github.com/supabase/cli/internal/utils/cast"
 	"github.com/supabase/cli/internal/utils/diff"
 	v1API "github.com/supabase/cli/pkg/api"
 )
@@ -53,8 +54,8 @@ func (a *RemoteApi) ToUpdatePostgrestConfigBody() v1API.UpdatePostgrestConfigBod
 
 	// Convert MaxRows to int pointer
 	if a.MaxRows > 0 {
-		maxRows := int(a.MaxRows)
-		body.MaxRows = &maxRows
+		intValue := cast.UintToInt(a.MaxRows)
+		body.MaxRows = &intValue
 	}
 
 	// Note: DbPool is not present in the Api struct, so it's not set here
@@ -84,7 +85,7 @@ func (a *RemoteApi) fromRemoteApiConfig(remoteConfig v1API.PostgrestConfigWithJW
 	}
 
 	// Update MaxRows if present in remoteConfig
-	result.MaxRows = uint(remoteConfig.MaxRows)
+	result.MaxRows = cast.IntToUint(remoteConfig.MaxRows)
 
 	return result
 }

diff --git a/pkg/config/api_test.go b/pkg/config/api_test.go
@@ -11,7 +11,7 @@ import (
 func TestApiToUpdatePostgrestConfigBody(t *testing.T) {
 	t.Run("converts all fields correctly", func(t *testing.T) {
 		api := &RemoteApi{
-			Enabled: true,
+			Enabled:         true,
 			Schemas:         []string{"public", "private"},
 			ExtraSearchPath: []string{"extensions", "public"},
 			MaxRows:         1000,
@@ -37,7 +37,7 @@ func TestApiToUpdatePostgrestConfigBody(t *testing.T) {
 func TestApiDiffWithRemote(t *testing.T) {
 	t.Run("detects differences", func(t *testing.T) {
 		api := &RemoteApi{
-			Enabled: 		 true,
+			Enabled:         true,
 			Schemas:         []string{"public", "private"},
 			ExtraSearchPath: []string{"extensions", "public"},
 			MaxRows:         1000,
@@ -61,7 +61,7 @@ func TestApiDiffWithRemote(t *testing.T) {
 
 	t.Run("handles no differences", func(t *testing.T) {
 		api := &RemoteApi{
-			Enabled: 		 true,
+			Enabled:         true,
 			Schemas:         []string{"public"},
 			ExtraSearchPath: []string{"public"},
 			MaxRows:         500,
@@ -79,7 +79,7 @@ func TestApiDiffWithRemote(t *testing.T) {
 	})
 	t.Run("handles multiple schemas and search paths with spaces", func(t *testing.T) {
 		api := &RemoteApi{
-			Enabled: 		 true,
+			Enabled:         true,
 			Schemas:         []string{"public", "private"},
 			ExtraSearchPath: []string{"extensions", "public"},
 			MaxRows:         500,
@@ -97,7 +97,7 @@ func TestApiDiffWithRemote(t *testing.T) {
 	})
 	t.Run("handles api disabled on remote side", func(t *testing.T) {
 		api := &RemoteApi{
-			Enabled: 		 true,
+			Enabled:         true,
 			Schemas:         []string{"public", "private"},
 			ExtraSearchPath: []string{"extensions", "public"},
 			MaxRows:         500,

diff --git a/pkg/parser/token.go b/pkg/parser/token.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/viper"
+	"github.com/supabase/cli/internal/utils/cast"
 )
 
 // Equal to `startBufSize` from `bufio/scan.go`
@@ -83,7 +84,7 @@ func Split(sql io.Reader, transform ...func(string) string) (stats []string, err
 
 	// Increase scanner capacity to support very long lines containing e.g. geodata
 	buf := make([]byte, startBufSize)
-	maxbuf := int(viper.GetSizeInBytes("SCANNER_BUFFER_SIZE"))
+	maxbuf := cast.UintToInt(viper.GetSizeInBytes("SCANNER_BUFFER_SIZE"))
 	if maxbuf == 0 {
 		maxbuf = MaxScannerCapacity
 	}