feat: wip

Author: oxyno-zeta

.golangci.yml

@@ -52,7 +52,6 @@ linters:
     - mnd
     - nakedret
     - nilerr
-    - nilnil
     - nlreturn
     - noctx
     - nolintlint
@@ -97,6 +96,7 @@ linters:
     - noinlineerr
     - lll
     - funcorder
+    - nilnil
   settings:
     godox:
       # report any comments starting with keywords, this is useful for TODO or FIXME comments that
@@ -387,6 +387,9 @@ linters:
       - legacy
       - std-error-handling
     rules:
+      - linters:
+          - gochecknoinits
+        path: cmd/.*
       - linters:
           - lll
           - govet
@@ -397,9 +400,18 @@ linters:
         path: internal/.*
       - linters:
           - unparam
+          - noctx
+          - govet
+          - mnd
+          - dupl
+          - gosec
         path: internal/controller/.*/.*_test\.go
       - linters:
           - revive
+          - noctx
+          - govet
+          - mnd
+          - gosec
         path: test/.*
     paths:
       - third_party$

internal/controller/postgresql/postgres/publication.go

@@ -175,7 +175,7 @@ func (c *pg) UpdatePublication(ctx context.Context, dbname, publicationName stri
 	// Build
 	builder.Build()
 
-	tx, err := c.db.Begin()
+	tx, err := c.db.BeginTx(ctx, nil)
 	if err != nil {
 		return err
 	}

internal/controller/postgresql/postgresqluserrole_controller_test.go

@@ -2808,9 +2808,12 @@ var _ = Describe("PostgresqlUserRole tests", func() {
 					}
 
 					// Check if sec have been updated
-					if !strings.Contains(string(sec2.Data["POSTGRES_URL_ARGS"]), "fake2=fake2&fake=fake") {
+					if !strings.Contains(string(sec2.Data["POSTGRES_URL_ARGS"]), "fake2=fake2") {
 						return errors.New("Secret not updated")
 					}
+					if !strings.Contains(string(sec2.Data["POSTGRES_URL_ARGS"]), "fake=fake") {
+						return errors.New("Secret not updated 2")
+					}
 
 					return nil
 				},

internal/controller/postgresql/suite_test.go

@@ -38,7 +38,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
+	//nolint:revive
 	. "github.com/onsi/ginkgo/v2"
+	//nolint:revive
 	. "github.com/onsi/gomega"
 
 	gerrors "errors"
@@ -1006,6 +1008,12 @@ func deleteSQLDBs(name string) error {
 		return err
 	}
 
+	if res.Err() != nil {
+		return res.Err()
+	}
+
+	defer res.Close()
+
 	var dbname string
 	for res.Next() {
 		err = res.Scan(&dbname)
@@ -1099,6 +1107,12 @@ func deleteSQLRoles() error {
 		return err
 	}
 
+	if res.Err() != nil {
+		return res.Err()
+	}
+
+	defer res.Close()
+
 	var role string
 	for res.Next() {
 		err = res.Scan(&role)
@@ -1230,6 +1244,8 @@ func getTableOwnerInSchema(dbName, schemaName, tableName string) (string, error)
 		return "", err
 	}
 
+	defer res.Close()
+
 	var owner string
 	for res.Next() {
 		err = res.Scan(&owner)
@@ -1365,6 +1381,8 @@ func getTypeOwner(dbName, typeName string) (string, error) {
 		return "", err
 	}
 
+	defer res.Close()
+
 	var owner string
 	for res.Next() {
 		err = res.Scan(&owner)

test/utils/utils.go

@@ -24,7 +24,8 @@ import (
 	"os/exec"
 	"strings"
 
-	. "github.com/onsi/ginkgo/v2" // nolint:revive,staticcheck
+	//nolint:staticcheck
+	. "github.com/onsi/ginkgo/v2"
 )
 
 const (
@@ -219,7 +220,6 @@ func GetProjectDir() (string, error) {
 // of the target content. The target content may span multiple lines.
 func UncommentCode(filename, target, prefix string) error {
 	// false positive
-	// nolint:gosec
 	content, err := os.ReadFile(filename)
 	if err != nil {
 		return fmt.Errorf("failed to read file %q: %w", filename, err)
@@ -263,7 +263,7 @@ func UncommentCode(filename, target, prefix string) error {
 	}
 
 	// false positive
-	// nolint:gosec
+
 	if err = os.WriteFile(filename, out.Bytes(), 0o644); err != nil {
 		return fmt.Errorf("failed to write file %q: %w", filename, err)
 	}