refactor: inline withOCCRetry wrapper with occretry.Retry

The wrapper added no value over calling occretry.Retry directly.

Author: amaksimo

pkg/storage/postgres/dsql.go

@@ -5,17 +5,11 @@ import (
 	"fmt"
 
 	"github.com/awslabs/aurora-dsql-connectors/go/pgx/dsql"
-	"github.com/awslabs/aurora-dsql-connectors/go/pgx/occretry"
 	"github.com/jackc/pgx/v5/pgxpool"
 
 	"github.com/openfga/openfga/pkg/storage/sqlcommon"
 )
 
-// withOCCRetry executes fn with automatic retry on DSQL OCC errors.
-func withOCCRetry(ctx context.Context, fn func() error) error {
-	return occretry.Retry(ctx, occretry.DefaultConfig(), fn)
-}
-
 // initDSQLDB initializes a new Aurora DSQL database connection.
 // DSQL uses IAM authentication which the connector handles automatically.
 func initDSQLDB(uri string, cfg *sqlcommon.Config) (*pgxpool.Pool, error) {

pkg/storage/postgres/postgres.go

@@ -16,6 +16,7 @@ import (
 
 	"github.com/IBM/pgxpoolprometheus"
 	sq "github.com/Masterminds/squirrel"
+	"github.com/awslabs/aurora-dsql-connectors/go/pgx/occretry"
 	"github.com/cenkalti/backoff/v4"
 	"github.com/jackc/pgpassfile"
 	"github.com/jackc/pgx/v5"
@@ -439,7 +440,7 @@ func (s *Datastore) Write(
 	defer span.End()
 	writeOpts := storage.NewTupleWriteOptions(opts...)
 	if s.isDSQL {
-		return withOCCRetry(ctx, func() error { return s.write(ctx, store, deletes, writes, writeOpts, time.Now().UTC()) })
+		return occretry.Retry(ctx, occretry.DefaultConfig(), func() error { return s.write(ctx, store, deletes, writes, writeOpts, time.Now().UTC()) })
 	}
 	return s.write(ctx, store, deletes, writes, writeOpts, time.Now().UTC())
 }