fix lint

pkg/connector/helpers.go

@@ -4,19 +4,15 @@ import (
 	"context"
 	"fmt"
 	"slices"
-	"strconv"
 	"strings"
 
 	"github.com/conductorone/baton-databricks/pkg/databricks"
 	v2 "github.com/conductorone/baton-sdk/pb/c1/connector/v2"
 	"github.com/conductorone/baton-sdk/pkg/annotations"
-	"github.com/conductorone/baton-sdk/pkg/pagination"
 	rs "github.com/conductorone/baton-sdk/pkg/types/resource"
 	"google.golang.org/protobuf/types/known/structpb"
 )
 
-const ResourcesPageSize uint = 50
-
 func parseResourceId(resourceId string) (*v2.ResourceId, *v2.ResourceId, error) {
 	parts := strings.Split(resourceId, "/")
 	switch len(parts) {
@@ -66,55 +62,6 @@ func annotationsForUserResourceType() annotations.Annotations {
 	return annos
 }
 
-func parsePageToken(i string, resourceID *v2.ResourceId) (*pagination.Bag, uint, error) {
-	b := &pagination.Bag{}
-	err := b.Unmarshal(i)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	if b.Current() == nil {
-		b.Push(pagination.PageState{
-			ResourceTypeID: resourceID.ResourceType,
-			ResourceID:     resourceID.Resource,
-		})
-	}
-
-	page, err := convertPageToken(b.PageToken())
-	if err != nil {
-		return nil, 0, err
-	}
-
-	return b, page, nil
-}
-
-// convertPageToken converts a string token into an int.
-func convertPageToken(token string) (uint, error) {
-	if token == "" {
-		return 1, nil
-	}
-
-	page, err := strconv.ParseUint(token, 10, 32)
-	if err != nil {
-		return 0, fmt.Errorf("failed to parse page token: %w", err)
-	}
-
-	return uint(page), nil
-}
-
-// prepareNextToken prepares the next page token.
-// It calculates the next page number and returns it as a string.
-func prepareNextToken(page uint, pageTotal int, total uint) string {
-	var token string
-
-	next := page + uint(pageTotal)
-	if next < total+1 {
-		token = strconv.Itoa(int(next))
-	}
-
-	return token
-}
-
 // prepareResourceID prepares a resource ID for a user, group, or service principal.
 // It's used when we need to parse results from listing rule sets.
 func prepareResourceID(ctx context.Context, c *databricks.Client, principal string) (*v2.ResourceId, error) {

pkg/connector/pagination.go

@@ -0,0 +1,60 @@
+package connector
+
+import (
+	"fmt"
+	"strconv"
+
+	v2 "github.com/conductorone/baton-sdk/pb/c1/connector/v2"
+	"github.com/conductorone/baton-sdk/pkg/pagination"
+)
+
+const ResourcesPageSize uint = 50
+
+func parsePageToken(i string, resourceID *v2.ResourceId) (*pagination.Bag, uint, error) {
+	b := &pagination.Bag{}
+	err := b.Unmarshal(i)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	if b.Current() == nil {
+		b.Push(pagination.PageState{
+			ResourceTypeID: resourceID.ResourceType,
+			ResourceID:     resourceID.Resource,
+		})
+	}
+
+	page, err := convertPageToken(b.PageToken())
+	if err != nil {
+		return nil, 0, err
+	}
+
+	return b, page, nil
+}
+
+// convertPageToken converts a string token into an int.
+func convertPageToken(token string) (uint, error) {
+	if token == "" {
+		return 1, nil
+	}
+
+	page, err := strconv.ParseUint(token, 10, 32)
+	if err != nil {
+		return 0, fmt.Errorf("failed to parse page token: %w", err)
+	}
+
+	return uint(page), nil
+}
+
+// prepareNextToken prepares the next page token.
+// It calculates the next page number and returns it as a string.
+func prepareNextToken(page uint, pageTotal int, total uint) string {
+	var token string
+
+	next := page + uint(pageTotal)
+	if next < total+1 {
+		token = strconv.FormatUint(uint64(next), 10)
+	}
+
+	return token
+}