fix linter

Author: MarcusGoldschmidt

pkg/postgres/tables_test.go

@@ -1,15 +1,17 @@
 package postgres
 
 import (
+	"context"
+	"testing"
+
 	"github.com/conductorone/baton-postgresql/pkg/testutil"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestTableGrantRevoke(t *testing.T) {
-	ctx := t.Context()
+	ctx := context.Background()
 
-	container := testutil.SetupPostgresContainer(t)
+	container := testutil.SetupPostgresContainer(ctx, t)
 
 	client, err := New(ctx, container.Dsn())
 	assert.NoError(t, err)

pkg/postgres/views_test.go

@@ -1,15 +1,17 @@
 package postgres
 
 import (
+	"context"
+	"testing"
+
 	"github.com/conductorone/baton-postgresql/pkg/testutil"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestViewGrantRevoke(t *testing.T) {
-	ctx := t.Context()
+	ctx := context.Background()
 
-	container := testutil.SetupPostgresContainer(t)
+	container := testutil.SetupPostgresContainer(ctx, t)
 
 	client, err := New(ctx, container.Dsn())
 	assert.NoError(t, err)

pkg/testutil/container.go

@@ -3,11 +3,12 @@ package testutil
 import (
 	"context"
 	_ "embed"
-	"github.com/jackc/pgx/v4"
-	"github.com/jackc/pgx/v4/pgxpool"
 	"testing"
 	"time"
 
+	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/pgxpool"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/modules/postgres"
@@ -39,8 +40,8 @@ func (d *SQLContainer) Role() string {
 	return "test_role"
 }
 
-func SetupPostgresContainer(t *testing.T) *SQLContainer {
-	ctx, cancel := context.WithTimeout(t.Context(), time.Minute)
+func SetupPostgresContainer(ctx context.Context, t *testing.T) *SQLContainer {
+	ctx, cancel := context.WithTimeout(ctx, time.Minute)
 	defer cancel()
 
 	pgContainer, err := postgres.Run(ctx,