From 96a27b4d7359cbea9f0b7101a92bd1cca5768c74 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 07:33:49 -0500 Subject: [PATCH 001/156] Add release workflow --- .github/scripts/bump-version.go | 43 +++++++++++++++++++ .github/workflows/release.yml | 76 +++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 .github/scripts/bump-version.go create mode 100644 .github/workflows/release.yml diff --git a/.github/scripts/bump-version.go b/.github/scripts/bump-version.go new file mode 100644 index 0000000000..5c7e5cd7b9 --- /dev/null +++ b/.github/scripts/bump-version.go @@ -0,0 +1,43 @@ +package main + +import ( + "bufio" + "fmt" + "os" + "path" +) + +const ( + versionFile = "version/version.go" +) + +func main() { + repoDir, err := os.Getwd() + versionFilePath := path.Join(repoDir, versionFile) + readFile, err := os.Open(versionFilePath) + + if err != nil { + fmt.Println(err) + } + fileScanner := bufio.NewScanner(readFile) + fileScanner.Split(bufio.ScanLines) + var fileLines []string + + for fileScanner.Scan() { + fileLines = append(fileLines, fileScanner.Text()) + } + + readFile.Close() + + fileLines[len(fileLines)-1] = "var Driver = \"" + os.Args[1] + "\"" + + writeFile, err := os.OpenFile(versionFilePath, os.O_WRONLY, 0644) + if err != nil { + fmt.Println(err) + } + for _, line := range fileLines { + fmt.Fprintln(writeFile, line) + } + + writeFile.Close() +} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000000..9c53caa976 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,76 @@ +name: Release + +on: + workflow_dispatch: + inputs: + version: + description: "The new version to set" + following_version: + description: "The post (dev) version to set" + dry_run: + description: "Dry Run?" + default: false + type: boolean + +defaults: + run: + shell: bash -eux {0} + +jobs: + bump-and-tag: + environment: release + runs-on: ubuntu-latest + permissions: + id-token: write + contents: write + steps: + - uses: mongodb-labs/drivers-github-tools/secure-checkout@v2 + with: + app_id: ${{ vars.APP_ID }} + private_key: ${{ secrets.APP_PRIVATE_KEY }} + - uses: mongodb-labs/drivers-github-tools/setup@v2 + with: + aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} + aws_region_name: ${{ vars.AWS_REGION_NAME }} + aws_secret_id: ${{ secrets.AWS_SECRET_ID }} + - uses: mongodb-labs/drivers-github-tools/bump-version@v2 + with: + version: ${{ inputs.version }} + version_bump_script: "go run ./.github/scripts/bump-version.go" + dry_run: ${{ inputs.dry_run }} + - uses: mongodb-labs/drivers-github-tools/tag-version@v2 + with: + version: ${{ inputs.version }} + dry_run: ${{ inputs.dry_run }} + + # static-scan: + # needs: [bump-and-tag] + # uses: ./.github/workflows/codeql.yml + # with: + # ref: ${{ inputs.version }} + + publish-and-bump: + needs: [bump-and-tag] + runs-on: ubuntu-latest + environment: release + permissions: + id-token: write + contents: write + security-events: write + steps: + - uses: mongodb-labs/drivers-github-tools/secure-checkout@v2 + with: + app_id: ${{ vars.APP_ID }} + private_key: ${{ secrets.APP_PRIVATE_KEY }} + - uses: mongodb-labs/drivers-github-tools/setup@v2 + with: + aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} + aws_region_name: ${{ vars.AWS_REGION_NAME }} + aws_secret_id: ${{ secrets.AWS_SECRET_ID }} + # TODO: generate reports here + # TODO: create draft github release here + - uses: mongodb-labs/drivers-github-tools/bump-version@v2 + with: + version: ${{ inputs.version }} + version_bump_script: "go run ./.github/scripts/bump-version.go" + dry_run: ${{ inputs.dry_run }} From 06081cf3e5c64464af962e52993ed1198e958823 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 08:20:10 -0500 Subject: [PATCH 002/156] try direct usage --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9c53caa976..e70d486b8b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: id-token: write contents: write steps: - - uses: mongodb-labs/drivers-github-tools/secure-checkout@v2 + - uses: actions/create-github-app-token@v1 with: app_id: ${{ vars.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} From 418f0e1988c348359ffe6dac6f2a0947ea203e67 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:22:40 +0000 Subject: [PATCH 003/156] BUMP 2.1 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 040c707064..d62ba33a8b 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,5 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "v1.16.0-prerelease" +var Driver = "2.1" +.0-prerelease" From d86b856579105b02d44f8c89cbfd82dd2d9528ce Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:23:34 +0000 Subject: [PATCH 004/156] BUMP 2.1 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index d62ba33a8b..917231502c 100644 --- a/version/version.go +++ b/version/version.go @@ -9,4 +9,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. var Driver = "2.1" -.0-prerelease" +var Driver = "2.1" From 9a10e2a1a00f7d45b2f2946dbde66b55b0436db1 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 08:30:05 -0500 Subject: [PATCH 005/156] update version writer --- .github/scripts/bump-version.go | 34 +++++++++++++-------------------- .github/workflows/release.yml | 12 ++++++------ 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/.github/scripts/bump-version.go b/.github/scripts/bump-version.go index 5c7e5cd7b9..8bc36e7ae5 100644 --- a/.github/scripts/bump-version.go +++ b/.github/scripts/bump-version.go @@ -1,7 +1,6 @@ package main import ( - "bufio" "fmt" "os" "path" @@ -9,35 +8,28 @@ import ( const ( versionFile = "version/version.go" + prefix = `// Copyright (C) MongoDB, Inc. 2017-present. + // + // Licensed under the Apache License, Version 2.0 (the "License"); you may + // not use this file except in compliance with the License. You may obtain + // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + + // Package version defines the Go Driver version. + package version // import "go.mongodb.org/mongo-driver/version" + + // Driver is the current version of the driver. + ` ) func main() { repoDir, err := os.Getwd() versionFilePath := path.Join(repoDir, versionFile) - readFile, err := os.Open(versionFilePath) - - if err != nil { - fmt.Println(err) - } - fileScanner := bufio.NewScanner(readFile) - fileScanner.Split(bufio.ScanLines) - var fileLines []string - - for fileScanner.Scan() { - fileLines = append(fileLines, fileScanner.Text()) - } - - readFile.Close() - - fileLines[len(fileLines)-1] = "var Driver = \"" + os.Args[1] + "\"" writeFile, err := os.OpenFile(versionFilePath, os.O_WRONLY, 0644) if err != nil { fmt.Println(err) } - for _, line := range fileLines { - fmt.Fprintln(writeFile, line) - } - + text := prefix + "var Driver = \"" + os.Args[1] + "\"\n" + fmt.Fprint(writeFile, text) writeFile.Close() } diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e70d486b8b..a4ed3e6ec8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,8 +7,8 @@ on: description: "The new version to set" following_version: description: "The post (dev) version to set" - dry_run: - description: "Dry Run?" + push_changes: + description: "Push changes?" default: false type: boolean @@ -24,7 +24,7 @@ jobs: id-token: write contents: write steps: - - uses: actions/create-github-app-token@v1 + - uses: mongodb-labs/drivers-github-tools/secure-checkout@v2 with: app_id: ${{ vars.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} @@ -37,11 +37,11 @@ jobs: with: version: ${{ inputs.version }} version_bump_script: "go run ./.github/scripts/bump-version.go" - dry_run: ${{ inputs.dry_run }} + push_commit: ${{ inputs.push_changes }} - uses: mongodb-labs/drivers-github-tools/tag-version@v2 with: version: ${{ inputs.version }} - dry_run: ${{ inputs.dry_run }} + push_tag: ${{ inputs.push_changes }} # static-scan: # needs: [bump-and-tag] @@ -73,4 +73,4 @@ jobs: with: version: ${{ inputs.version }} version_bump_script: "go run ./.github/scripts/bump-version.go" - dry_run: ${{ inputs.dry_run }} + push_commit: ${{ inputs.push_changes }} From 390035627d6364044f50b25c23d5abc9a5012938 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 08:34:20 -0500 Subject: [PATCH 006/156] reverse default --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a4ed3e6ec8..f3001fd829 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ on: description: "The post (dev) version to set" push_changes: description: "Push changes?" - default: false + default: true type: boolean defaults: From b3308f5325d2e3420727232366f8e166e6be2f0d Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:35:14 +0000 Subject: [PATCH 007/156] BUMP 2.1.1 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/version/version.go b/version/version.go index 917231502c..3bfa7df1e0 100644 --- a/version/version.go +++ b/version/version.go @@ -1,12 +1,12 @@ // Copyright (C) MongoDB, Inc. 2017-present. -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may -// not use this file except in compliance with the License. You may obtain -// a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - -// Package version defines the Go Driver version. -package version // import "go.mongodb.org/mongo-driver/version" - -// Driver is the current version of the driver. -var Driver = "2.1" -var Driver = "2.1" + // + // Licensed under the Apache License, Version 2.0 (the "License"); you may + // not use this file except in compliance with the License. You may obtain + // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + + // Package version defines the Go Driver version. + package version // import "go.mongodb.org/mongo-driver/version" + + // Driver is the current version of the driver. + var Driver = "2.1.1" + "2.1" From f44cbdb1201bc590e5365885ff46a996b43b8eeb Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 08:37:26 -0500 Subject: [PATCH 008/156] fix bump version --- .github/scripts/bump-version.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/scripts/bump-version.go b/.github/scripts/bump-version.go index 8bc36e7ae5..00a3b4f806 100644 --- a/.github/scripts/bump-version.go +++ b/.github/scripts/bump-version.go @@ -9,16 +9,16 @@ import ( const ( versionFile = "version/version.go" prefix = `// Copyright (C) MongoDB, Inc. 2017-present. - // - // Licensed under the Apache License, Version 2.0 (the "License"); you may - // not use this file except in compliance with the License. You may obtain - // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - - // Package version defines the Go Driver version. - package version // import "go.mongodb.org/mongo-driver/version" - - // Driver is the current version of the driver. - ` +// +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain +// a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + +// Package version defines the Go Driver version. +package version // import "go.mongodb.org/mongo-driver/version" + +// Driver is the current version of the driver. +` ) func main() { From 857567d8c386eaf81ef1dbaf9341aacb52a6e7ad Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:39:18 +0000 Subject: [PATCH 009/156] BUMP 2.1.3 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/version/version.go b/version/version.go index 3bfa7df1e0..ea8ff1c495 100644 --- a/version/version.go +++ b/version/version.go @@ -1,12 +1,13 @@ // Copyright (C) MongoDB, Inc. 2017-present. - // - // Licensed under the Apache License, Version 2.0 (the "License"); you may - // not use this file except in compliance with the License. You may obtain - // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - - // Package version defines the Go Driver version. - package version // import "go.mongodb.org/mongo-driver/version" - - // Driver is the current version of the driver. - var Driver = "2.1.1" +// +// Licensed under the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. You may obtain +// a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + +// Package version defines the Go Driver version. +package version // import "go.mongodb.org/mongo-driver/version" + +// Driver is the current version of the driver. +var Driver = "2.1.3" += "2.1.1" "2.1" From b84d2ac700fc3df6159ff800973b9c1d9038e126 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 08:41:44 -0500 Subject: [PATCH 010/156] fix file write --- .github/scripts/bump-version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/bump-version.go b/.github/scripts/bump-version.go index 00a3b4f806..791d5ba044 100644 --- a/.github/scripts/bump-version.go +++ b/.github/scripts/bump-version.go @@ -25,7 +25,7 @@ func main() { repoDir, err := os.Getwd() versionFilePath := path.Join(repoDir, versionFile) - writeFile, err := os.OpenFile(versionFilePath, os.O_WRONLY, 0644) + writeFile, err := os.OpenFile(versionFilePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) if err != nil { fmt.Println(err) } From 93ddae79618ba645b68d5f1028458a78f15a353d Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:42:56 +0000 Subject: [PATCH 011/156] BUMP 2.1.5 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/version/version.go b/version/version.go index ea8ff1c495..aa98db58a5 100644 --- a/version/version.go +++ b/version/version.go @@ -8,6 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.3" -= "2.1.1" - "2.1" +var Driver = "2.1.5" From dacad754171d4fa6a5f007be8aa1f9dfdc324fb1 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 08:46:59 -0500 Subject: [PATCH 012/156] use following version --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f3001fd829..9414cc1b53 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -71,6 +71,6 @@ jobs: # TODO: create draft github release here - uses: mongodb-labs/drivers-github-tools/bump-version@v2 with: - version: ${{ inputs.version }} + version: ${{ inputs.following_version }} version_bump_script: "go run ./.github/scripts/bump-version.go" push_commit: ${{ inputs.push_changes }} From 45ff6e95f5fe68f366be867aa12d9f9e47323191 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:48:00 +0000 Subject: [PATCH 013/156] BUMP 2.1.6 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index aa98db58a5..f7a1e83f5c 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.5" +var Driver = "2.1.6" From 531bd26a4168ed069014998847f20dca65d2898a Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:48:44 +0000 Subject: [PATCH 014/156] BUMP 2.2-prerelease Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index f7a1e83f5c..5acebcbbf8 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.6" +var Driver = "2.2-prerelease" From 93ea8be29590ba9b6a806e06c5e96280e4f66253 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 09:58:45 -0500 Subject: [PATCH 015/156] add github release handling --- .github/actions/publish/action.yml | 33 +++++++++ .github/actions/publish/forum.md.tmpl | 10 +++ .github/actions/publish/github.md.tmpl | 23 ++++++ .github/actions/publish/notes.go | 96 ++++++++++++++++++++++++++ .github/workflows/release.yml | 9 ++- 5 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 .github/actions/publish/action.yml create mode 100644 .github/actions/publish/forum.md.tmpl create mode 100644 .github/actions/publish/github.md.tmpl create mode 100644 .github/actions/publish/notes.go diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml new file mode 100644 index 0000000000..431197c991 --- /dev/null +++ b/.github/actions/publish/action.yml @@ -0,0 +1,33 @@ +name: Publish +description: Publish Draft GitHub Release +inputs: + version: + description: The published version + required: true + push_changes: + description: Whether to push the changes + default: "false" +runs: + using: composite + steps: + - name: Generate the notes + shell: bash -eux {0} + run: | + cd ${{ github.actions_path }} + go run notes.go ${{ inputs.version }} $PREV_VERSION + cat forum.md >> $GITHUB_STEP_SUMMARY + rm forum.md + - name: Create GitHub Release + shell: bash -eux {0} + run: | + echo "Creating draft release" + cd ${{ github.actions_path }} + export NOTES=$(cat github.md) + rm github.md + if [ "${{ inputs.push_changes }}"" == "true"]; then + gh release create ${VERSION} --draft --verify-tag --title ${VERSION} --notes $NOTES + gh release view ${VERSION} >> $GITHUB_STEP_SUMMARY + else + echo "## Skipping draft release with notes:" >> $GITHUB_STEP_SUMMARY + echo $NOTES >> $GITHUB_STEP_SUMMARY + fi \ No newline at end of file diff --git a/.github/actions/publish/forum.md.tmpl b/.github/actions/publish/forum.md.tmpl new file mode 100644 index 0000000000..5134bd8f3c --- /dev/null +++ b/.github/actions/publish/forum.md.tmpl @@ -0,0 +1,10 @@ +The MongoDB Go Driver Team is pleased to release version {{ .ReleaseVersion }} of the [MongoDB Go Driver](https://github.com/mongodb/mongo-go-driver). + +This release {description of notable changes}. For more information please see the [{{ .ReleaseVersion }} release notes](https://github.com/mongodb/mongo-go-driver/releases/tag/v{{ .ReleaseVersion }}). + +You can obtain the driver source from GitHub under the [v{{ .ReleaseVersion }} tag](https://github.com/mongodb/mongo-go-driver/tree/v{{ .ReleaseVersion }}). + +Documentation for the Go driver can be found on [pkg.go.dev](https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo?tab=doc) and the [MongoDB documentation site](https://docs.mongodb.com/ecosystem/drivers/go/). BSON library documentation is also available on [pkg.go.dev](https://pkg.go.dev/go.mongodb.org/mongo-driver/bson?tab=doc). Questions and inquiries can be asked on the [MongoDB Developer Community](https://community.mongodb.com/). Bugs can be reported in the [Go Driver project in the MongoDB JIRA](https://jira.mongodb.org/secure/CreateIssue!default.jspa?pid=14289) where a list of [current issues](https://jira.mongodb.org/browse/GODRIVER) can be found. Your feedback on the Go driver is greatly appreciated! + +Thank you, +The Go Driver Team diff --git a/.github/actions/publish/github.md.tmpl b/.github/actions/publish/github.md.tmpl new file mode 100644 index 0000000000..fdfc53c1df --- /dev/null +++ b/.github/actions/publish/github.md.tmpl @@ -0,0 +1,23 @@ +The MongoDB Go Driver Team is pleased to release version {{ .ReleaseVersion }} of the official Go driver. + +## Release Notes + +This release {description of notable changes}. + +### {Notable Release Feature 1} + +{Description of notable release feature 1} + +*** + +For a full list of tickets included in this release, please see the links below: + +* [Projects](https://jira.mongodb.org/issues/?jql=project%3Dgodriver%20and%20type%3Depic%20and%20status%20%3D%20Closed%20and%20fixVersion%3D{{ .ReleaseVersion }}) +* [New Features](https://jira.mongodb.org/issues/?jql=project%3Dgodriver%20and%20type%3D%22new%20feature%22%20and%20status%20%3D%20Closed%20and%20fixVersion%3D{{ .ReleaseVersion }}) +* [Improvements](https://jira.mongodb.org/issues/?jql=project%3Dgodriver%20and%20type%3Dimprovement%20and%20status%20%3D%20Closed%20and%20fixVersion%3D{{ .ReleaseVersion }}) +* [Bugs](https://jira.mongodb.org/issues/?jql=project%3DGODRIVER%20and%20type%3DBug%20and%20status%3Dclosed%20and%20fixVersion%3D{{ .ReleaseVersion }}) +* [Tasks](https://jira.mongodb.org/issues/?jql=project%3Dgodriver%20and%20type%3D%22task%22%20and%20status%20%3D%20Closed%20and%20fixVersion%3D{{ .ReleaseVersion }}) + +**Full Changelog**: [v{{ .PreviousVersion }}...{{ .ReleaseVersion }}](https://github.com/mongodb/mongo-go-driver/compare/v{{ .PreviousVersion }}...v{{ .ReleaseVersion }}) + +Documentation for the Go driver can be found on [pkg.go.dev](https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo?tab=doc) and the [MongoDB documentation site](https://docs.mongodb.com/ecosystem/drivers/go/). BSON library documentation is also available on [pkg.go.dev](https://pkg.go.dev/go.mongodb.org/mongo-driver/bson?tab=doc). Questions and inquiries can be asked on the [MongoDB Developer Community](https://community.mongodb.com/). Bugs can be reported in the [Go Driver project in the MongoDB JIRA](https://jira.mongodb.org/secure/CreateIssue!default.jspa?pid=14289) where a list of [current issues](https://jira.mongodb.org/browse/GODRIVER) can be found. Your feedback on the Go driver is greatly appreciated! diff --git a/.github/actions/publish/notes.go b/.github/actions/publish/notes.go new file mode 100644 index 0000000000..7bedc92980 --- /dev/null +++ b/.github/actions/publish/notes.go @@ -0,0 +1,96 @@ +package main + +import ( + _ "embed" + "fmt" + "log" + "os" + "text/template" + + "github.com/coreos/go-semver/semver" + "github.com/fatih/color" +) + +//go:embed github.md.tmpl +var githubTmpl string + +//go:embed forum.md.tmpl +var forumTmpl string + +// generateGithubNotes generates a partially filled out release notes template +// for a Github release and writes it to a file named "github.md". It +// also prints the gh command to create a new draft release with those release +// notes. +func generateGithubNotes(release, previous *semver.Version) { + filename := fmt.Sprintf("github.md", release) + + writeTemplate( + filename, + githubTmpl, + map[string]any{ + "ReleaseVersion": release.String(), + "PreviousVersion": previous.String(), + }) + + fmt.Println() + fmt.Print( + color.BlueString(`Wrote Github notes template to "`), + color.GreenString(filename), + color.BlueString(`".`), + "\n") + color.Blue("Fill out any missing information and run the following command to create the Github release:") + fmt.Println() + color.Green( + "\tgh auth refresh && gh release create v%[1]s --verify-tag --draft -R 'mongodb/mongo-go-driver' -t 'MongoDB Go Driver %[1]s' -F '%[2]s'", + release, + filename) +} + +// generateForumNotes generates a partially filled out release notes template +// for a MongoDB community forum release post and writes it to a file named +// "forum.md". +func generateForumNotes(version *semver.Version) { + data := map[string]any{ + "ReleaseVersion": version.String(), + } + + forumFilename := fmt.Sprintf("forum.md", version) + writeTemplate( + forumFilename, + forumTmpl, + data) + + fmt.Println() + fmt.Print( + color.BlueString(`Wrote MongoDB community forum notes template to "`), + color.GreenString(forumFilename), + color.BlueString(`".`), + "\n") + color.Blue("Fill out any missing information and paste the contents into a new MongoDB community forum post in section:") + color.Blue("https://www.mongodb.com/community/forums/c/announcements/driver-releases/110") +} + +func writeTemplate(filename, tmplText string, data any) { + tmpl, err := template.New(filename).Parse(tmplText) + if err != nil { + log.Fatalf("Error creating new template for %q: %v", filename, err) + } + + f, err := os.Create(filename) + if err != nil { + log.Fatalf("Error creating file %q: %v", filename, err) + } + defer f.Close() + + err = tmpl.Execute(f, data) + if err != nil { + log.Fatalf("Error executing template for %q: %v", filename, err) + } +} + +func main() { + version := os.Args[1] + prevVersion := os.Args[2] + generateGithubNotes(version, prevVersion) + generateForumNotes(version) +} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9414cc1b53..4337e0e722 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,6 +33,10 @@ jobs: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} aws_secret_id: ${{ secrets.AWS_SECRET_ID }} + # Todo: extract previous version and write it to a global variable + - run: | + export PREV_VERSION=$(cat version/version.go | grep "var Driver" | awk -F'"' '{print $2}') + echo "PREV_VERSION=$PREV_VERSION" >> $GITHUB_ENV - uses: mongodb-labs/drivers-github-tools/bump-version@v2 with: version: ${{ inputs.version }} @@ -68,7 +72,10 @@ jobs: aws_region_name: ${{ vars.AWS_REGION_NAME }} aws_secret_id: ${{ secrets.AWS_SECRET_ID }} # TODO: generate reports here - # TODO: create draft github release here + - uses: ./.github/actions/publish + with: + version: ${{ inputs.version }} + push_changes: ${{ inputs.push_changes }} - uses: mongodb-labs/drivers-github-tools/bump-version@v2 with: version: ${{ inputs.following_version }} From 541317b1542085702432101a1e30c8d64222467f Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 15:00:01 +0000 Subject: [PATCH 016/156] BUMP 2.1.6 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 5acebcbbf8..f7a1e83f5c 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-prerelease" +var Driver = "2.1.6" From c97ce6532dab904f3f15c022db4dc45735430901 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 15:02:24 +0000 Subject: [PATCH 017/156] BUMP 2.1.7 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index f7a1e83f5c..62736237d6 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.6" +var Driver = "2.1.7" From 8262f49653e701366570c176a8f10b838e1e3aae Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 10:06:13 -0500 Subject: [PATCH 018/156] fix handling of prev_version --- .github/actions/publish/action.yml | 5 ++++- .github/workflows/release.yml | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index 431197c991..992b52cf49 100644 --- a/.github/actions/publish/action.yml +++ b/.github/actions/publish/action.yml @@ -4,6 +4,9 @@ inputs: version: description: The published version required: true + prev_version: + description: The previous version + required: true push_changes: description: Whether to push the changes default: "false" @@ -14,7 +17,7 @@ runs: shell: bash -eux {0} run: | cd ${{ github.actions_path }} - go run notes.go ${{ inputs.version }} $PREV_VERSION + go run notes.go ${{ inputs.version }} ${{ inputs.prev_version }} cat forum.md >> $GITHUB_STEP_SUMMARY rm forum.md - name: Create GitHub Release diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4337e0e722..b3a9f2f3b9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,6 +23,8 @@ jobs: permissions: id-token: write contents: write + outputs: + prev_version: ${{ steps.prev-version.outputs.prev_version }} steps: - uses: mongodb-labs/drivers-github-tools/secure-checkout@v2 with: @@ -34,9 +36,11 @@ jobs: aws_region_name: ${{ vars.AWS_REGION_NAME }} aws_secret_id: ${{ secrets.AWS_SECRET_ID }} # Todo: extract previous version and write it to a global variable - - run: | + - name: Get previous version + id: prev-version + run: | export PREV_VERSION=$(cat version/version.go | grep "var Driver" | awk -F'"' '{print $2}') - echo "PREV_VERSION=$PREV_VERSION" >> $GITHUB_ENV + echo "prev_version=$PREV_VERSION" >> $GITHUB_ENV - uses: mongodb-labs/drivers-github-tools/bump-version@v2 with: version: ${{ inputs.version }} @@ -75,6 +79,7 @@ jobs: - uses: ./.github/actions/publish with: version: ${{ inputs.version }} + prev_version: ${{ needs.bump-and-tag.outputs.prev_version }} push_changes: ${{ inputs.push_changes }} - uses: mongodb-labs/drivers-github-tools/bump-version@v2 with: From 99b99524af735045ffdda5f14666f05c49aadcc5 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 15:07:33 +0000 Subject: [PATCH 019/156] BUMP 2.1.8 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 62736237d6..ffd1556aff 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.7" +var Driver = "2.1.8" From 714868335b2a749781ed13b0ef0c15885d3e3e16 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 10:19:50 -0500 Subject: [PATCH 020/156] fix path --- .github/actions/publish/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index 992b52cf49..f3e3695f66 100644 --- a/.github/actions/publish/action.yml +++ b/.github/actions/publish/action.yml @@ -16,7 +16,7 @@ runs: - name: Generate the notes shell: bash -eux {0} run: | - cd ${{ github.actions_path }} + cd ${{ github.action_path }} go run notes.go ${{ inputs.version }} ${{ inputs.prev_version }} cat forum.md >> $GITHUB_STEP_SUMMARY rm forum.md @@ -24,7 +24,7 @@ runs: shell: bash -eux {0} run: | echo "Creating draft release" - cd ${{ github.actions_path }} + cd ${{ github.action_path }} export NOTES=$(cat github.md) rm github.md if [ "${{ inputs.push_changes }}"" == "true"]; then From 069d04fd4e417381741e5e9e6eb77d86372cae71 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 15:20:59 +0000 Subject: [PATCH 021/156] BUMP 2.1.9 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index ffd1556aff..443e519efe 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.8" +var Driver = "2.1.9" From 57ee9fd670bc476659bade3f116f242def731d9d Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 10:23:59 -0500 Subject: [PATCH 022/156] add go mod --- .github/actions/publish/go.mod | 14 ++++++++++++++ .github/actions/publish/go.sum | 16 ++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 .github/actions/publish/go.mod create mode 100644 .github/actions/publish/go.sum diff --git a/.github/actions/publish/go.mod b/.github/actions/publish/go.mod new file mode 100644 index 0000000000..918c4dae33 --- /dev/null +++ b/.github/actions/publish/go.mod @@ -0,0 +1,14 @@ +module github.com/mongodb-labs/drivers-github-tools + +go 1.20 + +require ( + github.com/coreos/go-semver v0.3.1 + github.com/fatih/color v1.16.0 +) + +require ( + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + golang.org/x/sys v0.14.0 // indirect +) diff --git a/.github/actions/publish/go.sum b/.github/actions/publish/go.sum new file mode 100644 index 0000000000..3338da9921 --- /dev/null +++ b/.github/actions/publish/go.sum @@ -0,0 +1,16 @@ +github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= +github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 72e7f1b4b7cd75f2dd5b81c1d31c06d7c9d5391a Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 15:25:14 +0000 Subject: [PATCH 023/156] BUMP 2.1.10 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 443e519efe..a882a4a6a8 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.9" +var Driver = "2.1.10" From 91662d4af51714329ef6ff5c05878e8c5d52236a Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 10:30:32 -0500 Subject: [PATCH 024/156] make it generic --- .github/actions/publish/go.mod | 14 -------------- .github/actions/publish/go.sum | 16 ---------------- .github/actions/publish/notes.go | 33 +++++++++++++++----------------- 3 files changed, 15 insertions(+), 48 deletions(-) delete mode 100644 .github/actions/publish/go.mod delete mode 100644 .github/actions/publish/go.sum diff --git a/.github/actions/publish/go.mod b/.github/actions/publish/go.mod deleted file mode 100644 index 918c4dae33..0000000000 --- a/.github/actions/publish/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module github.com/mongodb-labs/drivers-github-tools - -go 1.20 - -require ( - github.com/coreos/go-semver v0.3.1 - github.com/fatih/color v1.16.0 -) - -require ( - github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.20 // indirect - golang.org/x/sys v0.14.0 // indirect -) diff --git a/.github/actions/publish/go.sum b/.github/actions/publish/go.sum deleted file mode 100644 index 3338da9921..0000000000 --- a/.github/actions/publish/go.sum +++ /dev/null @@ -1,16 +0,0 @@ -github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= -github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= -github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= -github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= -github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/.github/actions/publish/notes.go b/.github/actions/publish/notes.go index 7bedc92980..59ad02a378 100644 --- a/.github/actions/publish/notes.go +++ b/.github/actions/publish/notes.go @@ -6,9 +6,6 @@ import ( "log" "os" "text/template" - - "github.com/coreos/go-semver/semver" - "github.com/fatih/color" ) //go:embed github.md.tmpl @@ -21,26 +18,26 @@ var forumTmpl string // for a Github release and writes it to a file named "github.md". It // also prints the gh command to create a new draft release with those release // notes. -func generateGithubNotes(release, previous *semver.Version) { +func generateGithubNotes(release, previous string) { filename := fmt.Sprintf("github.md", release) writeTemplate( filename, githubTmpl, map[string]any{ - "ReleaseVersion": release.String(), - "PreviousVersion": previous.String(), + "ReleaseVersion": release, + "PreviousVersion": previous, }) fmt.Println() fmt.Print( - color.BlueString(`Wrote Github notes template to "`), - color.GreenString(filename), - color.BlueString(`".`), + `Wrote Github notes template to "`, + filename, + `".`, "\n") - color.Blue("Fill out any missing information and run the following command to create the Github release:") + fmt.Println("Fill out any missing information and run the following command to create the Github release:") fmt.Println() - color.Green( + fmt.Println( "\tgh auth refresh && gh release create v%[1]s --verify-tag --draft -R 'mongodb/mongo-go-driver' -t 'MongoDB Go Driver %[1]s' -F '%[2]s'", release, filename) @@ -49,9 +46,9 @@ func generateGithubNotes(release, previous *semver.Version) { // generateForumNotes generates a partially filled out release notes template // for a MongoDB community forum release post and writes it to a file named // "forum.md". -func generateForumNotes(version *semver.Version) { +func generateForumNotes(version string) { data := map[string]any{ - "ReleaseVersion": version.String(), + "ReleaseVersion": version, } forumFilename := fmt.Sprintf("forum.md", version) @@ -62,12 +59,12 @@ func generateForumNotes(version *semver.Version) { fmt.Println() fmt.Print( - color.BlueString(`Wrote MongoDB community forum notes template to "`), - color.GreenString(forumFilename), - color.BlueString(`".`), + `Wrote MongoDB community forum notes template to "`, + forumFilename, + `".`, "\n") - color.Blue("Fill out any missing information and paste the contents into a new MongoDB community forum post in section:") - color.Blue("https://www.mongodb.com/community/forums/c/announcements/driver-releases/110") + fmt.Println("Fill out any missing information and paste the contents into a new MongoDB community forum post in section:") + fmt.Println("https://www.mongodb.com/community/forums/c/announcements/driver-releases/110") } func writeTemplate(filename, tmplText string, data any) { From 47dfd0e5e6ba8c934869e1bffc96e27617a2804e Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 15:33:03 +0000 Subject: [PATCH 025/156] BUMP 2.1.11 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index a882a4a6a8..ffcff7bdd4 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.10" +var Driver = "2.1.11" From 80a36f4fb5572b1ecabea42ee931c46ef6cf7bf7 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 15:59:38 +0000 Subject: [PATCH 026/156] BUMP 2.1.12 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index ffcff7bdd4..352562ab35 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.11" +var Driver = "2.1.12" From 542a2de1fcbd328d748367d3795fdbf5f44fe908 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 11:08:59 -0500 Subject: [PATCH 027/156] fix output handling --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b3a9f2f3b9..8af79b7e6d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: id: prev-version run: | export PREV_VERSION=$(cat version/version.go | grep "var Driver" | awk -F'"' '{print $2}') - echo "prev_version=$PREV_VERSION" >> $GITHUB_ENV + echo "prev_version=$PREV_VERSION" >> $GITHUB_OUTPUT - uses: mongodb-labs/drivers-github-tools/bump-version@v2 with: version: ${{ inputs.version }} From 6cb903540bf8f69328923532dee7d41b716e46c5 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 16:10:01 +0000 Subject: [PATCH 028/156] BUMP 2.11.13 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 352562ab35..591ef90d9d 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.12" +var Driver = "2.11.13" From 34f11eeda6c8193aac69bdfdf98aa87ac433429c Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 11:23:42 -0500 Subject: [PATCH 029/156] fix file names --- .github/actions/publish/notes.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/publish/notes.go b/.github/actions/publish/notes.go index 59ad02a378..f6ba986ab3 100644 --- a/.github/actions/publish/notes.go +++ b/.github/actions/publish/notes.go @@ -19,7 +19,7 @@ var forumTmpl string // also prints the gh command to create a new draft release with those release // notes. func generateGithubNotes(release, previous string) { - filename := fmt.Sprintf("github.md", release) + filename := "github.md" writeTemplate( filename, @@ -51,7 +51,7 @@ func generateForumNotes(version string) { "ReleaseVersion": version, } - forumFilename := fmt.Sprintf("forum.md", version) + forumFilename := "forum.md" writeTemplate( forumFilename, forumTmpl, From 5a3c79101e1a1bab79d30d5593eb6d044a2782d9 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 16:24:43 +0000 Subject: [PATCH 030/156] BUMP 2.1.14 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 591ef90d9d..8127341639 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.11.13" +var Driver = "2.1.14" From 84d47347dc107adad57f2db0a304395dd89ee3c5 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 11:26:39 -0500 Subject: [PATCH 031/156] cleanup --- .github/actions/publish/action.yml | 2 +- .github/actions/publish/forum.md.tmpl | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index f3e3695f66..1cfbbed31e 100644 --- a/.github/actions/publish/action.yml +++ b/.github/actions/publish/action.yml @@ -27,7 +27,7 @@ runs: cd ${{ github.action_path }} export NOTES=$(cat github.md) rm github.md - if [ "${{ inputs.push_changes }}"" == "true"]; then + if [ "${{ inputs.push_changes }}" == "true"]; then gh release create ${VERSION} --draft --verify-tag --title ${VERSION} --notes $NOTES gh release view ${VERSION} >> $GITHUB_STEP_SUMMARY else diff --git a/.github/actions/publish/forum.md.tmpl b/.github/actions/publish/forum.md.tmpl index 5134bd8f3c..20a310df16 100644 --- a/.github/actions/publish/forum.md.tmpl +++ b/.github/actions/publish/forum.md.tmpl @@ -1,3 +1,5 @@ +## MongoDB Go Driver {{ .ReleaseVersion }} Released + The MongoDB Go Driver Team is pleased to release version {{ .ReleaseVersion }} of the [MongoDB Go Driver](https://github.com/mongodb/mongo-go-driver). This release {description of notable changes}. For more information please see the [{{ .ReleaseVersion }} release notes](https://github.com/mongodb/mongo-go-driver/releases/tag/v{{ .ReleaseVersion }}). From b6ff336535ca252e63366b0dc640f00afb0e4cba Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 16:27:37 +0000 Subject: [PATCH 032/156] BUMP 2.1.15 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 8127341639..5280cf39c6 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.14" +var Driver = "2.1.15" From c106a780d1e48ac16949106774d8e3da96d0b163 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 16:28:16 +0000 Subject: [PATCH 033/156] BUMP 2.2-prerelease Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 5280cf39c6..5acebcbbf8 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.15" +var Driver = "2.2-prerelease" From ce6cca830bd72ab3186f2b780d971382841266df Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 16:30:30 +0000 Subject: [PATCH 034/156] BUMP 2.1.16 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 5acebcbbf8..03f0e4d129 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-prerelease" +var Driver = "2.1.16" From 4a22f83dd6028edea5a0d1c470e3fa084f711258 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 16:31:16 +0000 Subject: [PATCH 035/156] BUMP 2.2-prerelease Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 03f0e4d129..5acebcbbf8 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.16" +var Driver = "2.2-prerelease" From ab5f027bf0c73d761386754ed9e91d35f69061f6 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 11:32:53 -0500 Subject: [PATCH 036/156] cleanup --- .github/actions/publish/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index 1cfbbed31e..d54491e75b 100644 --- a/.github/actions/publish/action.yml +++ b/.github/actions/publish/action.yml @@ -9,7 +9,7 @@ inputs: required: true push_changes: description: Whether to push the changes - default: "false" + default: "true" runs: using: composite steps: @@ -27,7 +27,7 @@ runs: cd ${{ github.action_path }} export NOTES=$(cat github.md) rm github.md - if [ "${{ inputs.push_changes }}" == "true"]; then + if [ "${{ inputs.push_changes }}" == "true" ]; then gh release create ${VERSION} --draft --verify-tag --title ${VERSION} --notes $NOTES gh release view ${VERSION} >> $GITHUB_STEP_SUMMARY else From e7a9d62e1533cbb9391ebf5de9b89aabc3b3d415 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 16:34:16 +0000 Subject: [PATCH 037/156] BUMP 2.1.17 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 5acebcbbf8..71060a8d0c 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-prerelease" +var Driver = "2.1.17" From 32cf1f5a2f3325a5c000d8b32e55fe939f1623ea Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 11:43:18 -0500 Subject: [PATCH 038/156] cleanup --- .github/actions/publish/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index d54491e75b..77c16865ec 100644 --- a/.github/actions/publish/action.yml +++ b/.github/actions/publish/action.yml @@ -26,6 +26,7 @@ runs: echo "Creating draft release" cd ${{ github.action_path }} export NOTES=$(cat github.md) + export VERSION=${{inputs.version}} rm github.md if [ "${{ inputs.push_changes }}" == "true" ]; then gh release create ${VERSION} --draft --verify-tag --title ${VERSION} --notes $NOTES From 4d775024ced7beffd7e9cb3d6b76b67f1ff5523d Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 16:44:16 +0000 Subject: [PATCH 039/156] BUMP 2.1.18 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 71060a8d0c..832f8dc131 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.17" +var Driver = "2.1.18" From af1ed60dc926473df4cfd8a17ef058bd5fa54803 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 11:46:08 -0500 Subject: [PATCH 040/156] cleanup --- .github/actions/publish/action.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index 77c16865ec..475453a27d 100644 --- a/.github/actions/publish/action.yml +++ b/.github/actions/publish/action.yml @@ -25,13 +25,12 @@ runs: run: | echo "Creating draft release" cd ${{ github.action_path }} - export NOTES=$(cat github.md) export VERSION=${{inputs.version}} - rm github.md if [ "${{ inputs.push_changes }}" == "true" ]; then - gh release create ${VERSION} --draft --verify-tag --title ${VERSION} --notes $NOTES + gh release create ${VERSION} --draft --verify-tag --title ${VERSION} -F github.md gh release view ${VERSION} >> $GITHUB_STEP_SUMMARY else echo "## Skipping draft release with notes:" >> $GITHUB_STEP_SUMMARY - echo $NOTES >> $GITHUB_STEP_SUMMARY - fi \ No newline at end of file + cat github.md >> $GITHUB_STEP_SUMMARY + fi + rm github.md \ No newline at end of file From e0ba6890817cb1353576ea8ef0c6d4e8c9345d3a Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 16:47:04 +0000 Subject: [PATCH 041/156] BUMP 2.1.19 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 832f8dc131..4fba17e911 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.18" +var Driver = "2.1.19" From 1561b6680c85d4af2311dcf2382a1dc58910efd4 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 16:47:50 +0000 Subject: [PATCH 042/156] BUMP 2.2-prerelease Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 4fba17e911..5acebcbbf8 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.19" +var Driver = "2.2-prerelease" From 1f797321953d83fc02d679166e0dad51272624f2 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 14:35:44 -0500 Subject: [PATCH 043/156] add reports --- .github/workflows/release.yml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8af79b7e6d..98f59efc3e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,6 @@ jobs: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} aws_secret_id: ${{ secrets.AWS_SECRET_ID }} - # Todo: extract previous version and write it to a global variable - name: Get previous version id: prev-version run: | @@ -75,11 +74,34 @@ jobs: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} aws_secret_id: ${{ secrets.AWS_SECRET_ID }} - # TODO: generate reports here + - uses: mongodb-labs/drivers-github-tools/authorized-pub@v2 + with: + product_name: mongo-go-driver + release_version: ${{ inputs.version }} + token: ${{ github.token }} + - uses: mongodb-labs/drivers-github-tools/sbom@v2 + with: + silk_asset_group: mongodb-go-driver-v1 + - name: Generate Sarif Report + uses: mongodb-labs/drivers-github-tools/code-scanning-export@v2 + with: + ref: ${{ inputs.version }} + output-file: ${{ env.S3_ASSETS }}/code-scanning-alerts.json + - name: Generate Compliance Report + uses: mongodb-labs/drivers-github-tools/compliance-report@v2 + with: + token: ${{ github.token }} + - name: Upload S3 assets + uses: mongodb-labs/drivers-github-tools/upload-s3-assets@v2 + with: + version: ${{ inputs.version }} + product_name: mongo-go-driver + dry_run: ${{ inputs.push_changes == 'true' && 'false' || 'true' }} - uses: ./.github/actions/publish with: version: ${{ inputs.version }} prev_version: ${{ needs.bump-and-tag.outputs.prev_version }} + product_name: mongo-go-driver push_changes: ${{ inputs.push_changes }} - uses: mongodb-labs/drivers-github-tools/bump-version@v2 with: From 0b7216c8035c777bfc52827caa19194b0b9620ba Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 19:36:49 +0000 Subject: [PATCH 044/156] BUMP 2.1.20 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 5acebcbbf8..e64a11d6ab 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-prerelease" +var Driver = "2.1.20" From 3a9691e34efe18d07813defc5449162bf3b8f67e Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 14:54:01 -0500 Subject: [PATCH 045/156] GODRIVER-3187 Add SBOM lite file (#1655) --- sbom.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 sbom.json diff --git a/sbom.json b/sbom.json new file mode 100644 index 0000000000..d561c09385 --- /dev/null +++ b/sbom.json @@ -0,0 +1,11 @@ +{ + "metadata": { + "timestamp": "2024-06-04T11:44:11.689753+00:00" + }, + "components": [], + "serialNumber": "urn:uuid:6687021d-b80d-46ed-acc9-031a17e582a3", + "version": 1, + "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", + "bomFormat": "CycloneDX", + "specVersion": "1.5" +} From 0dcfade7a9d25bb46a7b27712fdeb02fd04af5ae Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 19:55:27 +0000 Subject: [PATCH 046/156] BUMP 2.1.21 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index e64a11d6ab..526eaa9bf5 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.20" +var Driver = "2.1.21" From 506a02efee5f9c8ca3102ab52097ed92522888b6 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 20:01:52 +0000 Subject: [PATCH 047/156] BUMP 2.1.22 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 526eaa9bf5..148e89c3b2 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.21" +var Driver = "2.1.22" From 6fe6f4aefb24577cab3a406f646b581350afa35e Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 15:04:40 -0500 Subject: [PATCH 048/156] skip reports for now --- .github/workflows/release.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 98f59efc3e..e5bd103cb3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,14 +79,14 @@ jobs: product_name: mongo-go-driver release_version: ${{ inputs.version }} token: ${{ github.token }} - - uses: mongodb-labs/drivers-github-tools/sbom@v2 - with: - silk_asset_group: mongodb-go-driver-v1 - - name: Generate Sarif Report - uses: mongodb-labs/drivers-github-tools/code-scanning-export@v2 - with: - ref: ${{ inputs.version }} - output-file: ${{ env.S3_ASSETS }}/code-scanning-alerts.json + # - uses: mongodb-labs/drivers-github-tools/sbom@v2 + # with: + # silk_asset_group: mongodb-go-driver-v1 + # - name: Generate Sarif Report + # uses: mongodb-labs/drivers-github-tools/code-scanning-export@v2 + # with: + # ref: ${{ inputs.version }} + # output-file: ${{ env.S3_ASSETS }}/code-scanning-alerts.json - name: Generate Compliance Report uses: mongodb-labs/drivers-github-tools/compliance-report@v2 with: From 506e099c197c0dd947631bfcba416f558a7f2d79 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 20:05:42 +0000 Subject: [PATCH 049/156] BUMP 2.1.23 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 148e89c3b2..184290b7ab 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.22" +var Driver = "2.1.23" From b1122fe3ed4a7841d04501c9273ecfe716b13434 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 20:06:31 +0000 Subject: [PATCH 050/156] BUMP 2.2-pre Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 184290b7ab..e5bd8c0251 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.23" +var Driver = "2.2-pre" From 3afa2c3386a658eb29512e97f95070d28115f5e4 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 15:13:30 -0500 Subject: [PATCH 051/156] fix dry run handling --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e5bd103cb3..c91b1acdeb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -96,12 +96,11 @@ jobs: with: version: ${{ inputs.version }} product_name: mongo-go-driver - dry_run: ${{ inputs.push_changes == 'true' && 'false' || 'true' }} + dry_run: ${{ inputs.push_changes == true && 'false' || 'true' }} - uses: ./.github/actions/publish with: version: ${{ inputs.version }} prev_version: ${{ needs.bump-and-tag.outputs.prev_version }} - product_name: mongo-go-driver push_changes: ${{ inputs.push_changes }} - uses: mongodb-labs/drivers-github-tools/bump-version@v2 with: From 2caf69d68ad398a53e49ed907289c28d1ec76155 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 20:14:30 +0000 Subject: [PATCH 052/156] BUMP 2.1.24 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index e5bd8c0251..60e42f18f9 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-pre" +var Driver = "2.1.24" From aefd09bc06dcfed0be8a58dbf9241890c62dea27 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 20:15:13 +0000 Subject: [PATCH 053/156] BUMP 2.2-prerelease Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 60e42f18f9..5acebcbbf8 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.24" +var Driver = "2.2-prerelease" From 1d060581ed18dc54215a081efe8f4e939c140528 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 15:54:22 -0500 Subject: [PATCH 054/156] fix dry run handling --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c91b1acdeb..4238bdba52 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -96,7 +96,7 @@ jobs: with: version: ${{ inputs.version }} product_name: mongo-go-driver - dry_run: ${{ inputs.push_changes == true && 'false' || 'true' }} + dry_run: ${{ inputs.push_changes != true }} - uses: ./.github/actions/publish with: version: ${{ inputs.version }} From 8981d212432c23251653fd107cddfcea8aa41c02 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 15:54:55 -0500 Subject: [PATCH 055/156] fix dry run handling --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4238bdba52..fb2124b3b6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -96,7 +96,7 @@ jobs: with: version: ${{ inputs.version }} product_name: mongo-go-driver - dry_run: ${{ inputs.push_changes != true }} + dry_run: ${{ inputs.push_changes != 'true' }} - uses: ./.github/actions/publish with: version: ${{ inputs.version }} From 2483452d58671e46f12cb7a4f2186e2e8685491f Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 20:56:51 +0000 Subject: [PATCH 056/156] BUMP 2.1.30 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 5acebcbbf8..0cbb6b9924 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-prerelease" +var Driver = "2.1.30" From da260b1b3f487299e9f36adb40ce73789b15cdc8 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 20:57:37 +0000 Subject: [PATCH 057/156] BUMP 2.2-prerelease Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 0cbb6b9924..5acebcbbf8 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.30" +var Driver = "2.2-prerelease" From 762ca7747231d57d40adb10f19cc26a1c845a9ec Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 16:01:27 -0500 Subject: [PATCH 058/156] fix dry run handling --- .github/workflows/release.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fb2124b3b6..437e699c9f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -87,6 +87,14 @@ jobs: # with: # ref: ${{ inputs.version }} # output-file: ${{ env.S3_ASSETS }}/code-scanning-alerts.json + - name: Handle Dry Run + run: | + if [ "${{ inputs.push_changes }}"" != 'true' ]; then + export DRY_RUN=true + else: + export DRY_RUN=false + fi + export "DRY_RUN=$DRY_RUN" >> $GITHUB_ENV - name: Generate Compliance Report uses: mongodb-labs/drivers-github-tools/compliance-report@v2 with: @@ -96,7 +104,7 @@ jobs: with: version: ${{ inputs.version }} product_name: mongo-go-driver - dry_run: ${{ inputs.push_changes != 'true' }} + dry_run: ${{ env.DRY_RUN }} - uses: ./.github/actions/publish with: version: ${{ inputs.version }} From 98d2da8b1326b9f117b30e3157465026edf12151 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 21:02:34 +0000 Subject: [PATCH 059/156] BUMP 2.1.31 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 5acebcbbf8..00c85c09f0 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-prerelease" +var Driver = "2.1.31" From de5f7fc6e1ff5f9344b31518bcaa19b1e6e0608c Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 16:03:32 -0500 Subject: [PATCH 060/156] fix dry run handling --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 437e699c9f..7479c720c1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -89,7 +89,7 @@ jobs: # output-file: ${{ env.S3_ASSETS }}/code-scanning-alerts.json - name: Handle Dry Run run: | - if [ "${{ inputs.push_changes }}"" != 'true' ]; then + if [ "${{ inputs.push_changes }}" != "true" ]; then export DRY_RUN=true else: export DRY_RUN=false From eea6933e55e599a742155643e786d7db3535b728 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 21:04:37 +0000 Subject: [PATCH 061/156] BUMP 2.1.32 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 00c85c09f0..d4e33500ec 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.31" +var Driver = "2.1.32" From d84aea57f99bf5a920885cdb65b45001dc93538d Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 16:05:41 -0500 Subject: [PATCH 062/156] fix dry run handling --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7479c720c1..dd0690eb5c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -91,7 +91,7 @@ jobs: run: | if [ "${{ inputs.push_changes }}" != "true" ]; then export DRY_RUN=true - else: + else export DRY_RUN=false fi export "DRY_RUN=$DRY_RUN" >> $GITHUB_ENV From 06fe19a61b0c9a9ac4128265811fc9072fc112f6 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 21:06:41 +0000 Subject: [PATCH 063/156] BUMP 2.1.33 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index d4e33500ec..1ac7c2be39 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.32" +var Driver = "2.1.33" From 82354f8d625abeccee9a5770f7f508622feac47b Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 21:07:43 +0000 Subject: [PATCH 064/156] BUMP 2.2-pre Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 1ac7c2be39..e5bd8c0251 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.33" +var Driver = "2.2-pre" From 786ea299a2ed9278da4ea07c84f4e76f38a6aa32 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 12 Jun 2024 16:08:37 -0500 Subject: [PATCH 065/156] fix dry run handling --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd0690eb5c..ece3dc18e1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -94,7 +94,7 @@ jobs: else export DRY_RUN=false fi - export "DRY_RUN=$DRY_RUN" >> $GITHUB_ENV + echo "DRY_RUN=$DRY_RUN" >> $GITHUB_ENV - name: Generate Compliance Report uses: mongodb-labs/drivers-github-tools/compliance-report@v2 with: From bcb933d77a4fcdc71c3bbc0df6cc82ed6c9eb7cc Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 21:09:37 +0000 Subject: [PATCH 066/156] BUMP 2.1.34 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index e5bd8c0251..edcded3c19 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-pre" +var Driver = "2.1.34" From a8b16671246a31bbcad8c7c287c2b845f4326e81 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 21:14:56 +0000 Subject: [PATCH 067/156] BUMP 2.1.35 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index edcded3c19..ea124baf61 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.34" +var Driver = "2.1.35" From 30935d445ed9e1fe4f9748223b828f251bca116b Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 21:15:44 +0000 Subject: [PATCH 068/156] BUMP 2.2-pre Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index ea124baf61..e5bd8c0251 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.35" +var Driver = "2.2-pre" From 952aa4cf657448e6fa4b4c3225061b5f0d097af3 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Thu, 13 Jun 2024 07:26:43 -0500 Subject: [PATCH 069/156] try sbom --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ece3dc18e1..4d103728f2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,9 +79,9 @@ jobs: product_name: mongo-go-driver release_version: ${{ inputs.version }} token: ${{ github.token }} - # - uses: mongodb-labs/drivers-github-tools/sbom@v2 - # with: - # silk_asset_group: mongodb-go-driver-v1 + - uses: mongodb-labs/drivers-github-tools/sbom@v2 + with: + silk_asset_group: mongodb-go-driver-v1 # - name: Generate Sarif Report # uses: mongodb-labs/drivers-github-tools/code-scanning-export@v2 # with: From f6139d62a4e983dc7050e67ad876ec8411296709 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 12:30:51 +0000 Subject: [PATCH 070/156] BUMP 2.11.14 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index e5bd8c0251..ba4c9f1817 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-pre" +var Driver = "2.11.14" From 243362fe917408b219ef2708128300edf8aed745 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 12:31:42 +0000 Subject: [PATCH 071/156] BUMP 2.2-pre Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index ba4c9f1817..e5bd8c0251 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.11.14" +var Driver = "2.2-pre" From 6e75330aac2039a82e635fa30d76e1465f9d8644 Mon Sep 17 00:00:00 2001 From: Matt Dale <9760375+matthewdale@users.noreply.github.com> Date: Thu, 13 Jun 2024 05:53:40 -0700 Subject: [PATCH 072/156] GODRIVER-3245 Use a custom CodeQL workflow. (#1674) --- .github/workflows/codeql.yml | 58 ++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000000..044e1743df --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,58 @@ +name: "CodeQL" + +on: + push: + branches: [ "v1", "cloud-*", "master", "release/*" ] + pull_request: + branches: [ "v1", "cloud-*", "master", "release/*" ] + schedule: + - cron: '36 17 * * 0' + workflow_call: + inputs: + ref: + required: true + type: string + +jobs: + analyze: + name: Analyze (${{ matrix.language }}) + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} + permissions: + # required for all workflows + security-events: write + + # required to fetch internal or private CodeQL packs + packages: read + + # only required for workflows in private repositories + actions: read + contents: read + + strategy: + fail-fast: false + matrix: + include: + - language: go + build-mode: manual + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + + - if: matrix.build-mode == 'manual' + shell: bash + run: | + make build + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" From abeee070e9d8a0adb78ac645cdca1ba649789e49 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Thu, 13 Jun 2024 07:54:29 -0500 Subject: [PATCH 073/156] add sarif --- .github/workflows/release.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4d103728f2..8ccbbfcef0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,11 +50,11 @@ jobs: version: ${{ inputs.version }} push_tag: ${{ inputs.push_changes }} - # static-scan: - # needs: [bump-and-tag] - # uses: ./.github/workflows/codeql.yml - # with: - # ref: ${{ inputs.version }} + static-scan: + needs: [bump-and-tag] + uses: ./.github/workflows/codeql.yml + with: + ref: ${{ inputs.version }} publish-and-bump: needs: [bump-and-tag] @@ -82,11 +82,11 @@ jobs: - uses: mongodb-labs/drivers-github-tools/sbom@v2 with: silk_asset_group: mongodb-go-driver-v1 - # - name: Generate Sarif Report - # uses: mongodb-labs/drivers-github-tools/code-scanning-export@v2 - # with: - # ref: ${{ inputs.version }} - # output-file: ${{ env.S3_ASSETS }}/code-scanning-alerts.json + - name: Generate Sarif Report + uses: mongodb-labs/drivers-github-tools/code-scanning-export@v2 + with: + ref: ${{ inputs.version }} + output-file: ${{ env.S3_ASSETS }}/code-scanning-alerts.json - name: Handle Dry Run run: | if [ "${{ inputs.push_changes }}" != "true" ]; then From e6175111b06f42f40ffb46de0b71ac9df37acf61 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Thu, 13 Jun 2024 07:56:21 -0500 Subject: [PATCH 074/156] fix serif --- .github/workflows/codeql.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 044e1743df..21c81a32fa 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -22,13 +22,6 @@ jobs: # required for all workflows security-events: write - # required to fetch internal or private CodeQL packs - packages: read - - # only required for workflows in private repositories - actions: read - contents: read - strategy: fail-fast: false matrix: From 992565629a3c33b477c266e343291e93ea8cdd06 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Thu, 13 Jun 2024 07:57:04 -0500 Subject: [PATCH 075/156] fix serif --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ccbbfcef0..175016ec9b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,6 +52,8 @@ jobs: static-scan: needs: [bump-and-tag] + permissions: + security-events: write uses: ./.github/workflows/codeql.yml with: ref: ${{ inputs.version }} @@ -63,7 +65,6 @@ jobs: permissions: id-token: write contents: write - security-events: write steps: - uses: mongodb-labs/drivers-github-tools/secure-checkout@v2 with: From 5dab1ba0e6235b0c8c7e03f2f2d7ef65fdb770e7 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 12:58:21 +0000 Subject: [PATCH 076/156] BUMP 2.11.15 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index e5bd8c0251..5c44baca13 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-pre" +var Driver = "2.11.15" From b35155d19e1a800f0ec19c99e6ff421a60ebde9f Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Thu, 13 Jun 2024 08:00:35 -0500 Subject: [PATCH 077/156] fix serif --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 175016ec9b..d96c6ea14b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,7 +59,7 @@ jobs: ref: ${{ inputs.version }} publish-and-bump: - needs: [bump-and-tag] + needs: [bump-and-tag, static-scan] runs-on: ubuntu-latest environment: release permissions: From 42b3100f00487c3fd2fc57f9c8ce80add7d3e50a Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:01:42 +0000 Subject: [PATCH 078/156] BUMP 2.11.16 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 5c44baca13..94a7a99cca 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.11.15" +var Driver = "2.11.16" From a234da29d1b4996b7f7cd8b750d0c69af5eee9f6 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Thu, 13 Jun 2024 08:23:24 -0500 Subject: [PATCH 079/156] fix serif --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d96c6ea14b..b16eb7a670 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,6 +65,7 @@ jobs: permissions: id-token: write contents: write + security-events: read steps: - uses: mongodb-labs/drivers-github-tools/secure-checkout@v2 with: From 8ade79d7646cc39170fb2488d214fc3e07dc346a Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:24:16 +0000 Subject: [PATCH 080/156] BUMP 2.11.17 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 94a7a99cca..c9082f0d89 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.11.16" +var Driver = "2.11.17" From be9d886abc4adb262b948cd92b9453ebb365e235 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:31:30 +0000 Subject: [PATCH 081/156] BUMP 2.2-pre Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index c9082f0d89..e5bd8c0251 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.11.17" +var Driver = "2.2-pre" From d0898f86a0752d6f0a0e2667c76d4f67e9d76a18 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Thu, 13 Jun 2024 08:35:35 -0500 Subject: [PATCH 082/156] use full-report --- .github/workflows/release.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b16eb7a670..972ca7fae4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -76,19 +76,12 @@ jobs: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} aws_secret_id: ${{ secrets.AWS_SECRET_ID }} - - uses: mongodb-labs/drivers-github-tools/authorized-pub@v2 + - uses: blink1073/drivers-github-tools/full-report@full-report with: product_name: mongo-go-driver release_version: ${{ inputs.version }} - token: ${{ github.token }} - - uses: mongodb-labs/drivers-github-tools/sbom@v2 - with: silk_asset_group: mongodb-go-driver-v1 - - name: Generate Sarif Report - uses: mongodb-labs/drivers-github-tools/code-scanning-export@v2 - with: - ref: ${{ inputs.version }} - output-file: ${{ env.S3_ASSETS }}/code-scanning-alerts.json + token: ${{ github.token }} - name: Handle Dry Run run: | if [ "${{ inputs.push_changes }}" != "true" ]; then @@ -97,10 +90,6 @@ jobs: export DRY_RUN=false fi echo "DRY_RUN=$DRY_RUN" >> $GITHUB_ENV - - name: Generate Compliance Report - uses: mongodb-labs/drivers-github-tools/compliance-report@v2 - with: - token: ${{ github.token }} - name: Upload S3 assets uses: mongodb-labs/drivers-github-tools/upload-s3-assets@v2 with: From 612188caa140f4b4238887d0dce972b5379fcb1a Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:36:21 +0000 Subject: [PATCH 083/156] BUMP 2.11.18 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index e5bd8c0251..3065184d50 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-pre" +var Driver = "2.11.18" From f0b4a8287f0b84409afbb2011f7fd3b59a611d84 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:46:10 +0000 Subject: [PATCH 084/156] BUMP 2.11.19 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 3065184d50..c0212f5c7c 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.11.18" +var Driver = "2.11.19" From 19ada56cc2701e83a22697ab7838b38ed56da899 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:52:53 +0000 Subject: [PATCH 085/156] BUMP 2.2-pre Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index c0212f5c7c..e5bd8c0251 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.11.19" +var Driver = "2.2-pre" From 9d64f3e1ff15c1f4615c0471537962340dcd01a4 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 14:12:40 +0000 Subject: [PATCH 086/156] BUMP 2.11.20 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index e5bd8c0251..4656d2eb47 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-pre" +var Driver = "2.11.20" From deb2f7bd7e42040fbd220ae069102343d7e41762 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 14:14:23 +0000 Subject: [PATCH 087/156] BUMP 2.11.21 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 4656d2eb47..d2b7b7eedb 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.11.20" +var Driver = "2.11.21" From 4f502186002e80fe8d99cd893cff1d185435b3bb Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 14:23:17 +0000 Subject: [PATCH 088/156] BUMP 2.11.22 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index d2b7b7eedb..8dcf4a643c 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.11.21" +var Driver = "2.11.22" From 3c4b578d8bf36b503d4baef6e9400fdff4e9168f Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 14:30:20 +0000 Subject: [PATCH 089/156] BUMP 2.2-pre Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 8dcf4a643c..e5bd8c0251 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.11.22" +var Driver = "2.2-pre" From b784fe8e687ceff828628b05b5a1ff495c02331a Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 14:31:50 +0000 Subject: [PATCH 090/156] BUMP 2.11.23 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index e5bd8c0251..5f6be837ec 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-pre" +var Driver = "2.11.23" From 7c8884015545b20afedb47577dd87c0537156f38 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 14:38:54 +0000 Subject: [PATCH 091/156] BUMP 2.2-pre Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 5f6be837ec..e5bd8c0251 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.11.23" +var Driver = "2.2-pre" From b2a7426295832b99a183032af6d87bef7933e6a2 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Thu, 13 Jun 2024 20:10:00 -0500 Subject: [PATCH 092/156] upload release assets --- .github/actions/publish/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index 475453a27d..3d7babdf2f 100644 --- a/.github/actions/publish/action.yml +++ b/.github/actions/publish/action.yml @@ -28,6 +28,7 @@ runs: export VERSION=${{inputs.version}} if [ "${{ inputs.push_changes }}" == "true" ]; then gh release create ${VERSION} --draft --verify-tag --title ${VERSION} -F github.md + gh release upload ${VERSION} $RELEASE_ASSETS/*.* gh release view ${VERSION} >> $GITHUB_STEP_SUMMARY else echo "## Skipping draft release with notes:" >> $GITHUB_STEP_SUMMARY From fb39da8569f4a0aa39c79c18066ed49aaff00538 Mon Sep 17 00:00:00 2001 From: timothy-kim-mongo Date: Fri, 14 Jun 2024 14:58:29 -0400 Subject: [PATCH 093/156] GODRIVER-2667 Replacing the assert.Soon with the assert.Eventually function (#1668) --- internal/test/compilecheck/go.mod | 8 +- internal/test/compilecheck/go.sum | 19 ++- mongo/integration/client_test.go | 152 +++++++----------- mongo/integration/csot_prose_test.go | 52 ++++-- mongo/integration/sdam_error_handling_test.go | 64 ++------ mongo/integration/sdam_prose_test.go | 33 ++-- .../unified_runner_events_helper_test.go | 57 +++---- mongo/with_transactions_test.go | 50 ++++-- x/mongo/driver/topology/connection_test.go | 22 ++- .../driver/topology/topology_errors_test.go | 12 +- 10 files changed, 220 insertions(+), 249 deletions(-) diff --git a/internal/test/compilecheck/go.mod b/internal/test/compilecheck/go.mod index 69d192022a..cc09124838 100644 --- a/internal/test/compilecheck/go.mod +++ b/internal/test/compilecheck/go.mod @@ -9,14 +9,14 @@ replace go.mongodb.org/mongo-driver => ../../../ require go.mongodb.org/mongo-driver v1.11.7 require ( - github.com/golang/snappy v0.0.1 // indirect + github.com/golang/snappy v0.0.4 // indirect github.com/klauspost/compress v1.13.6 // indirect - github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect + github.com/montanaflynn/stats v0.7.1 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect - golang.org/x/crypto v0.17.0 // indirect - golang.org/x/sync v0.1.0 // indirect + golang.org/x/crypto v0.22.0 // indirect + golang.org/x/sync v0.7.0 // indirect golang.org/x/text v0.14.0 // indirect ) diff --git a/internal/test/compilecheck/go.sum b/internal/test/compilecheck/go.sum index fe79e66209..802402a881 100644 --- a/internal/test/compilecheck/go.sum +++ b/internal/test/compilecheck/go.sum @@ -1,11 +1,11 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0= -github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= +github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE= +github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= @@ -17,16 +17,16 @@ github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7Jul github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= -golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -44,4 +44,3 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= diff --git a/mongo/integration/client_test.go b/mongo/integration/client_test.go index 0139d273da..0e478537b4 100644 --- a/mongo/integration/client_test.go +++ b/mongo/integration/client_test.go @@ -526,31 +526,23 @@ func TestClient(t *testing.T) { // Assert that the minimum RTT is eventually >250ms. topo := getTopologyFromClient(mt.Client) - assert.Soon(mt, func(ctx context.Context) { - for { - // Stop loop if callback has been canceled. - select { - case <-ctx.Done(): - return - default: - } - - time.Sleep(100 * time.Millisecond) - - // Wait for all of the server's minimum RTTs to be >250ms. - done := true - for _, desc := range topo.Description().Servers { - server, err := topo.FindServer(desc) - assert.Nil(mt, err, "FindServer error: %v", err) - if server.RTTMonitor().Min() <= 250*time.Millisecond { - done = false - } - } - if done { - return + callback := func() bool { + // Wait for all of the server's minimum RTTs to be >250ms. + for _, desc := range topo.Description().Servers { + server, err := topo.FindServer(desc) + assert.NoError(mt, err, "FindServer error: %v", err) + if server.RTTMonitor().Min() <= 250*time.Millisecond { + return false // the tick should wait for 100ms in this case } } - }, 10*time.Second) + + return true + } + assert.Eventually(t, + callback, + 10*time.Second, + 100*time.Millisecond, + "expected that the minimum RTT is eventually >250ms") }) // Test that if the minimum RTT is greater than the remaining timeout for an operation, the @@ -574,31 +566,23 @@ func TestClient(t *testing.T) { // Assert that the minimum RTT is eventually >250ms. topo := getTopologyFromClient(mt.Client) - assert.Soon(mt, func(ctx context.Context) { - for { - // Stop loop if callback has been canceled. - select { - case <-ctx.Done(): - return - default: - } - - time.Sleep(100 * time.Millisecond) - - // Wait for all of the server's minimum RTTs to be >250ms. - done := true - for _, desc := range topo.Description().Servers { - server, err := topo.FindServer(desc) - assert.Nil(mt, err, "FindServer error: %v", err) - if server.RTTMonitor().Min() <= 250*time.Millisecond { - done = false - } - } - if done { - return + callback := func() bool { + // Wait for all of the server's minimum RTTs to be >250ms. + for _, desc := range topo.Description().Servers { + server, err := topo.FindServer(desc) + assert.NoError(mt, err, "FindServer error: %v", err) + if server.RTTMonitor().Min() <= 250*time.Millisecond { + return false } } - }, 10*time.Second) + + return true + } + assert.Eventually(t, + callback, + 10*time.Second, + 100*time.Millisecond, + "expected that the minimum RTT is eventually >250ms") // Once we've waited for the minimum RTT for the single server to be >250ms, run a bunch of // Ping operations with a timeout of 250ms and expect that they return errors. @@ -625,31 +609,23 @@ func TestClient(t *testing.T) { // Assert that RTT90s are eventually >300ms. topo := getTopologyFromClient(mt.Client) - assert.Soon(mt, func(ctx context.Context) { - for { - // Stop loop if callback has been canceled. - select { - case <-ctx.Done(): - return - default: - } - - time.Sleep(100 * time.Millisecond) - - // Wait for all of the server's RTT90s to be >300ms. - done := true - for _, desc := range topo.Description().Servers { - server, err := topo.FindServer(desc) - assert.Nil(mt, err, "FindServer error: %v", err) - if server.RTTMonitor().P90() <= 300*time.Millisecond { - done = false - } - } - if done { - return + callback := func() bool { + // Wait for all of the server's RTT90s to be >300ms. + for _, desc := range topo.Description().Servers { + server, err := topo.FindServer(desc) + assert.NoError(mt, err, "FindServer error: %v", err) + if server.RTTMonitor().P90() <= 300*time.Millisecond { + return false } } - }, 10*time.Second) + + return true + } + assert.Eventually(t, + callback, + 10*time.Second, + 100*time.Millisecond, + "expected that the RTT90s are eventually >300ms") }) // Test that if Timeout is set and the RTT90 is greater than the remaining timeout for an operation, the @@ -676,31 +652,23 @@ func TestClient(t *testing.T) { // Assert that RTT90s are eventually >275ms. topo := getTopologyFromClient(mt.Client) - assert.Soon(mt, func(ctx context.Context) { - for { - // Stop loop if callback has been canceled. - select { - case <-ctx.Done(): - return - default: - } - - time.Sleep(100 * time.Millisecond) - - // Wait for all of the server's RTT90s to be >275ms. - done := true - for _, desc := range topo.Description().Servers { - server, err := topo.FindServer(desc) - assert.Nil(mt, err, "FindServer error: %v", err) - if server.RTTMonitor().P90() <= 275*time.Millisecond { - done = false - } - } - if done { - return + callback := func() bool { + // Wait for all of the server's RTT90s to be >275ms. + for _, desc := range topo.Description().Servers { + server, err := topo.FindServer(desc) + assert.NoError(mt, err, "FindServer error: %v", err) + if server.RTTMonitor().P90() <= 275*time.Millisecond { + return false } } - }, 10*time.Second) + + return true + } + assert.Eventually(t, + callback, + 10*time.Second, + 100*time.Millisecond, + "expected that the RTT90s are eventually >275ms") // Once we've waited for the RTT90 for the servers to be >275ms, run 10 Ping operations // with a timeout of 275ms and expect that they return timeout errors. diff --git a/mongo/integration/csot_prose_test.go b/mongo/integration/csot_prose_test.go index 4f9f112b3f..c8ddfd68df 100644 --- a/mongo/integration/csot_prose_test.go +++ b/mongo/integration/csot_prose_test.go @@ -89,13 +89,18 @@ func TestCSOTProse(t *testing.T) { mt.RunOpts("serverSelectionTimeoutMS honored if timeoutMS is not set", mtOpts, func(mt *mtest.T) { mt.Parallel() - callback := func(ctx context.Context) { - err := mt.Client.Ping(ctx, nil) - assert.NotNil(mt, err, "expected Ping error, got nil") + callback := func() bool { + err := mt.Client.Ping(context.Background(), nil) + assert.Error(mt, err, "expected Ping error, got nil") + return true } // Assert that Ping fails within 150ms due to server selection timeout. - assert.Soon(mt, callback, 150*time.Millisecond) + assert.Eventually(t, + callback, + 150*time.Millisecond, + time.Millisecond, + "expected ping to fail within 150ms") }) cliOpts = options.Client().ApplyURI("mongodb://invalid/?timeoutMS=100&serverSelectionTimeoutMS=200") @@ -103,13 +108,18 @@ func TestCSOTProse(t *testing.T) { mt.RunOpts("timeoutMS honored for server selection if it's lower than serverSelectionTimeoutMS", mtOpts, func(mt *mtest.T) { mt.Parallel() - callback := func(ctx context.Context) { - err := mt.Client.Ping(ctx, nil) - assert.NotNil(mt, err, "expected Ping error, got nil") + callback := func() bool { + err := mt.Client.Ping(context.Background(), nil) + assert.Error(mt, err, "expected Ping error, got nil") + return true } // Assert that Ping fails within 150ms due to timeout. - assert.Soon(mt, callback, 150*time.Millisecond) + assert.Eventually(t, + callback, + 150*time.Millisecond, + time.Millisecond, + "expected ping to fail within 150ms") }) cliOpts = options.Client().ApplyURI("mongodb://invalid/?timeoutMS=200&serverSelectionTimeoutMS=100") @@ -117,13 +127,18 @@ func TestCSOTProse(t *testing.T) { mt.RunOpts("serverSelectionTimeoutMS honored for server selection if it's lower than timeoutMS", mtOpts, func(mt *mtest.T) { mt.Parallel() - callback := func(ctx context.Context) { - err := mt.Client.Ping(ctx, nil) - assert.NotNil(mt, err, "expected Ping error, got nil") + callback := func() bool { + err := mt.Client.Ping(context.Background(), nil) + assert.Error(mt, err, "expected Ping error, got nil") + return true } // Assert that Ping fails within 150ms due to server selection timeout. - assert.Soon(mt, callback, 150*time.Millisecond) + assert.Eventually(t, + callback, + 150*time.Millisecond, + time.Millisecond, + "expected ping to fail within 150ms") }) cliOpts = options.Client().ApplyURI("mongodb://invalid/?timeoutMS=0&serverSelectionTimeoutMS=100") @@ -131,13 +146,18 @@ func TestCSOTProse(t *testing.T) { mt.RunOpts("serverSelectionTimeoutMS honored for server selection if timeoutMS=0", mtOpts, func(mt *mtest.T) { mt.Parallel() - callback := func(ctx context.Context) { - err := mt.Client.Ping(ctx, nil) - assert.NotNil(mt, err, "expected Ping error, got nil") + callback := func() bool { + err := mt.Client.Ping(context.Background(), nil) + assert.Error(mt, err, "expected Ping error, got nil") + return true } // Assert that Ping fails within 150ms due to server selection timeout. - assert.Soon(mt, callback, 150*time.Millisecond) + assert.Eventually(t, + callback, + 150*time.Millisecond, + time.Millisecond, + "expected ping to fail within 150ms") }) }) } diff --git a/mongo/integration/sdam_error_handling_test.go b/mongo/integration/sdam_error_handling_test.go index 58cac9ccdd..4a2baf542d 100644 --- a/mongo/integration/sdam_error_handling_test.go +++ b/mongo/integration/sdam_error_handling_test.go @@ -85,23 +85,13 @@ func TestSDAMErrorHandling(t *testing.T) { assert.NotNil(mt, err, "expected InsertOne error, got nil") assert.True(mt, mongo.IsTimeout(err), "expected timeout error, got %v", err) assert.True(mt, mongo.IsNetworkError(err), "expected network error, got %v", err) + // Assert that the pool is cleared within 2 seconds. - assert.Soon(mt, func(ctx context.Context) { - ticker := time.NewTicker(100 * time.Millisecond) - defer ticker.Stop() - - for { - select { - case <-ticker.C: - case <-ctx.Done(): - return - } - - if tpm.IsPoolCleared() { - return - } - } - }, 2*time.Second) + assert.Eventually(t, + tpm.IsPoolCleared, + 2*time.Second, + 100*time.Millisecond, + "expected pool is cleared within 2 seconds") }) mt.RunOpts("pool cleared on non-timeout network error", noClientOpts, func(mt *mtest.T) { @@ -131,22 +121,11 @@ func TestSDAMErrorHandling(t *testing.T) { SetMinPoolSize(5)) // Assert that the pool is cleared within 2 seconds. - assert.Soon(mt, func(ctx context.Context) { - ticker := time.NewTicker(100 * time.Millisecond) - defer ticker.Stop() - - for { - select { - case <-ticker.C: - case <-ctx.Done(): - return - } - - if tpm.IsPoolCleared() { - return - } - } - }, 2*time.Second) + assert.Eventually(t, + tpm.IsPoolCleared, + 2*time.Second, + 100*time.Millisecond, + "expected pool is cleared within 2 seconds") }) mt.Run("foreground", func(mt *mtest.T) { @@ -175,22 +154,11 @@ func TestSDAMErrorHandling(t *testing.T) { assert.False(mt, mongo.IsTimeout(err), "expected non-timeout error, got %v", err) // Assert that the pool is cleared within 2 seconds. - assert.Soon(mt, func(ctx context.Context) { - ticker := time.NewTicker(100 * time.Millisecond) - defer ticker.Stop() - - for { - select { - case <-ticker.C: - case <-ctx.Done(): - return - } - - if tpm.IsPoolCleared() { - return - } - } - }, 2*time.Second) + assert.Eventually(t, + tpm.IsPoolCleared, + 2*time.Second, + 100*time.Millisecond, + "expected pool is cleared within 2 seconds") }) }) }) diff --git a/mongo/integration/sdam_prose_test.go b/mongo/integration/sdam_prose_test.go index f91bab1176..615c77569b 100644 --- a/mongo/integration/sdam_prose_test.go +++ b/mongo/integration/sdam_prose_test.go @@ -124,28 +124,23 @@ func TestSDAMProse(t *testing.T) { AppName: "streamingRttTest", }, }) - callback := func(ctx context.Context) { - for { - // Stop loop if callback has been canceled. - select { - case <-ctx.Done(): - return - default: + callback := func() bool { + // We don't know which server received the failpoint command, so we wait until any of the server + // RTTs cross the threshold. + for _, serverDesc := range testTopology.Description().Servers { + if serverDesc.AverageRTT > 250*time.Millisecond { + return true } - - // We don't know which server received the failpoint command, so we wait until any of the server - // RTTs cross the threshold. - for _, serverDesc := range testTopology.Description().Servers { - if serverDesc.AverageRTT > 250*time.Millisecond { - return - } - } - - // The next update will be in ~500ms. - time.Sleep(500 * time.Millisecond) } + + // The next update will be in ~500ms. + return false } - assert.Soon(t, callback, defaultCallbackTimeout) + assert.Eventually(t, + callback, + defaultCallbackTimeout, + 500*time.Millisecond, + "expected average rtt heartbeats at least within every 500 ms period") }) }) diff --git a/mongo/integration/unified_runner_events_helper_test.go b/mongo/integration/unified_runner_events_helper_test.go index 780be40de9..5afc510e14 100644 --- a/mongo/integration/unified_runner_events_helper_test.go +++ b/mongo/integration/unified_runner_events_helper_test.go @@ -87,31 +87,23 @@ func waitForEvent(mt *mtest.T, test *testCase, op *operation) { eventType := op.Arguments.Lookup("event").StringValue() expectedCount := int(op.Arguments.Lookup("count").Int32()) - callback := func(ctx context.Context) { - for { - // Stop loop if callback has been canceled. - select { - case <-ctx.Done(): - return - default: - } - - var count int - // Spec tests only ever wait for ServerMarkedUnknown SDAM events for the time being. - if eventType == "ServerMarkedUnknownEvent" { - count = test.monitor.getServerMarkedUnknownCount() - } else { - count = test.monitor.getPoolEventCount(eventType) - } - - if count >= expectedCount { - return - } - time.Sleep(100 * time.Millisecond) + callback := func() bool { + var count int + // Spec tests only ever wait for ServerMarkedUnknown SDAM events for the time being. + if eventType == "ServerMarkedUnknownEvent" { + count = test.monitor.getServerMarkedUnknownCount() + } else { + count = test.monitor.getPoolEventCount(eventType) } + + return count >= expectedCount } - assert.Soon(mt, callback, defaultCallbackTimeout) + assert.Eventually(mt, + callback, + defaultCallbackTimeout, + 100*time.Millisecond, + "expected spec tests to only wait for Server Marked Unknown SDAM events") } func assertEventCount(mt *mtest.T, testCase *testCase, op *operation) { @@ -134,23 +126,16 @@ func recordPrimary(mt *mtest.T, testCase *testCase) { } func waitForPrimaryChange(mt *mtest.T, testCase *testCase, op *operation) { - callback := func(ctx context.Context) { - for { - // Stop loop if callback has been canceled. - select { - case <-ctx.Done(): - return - default: - } - - if getPrimaryAddress(mt, testCase.testTopology, false) != testCase.recordedPrimary { - return - } - } + callback := func() bool { + return getPrimaryAddress(mt, testCase.testTopology, false) != testCase.recordedPrimary } timeout := convertValueToMilliseconds(mt, op.Arguments.Lookup("timeoutMS")) - assert.Soon(mt, callback, timeout) + assert.Eventually(mt, + callback, + timeout, + 100*time.Millisecond, + "expected primary address to be different within the timeout period") } // getPrimaryAddress returns the address of the current primary. If failFast is true, the server selection fast path diff --git a/mongo/with_transactions_test.go b/mongo/with_transactions_test.go index af7ce98b0c..544053b973 100644 --- a/mongo/with_transactions_test.go +++ b/mongo/with_transactions_test.go @@ -399,19 +399,23 @@ func TestConvenientTransactions(t *testing.T) { // Insert a document within a session and manually cancel context before // "commitTransaction" can be sent. - callback := func(ctx context.Context) { - transactionCtx, cancel := context.WithCancel(ctx) - + callback := func() bool { + transactionCtx, cancel := context.WithCancel(context.Background()) _, _ = sess.WithTransaction(transactionCtx, func(ctx SessionContext) (interface{}, error) { _, err := coll.InsertOne(ctx, bson.M{"x": 1}) - assert.Nil(t, err, "InsertOne error: %v", err) + assert.NoError(t, err, "InsertOne error: %v", err) cancel() return nil, nil }) + return true } // Assert that transaction is canceled within 500ms and not 2 seconds. - assert.Soon(t, callback, 500*time.Millisecond) + assert.Eventually(t, + callback, + 500*time.Millisecond, + time.Millisecond, + "expected transaction to be canceled within 500ms") // Assert that AbortTransaction was started once and succeeded. assert.Equal(t, 1, len(abortStarted), "expected 1 abortTransaction started event, got %d", len(abortStarted)) @@ -459,19 +463,24 @@ func TestConvenientTransactions(t *testing.T) { assert.Nil(t, err, "StartSession error: %v", err) defer sess.EndSession(context.Background()) - callback := func(ctx context.Context) { + callback := func() bool { // Create transaction context with short timeout. - withTransactionContext, cancel := context.WithTimeout(ctx, time.Nanosecond) + withTransactionContext, cancel := context.WithTimeout(context.Background(), time.Nanosecond) defer cancel() _, _ = sess.WithTransaction(withTransactionContext, func(ctx SessionContext) (interface{}, error) { _, err := coll.InsertOne(ctx, bson.D{{}}) return nil, err }) + return true } // Assert that transaction fails within 500ms and not 2 seconds. - assert.Soon(t, callback, 500*time.Millisecond) + assert.Eventually(t, + callback, + 500*time.Millisecond, + time.Millisecond, + "expected transaction to fail within 500ms") }) t.Run("canceled context before callback does not retry", func(t *testing.T) { withTransactionTimeout = 2 * time.Second @@ -489,19 +498,24 @@ func TestConvenientTransactions(t *testing.T) { assert.Nil(t, err, "StartSession error: %v", err) defer sess.EndSession(context.Background()) - callback := func(ctx context.Context) { + callback := func() bool { // Create transaction context and cancel it immediately. - withTransactionContext, cancel := context.WithTimeout(ctx, 2*time.Second) + withTransactionContext, cancel := context.WithTimeout(context.Background(), 2*time.Second) cancel() _, _ = sess.WithTransaction(withTransactionContext, func(ctx SessionContext) (interface{}, error) { _, err := coll.InsertOne(ctx, bson.D{{}}) return nil, err }) + return true } // Assert that transaction fails within 500ms and not 2 seconds. - assert.Soon(t, callback, 500*time.Millisecond) + assert.Eventually(t, + callback, + 500*time.Millisecond, + time.Millisecond, + "expected transaction to fail within 500ms") }) t.Run("slow operation in callback retries", func(t *testing.T) { withTransactionTimeout = 2 * time.Second @@ -540,8 +554,8 @@ func TestConvenientTransactions(t *testing.T) { assert.Nil(t, err, "StartSession error: %v", err) defer sess.EndSession(context.Background()) - callback := func(ctx context.Context) { - _, err = sess.WithTransaction(ctx, func(ctx SessionContext) (interface{}, error) { + callback := func() bool { + _, err = sess.WithTransaction(context.Background(), func(ctx SessionContext) (interface{}, error) { // Set a timeout of 300ms to cause a timeout on first insertOne // and force a retry. c, cancel := context.WithTimeout(ctx, 300*time.Millisecond) @@ -550,11 +564,17 @@ func TestConvenientTransactions(t *testing.T) { _, err := coll.InsertOne(c, bson.D{{}}) return nil, err }) - assert.Nil(t, err, "WithTransaction error: %v", err) + assert.NoError(t, err, "WithTransaction error: %v", err) + return true } // Assert that transaction passes within 2 seconds. - assert.Soon(t, callback, 2*time.Second) + assert.Eventually(t, + callback, + withTransactionTimeout, + time.Millisecond, + "expected transaction to be passed within 2s") + }) } diff --git a/x/mongo/driver/topology/connection_test.go b/x/mongo/driver/topology/connection_test.go index dc774b469b..946f74d8f2 100644 --- a/x/mongo/driver/topology/connection_test.go +++ b/x/mongo/driver/topology/connection_test.go @@ -236,13 +236,18 @@ func TestConnection(t *testing.T) { conn := newConnection("", connOpts...) var connectErr error - callback := func(ctx context.Context) { - connectCtx, cancel := context.WithTimeout(ctx, tc.contextTimeout) + callback := func() bool { + connectCtx, cancel := context.WithTimeout(context.Background(), tc.contextTimeout) defer cancel() connectErr = conn.connect(connectCtx) + return true } - assert.Soon(t, callback, tc.maxConnectTime) + assert.Eventually(t, + callback, + tc.maxConnectTime, + time.Millisecond, + "expected timeout to apply to socket establishment after maximum connect time") ce, ok := connectErr.(ConnectionError) assert.True(t, ok, "expected error %v to be of type %T", connectErr, ConnectionError{}) @@ -271,13 +276,18 @@ func TestConnection(t *testing.T) { conn := newConnection(address.Address(l.Addr().String()), connOpts...) var connectErr error - callback := func(ctx context.Context) { - connectCtx, cancel := context.WithTimeout(ctx, tc.contextTimeout) + callback := func() bool { + connectCtx, cancel := context.WithTimeout(context.Background(), tc.contextTimeout) defer cancel() connectErr = conn.connect(connectCtx) + return true } - assert.Soon(t, callback, tc.maxConnectTime) + assert.Eventually(t, + callback, + tc.maxConnectTime, + time.Millisecond, + "expected timeout to apply to TLS handshake after maximum connect time") ce, ok := connectErr.(ConnectionError) assert.True(t, ok, "expected error %v to be of type %T", connectErr, ConnectionError{}) diff --git a/x/mongo/driver/topology/topology_errors_test.go b/x/mongo/driver/topology/topology_errors_test.go index c09ef9731c..c7dc7336e9 100644 --- a/x/mongo/driver/topology/topology_errors_test.go +++ b/x/mongo/driver/topology/topology_errors_test.go @@ -46,15 +46,21 @@ func TestTopologyErrors(t *testing.T) { assert.Nil(t, err, "error creating topology: %v", err) var serverSelectionErr error - callback := func(ctx context.Context) { - selectServerCtx, cancel := context.WithTimeout(ctx, 10*time.Millisecond) + callback := func() bool { + selectServerCtx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond) defer cancel() state := newServerSelectionState(selectNone, make(<-chan time.Time)) subCh := make(<-chan description.Topology) _, serverSelectionErr = topo.selectServerFromSubscription(selectServerCtx, subCh, state) + return true } - assert.Soon(t, callback, 150*time.Millisecond) + assert.Eventually(t, + callback, + 150*time.Millisecond, + time.Millisecond, + "expected context deadline to fail within 150ms") + assert.True(t, errors.Is(serverSelectionErr, context.DeadlineExceeded), "expected %v, received %v", context.DeadlineExceeded, serverSelectionErr) }) From 68a36707d41a3761f4b0318303683d4da3c64729 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 16 Jun 2024 06:46:06 -0500 Subject: [PATCH 094/156] use upstream actions --- .github/actions/publish/action.yml | 37 ---------- .github/actions/publish/forum.md.tmpl | 12 ---- .github/actions/publish/github.md.tmpl | 23 ------- .github/actions/publish/notes.go | 93 -------------------------- .github/scripts/bump-version.go | 35 ---------- .github/workflows/release.yml | 54 ++++----------- 6 files changed, 12 insertions(+), 242 deletions(-) delete mode 100644 .github/actions/publish/action.yml delete mode 100644 .github/actions/publish/forum.md.tmpl delete mode 100644 .github/actions/publish/github.md.tmpl delete mode 100644 .github/actions/publish/notes.go delete mode 100644 .github/scripts/bump-version.go diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml deleted file mode 100644 index 3d7babdf2f..0000000000 --- a/.github/actions/publish/action.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Publish -description: Publish Draft GitHub Release -inputs: - version: - description: The published version - required: true - prev_version: - description: The previous version - required: true - push_changes: - description: Whether to push the changes - default: "true" -runs: - using: composite - steps: - - name: Generate the notes - shell: bash -eux {0} - run: | - cd ${{ github.action_path }} - go run notes.go ${{ inputs.version }} ${{ inputs.prev_version }} - cat forum.md >> $GITHUB_STEP_SUMMARY - rm forum.md - - name: Create GitHub Release - shell: bash -eux {0} - run: | - echo "Creating draft release" - cd ${{ github.action_path }} - export VERSION=${{inputs.version}} - if [ "${{ inputs.push_changes }}" == "true" ]; then - gh release create ${VERSION} --draft --verify-tag --title ${VERSION} -F github.md - gh release upload ${VERSION} $RELEASE_ASSETS/*.* - gh release view ${VERSION} >> $GITHUB_STEP_SUMMARY - else - echo "## Skipping draft release with notes:" >> $GITHUB_STEP_SUMMARY - cat github.md >> $GITHUB_STEP_SUMMARY - fi - rm github.md \ No newline at end of file diff --git a/.github/actions/publish/forum.md.tmpl b/.github/actions/publish/forum.md.tmpl deleted file mode 100644 index 20a310df16..0000000000 --- a/.github/actions/publish/forum.md.tmpl +++ /dev/null @@ -1,12 +0,0 @@ -## MongoDB Go Driver {{ .ReleaseVersion }} Released - -The MongoDB Go Driver Team is pleased to release version {{ .ReleaseVersion }} of the [MongoDB Go Driver](https://github.com/mongodb/mongo-go-driver). - -This release {description of notable changes}. For more information please see the [{{ .ReleaseVersion }} release notes](https://github.com/mongodb/mongo-go-driver/releases/tag/v{{ .ReleaseVersion }}). - -You can obtain the driver source from GitHub under the [v{{ .ReleaseVersion }} tag](https://github.com/mongodb/mongo-go-driver/tree/v{{ .ReleaseVersion }}). - -Documentation for the Go driver can be found on [pkg.go.dev](https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo?tab=doc) and the [MongoDB documentation site](https://docs.mongodb.com/ecosystem/drivers/go/). BSON library documentation is also available on [pkg.go.dev](https://pkg.go.dev/go.mongodb.org/mongo-driver/bson?tab=doc). Questions and inquiries can be asked on the [MongoDB Developer Community](https://community.mongodb.com/). Bugs can be reported in the [Go Driver project in the MongoDB JIRA](https://jira.mongodb.org/secure/CreateIssue!default.jspa?pid=14289) where a list of [current issues](https://jira.mongodb.org/browse/GODRIVER) can be found. Your feedback on the Go driver is greatly appreciated! - -Thank you, -The Go Driver Team diff --git a/.github/actions/publish/github.md.tmpl b/.github/actions/publish/github.md.tmpl deleted file mode 100644 index fdfc53c1df..0000000000 --- a/.github/actions/publish/github.md.tmpl +++ /dev/null @@ -1,23 +0,0 @@ -The MongoDB Go Driver Team is pleased to release version {{ .ReleaseVersion }} of the official Go driver. - -## Release Notes - -This release {description of notable changes}. - -### {Notable Release Feature 1} - -{Description of notable release feature 1} - -*** - -For a full list of tickets included in this release, please see the links below: - -* [Projects](https://jira.mongodb.org/issues/?jql=project%3Dgodriver%20and%20type%3Depic%20and%20status%20%3D%20Closed%20and%20fixVersion%3D{{ .ReleaseVersion }}) -* [New Features](https://jira.mongodb.org/issues/?jql=project%3Dgodriver%20and%20type%3D%22new%20feature%22%20and%20status%20%3D%20Closed%20and%20fixVersion%3D{{ .ReleaseVersion }}) -* [Improvements](https://jira.mongodb.org/issues/?jql=project%3Dgodriver%20and%20type%3Dimprovement%20and%20status%20%3D%20Closed%20and%20fixVersion%3D{{ .ReleaseVersion }}) -* [Bugs](https://jira.mongodb.org/issues/?jql=project%3DGODRIVER%20and%20type%3DBug%20and%20status%3Dclosed%20and%20fixVersion%3D{{ .ReleaseVersion }}) -* [Tasks](https://jira.mongodb.org/issues/?jql=project%3Dgodriver%20and%20type%3D%22task%22%20and%20status%20%3D%20Closed%20and%20fixVersion%3D{{ .ReleaseVersion }}) - -**Full Changelog**: [v{{ .PreviousVersion }}...{{ .ReleaseVersion }}](https://github.com/mongodb/mongo-go-driver/compare/v{{ .PreviousVersion }}...v{{ .ReleaseVersion }}) - -Documentation for the Go driver can be found on [pkg.go.dev](https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo?tab=doc) and the [MongoDB documentation site](https://docs.mongodb.com/ecosystem/drivers/go/). BSON library documentation is also available on [pkg.go.dev](https://pkg.go.dev/go.mongodb.org/mongo-driver/bson?tab=doc). Questions and inquiries can be asked on the [MongoDB Developer Community](https://community.mongodb.com/). Bugs can be reported in the [Go Driver project in the MongoDB JIRA](https://jira.mongodb.org/secure/CreateIssue!default.jspa?pid=14289) where a list of [current issues](https://jira.mongodb.org/browse/GODRIVER) can be found. Your feedback on the Go driver is greatly appreciated! diff --git a/.github/actions/publish/notes.go b/.github/actions/publish/notes.go deleted file mode 100644 index f6ba986ab3..0000000000 --- a/.github/actions/publish/notes.go +++ /dev/null @@ -1,93 +0,0 @@ -package main - -import ( - _ "embed" - "fmt" - "log" - "os" - "text/template" -) - -//go:embed github.md.tmpl -var githubTmpl string - -//go:embed forum.md.tmpl -var forumTmpl string - -// generateGithubNotes generates a partially filled out release notes template -// for a Github release and writes it to a file named "github.md". It -// also prints the gh command to create a new draft release with those release -// notes. -func generateGithubNotes(release, previous string) { - filename := "github.md" - - writeTemplate( - filename, - githubTmpl, - map[string]any{ - "ReleaseVersion": release, - "PreviousVersion": previous, - }) - - fmt.Println() - fmt.Print( - `Wrote Github notes template to "`, - filename, - `".`, - "\n") - fmt.Println("Fill out any missing information and run the following command to create the Github release:") - fmt.Println() - fmt.Println( - "\tgh auth refresh && gh release create v%[1]s --verify-tag --draft -R 'mongodb/mongo-go-driver' -t 'MongoDB Go Driver %[1]s' -F '%[2]s'", - release, - filename) -} - -// generateForumNotes generates a partially filled out release notes template -// for a MongoDB community forum release post and writes it to a file named -// "forum.md". -func generateForumNotes(version string) { - data := map[string]any{ - "ReleaseVersion": version, - } - - forumFilename := "forum.md" - writeTemplate( - forumFilename, - forumTmpl, - data) - - fmt.Println() - fmt.Print( - `Wrote MongoDB community forum notes template to "`, - forumFilename, - `".`, - "\n") - fmt.Println("Fill out any missing information and paste the contents into a new MongoDB community forum post in section:") - fmt.Println("https://www.mongodb.com/community/forums/c/announcements/driver-releases/110") -} - -func writeTemplate(filename, tmplText string, data any) { - tmpl, err := template.New(filename).Parse(tmplText) - if err != nil { - log.Fatalf("Error creating new template for %q: %v", filename, err) - } - - f, err := os.Create(filename) - if err != nil { - log.Fatalf("Error creating file %q: %v", filename, err) - } - defer f.Close() - - err = tmpl.Execute(f, data) - if err != nil { - log.Fatalf("Error executing template for %q: %v", filename, err) - } -} - -func main() { - version := os.Args[1] - prevVersion := os.Args[2] - generateGithubNotes(version, prevVersion) - generateForumNotes(version) -} diff --git a/.github/scripts/bump-version.go b/.github/scripts/bump-version.go deleted file mode 100644 index 791d5ba044..0000000000 --- a/.github/scripts/bump-version.go +++ /dev/null @@ -1,35 +0,0 @@ -package main - -import ( - "fmt" - "os" - "path" -) - -const ( - versionFile = "version/version.go" - prefix = `// Copyright (C) MongoDB, Inc. 2017-present. -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may -// not use this file except in compliance with the License. You may obtain -// a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - -// Package version defines the Go Driver version. -package version // import "go.mongodb.org/mongo-driver/version" - -// Driver is the current version of the driver. -` -) - -func main() { - repoDir, err := os.Getwd() - versionFilePath := path.Join(repoDir, versionFile) - - writeFile, err := os.OpenFile(versionFilePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) - if err != nil { - fmt.Println(err) - } - text := prefix + "var Driver = \"" + os.Args[1] + "\"\n" - fmt.Fprint(writeFile, text) - writeFile.Close() -} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 972ca7fae4..1753d55d1e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,14 +17,14 @@ defaults: shell: bash -eux {0} jobs: - bump-and-tag: + pre-publish: environment: release runs-on: ubuntu-latest permissions: id-token: write contents: write outputs: - prev_version: ${{ steps.prev-version.outputs.prev_version }} + prev_version: ${{ steps.pre-publish.outputs.prev_version }} steps: - uses: mongodb-labs/drivers-github-tools/secure-checkout@v2 with: @@ -35,31 +35,23 @@ jobs: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} aws_secret_id: ${{ secrets.AWS_SECRET_ID }} - - name: Get previous version - id: prev-version - run: | - export PREV_VERSION=$(cat version/version.go | grep "var Driver" | awk -F'"' '{print $2}') - echo "prev_version=$PREV_VERSION" >> $GITHUB_OUTPUT - - uses: mongodb-labs/drivers-github-tools/bump-version@v2 + - name: Pre Publish + id: pre-publish + uses: blink1073/drivers-github-tools/golang/pre-publish@go-driver-actions with: version: ${{ inputs.version }} - version_bump_script: "go run ./.github/scripts/bump-version.go" push_commit: ${{ inputs.push_changes }} - - uses: mongodb-labs/drivers-github-tools/tag-version@v2 - with: - version: ${{ inputs.version }} - push_tag: ${{ inputs.push_changes }} static-scan: - needs: [bump-and-tag] + needs: [pre-publish] permissions: security-events: write uses: ./.github/workflows/codeql.yml with: ref: ${{ inputs.version }} - publish-and-bump: - needs: [bump-and-tag, static-scan] + publish: + needs: [pre-publish, static-scan] runs-on: ubuntu-latest environment: release permissions: @@ -76,33 +68,11 @@ jobs: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} aws_secret_id: ${{ secrets.AWS_SECRET_ID }} - - uses: blink1073/drivers-github-tools/full-report@full-report + - name: Publish + uses: blink1073/drivers-github-tools/golang/publish/@go-driver-actions with: product_name: mongo-go-driver - release_version: ${{ inputs.version }} - silk_asset_group: mongodb-go-driver-v1 - token: ${{ github.token }} - - name: Handle Dry Run - run: | - if [ "${{ inputs.push_changes }}" != "true" ]; then - export DRY_RUN=true - else - export DRY_RUN=false - fi - echo "DRY_RUN=$DRY_RUN" >> $GITHUB_ENV - - name: Upload S3 assets - uses: mongodb-labs/drivers-github-tools/upload-s3-assets@v2 - with: - version: ${{ inputs.version }} - product_name: mongo-go-driver - dry_run: ${{ env.DRY_RUN }} - - uses: ./.github/actions/publish - with: version: ${{ inputs.version }} - prev_version: ${{ needs.bump-and-tag.outputs.prev_version }} + silk_asset_group: mongodb-go-driver-v1 + prev_version: ${{ needs.pre-publish.outputs.prev_version }} push_changes: ${{ inputs.push_changes }} - - uses: mongodb-labs/drivers-github-tools/bump-version@v2 - with: - version: ${{ inputs.following_version }} - version_bump_script: "go run ./.github/scripts/bump-version.go" - push_commit: ${{ inputs.push_changes }} From d40212f1540e1f5800ccab9cc499a4837c63d499 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 11:47:57 +0000 Subject: [PATCH 095/156] BUMP 2.11.24 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index e5bd8c0251..793bff1fec 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-pre" +var Driver = "2.11.24" From 693dda97b4ee2a91ca45276504ad530ff5bebf20 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 16 Jun 2024 06:48:59 -0500 Subject: [PATCH 096/156] fix version --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1753d55d1e..95353f212c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: uses: blink1073/drivers-github-tools/golang/pre-publish@go-driver-actions with: version: ${{ inputs.version }} - push_commit: ${{ inputs.push_changes }} + push_changes: ${{ inputs.push_changes }} static-scan: needs: [pre-publish] From 4eaef0a908d449f14657b5a997827c8dfa46457f Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 11:49:56 +0000 Subject: [PATCH 097/156] BUMP 2.1.25 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 793bff1fec..80ac11edff 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.11.24" +var Driver = "2.1.25" From 710329d80c97a382d46d994478289a7da4eea248 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 16 Jun 2024 07:06:16 -0500 Subject: [PATCH 098/156] fix inputs --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 95353f212c..e562237389 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -71,8 +71,8 @@ jobs: - name: Publish uses: blink1073/drivers-github-tools/golang/publish/@go-driver-actions with: - product_name: mongo-go-driver version: ${{ inputs.version }} silk_asset_group: mongodb-go-driver-v1 prev_version: ${{ needs.pre-publish.outputs.prev_version }} push_changes: ${{ inputs.push_changes }} + token: ${{ env.GH_TOKEN }} From 1875c862eadfb58d85f3a30a81efa2ac695ba232 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 12:07:10 +0000 Subject: [PATCH 099/156] BUMP 2.1.26 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 80ac11edff..ed584229d9 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.25" +var Driver = "2.1.26" From 4d663bab363d1d52e366f14e5f6d6ce1687f893d Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 12:33:57 +0000 Subject: [PATCH 100/156] BUMP 2.1.27 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index ed584229d9..e3257f64dc 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.26" +var Driver = "2.1.27" From e12bd8df2f7d454dfc592796192821f7592dda86 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 12:46:50 +0000 Subject: [PATCH 101/156] BUMP 2.1.28 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index e3257f64dc..cbab64eb32 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.27" +var Driver = "2.1.28" From 6263683e31656fa1a2b11f06431531145be05622 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 13:01:45 +0000 Subject: [PATCH 102/156] BUMP 2.1.29 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index cbab64eb32..05dede1617 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.28" +var Driver = "2.1.29" From fe197cd3b14a9a995c87df0a1e0b3ea646d3feab Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 13:19:56 +0000 Subject: [PATCH 103/156] BUMP 2.1.30 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 05dede1617..0cbb6b9924 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.29" +var Driver = "2.1.30" From e56c3cda496b320999654fe1a00c1721534f5f0e Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 16 Jun 2024 08:33:05 -0500 Subject: [PATCH 104/156] clean up silk_asset_group_handling --- .github/workflows/release.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e562237389..30c989eae3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,10 @@ defaults: run: shell: bash -eux {0} +env: + # Changes per branch + SILK_ASSET_GROUP: mongodb-go-driver-v1 + jobs: pre-publish: environment: release @@ -72,7 +76,7 @@ jobs: uses: blink1073/drivers-github-tools/golang/publish/@go-driver-actions with: version: ${{ inputs.version }} - silk_asset_group: mongodb-go-driver-v1 + silk_asset_group: ${{ env.SILK_ASSET_GROUP }} prev_version: ${{ needs.pre-publish.outputs.prev_version }} push_changes: ${{ inputs.push_changes }} token: ${{ env.GH_TOKEN }} From 3b63889a12bbc6c4e5b0141c35b9f5bc668f6e5c Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 13:33:51 +0000 Subject: [PATCH 105/156] BUMP 2.1.31 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 0cbb6b9924..00c85c09f0 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.30" +var Driver = "2.1.31" From 2eab0fbe8320803ccf1e104566ac5a7efe24762e Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 13:36:20 +0000 Subject: [PATCH 106/156] BUMP 2.1.36 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 00c85c09f0..c79920fd10 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.31" +var Driver = "2.1.36" From 863358322a5a1d0920a917a17d286dd8c20afb4e Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 13:45:50 +0000 Subject: [PATCH 107/156] BUMP 2.1.37 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index c79920fd10..961a5aefc9 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.36" +var Driver = "2.1.37" From 7ce21b0000df5b19b7f8f078a55ac264c5114b9d Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 13:54:43 +0000 Subject: [PATCH 108/156] BUMP 2.1.38 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 961a5aefc9..3b18b4cc10 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.37" +var Driver = "2.1.38" From 69ad850d78caa9f9575a1fb267fc14b119943a65 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 14:34:22 +0000 Subject: [PATCH 109/156] BUMP 2.1.39 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 3b18b4cc10..f0b95e25d1 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.38" +var Driver = "2.1.39" From f7ed68ba6cd4c58a6aed49138267f95a60e54c6f Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 14:46:59 +0000 Subject: [PATCH 110/156] BUMP 2.1.40 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index f0b95e25d1..75253ac445 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.39" +var Driver = "2.1.40" From 77ea545c9e2799418524c87c4b29d01da144fae9 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 15:03:23 +0000 Subject: [PATCH 111/156] BUMP 2.1.41 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 75253ac445..6e85670dfb 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.40" +var Driver = "2.1.41" From 0564ca84efe325f9fb26702ea6dd6b446e1e9d8f Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 16 Jun 2024 10:17:16 -0500 Subject: [PATCH 112/156] pass following_version --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 30c989eae3..4fc410633d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -78,5 +78,6 @@ jobs: version: ${{ inputs.version }} silk_asset_group: ${{ env.SILK_ASSET_GROUP }} prev_version: ${{ needs.pre-publish.outputs.prev_version }} + following_version: ${{ inputs.following_version }} push_changes: ${{ inputs.push_changes }} token: ${{ env.GH_TOKEN }} From 95d52e17427ac9e372fb7f39db68c29d84740155 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 15:21:05 +0000 Subject: [PATCH 113/156] BUMP 2.1.42 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 6e85670dfb..8333f0ce5a 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.41" +var Driver = "2.1.42" From aca5cc7f0696a6bd96cbfcd5b926098d37c108eb Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 15:28:29 +0000 Subject: [PATCH 114/156] BUMP 2.2-pre Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 8333f0ce5a..e5bd8c0251 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.42" +var Driver = "2.2-pre" From 1fbf92cc6e927cfe88e5fe906bdfd6ab086bcc4d Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 16 Jun 2024 10:39:00 -0500 Subject: [PATCH 115/156] set artifactory username --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4fc410633d..49c8b38538 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,6 +39,7 @@ jobs: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} aws_secret_id: ${{ secrets.AWS_SECRET_ID }} + artifactory_username: ${{ vars.ARTIFACTORY_USERNAME }} - name: Pre Publish id: pre-publish uses: blink1073/drivers-github-tools/golang/pre-publish@go-driver-actions @@ -72,6 +73,7 @@ jobs: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} aws_secret_id: ${{ secrets.AWS_SECRET_ID }} + artifactory_username: ${{ vars.ARTIFACTORY_USERNAME }} - name: Publish uses: blink1073/drivers-github-tools/golang/publish/@go-driver-actions with: From c1eeb5f4e9b5293723e0a185bb656a4f6faad2fb Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 16 Jun 2024 10:45:24 -0500 Subject: [PATCH 116/156] use fork --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 49c8b38538..3ad105a011 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: with: app_id: ${{ vars.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} - - uses: mongodb-labs/drivers-github-tools/setup@v2 + - uses: blink1073/drivers-github-tools/setup@@go-driver-actions with: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} @@ -68,7 +68,7 @@ jobs: with: app_id: ${{ vars.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} - - uses: mongodb-labs/drivers-github-tools/setup@v2 + - uses: blink1073/drivers-github-tools/setup@@go-driver-actions with: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} From 320f3c01158da40f66bec5ce16752f3452137982 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 16 Jun 2024 10:45:53 -0500 Subject: [PATCH 117/156] fix fork --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3ad105a011..5228e7007e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: with: app_id: ${{ vars.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} - - uses: blink1073/drivers-github-tools/setup@@go-driver-actions + - uses: blink1073/drivers-github-tools/setup@go-driver-actions with: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} @@ -68,7 +68,7 @@ jobs: with: app_id: ${{ vars.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} - - uses: blink1073/drivers-github-tools/setup@@go-driver-actions + - uses: blink1073/drivers-github-tools/setup@go-driver-actions with: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} From 5331665ef6fe400fb8811f812c2fb5cd9b6fce66 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 16 Jun 2024 10:46:49 -0500 Subject: [PATCH 118/156] fix fork --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5228e7007e..865e178453 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: with: app_id: ${{ vars.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} - - uses: blink1073/drivers-github-tools/setup@go-driver-actions + - uses: blink1073/drivers-github-tools/setup/setup@go-driver-actions with: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} @@ -75,7 +75,7 @@ jobs: aws_secret_id: ${{ secrets.AWS_SECRET_ID }} artifactory_username: ${{ vars.ARTIFACTORY_USERNAME }} - name: Publish - uses: blink1073/drivers-github-tools/golang/publish/@go-driver-actions + uses: blink1073/drivers-github-tools/golang/publish@go-driver-actions with: version: ${{ inputs.version }} silk_asset_group: ${{ env.SILK_ASSET_GROUP }} From 9cc73a646cce37f2b61cd3e4724e4c047c460127 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 16 Jun 2024 10:47:42 -0500 Subject: [PATCH 119/156] fix fork --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 865e178453..8151a5e64f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: with: app_id: ${{ vars.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} - - uses: blink1073/drivers-github-tools/setup/setup@go-driver-actions + - uses: blink1073/drivers-github-tools/setup@go-driver-actions with: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} From 1c0e0866e774528ab4eaa512953c786a2f3b26be Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 15:48:31 +0000 Subject: [PATCH 120/156] BUMP 2.1.45 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index e5bd8c0251..5f96e7d271 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-pre" +var Driver = "2.1.45" From 051b219f4c996aeb8b0d971dd59d9c980afbcf26 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 15:56:02 +0000 Subject: [PATCH 121/156] BUMP 2.2-pre Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 5f96e7d271..e5bd8c0251 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.45" +var Driver = "2.2-pre" From 5830b616b08581ecdc477ecaf962632a29f9e165 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 16 Jun 2024 11:06:06 -0500 Subject: [PATCH 122/156] use full-report for setup --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8151a5e64f..f478fe2858 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: with: app_id: ${{ vars.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} - - uses: blink1073/drivers-github-tools/setup@go-driver-actions + - uses: blink1073/drivers-github-tools/setup@full-report with: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} @@ -68,7 +68,7 @@ jobs: with: app_id: ${{ vars.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} - - uses: blink1073/drivers-github-tools/setup@go-driver-actions + - uses: blink1073/drivers-github-tools/setup@full-report with: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} From 7c18afb640a13194d2b0e2c8012fdc3724fe3ddf Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 16:07:11 +0000 Subject: [PATCH 123/156] BUMP 2.1.46 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index e5bd8c0251..13cc7b2252 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-pre" +var Driver = "2.1.46" From 9002774f05c1bb7c23fef9c3cecf4711d2ee6fbb Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 16:15:22 +0000 Subject: [PATCH 124/156] BUMP 2.2-pre Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 13cc7b2252..e5bd8c0251 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.46" +var Driver = "2.2-pre" From ab0aab6f486d78902acedf29b2e12f7d80e7648a Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 16:19:24 +0000 Subject: [PATCH 125/156] BUMP 2.1.47 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index e5bd8c0251..ae438014dc 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-pre" +var Driver = "2.1.47" From 84e46fe258f65276b245e168278dad5119af45b3 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 16:27:07 +0000 Subject: [PATCH 126/156] BUMP 2.2-pre Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index ae438014dc..e5bd8c0251 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.47" +var Driver = "2.2-pre" From 810f77163006a6e63db1bf42f5de5959cbb62940 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 16 Jun 2024 14:27:10 -0500 Subject: [PATCH 127/156] fix version handling --- .github/workflows/release.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f478fe2858..8ea9c8a16e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,8 +5,10 @@ on: inputs: version: description: "The new version to set" - following_version: - description: "The post (dev) version to set" + required: true + prev_version: + description: "The previous tagged version" + required: true push_changes: description: "Push changes?" default: true @@ -79,7 +81,6 @@ jobs: with: version: ${{ inputs.version }} silk_asset_group: ${{ env.SILK_ASSET_GROUP }} - prev_version: ${{ needs.pre-publish.outputs.prev_version }} - following_version: ${{ inputs.following_version }} + prev_version: ${{ inputs.prev_version }} push_changes: ${{ inputs.push_changes }} token: ${{ env.GH_TOKEN }} From 96f2bcf4f964ce84623c1fd1f90dcfd1c027c352 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 19:31:26 +0000 Subject: [PATCH 128/156] BUMP 2.1.48 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index e5bd8c0251..ab1a329707 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2-pre" +var Driver = "2.1.48" From 1f5f1dbf0867410d09c6404a50de53f818c9fa06 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 20:01:07 +0000 Subject: [PATCH 129/156] BUMP v2.1.49 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index ab1a329707..acdf4249e0 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.48" +var Driver = "2.1.49" From 3a6bf6fb8246b9ed2b49f5e7417636a26ee88b9d Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 21:43:22 +0000 Subject: [PATCH 130/156] BUMP v2.1.50 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index acdf4249e0..ac2c301dd6 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.49" +var Driver = "2.1.50" From e0c7fcbd791534f9f1b04578eb5d59427665d586 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 21:53:31 +0000 Subject: [PATCH 131/156] BUMP v2.1.51 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index ac2c301dd6..5718c94ae3 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.50" +var Driver = "2.1.51" From 9076dbc5228206255ad3dba1216a346460528f63 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 22:06:16 +0000 Subject: [PATCH 132/156] BUMP v2.1.52 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 5718c94ae3..6b82c5ac00 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.51" +var Driver = "2.1.52" From 64b2ad1ef269cb004b4bd46b0eb56a78ae9be510 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 22:23:38 +0000 Subject: [PATCH 133/156] BUMP v2.1.53 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 6b82c5ac00..53c5bab8d7 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.52" +var Driver = "2.1.53" From 218c051541094ad11743ef4e5f7d0edb6f6bbff7 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 22:42:15 +0000 Subject: [PATCH 134/156] BUMP v2.1.54 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 53c5bab8d7..9e9a5f139e 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.53" +var Driver = "2.1.54" From 78b8f8dcc61a54557b376efd3304a6bca8fecb60 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 23:05:26 +0000 Subject: [PATCH 135/156] BUMP v2.1.55 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 9e9a5f139e..eaec97ee73 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.54" +var Driver = "2.1.55" From caed0562a222b13e1f44388b8683b65cdcc4de68 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 23:15:52 +0000 Subject: [PATCH 136/156] BUMP v2.1.56 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index eaec97ee73..5781c76ffe 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.55" +var Driver = "2.1.56" From 8b7ca50a91870459478359614961804e2c3d456c Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 23:29:48 +0000 Subject: [PATCH 137/156] BUMP v2.1.57 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 5781c76ffe..3aecc6bcf4 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.56" +var Driver = "2.1.57" From b167c05773b46d15e6ba04354a68ce9160d456b4 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 12:19:08 +0000 Subject: [PATCH 138/156] BUMP v2.1.58 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 3aecc6bcf4..3e698d1222 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.57" +var Driver = "2.1.58" From 9e6b9756bd68e91b4b6e500e3cf51a8cd5c7dd7d Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 17 Jun 2024 07:44:50 -0500 Subject: [PATCH 139/156] use v2 --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ea9c8a16e..861a814286 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,7 @@ jobs: with: app_id: ${{ vars.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} - - uses: blink1073/drivers-github-tools/setup@full-report + - uses: mongodb/drivers-github-tools/setup@v2 with: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} @@ -70,7 +70,7 @@ jobs: with: app_id: ${{ vars.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} - - uses: blink1073/drivers-github-tools/setup@full-report + - uses: mongodb/drivers-github-tools/setup@v2 with: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} From 4a540937c037656bcd8bff707e9b95c331a1f03b Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 17 Jun 2024 07:45:53 -0500 Subject: [PATCH 140/156] update repo --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 861a814286..6514c14a0c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,7 @@ jobs: with: app_id: ${{ vars.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} - - uses: mongodb/drivers-github-tools/setup@v2 + - uses: mongodb-labs/drivers-github-tools/setup@v2 with: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} @@ -70,7 +70,7 @@ jobs: with: app_id: ${{ vars.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} - - uses: mongodb/drivers-github-tools/setup@v2 + - uses: mongodb-labs/drivers-github-tools/setup@v2 with: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: ${{ vars.AWS_REGION_NAME }} From 8cc36401ae8ad047d57c9a13e36a2e2fecd3e027 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 12:48:27 +0000 Subject: [PATCH 141/156] BUMP v2.1.59 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 3e698d1222..6ff64e6adf 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.58" +var Driver = "2.1.59" From 82efb0ffcdedf908ba9167814c6b60eda1db7f0e Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 13:11:46 +0000 Subject: [PATCH 142/156] BUMP v2.1.60 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 6ff64e6adf..efb790303d 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.59" +var Driver = "2.1.60" From 2f67c098052dce2691f26a67cafa8f934e729923 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 24 Jun 2024 20:07:19 -0500 Subject: [PATCH 143/156] add evg-project --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6514c14a0c..b003613255 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,6 +21,7 @@ defaults: env: # Changes per branch SILK_ASSET_GROUP: mongodb-go-driver-v1 + EVERGREEN_PROJECT: mongo-go-driver-v1 jobs: pre-publish: From 7f304f97fa96116fd85796cfbf784c9c2b8837fc Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 25 Jun 2024 14:25:38 -0500 Subject: [PATCH 144/156] use github ref for static scan --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b003613255..fdfed67c8c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,7 +56,7 @@ jobs: security-events: write uses: ./.github/workflows/codeql.yml with: - ref: ${{ inputs.version }} + ref: ${{ github.ref }} publish: needs: [pre-publish, static-scan] From 3fb968944702762b69f79ab1ff5e6167e278bc4f Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:06:18 +0000 Subject: [PATCH 145/156] BUMP v2.1.57 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index efb790303d..3aecc6bcf4 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.60" +var Driver = "2.1.57" From a4859afe45db4ad343f63ddeafab7eed3b584a10 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:07:46 +0000 Subject: [PATCH 146/156] BUMP v2.1.60 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 3aecc6bcf4..efb790303d 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.57" +var Driver = "2.1.60" From 083a6ad4471d2b9463a17efc87171a6ad18c9ceb Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:09:21 +0000 Subject: [PATCH 147/156] BUMP v2.2.1 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index efb790303d..dae0cb69e6 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.1.60" +var Driver = "2.2.1" From 6f53989646de1fe5ad8c83b49440c9773523f8c9 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:20:59 +0000 Subject: [PATCH 148/156] BUMP v2.2.2 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index dae0cb69e6..4d15bc4a98 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2.1" +var Driver = "2.2.2" From b5f58fbfe60b78c3bea0b688295042c4cd7e8679 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 25 Jun 2024 15:30:35 -0500 Subject: [PATCH 149/156] pass evergreen project --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fdfed67c8c..f7c905a0f2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,6 +82,7 @@ jobs: with: version: ${{ inputs.version }} silk_asset_group: ${{ env.SILK_ASSET_GROUP }} + evergreen_project: ${{ env.EVERGREEN_PROJECT }} prev_version: ${{ inputs.prev_version }} push_changes: ${{ inputs.push_changes }} token: ${{ env.GH_TOKEN }} From 2826fd34d38b1f53c99bd0cd98a180b3ff49ae9f Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:31:18 +0000 Subject: [PATCH 150/156] BUMP v2.2.3 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 4d15bc4a98..0381409714 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2.2" +var Driver = "2.2.3" From d43da195cb2706d8b221bbf8addb228fc7f5d35c Mon Sep 17 00:00:00 2001 From: ANAND KUMAR JHA <36113559+anandkumarjha54321@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:25:30 +0530 Subject: [PATCH 151/156] GODRIVER-3257 Update client.go (#1681) Co-authored-by: Qingyang Hu --- mongo/client.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mongo/client.go b/mongo/client.go index 280749c7dd..4266412aab 100644 --- a/mongo/client.go +++ b/mongo/client.go @@ -209,10 +209,6 @@ func NewClient(opts ...*options.ClientOptions) (*Client, error) { clientOpt.SetMaxPoolSize(defaultMaxPoolSize) } - if err != nil { - return nil, err - } - cfg, err := topology.NewConfig(clientOpt, client.clock) if err != nil { return nil, err From 4209f6bc42706124f47e5098aa5fc1a1c261a7fd Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 25 Jun 2024 19:04:57 -0500 Subject: [PATCH 152/156] use upstream --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f7c905a0f2..522c6de118 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,7 +45,7 @@ jobs: artifactory_username: ${{ vars.ARTIFACTORY_USERNAME }} - name: Pre Publish id: pre-publish - uses: blink1073/drivers-github-tools/golang/pre-publish@go-driver-actions + uses: mongodb-labs/drivers-github-tools/golang/pre-publish@v2 with: version: ${{ inputs.version }} push_changes: ${{ inputs.push_changes }} @@ -78,7 +78,7 @@ jobs: aws_secret_id: ${{ secrets.AWS_SECRET_ID }} artifactory_username: ${{ vars.ARTIFACTORY_USERNAME }} - name: Publish - uses: blink1073/drivers-github-tools/golang/publish@go-driver-actions + uses: mongob-labs/drivers-github-tools/golang/publish@v2 with: version: ${{ inputs.version }} silk_asset_group: ${{ env.SILK_ASSET_GROUP }} From 5f6bab61a3e00a479a26dcc68f7d78e58b8c6f9c Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 00:05:48 +0000 Subject: [PATCH 153/156] BUMP v2.2.4 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 0381409714..30aa9f8a12 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2.3" +var Driver = "2.2.4" From 1e9a0ef6dd9814d1811c393bc0ea0b4d1952c5b2 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 25 Jun 2024 19:20:34 -0500 Subject: [PATCH 154/156] fix upstream --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 522c6de118..0f4d446237 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -78,7 +78,7 @@ jobs: aws_secret_id: ${{ secrets.AWS_SECRET_ID }} artifactory_username: ${{ vars.ARTIFACTORY_USERNAME }} - name: Publish - uses: mongob-labs/drivers-github-tools/golang/publish@v2 + uses: mongodb-labs/drivers-github-tools/golang/publish@v2 with: version: ${{ inputs.version }} silk_asset_group: ${{ env.SILK_ASSET_GROUP }} From 607edb615a8733659d7e519fc369c4be39788f4c Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 00:21:19 +0000 Subject: [PATCH 155/156] BUMP v2.2.5 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 30aa9f8a12..ae6a52e3e7 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2.4" +var Driver = "2.2.5" From 7966d8348d3d07409dee73517896ff9676222cfe Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 25 Jun 2024 19:33:21 -0500 Subject: [PATCH 156/156] restore version --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index ae6a52e3e7..040c707064 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ package version // import "go.mongodb.org/mongo-driver/version" // Driver is the current version of the driver. -var Driver = "2.2.5" +var Driver = "v1.16.0-prerelease"