Merge remote-tracking branch 'origin/main' into CBG-5144-prep-test

Author: torcolvin

.github/workflows/ci.yml

@@ -31,14 +31,18 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: ${{ !contains(github.ref, 'release/') && !contains(github.ref, 'main') }}
 
+env:
+  GO_VERSION: &go_version 1.25.7
+  GO_TEST_ANNOTATIONS_VERSION: &go_test_annotations_version guyarb/golang-test-annotations@v0.8.0
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.25.6
+          go-version: *go_version
       - name: go-build
         run: go build "./..."
 
@@ -49,7 +53,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.25.6
+          go-version: *go_version
       - run: go install github.com/google/addlicense@latest
       - run: addlicense -check -f licenses/addlicense.tmpl .
 
@@ -60,7 +64,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.25.6
+          go-version: *go_version
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v9
         with:
@@ -87,15 +91,15 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.25.6
+          go-version: *go_version
       - name: Build
         run: go build -v "./..."
       - name: Run Tests
         run: go test -tags cb_sg_devmode -shuffle=on -timeout=30m -count=1 -json -v "./..." | tee test.json | jq -s -jr 'sort_by(.Package,.Time) | .[].Output | select (. != null )'
         shell: bash
       - name: Annotate Failures
         if: always()
-        uses: guyarb/golang-test-annotations@v0.8.0
+        uses: *go_test_annotations_version
         with:
           test-results: test.json
 
@@ -107,13 +111,13 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.25.6
+          go-version: *go_version
       - name: Run Tests
         run: go test -tags cb_sg_devmode -race -shuffle=on -timeout=30m -count=1 -json -v "./..." | tee test.json | jq -s -jr 'sort_by(.Package,.Time) | .[].Output | select (. != null )'
         shell: bash
       - name: Annotate Failures
         if: always()
-        uses: guyarb/golang-test-annotations@v0.8.0
+        uses: *go_test_annotations_version
         with:
           test-results: test.json
 
@@ -122,6 +126,43 @@ jobs:
     env:
       GOPRIVATE: github.com/couchbaselabs
       SG_TEST_USE_DEFAULT_COLLECTION: true
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v5
+        with:
+          go-version: *go_version
+      - name: Run Tests
+        run: go test -tags cb_sg_devmode -shuffle=on -timeout=30m -count=1 -json -v "./..." | tee test.json | jq -s -jr 'sort_by(.Package,.Time) | .[].Output | select (. != null )'
+        shell: bash
+      - name: Annotate Failures
+        if: always()
+        uses: *go_test_annotations_version
+        with:
+          test-results: test.json
+  test-benchmark-compile:
+    runs-on: ubuntu-latest
+    env:
+      GOPRIVATE: github.com/couchbaselabs
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v5
+        with:
+          go-version: *go_version
+      - name: Run Tests
+        run: go test -tags cb_sg_devmode -shuffle=on -timeout=30m -count=1 -json -short -bench=. -benchtime=1x -run '!' -v "./..." | tee test.json | jq -s -jr 'sort_by(.Package,.Time) | .[].Output | select (. != null )'
+        shell: bash
+      - name: Annotate Failures
+        if: always()
+        uses: *go_test_annotations_version
+        with:
+          test-results: test.json
+
+
+  test-disable-rev-cache:
+    runs-on: ubuntu-latest
+    env:
+      GOPRIVATE: github.com/couchbaselabs
+      SG_TEST_DISABLE_REV_CACHE: true
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-go@v5
@@ -174,7 +215,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.25.6
+          go-version: *go_version
       - name: Build
         run: go build -v "./tools/stats-definition-exporter"
       - name: Run Tests
@@ -187,7 +228,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.25.6
+          go-version: *go_version
       - name: Build
         run: go build "./tools/cache_perf_tool"
   govulncheck:
@@ -197,5 +238,5 @@ jobs:
       - id: govulncheck
         uses: golang/govulncheck-action@v1
         with:
-           go-version-input: 1.25.6
+           go-version-input: *go_version
            go-package: ./...

Jenkinsfile

