Merge remote-tracking branch 'origin/main' into CBG-5425

Author: torcolvin

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ env:
   ACTIONS_CHECKOUT_VERSION: &actions_checkout_version actions/checkout@v6
   ACTIONS_SETUP_GO_VERSION: &actions_setup_go_version actions/setup-go@v6
   ACTIONS_RUFF_VERSION: &actions_ruff_version astral-sh/ruff-action@v4.0.0
-  GO_VERSION: &go_version 1.26.3
+  GO_VERSION: &go_version 1.26.4
   GOTESTSUM_VERSION: 1.13.0
   GO_TEST_ANNOTATIONS_VERSION: &go_test_annotations_version guyarb/golang-test-annotations@v0.9.0
 

.github/workflows/service.yml

@@ -47,7 +47,7 @@ jobs:
       # build sync gateway since the executable is needed for service installation
       - uses: actions/setup-go@v6
         with:
-          go-version: 1.26.3
+          go-version: 1.26.4
       - name: "Build Sync Gateway"
         run: mkdir -p ./bin && go build -o ./bin ./...
       - name: "Run test scripts"

.gitignore

@@ -29,3 +29,6 @@ tools/stats-definition-exporter/stats-definition-exporter
 .cbcache/
 
 planPIndexes/
+
+couchbase-lite-tests
+integration-test/e2e/.gitconfig.e2e

.pre-commit-config.yaml

@@ -0,0 +1,91 @@
+# Copyright 2024-Present Couchbase, Inc.
+#
+# Use of this software is governed by the Business Source License included in
+# the file licenses/BSL-Couchbase.txt.  As of the Change Date specified in that
+# file, in accordance with the Business Source License, use of this software
+# will be governed by the Apache License, Version 2.0, included in the file
+# licenses/APL2.txt.
+
+repos:
+  - repo: local
+    hooks:
+      - id: addlicense
+        name: addlicense
+        language: system
+        entry: go run github.com/google/addlicense@latest -f licenses/addlicense.tmpl
+        types_or: [go, python]
+
+      - id: goimports
+        name: goimports
+        language: system
+        entry: go run golang.org/x/tools/cmd/goimports@latest
+        args: [-w]
+        types: [go]
+
+      - id: golangci-lint
+        name: golangci-lint
+        language: system
+        # version must match .github/workflows/ci.yml golangci job
+        entry: go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2
+        args: [run, --config=.golangci-strict.yml, --fix=false]
+        types: [go]
+        pass_filenames: false
+
+      - id: ruff-format
+        name: ruff format
+        language: system
+        entry: uv run -- ruff format
+        types: [python]
+
+      - id: mypy
+        name: mypy
+        language: system
+        entry: uv run -- mypy
+        pass_filenames: false
+        files: ^(pyproject\.toml|.*\.py)$
+
+      - id: manifest-product-config-sorted
+        name: manifest/product-config.json keys sorted
+        language: system
+        entry: bash -c 'diff <(jq --sort-keys . manifest/product-config.json) <(jq . manifest/product-config.json)'
+        files: ^manifest/product-config\.json$
+        pass_filenames: false
+
+      - id: redocly-lint
+        name: redocly lint
+        language: system
+        entry: npx --yes @redocly/cli@2 lint --config=.redocly.yaml --format=stylish
+        files: ^(docs/api/|\.redocly\.yaml$)
+        pass_filenames: false
+
+      - id: yamllint
+        name: yamllint
+        language: system
+        entry: yamllint
+        args: [docs/api]
+        files: ^docs/api/
+        pass_filenames: false
+
+      - id: shellcheck
+        name: shellcheck
+        language: system
+        entry: shellcheck
+        types: [shell]
+        exclude: >-
+          (?x)^(
+            build\.sh|
+            bootstrap\.sh|
+            bench\.sh|
+            build/postinst\.tmpl|
+            build/postrm\.tmpl|
+            integration-test/service-test\.sh|
+            integration-test/service-install-tests\.sh|
+            rewrite-manifest\.sh|
+            snap-manifest\.sh|
+            set-version-stamp\.sh|
+            service/sync_gateway_service_install\.sh|
+            service/sync_gateway_service_uninstall\.sh|
+            service/sync_gateway_service_upgrade\.sh|
+            test-integration-init\.sh|
+            test\.sh
+          )$

README.md

@@ -22,17 +22,35 @@ Download Sync Gateway and other Couchbase packages for Linux, Windows and macOS
 
 ### Pre-requisites
 
-To build Sync Gateway from source, you must have the following installed:
-
-* Go 1.21 or later ([Installing Go](https://golang.org/doc/install))
 * Building the Enterprise Edition requires access to private code, and cannot be built by third-parties.
 
-### Build Instructions 
+### Build Instructions
 
 ```shell
 $ go build
 ```
 
+## Contributing
+
+### Pre-commit hooks
+
+Pre-commit is optional — it's a convenience to catch issues locally before CI does. Run once per checkout to enable it:
+
+```shell
+uvx pre-commit install
+```
+
+After that, the hooks run automatically whenever you `git commit`. `uvx` ships with [uv](https://docs.astral.sh/uv/getting-started/installation/).
+
+#### Running hooks manually
+
+If you need to run the hooks outside of a commit:
+
+```shell
+uvx pre-commit run            # staged files only
+uvx pre-commit run --all-files  # entire repo
+```
+
 ## Resources
 
 - [Sync Gateway Documentation][SG_DOCS]

auth/auth.go

@@ -428,9 +428,17 @@ func (auth *Authenticator) Save(p Principal) error {
 	return nil
 }
 
-// Used for resync
-func (auth *Authenticator) UpdateSequenceNumber(p Principal, seq uint64) error {
+// Used for resync.  Cancels update if provided resyncID matches existing on the principal
+func (auth *Authenticator) UpdateSequenceNumberForResync(p Principal, seq uint64, resyncID string) error {
+
+	if resyncID == "" {
+		return errors.New("resyncID must not be empty")
+	}
+	if p.ResyncID() == resyncID {
+		return nil
+	}
 	p.SetSequence(seq)
+	p.SetResyncID(resyncID)
 	casOut, writeErr := auth.datastore.WriteCas(auth.LogCtx, p.DocID(), 0, p.Cas(), p, 0)
 	if writeErr != nil {
 		return writeErr