chore: add cockroachdb 26.1 to the matrix

Author: tstirrat15

.github/workflows/build-test.yaml

@@ -262,7 +262,7 @@ jobs:
       fail-fast: false
       matrix:
         datastore: ["crdb"]
-        crdbversion: ["25.2.0", "25.3.0"]
+        crdbversion: ["25.3.0", "26.1.0"]
     steps:
       - uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
         if: |
@@ -297,7 +297,7 @@ jobs:
       fail-fast: false
       matrix:
         datastore: ["crdb"]
-        crdbversion: ["25.2.0", "25.3.0"]
+        crdbversion: ["25.3.0", "26.1.0"]
     steps:
       - uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
         if: |

internal/datastore/common/errors.go

@@ -163,6 +163,7 @@ func RedactAndLogSensitiveConnString(ctx context.Context, baseErr string, err er
 	filtered = strings.ReplaceAll(filtered, pgURL, "(redacted)")
 	filtered = portMatchRegex.ReplaceAllString(filtered, "(redacted)")
 	filtered = parseMatchRegex.ReplaceAllString(filtered, "(redacted)")
+	fmt.Println(baseErr + ": " + filtered)
 	log.Ctx(ctx).Trace().Msg(baseErr + ": " + filtered)
 	return fmt.Errorf("%s. To view details of this error (that may contain sensitive information), please run with --log-level=trace", baseErr)
 }

internal/datastore/crdb/version.go

@@ -2,20 +2,17 @@ package crdb
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"regexp"
 	"strconv"
 
 	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgconn"
 	"github.com/rs/zerolog"
 
 	pgxcommon "github.com/authzed/spicedb/internal/datastore/postgres/common"
 )
 
 const (
-	queryVersionJSON = "SELECT crdb_internal.active_version()::jsonb;"
 	queryVersion     = "SELECT version();"
 
 	errFunctionDoesNotExist = "42883"
@@ -24,26 +21,15 @@ const (
 var versionRegex = regexp.MustCompile(`v([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?`)
 
 func queryServerVersion(ctx context.Context, db pgxcommon.DBFuncQuerier, version *crdbVersion) error {
+	// The crdb_internal.active_version() wasn't added until v22.1.X, try to parse the version
+	var versionStr string
 	if err := db.QueryRowFunc(ctx, func(ctx context.Context, row pgx.Row) error {
-		return row.Scan(version)
-	}, queryVersionJSON); err != nil {
-		var pgerr *pgconn.PgError
-		if !errors.As(err, &pgerr) || pgerr.Code != errFunctionDoesNotExist {
-			return err
-		}
-
-		// The crdb_internal.active_version() wasn't added until v22.1.X, try to parse the version
-		var versionStr string
-		if err := db.QueryRowFunc(ctx, func(ctx context.Context, row pgx.Row) error {
-			return row.Scan(&versionStr)
-		}, queryVersion); err != nil {
-			return err
-		}
-
-		return parseVersionStringInto(versionStr, version)
+		return row.Scan(&versionStr)
+	}, queryVersion); err != nil {
+		return err
 	}
 
-	return nil
+	return parseVersionStringInto(versionStr, version)
 }
 
 func parseVersionStringInto(versionStr string, version *crdbVersion) error {