@@ -15,7 +15,7 @@ pipeline {
     }
 
     tools {
-        go '1.25.6'
+        go '1.25.7'
     }
 
     stages {

auth/jwt.go

@@ -39,6 +39,7 @@ var SupportedAlgorithms = map[jose.SignatureAlgorithm]bool{
 	jose.PS256: true,
 	jose.PS384: true,
 	jose.PS512: true,
+	jose.EdDSA: true,
 }
 
 // Full list of supported algorithms is used to initially parse the JWT.  The more restricted list (based
@@ -53,6 +54,7 @@ var SupportedAlgorithmsSlice = []jose.SignatureAlgorithm{
 	jose.PS256,
 	jose.PS384,
 	jose.PS512,
+	jose.EdDSA,
 }
 
 // JWTConfigCommon groups together configuration options common to both OIDC and local JWT authentication.

base/collection_xattr_common.go

@@ -88,7 +88,7 @@ func (c *Collection) WriteTombstoneWithXattrs(ctx context.Context, k string, exp
 
 		// If deleteBody == true, remove the body and update xattr
 		if deleteBody {
-			casOut, tombstoneErr = c.updateXattrsDeleteBody(ctx, k, exp, cas, xattrs, nil, opts)
+			casOut, tombstoneErr = c.updateXattrsDeleteBody(ctx, k, exp, cas, xattrs, xattrsToDelete, opts)
 		} else {
 			if len(xattrs) == 0 && len(xattrsToDelete) == 0 {
 				return false, sgbucket.ErrNeedXattrs, 0

base/collection_xattr_test.go

@@ -798,6 +798,7 @@ func TestWriteTombstoneWithXattrs(t *testing.T) {
 				finalXattrs: map[string][]byte{
 					"_xattr1": []byte(`{"c": "d"}`),
 				},
+				writeErrorFunc: RequireXattrDeleteOnDocumentInsertError,
 			},
 			{
 				name:        "previousDoc=nil,xattrsToUpdate=_xattr1,xattrsToDelete=_xattr2,cas=0,deleteBody=true",
@@ -811,14 +812,15 @@ func TestWriteTombstoneWithXattrs(t *testing.T) {
 					"_xattr1": []byte(`{"c": "d"}`),
 				},
 				deleteBody:     true,
-				writeErrorFunc: RequireDocNotFoundError,
+				writeErrorFunc: RequireXattrDeleteOnDocumentInsertError,
 			},
 			{
 				name: "previousDoc=body+_xattr1,_xattr2,xattrsToUpdate=_xattr1,xattrsToDelete=_xattr2,cas=correct,deleteBody=false",
 				previousDoc: &sgbucket.BucketDocument{
 					Body: []byte(`{"foo": "bar"}`),
 					Xattrs: map[string][]byte{
 						"_xattr1": []byte(`{"a" : "b"}`),
+						"_xattr2": []byte(`{"c": "d"}`),
 					},
 				},
 				updatedXattrs: map[string][]byte{
@@ -838,6 +840,7 @@ func TestWriteTombstoneWithXattrs(t *testing.T) {
 					Body: []byte(`{"foo": "bar"}`),
 					Xattrs: map[string][]byte{
 						"_xattr1": []byte(`{"a" : "b"}`),
+						"_xattr2": []byte(`{"c": "d"}`),
 					},
 				},
 				updatedXattrs: map[string][]byte{
@@ -874,7 +877,7 @@ func TestWriteTombstoneWithXattrs(t *testing.T) {
 					cas = casOut
 				}
 			}
-			_, err := col.WriteTombstoneWithXattrs(ctx, docID, exp, cas, test.updatedXattrs, nil, test.deleteBody, nil)
+			_, err := col.WriteTombstoneWithXattrs(ctx, docID, exp, cas, test.updatedXattrs, test.xattrsToDelete, test.deleteBody, nil)
 			if test.writeErrorFunc != nil {
 				test.writeErrorFunc(t, err)
 				if test.finalBody != nil {

base/constants.go

@@ -47,6 +47,9 @@ const (
 	TestEnvSyncGatewayUseXattrs = "SG_TEST_USE_XATTRS"
 	TestEnvSyncGatewayTrue      = "True"
 
+	// TestEnvDisableRevCache if set to true will disable the revision cache for tests
+	TestEnvDisableRevCache = "SG_TEST_DISABLE_REV_CACHE"
+
 	// Should the tests drop the GSI indexes?
 	TestEnvSyncGatewayDropIndexes = "SG_TEST_DROP_INDEXES"