Skip to content

Commit ad14596

Browse files
cyrilgdncyrilgdn
committed
fixup! fixup! chore: bump Go version to 1.24 and golangci-lint
1 parent 329a957 commit ad14596

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

‎postgresql/resource_postgresql_database_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ func checkTableOwnership(
389389
if err != nil {
390390
t.Fatalf("could not create connection pool: %v", err)
391391
}
392-
deferDBClose(t, db)
392+
closeDB(t, db)
393393

394394
var _rez int
395395

‎postgresql/resource_postgresql_grant_role_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func checkGrantRole(t *testing.T, dsn, role string, grantRole string, withAdmin
145145
if err != nil {
146146
t.Fatalf("could to create connection pool: %v", err)
147147
}
148-
deferDBClose(t, db)
148+
defer closeDB(t, db)
149149

150150
var _rez int
151151
err = db.QueryRow(`

‎postgresql/resource_postgresql_grant_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,7 +1446,7 @@ func TestAccPostgresqlGrantOwnerPG15(t *testing.T) {
14461446
if err != nil {
14471447
t.Fatalf("could not connect to database %s: %v", dbName, err)
14481448
}
1449-
deferDBClose(t, db)
1449+
defer closeDB(t, db)
14501450

14511451
if _, err := db.Exec(`
14521452
ALTER SCHEMA test_schema OWNER TO pg_database_owner;
@@ -1483,7 +1483,7 @@ func TestAccPostgresqlGrantOwnerPG15(t *testing.T) {
14831483
func testCheckDatabasesPrivileges(t *testing.T, canCreate bool) func(*terraform.State) error {
14841484
return func(*terraform.State) error {
14851485
db := connectAsTestRole(t, "test_grant_role", "test_grant_db")
1486-
deferDBClose(t, db)
1486+
defer closeDB(t, db)
14871487

14881488
if err := testHasGrantForQuery(db, "CREATE SCHEMA plop", canCreate); err != nil {
14891489
return err
@@ -1495,7 +1495,7 @@ func testCheckDatabasesPrivileges(t *testing.T, canCreate bool) func(*terraform.
14951495
func testCheckFunctionExecutable(t *testing.T, role, function string) func(*terraform.State) error {
14961496
return func(*terraform.State) error {
14971497
db := connectAsTestRole(t, role, "postgres")
1498-
deferDBClose(t, db)
1498+
defer closeDB(t, db)
14991499

15001500
if err := testHasGrantForQuery(db, fmt.Sprintf("SELECT %s()", function), true); err != nil {
15011501
return err
@@ -1507,7 +1507,7 @@ func testCheckFunctionExecutable(t *testing.T, role, function string) func(*terr
15071507
func testCheckFunctionWithArgsExecutable(t *testing.T, role, function string, args []string) func(*terraform.State) error {
15081508
return func(*terraform.State) error {
15091509
db := connectAsTestRole(t, role, "postgres")
1510-
deferDBClose(t, db)
1510+
defer closeDB(t, db)
15111511

15121512
if err := testHasGrantForQuery(db, fmt.Sprintf("SELECT %s(%s)", function, strings.Join(args, ", ")), true); err != nil {
15131513
return err
@@ -1519,7 +1519,7 @@ func testCheckFunctionWithArgsExecutable(t *testing.T, role, function string, ar
15191519
func testCheckProcedureExecutable(t *testing.T, role, procedure string) func(*terraform.State) error {
15201520
return func(*terraform.State) error {
15211521
db := connectAsTestRole(t, role, "postgres")
1522-
deferDBClose(t, db)
1522+
defer closeDB(t, db)
15231523

15241524
if err := testHasGrantForQuery(db, fmt.Sprintf("CALL %s()", procedure), true); err != nil {
15251525
return err
@@ -1541,7 +1541,7 @@ func testCheckSchemaPrivileges(t *testing.T, usage, create bool) func(*terraform
15411541
dbExecute(t, dsn, "GRANT SELECT ON test_schema.test_usage TO test_grant_role")
15421542

15431543
db := connectAsTestRole(t, "test_grant_role", "postgres")
1544-
deferDBClose(t, db)
1544+
defer closeDB(t, db)
15451545

15461546
if err := testHasGrantForQuery(db, "SELECT 1 FROM test_schema.test_usage", usage); err != nil {
15471547
return err
@@ -1564,7 +1564,7 @@ func testCheckForeignDataWrapperPrivileges(t *testing.T, usage bool) func(*terra
15641564
dbExecute(t, dsn, "DROP SERVER IF EXISTS test_srv")
15651565
}()
15661566
db := connectAsTestRole(t, "test_role", "postgres")
1567-
deferDBClose(t, db)
1567+
defer closeDB(t, db)
15681568

15691569
if err := testHasGrantForQuery(db, "CREATE SERVER test_srv FOREIGN DATA WRAPPER test_fdw", usage); err != nil {
15701570
return err
@@ -1583,7 +1583,7 @@ func testCheckForeignServerPrivileges(t *testing.T, usage bool) func(*terraform.
15831583
dbExecute(t, dsn, "DROP FOREIGN TABLE IF EXISTS test_tbl")
15841584
}()
15851585
db := connectAsTestRole(t, "test_role", "postgres")
1586-
deferDBClose(t, db)
1586+
defer closeDB(t, db)
15871587

15881588
if err := testHasGrantForQuery(db, "CREATE FOREIGN TABLE test_tbl() SERVER test_srv", usage); err != nil {
15891589
return err

‎postgresql/utils_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const (
1818
testRolePassword = "testpwd"
1919
)
2020

21-
func deferDBClose(t *testing.T, db *sql.DB) {
21+
func closeDB(t *testing.T, db *sql.DB) {
2222
if err := db.Close(); err != nil {
2323
t.Fatalf("could not close connection to database: %v", err)
2424
}
@@ -87,7 +87,7 @@ func dbExecute(t *testing.T, dsn, query string, args ...any) {
8787
if err != nil {
8888
t.Fatalf("could to create connection pool: %v", err)
8989
}
90-
deferDBClose(t, db)
90+
closeDB(t, db)
9191

9292
// Create the test DB
9393
if _, err = db.Exec(query, args...); err != nil {
@@ -157,7 +157,7 @@ func createTestTables(t *testing.T, dbSuffix string, tables []string, owner stri
157157
if err != nil {
158158
t.Fatalf("could not open connection pool for db %s: %v", dbName, err)
159159
}
160-
deferDBClose(t, db)
160+
defer closeDB(t, db)
161161

162162
if owner != "" {
163163
if !config.Superuser {
@@ -192,7 +192,7 @@ func createTestTables(t *testing.T, dbSuffix string, tables []string, owner stri
192192
if err != nil {
193193
t.Fatalf("could not open connection pool for db %s: %v", dbName, err)
194194
}
195-
deferDBClose(t, db)
195+
closeDB(t, db)
196196

197197
if owner != "" && !config.Superuser {
198198
if _, err := db.Exec(fmt.Sprintf("GRANT %s TO CURRENT_USER", owner)); err != nil {
@@ -223,7 +223,7 @@ func createTestSchemas(t *testing.T, dbSuffix string, schemas []string, owner st
223223
if err != nil {
224224
t.Fatalf("could not open connection pool for db %s: %v", dbName, err)
225225
}
226-
deferDBClose(t, db)
226+
closeDB(t, db)
227227

228228
if owner != "" {
229229
if !config.Superuser {
@@ -258,7 +258,7 @@ func createTestSchemas(t *testing.T, dbSuffix string, schemas []string, owner st
258258
if err != nil {
259259
t.Fatalf("could not open connection pool for db %s: %v", dbName, err)
260260
}
261-
deferDBClose(t, db)
261+
closeDB(t, db)
262262

263263
if owner != "" && !config.Superuser {
264264
if _, err := db.Exec(fmt.Sprintf("GRANT %s TO CURRENT_USER", owner)); err != nil {
@@ -288,7 +288,7 @@ func createTestSequences(t *testing.T, dbSuffix string, sequences []string, owne
288288
if err != nil {
289289
t.Fatalf("could not open connection pool for db %s: %v", dbName, err)
290290
}
291-
deferDBClose(t, db)
291+
closeDB(t, db)
292292

293293
if owner != "" {
294294
if !config.Superuser {
@@ -322,7 +322,7 @@ func createTestSequences(t *testing.T, dbSuffix string, sequences []string, owne
322322
if err != nil {
323323
t.Fatalf("could not open connection pool for db %s: %v", dbName, err)
324324
}
325-
deferDBClose(t, db)
325+
closeDB(t, db)
326326

327327
if owner != "" && !config.Superuser {
328328
if _, err := db.Exec(fmt.Sprintf("GRANT %s TO CURRENT_USER", owner)); err != nil {
@@ -377,7 +377,7 @@ func connectAsTestRole(t *testing.T, role, dbName string) *sql.DB {
377377

378378
func testCheckTablesPrivileges(t *testing.T, dbName, roleName string, tables []string, allowedPrivileges []string) error {
379379
db := connectAsTestRole(t, roleName, dbName)
380-
deferDBClose(t, db)
380+
closeDB(t, db)
381381

382382
for _, table := range tables {
383383
queries := map[string]string{
@@ -398,7 +398,7 @@ func testCheckTablesPrivileges(t *testing.T, dbName, roleName string, tables []s
398398

399399
func testCheckSchemasPrivileges(t *testing.T, dbName, roleName string, schemas []string, allowedPrivileges []string) error {
400400
db := connectAsTestRole(t, roleName, dbName)
401-
deferDBClose(t, db)
401+
closeDB(t, db)
402402

403403
for _, schema := range schemas {
404404
queries := map[string]string{
@@ -417,7 +417,7 @@ func testCheckSchemasPrivileges(t *testing.T, dbName, roleName string, schemas [
417417

418418
func testCheckColumnPrivileges(t *testing.T, dbName, roleName string, tables []string, allowedPrivileges []string, columns []string) error {
419419
db := connectAsTestRole(t, roleName, dbName)
420-
deferDBClose(t, db)
420+
closeDB(t, db)
421421

422422
columnValues := []string{}
423423
for _, col := range columns {

0 commit comments

Comments
 (0)