Merge branch 'v1' into GODRIVER-3567-v1

Author: prestonvasquez

.github/workflows/merge-up.yml

@@ -0,0 +1,36 @@
+name: Merge up
+
+on:
+  push:
+    branches:
+      - release/*.*
+      - v*
+
+permissions:
+  id-token: write
+  contents: write
+  pull-requests: write
+
+jobs:
+  merge-up:
+    name: Create merge up pull request
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: mongodb-labs/drivers-github-tools/secure-checkout@v2
+        with:
+          app_id: ${{ vars.PR_APP_ID }}
+          private_key: ${{ secrets.PR_APP_PRIVATE_KEY }}
+          # Make sure to include fetch-depth 0 so all branches are fetched, not
+          # just the current one
+          fetch-depth: 0
+
+      - name: Create pull request
+        id: create-pull-request
+        uses: alcaeus/automatic-merge-up-action@main
+        with:
+          ref: ${{ github.ref_name }}
+          branchNamePattern: 'release/<major>.<minor>'
+          devBranchNamePattern: 'v<major>'
+          fallbackBranch: 'master'
+          enableAutoMerge: true

bson/bson_test.go

@@ -19,6 +19,7 @@ import (
 	"go.mongodb.org/mongo-driver/bson/bsoncodec"
 	"go.mongodb.org/mongo-driver/bson/bsonoptions"
 	"go.mongodb.org/mongo-driver/bson/bsontype"
+	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/internal/assert"
 	"go.mongodb.org/mongo-driver/x/bsonx/bsoncore"
 )
@@ -226,11 +227,20 @@ func TestMapCodec(t *testing.T) {
 }
 
 func TestExtJSONEscapeKey(t *testing.T) {
-	doc := D{{Key: "\\usb#", Value: int32(1)}}
+	doc := D{
+		{
+			Key:   "\\usb#",
+			Value: int32(1),
+		},
+		{
+			Key:   "regex",
+			Value: primitive.Regex{Pattern: "ab\\\\\\\"ab", Options: "\""},
+		},
+	}
 	b, err := MarshalExtJSON(&doc, false, false)
 	noerr(t, err)
 
-	want := "{\"\\\\usb#\":1}"
+	want := `{"\\usb#":1,"regex":{"$regularExpression":{"pattern":"ab\\\\\\\"ab","options":"\""}}}`
 	if diff := cmp.Diff(want, string(b)); diff != "" {
 		t.Errorf("Marshaled documents do not match. got %v, want %v", string(b), want)
 	}

bson/bsonrw/extjson_writer.go

@@ -468,12 +468,13 @@ func (ejvw *extJSONValueWriter) WriteRegex(pattern string, options string) error
 		return err
 	}
 
+	options = sortStringAlphebeticAscending(options)
 	var buf bytes.Buffer
 	buf.WriteString(`{"$regularExpression":{"pattern":`)
 	writeStringWithEscapes(pattern, &buf, ejvw.escapeHTML)
-	buf.WriteString(`,"options":"`)
-	buf.WriteString(sortStringAlphebeticAscending(options))
-	buf.WriteString(`"}},`)
+	buf.WriteString(`,"options":`)
+	writeStringWithEscapes(options, &buf, ejvw.escapeHTML)
+	buf.WriteString(`}},`)
 
 	ejvw.buf = append(ejvw.buf, buf.Bytes()...)