diff --git a/.evergreen.yml b/.evergreen.yml index 3276782ade..f4b497a209 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -4228,34 +4228,54 @@ functions: papertrail_trace: - command: shell.exec params: + env: + PAPERTRAIL_KEY_ID: ${papertrail_key_id} + PAPERTRAIL_SECRET_KEY: ${papertrail_secret_key} + EVERGREEN_TASK_ID: ${task_id} + EVERGREEN_EXECUTION: ${execution} + EVERGREEN_AUTHOR: ${author} working_dir: src shell: bash script: | set -e - set -x ls -lh dist/ if [ x"${triggered_by_git_tag}" == x"" ]; then tag=$(git describe --tags --always --dirty) else tag="${triggered_by_git_tag}" fi - echo "Setting version for papertrail to $tag, with product ${product}" - version="$(echo $tag | sed -e 's/^[vr]//')" - cat < trace-expansions.yml - release_version: "$version" - EOT - cat trace-expansions.yml - - command: expansions.update - params: - file: src/trace-expansions.yml - - command: papertrail.trace - params: - key_id: ${papertrail_key_id} - secret_key: ${papertrail_secret_key} - product: ${product} - version: ${release_version} - filenames: - - "src/dist/*" + + # Set the release publisher + submitter=$(node -p 'JSON.parse(fs.readFileSync("packages/cli-repl/package.json")).releasePublisher') + if [ -z "$submitter" ] || [ "$submitter" == "undefined" ] || [ "$submitter" == "null" ]; then + submitter="${EVERGREEN_AUTHOR}" + fi + + echo "Setting version for papertrail to $tag, with product ${product} and submitter ${submitter}" + + echo "X-PAPERTRAIL-KEY-ID: ${PAPERTRAIL_KEY_ID}" > .papertrail.headers + echo "X-PAPERTRAIL-SECRET-KEY: ${PAPERTRAIL_SECRET_KEY}" >> .papertrail.headers + + + for file in src/dist/* ; do + if [ -f "$file" ]; then + filename=$(basename "$file") + checksum=$(shasum -a 256 "$file" | cut -f1 -d' ') + platform="evergreen" + build="${EVERGREEN_TASK_ID}_${EVERGREEN_EXECUTION}" + + curl -G -X POST -H @.papertrail.headers "https://papertrail.devprod-infra.prod.corp.mongodb.com/trace" \ + --data-urlencode "version=${release_version}" \ + --data-urlencode "product=${product}" \ + --data-urlencode "sha256=${checksum}" \ + --data-urlencode "filename=${filename}" \ + --data-urlencode "build=${build}" \ + --data-urlencode "platform=${platform}" \ + --data-urlencode "submitter=${submitter}" + fi + done + + rm -f .papertrail.headers release_draft: - command: expansions.write diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in index 80c7828d29..27dcda544e 100644 --- a/.evergreen/evergreen.yml.in +++ b/.evergreen/evergreen.yml.in @@ -873,10 +873,19 @@ functions: papertrail_trace: - command: shell.exec params: + env: + PAPERTRAIL_KEY_ID: ${papertrail_key_id} + PAPERTRAIL_SECRET_KEY: ${papertrail_secret_key} + EVERGREEN_TASK_ID: ${task_id} + EVERGREEN_EXECUTION: ${execution} + EVERGREEN_AUTHOR: ${author} working_dir: src shell: bash script: | set -e + echo "X-PAPERTRAIL-KEY-ID: ${PAPERTRAIL_KEY_ID}" > .papertrail.headers + echo "X-PAPERTRAIL-SECRET-KEY: ${PAPERTRAIL_SECRET_KEY}" >> .papertrail.headers + set -x ls -lh dist/ if [ x"${triggered_by_git_tag}" == x"" ]; then @@ -884,23 +893,35 @@ functions: else tag="${triggered_by_git_tag}" fi - echo "Setting version for papertrail to $tag, with product ${product}" - version="$(echo $tag | sed -e 's/^[vr]//')" - cat < trace-expansions.yml - release_version: "$version" - EOT - cat trace-expansions.yml - - command: expansions.update - params: - file: src/trace-expansions.yml - - command: papertrail.trace - params: - key_id: ${papertrail_key_id} - secret_key: ${papertrail_secret_key} - product: ${product} - version: ${release_version} - filenames: - - "src/dist/*" + + # Set the release publisher + submitter=$(node -p 'JSON.parse(fs.readFileSync("packages/cli-repl/package.json")).releasePublisher') + if [ -z "$submitter" ] || [ "$submitter" == "undefined" ] || [ "$submitter" == "null" ]; then + echo "Using evergreen author as submitter" + submitter="${EVERGREEN_AUTHOR}" + fi + + echo "Setting version for papertrail to $tag, with product ${product} and submitter ${submitter}" + + for file in src/dist/* ; do + if [ -f "$file" ]; then + filename=$(basename "$file") + checksum=$(shasum -a 256 "$file" | cut -f1 -d' ') + platform="evergreen" + build="${EVERGREEN_TASK_ID}_${EVERGREEN_EXECUTION}" + + curl -G -X POST -H @.papertrail.headers "https://papertrail.devprod-infra.prod.corp.mongodb.com/trace" \ + --data-urlencode "version=${release_version}" \ + --data-urlencode "product=${product}" \ + --data-urlencode "sha256=${checksum}" \ + --data-urlencode "filename=${filename}" \ + --data-urlencode "build=${build}" \ + --data-urlencode "platform=${platform}" \ + --data-urlencode "submitter=${submitter}" + fi + done + + rm -f .papertrail.headers release_draft: - command: expansions.write diff --git a/.github/workflows/merge-release-pr.yml b/.github/workflows/merge-release-pr.yml new file mode 100644 index 0000000000..8a4edc7041 --- /dev/null +++ b/.github/workflows/merge-release-pr.yml @@ -0,0 +1,35 @@ +name: Merge mongosh Release PR + +on: + push: + tags: + - 'v*' + +jobs: + prepare-release: + runs-on: ubuntu-latest + steps: + - uses: mongodb-js/devtools-shared/actions/setup-bot-token@main + id: app-token + with: + app-id: ${{ vars.DEVTOOLS_BOT_APP_ID }} + private-key: ${{ secrets.DEVTOOLS_BOT_PRIVATE_KEY }} + + - uses: actions/checkout@v4 + with: + # don't checkout a detatched HEAD + ref: ${{ github.head_ref }} + + # this is important so git log can pick up on + # the whole history to generate the list of AUTHORS + fetch-depth: "0" + token: ${{ steps.app-token.outputs.token }} + + + - name: Merge Pull Request + shell: bash + env: + MONGOSH_RELEASE_VERSION: ${{ env.NEXT_VERSION }} + GH_TOKEN: ${{ steps.app-token.outputs.token }} + run: | + gh pr merge release/${{ github.ref_name }} --squash \ No newline at end of file diff --git a/.github/workflows/prepare-release-mongosh.yml b/.github/workflows/prepare-release-mongosh.yml new file mode 100644 index 0000000000..f5c5ca3e89 --- /dev/null +++ b/.github/workflows/prepare-release-mongosh.yml @@ -0,0 +1,112 @@ +name: Prepare mongosh Release + +on: + workflow_dispatch: + inputs: + jiraTicket: + description: 'Jira ticket for the release, e.g. MONGOSH-1234' + required: true + + versionBump: + description: 'Version bump' + type: choice + required: true + default: 'patch' + options: + - patch + - minor + - major + - exact-version + + exactVersion: + description: 'Exact version: (Only effective selecting "exact-version" as version bump)' + required: false + +jobs: + prepare-release: + runs-on: ubuntu-latest + steps: + - uses: mongodb-js/devtools-shared/actions/setup-bot-token@main + id: app-token + with: + app-id: ${{ vars.DEVTOOLS_BOT_APP_ID }} + private-key: ${{ secrets.DEVTOOLS_BOT_PRIVATE_KEY }} + + - uses: actions/checkout@v4 + with: + # don't checkout a detatched HEAD + ref: ${{ github.head_ref }} + + # this is important so git log can pick up on + # the whole history to generate the list of AUTHORS + fetch-depth: "0" + token: ${{ steps.app-token.outputs.token }} + + - name: Setup Node.js Environment + uses: actions/setup-node@v4 + with: + node-version: 20.18.1 + + - name: Determine Next Version + shell: bash + run: | + set -e + + VERSION_BUMP=${{ github.event.inputs.versionBump }} + + if [[ "$VERSION_BUMP" == "major" || "$VERSION_BUMP" == "minor" || "$VERSION_BUMP" == "patch" ]]; then + PREV_VERSION_TAG=$(gh api repos/:owner/:repo/releases --jq '. | map(select(.draft == false)) | .[0] | .tag_name') + PREV_VERSION=$(npx semver --coerce ${PREV_VERSION_TAG}) + + NEXT_VERSION=$(npx semver -i $VERSION_BUMP $PREV_VERSION) + else + NEXT_VERSION=${{ github.event.inputs.exactVersion }} + fi + + # Remove the 'v' prefix from NEXT_VERSION if it exists + NEXT_VERSION="${NEXT_VERSION#v}" + + # Validates the version before using it + npx semver v"${NEXT_VERSION}" + + echo "RELEASE_TAG=v${NEXT_VERSION}" >> "$GITHUB_ENV" + + - name: Validate release tag + shell: bash + run: | + if [ -z "${RELEASE_TAG}" ]; then + echo "RELEASE_TAG is not set or is empty" + exit 1 + fi + + if git rev-parse "$RELEASE_TAG" >/dev/null 2>&1; then + echo "Error: Tag $RELEASE_TAG already exists" + echo "If you are trying to re-create a draft release with this version, please delete the release and the tag first." + echo "If this version has already been release consider using a different one." + exit 1 + fi + + - name: Bump mongosh and package versions + shell: bash + env: + MONGOSH_RELEASE_VERSION: ${{ env.NEXT_VERSION }} + run: | + set -e + echo Bumping mongosh versions to ${NEXT_VERSION} and packages + + npm run bump + + git add . + git commit --no-allow-empty -m "chore(release): prepare for mongosh v${NEXT_VERSION} ${{ github.event.inputs.jiraTicket }}" || true + + - name: Create Pull Request + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # 7.0.5 + with: + token: ${{ steps.app-token.outputs.token }} + commit-message: "chore(release): prepare for mongosh v${NEXT_VERSION} ${{ github.event.inputs.jiraTicket }}" + branch: release/${RELEASE_TAG} + title: "chore(release): prepare for mongosh v${NEXT_VERSION} ${{ github.event.inputs.jiraTicket }}" + body: | + - [${{ github.event.inputs.jiraTicket }}](https://jira.mongodb.org/browse/${{ github.event.inputs.jiraTicket }}) + - This PR is for the release of mongosh v${NEXT_VERSION}. + - **Do not merge manually, use the Release mongosh action instead.** diff --git a/.github/workflows/release-mongosh.yml b/.github/workflows/release-mongosh.yml new file mode 100644 index 0000000000..d11b2052a2 --- /dev/null +++ b/.github/workflows/release-mongosh.yml @@ -0,0 +1,61 @@ +name: Release mongosh +on: + workflow_run: + workflows: ["CheckQL", "Run Smoke Tests", "evergreen"] + types: ["completed"] + branches: ["release/**"] + workflow_dispatch: + +jobs: + publish: + if: | + startsWith(github.head_ref, 'refs/heads/release/') + runs-on: ubuntu-latest + + steps: + - uses: mongodb-js/devtools-shared/actions/setup-bot-token@main + id: app-token + with: + app-id: ${{ vars.DEVTOOLS_BOT_APP_ID }} + private-key: ${{ secrets.DEVTOOLS_BOT_PRIVATE_KEY }} + + - uses: actions/checkout@v4 + with: + # don't checkout a detatched HEAD + ref: ${{ github.head_ref }} + + # this is important so git log can pick up on + # the whole history to generate the list of AUTHORS + fetch-depth: "0" + token: ${{ steps.app-token.outputs.token }} + + - name: Extract version from the branch + run: | + set -e + export NEXT_VERSION=$(echo "${GITHUB_REF}" | sed -n 's/refs\/heads\/release\/\(.*\)/\1/p') + + echo "NEXT_VERSION=${NEXT_VERSION}" >> "$GITHUB_ENV" + echo "RELEASE_TAG=v${NEXT_VERSION}" >> "$GITHUB_ENV" + + - name: Validate release tag + shell: bash + run: | + if [ -z "${RELEASE_TAG}" ]; then + echo "RELEASE_TAG is not set or is empty" + exit 1 + fi + + if git rev-parse "$RELEASE_TAG" >/dev/null 2>&1; then + echo "Error: Tag $RELEASE_TAG already exists" + echo "If you are trying to re-create a draft release with this version, please delete the release and the tag first." + echo "If this version has already been released consider using a different one." + exit 1 + fi + + - name: "Trigger mongosh publish" + env: + NPM_TOKEN: ${{ secrets.DEVTOOLSBOT_NPM_TOKEN }} + MONGOSH_RELEASE_PUBLISHER: ${{ github.triggering_actor }} + run: | + echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> ~/.npmrc + npm run publish diff --git a/package-lock.json b/package-lock.json index 21ce0afe7b..098d799730 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5858,6 +5858,7 @@ "version": "1.1.16", "resolved": "https://registry.npmjs.org/@mongodb-js/monorepo-tools/-/monorepo-tools-1.1.16.tgz", "integrity": "sha512-LiIIGvpvgQl+8r72+GFS4QIcQa1Cp2wdtCRgnpVGbYqVKfr/URMA3j95dsBKrDbOsuFgNQ/6052TZdtTfho63g==", + "dev": true, "license": "SSPL", "dependencies": { "chalk": "^4.1.1", @@ -5880,6 +5881,7 @@ }, "node_modules/@mongodb-js/monorepo-tools/node_modules/find-up": { "version": "4.1.0", + "dev": true, "license": "MIT", "dependencies": { "locate-path": "^5.0.0", @@ -5891,6 +5893,7 @@ }, "node_modules/@mongodb-js/monorepo-tools/node_modules/locate-path": { "version": "5.0.0", + "dev": true, "license": "MIT", "dependencies": { "p-locate": "^4.1.0" @@ -5901,6 +5904,7 @@ }, "node_modules/@mongodb-js/monorepo-tools/node_modules/p-limit": { "version": "2.3.0", + "dev": true, "license": "MIT", "dependencies": { "p-try": "^2.0.0" @@ -5914,6 +5918,7 @@ }, "node_modules/@mongodb-js/monorepo-tools/node_modules/p-locate": { "version": "4.1.0", + "dev": true, "license": "MIT", "dependencies": { "p-limit": "^2.2.0" @@ -6733,6 +6738,7 @@ }, "node_modules/@npmcli/fs": { "version": "1.1.1", + "dev": true, "license": "ISC", "dependencies": { "@gar/promisify": "^1.0.1", @@ -6741,6 +6747,7 @@ }, "node_modules/@npmcli/git": { "version": "2.1.0", + "dev": true, "license": "ISC", "dependencies": { "@npmcli/promise-spawn": "^1.3.2", @@ -6755,6 +6762,7 @@ }, "node_modules/@npmcli/git/node_modules/mkdirp": { "version": "1.0.4", + "dev": true, "license": "MIT", "bin": { "mkdirp": "bin/cmd.js" @@ -6765,6 +6773,7 @@ }, "node_modules/@npmcli/installed-package-contents": { "version": "1.0.7", + "dev": true, "license": "ISC", "dependencies": { "npm-bundled": "^1.1.1", @@ -7184,6 +7193,7 @@ }, "node_modules/@npmcli/move-file": { "version": "1.1.2", + "dev": true, "license": "MIT", "dependencies": { "mkdirp": "^1.0.4", @@ -7195,6 +7205,7 @@ }, "node_modules/@npmcli/move-file/node_modules/mkdirp": { "version": "1.0.4", + "dev": true, "license": "MIT", "bin": { "mkdirp": "bin/cmd.js" @@ -7213,6 +7224,7 @@ }, "node_modules/@npmcli/node-gyp": { "version": "1.0.3", + "dev": true, "license": "ISC" }, "node_modules/@npmcli/package-json": { @@ -7351,6 +7363,7 @@ }, "node_modules/@npmcli/promise-spawn": { "version": "1.3.2", + "dev": true, "license": "ISC", "dependencies": { "infer-owner": "^1.0.4" @@ -7377,6 +7390,7 @@ }, "node_modules/@npmcli/run-script": { "version": "1.8.6", + "dev": true, "license": "ISC", "dependencies": { "@npmcli/node-gyp": "^1.0.2", @@ -7387,6 +7401,7 @@ }, "node_modules/@npmcli/run-script/node_modules/ansi-regex": { "version": "2.1.1", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -7394,10 +7409,12 @@ }, "node_modules/@npmcli/run-script/node_modules/aproba": { "version": "1.2.0", + "dev": true, "license": "ISC" }, "node_modules/@npmcli/run-script/node_modules/are-we-there-yet": { "version": "1.1.7", + "dev": true, "license": "ISC", "dependencies": { "delegates": "^1.0.0", @@ -7406,6 +7423,7 @@ }, "node_modules/@npmcli/run-script/node_modules/gauge": { "version": "2.7.4", + "dev": true, "license": "ISC", "dependencies": { "aproba": "^1.0.3", @@ -7420,6 +7438,7 @@ }, "node_modules/@npmcli/run-script/node_modules/glob": { "version": "7.2.3", + "dev": true, "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", @@ -7438,6 +7457,7 @@ }, "node_modules/@npmcli/run-script/node_modules/is-fullwidth-code-point": { "version": "1.0.0", + "dev": true, "license": "MIT", "dependencies": { "number-is-nan": "^1.0.0" @@ -7448,6 +7468,7 @@ }, "node_modules/@npmcli/run-script/node_modules/node-gyp": { "version": "7.1.2", + "dev": true, "license": "MIT", "dependencies": { "env-paths": "^2.2.0", @@ -7470,6 +7491,7 @@ }, "node_modules/@npmcli/run-script/node_modules/npmlog": { "version": "4.1.2", + "dev": true, "license": "ISC", "dependencies": { "are-we-there-yet": "~1.1.2", @@ -7480,6 +7502,7 @@ }, "node_modules/@npmcli/run-script/node_modules/string-width": { "version": "1.0.2", + "dev": true, "license": "MIT", "dependencies": { "code-point-at": "^1.0.0", @@ -7492,6 +7515,7 @@ }, "node_modules/@npmcli/run-script/node_modules/strip-ansi": { "version": "3.0.1", + "dev": true, "license": "MIT", "dependencies": { "ansi-regex": "^2.0.0" @@ -11063,6 +11087,7 @@ }, "node_modules/argv-formatter": { "version": "1.0.0", + "dev": true, "license": "MIT" }, "node_modules/aria-query": { @@ -11258,6 +11283,7 @@ }, "node_modules/assert-plus": { "version": "1.0.0", + "dev": true, "license": "MIT", "engines": { "node": ">=0.8" @@ -11318,6 +11344,7 @@ }, "node_modules/asynckit": { "version": "0.4.0", + "devOptional": true, "license": "MIT" }, "node_modules/available-typed-arrays": { @@ -11363,6 +11390,7 @@ }, "node_modules/aws-sign2": { "version": "0.7.0", + "dev": true, "license": "Apache-2.0", "engines": { "node": "*" @@ -12232,6 +12260,7 @@ }, "node_modules/builtins": { "version": "1.0.3", + "dev": true, "license": "MIT" }, "node_modules/bundle-name": { @@ -12264,6 +12293,7 @@ }, "node_modules/cacache": { "version": "15.3.0", + "dev": true, "license": "ISC", "dependencies": { "@npmcli/fs": "^1.0.0", @@ -12291,6 +12321,7 @@ }, "node_modules/cacache/node_modules/glob": { "version": "7.2.3", + "dev": true, "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", @@ -12309,6 +12340,7 @@ }, "node_modules/cacache/node_modules/mkdirp": { "version": "1.0.4", + "dev": true, "license": "MIT", "bin": { "mkdirp": "bin/cmd.js" @@ -12527,6 +12559,7 @@ }, "node_modules/caseless": { "version": "0.12.0", + "dev": true, "license": "Apache-2.0" }, "node_modules/chai": { @@ -12723,6 +12756,7 @@ }, "node_modules/cli-cursor": { "version": "3.1.0", + "devOptional": true, "license": "MIT", "dependencies": { "restore-cursor": "^3.1.0" @@ -12745,6 +12779,7 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", + "devOptional": true, "license": "MIT", "engines": { "node": ">=6" @@ -12831,6 +12866,7 @@ }, "node_modules/code-point-at": { "version": "1.1.0", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -12887,6 +12923,7 @@ }, "node_modules/combined-stream": { "version": "1.0.8", + "devOptional": true, "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" @@ -13458,6 +13495,7 @@ }, "node_modules/dashdash": { "version": "1.14.1", + "dev": true, "license": "MIT", "dependencies": { "assert-plus": "^1.0.0" @@ -13925,6 +13963,7 @@ }, "node_modules/defaults": { "version": "1.0.3", + "devOptional": true, "license": "MIT", "dependencies": { "clone": "^1.0.2" @@ -13932,6 +13971,7 @@ }, "node_modules/defaults/node_modules/clone": { "version": "1.0.4", + "devOptional": true, "license": "MIT", "engines": { "node": ">=0.8" @@ -13998,6 +14038,7 @@ }, "node_modules/delayed-stream": { "version": "1.0.0", + "devOptional": true, "license": "MIT", "engines": { "node": ">=0.4.0" @@ -14412,6 +14453,7 @@ }, "node_modules/duplexer2": { "version": "0.1.4", + "dev": true, "license": "BSD-3-Clause", "dependencies": { "readable-stream": "^2.0.2" @@ -14502,6 +14544,7 @@ }, "node_modules/ecc-jsbn": { "version": "0.1.2", + "dev": true, "license": "MIT", "dependencies": { "jsbn": "~0.1.0", @@ -15652,6 +15695,7 @@ }, "node_modules/extend": { "version": "3.0.2", + "dev": true, "license": "MIT" }, "node_modules/external-editor": { @@ -15713,6 +15757,7 @@ }, "node_modules/extsprintf": { "version": "1.3.0", + "dev": true, "engines": [ "node >=0.6.0" ], @@ -16139,6 +16184,7 @@ }, "node_modules/forever-agent": { "version": "0.6.1", + "dev": true, "license": "Apache-2.0", "engines": { "node": "*" @@ -16452,6 +16498,7 @@ }, "node_modules/getpass": { "version": "0.1.7", + "dev": true, "license": "MIT", "dependencies": { "assert-plus": "^1.0.0" @@ -16459,6 +16506,7 @@ }, "node_modules/git-log-parser": { "version": "1.2.0", + "dev": true, "license": "MIT", "dependencies": { "argv-formatter": "~1.0.0", @@ -16471,6 +16519,7 @@ }, "node_modules/git-log-parser/node_modules/split2": { "version": "1.0.0", + "dev": true, "license": "ISC", "dependencies": { "through2": "~2.0.0" @@ -16898,6 +16947,7 @@ }, "node_modules/har-schema": { "version": "2.0.0", + "dev": true, "license": "ISC", "engines": { "node": ">=4" @@ -16905,6 +16955,7 @@ }, "node_modules/har-validator": { "version": "5.1.5", + "dev": true, "license": "MIT", "dependencies": { "ajv": "^6.12.3", @@ -17152,6 +17203,7 @@ }, "node_modules/hosted-git-info": { "version": "4.1.0", + "devOptional": true, "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" @@ -17454,6 +17506,7 @@ }, "node_modules/http-signature": { "version": "1.2.0", + "dev": true, "license": "MIT", "dependencies": { "assert-plus": "^1.0.0", @@ -17553,6 +17606,7 @@ }, "node_modules/ignore-walk": { "version": "3.0.4", + "dev": true, "license": "ISC", "dependencies": { "minimatch": "^3.0.4" @@ -17963,6 +18017,7 @@ }, "node_modules/is-interactive": { "version": "1.0.0", + "devOptional": true, "license": "MIT", "engines": { "node": ">=8" @@ -18206,10 +18261,12 @@ }, "node_modules/is-typedarray": { "version": "1.0.0", + "dev": true, "license": "MIT" }, "node_modules/is-unicode-supported": { "version": "0.1.0", + "devOptional": true, "license": "MIT", "engines": { "node": ">=10" @@ -18305,6 +18362,7 @@ }, "node_modules/isstream": { "version": "0.1.2", + "dev": true, "license": "MIT" }, "node_modules/istanbul-lib-coverage": { @@ -18634,6 +18692,7 @@ }, "node_modules/jsbn": { "version": "0.1.1", + "dev": true, "license": "MIT" }, "node_modules/jsesc": { @@ -18657,10 +18716,12 @@ }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", + "devOptional": true, "license": "MIT" }, "node_modules/json-schema": { "version": "0.4.0", + "dev": true, "license": "(AFL-2.1 OR BSD-3-Clause)" }, "node_modules/json-schema-traverse": { @@ -18710,6 +18771,7 @@ }, "node_modules/jsonparse": { "version": "1.3.1", + "devOptional": true, "engines": [ "node >= 0.2.0" ], @@ -18732,6 +18794,7 @@ }, "node_modules/jsprim": { "version": "1.4.2", + "dev": true, "license": "MIT", "dependencies": { "assert-plus": "1.0.0", @@ -21110,6 +21173,7 @@ }, "node_modules/minipass-fetch": { "version": "1.4.1", + "dev": true, "license": "MIT", "dependencies": { "minipass": "^3.1.0", @@ -21135,6 +21199,7 @@ }, "node_modules/minipass-json-stream": { "version": "1.0.1", + "dev": true, "license": "MIT", "dependencies": { "jsonparse": "^1.3.1", @@ -21945,6 +22010,7 @@ }, "node_modules/nopt": { "version": "5.0.0", + "dev": true, "license": "ISC", "dependencies": { "abbrev": "1" @@ -22005,6 +22071,7 @@ }, "node_modules/npm-bundled": { "version": "1.1.2", + "dev": true, "license": "ISC", "dependencies": { "npm-normalize-package-bin": "^1.0.1" @@ -22012,6 +22079,7 @@ }, "node_modules/npm-install-checks": { "version": "4.0.0", + "dev": true, "license": "BSD-2-Clause", "dependencies": { "semver": "^7.1.1" @@ -22022,6 +22090,7 @@ }, "node_modules/npm-normalize-package-bin": { "version": "1.0.1", + "dev": true, "license": "ISC" }, "node_modules/npm-package-arg": { @@ -22056,6 +22125,7 @@ }, "node_modules/npm-packlist": { "version": "2.2.2", + "dev": true, "license": "ISC", "dependencies": { "glob": "^7.1.6", @@ -22072,6 +22142,7 @@ }, "node_modules/npm-packlist/node_modules/glob": { "version": "7.2.3", + "dev": true, "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", @@ -22090,6 +22161,7 @@ }, "node_modules/npm-pick-manifest": { "version": "6.1.1", + "dev": true, "license": "ISC", "dependencies": { "npm-install-checks": "^4.0.0", @@ -22100,6 +22172,7 @@ }, "node_modules/npm-pick-manifest/node_modules/npm-package-arg": { "version": "8.1.5", + "dev": true, "license": "ISC", "dependencies": { "hosted-git-info": "^4.0.1", @@ -22112,6 +22185,7 @@ }, "node_modules/npm-pick-manifest/node_modules/validate-npm-package-name": { "version": "3.0.0", + "dev": true, "license": "ISC", "dependencies": { "builtins": "^1.0.3" @@ -22195,6 +22269,7 @@ }, "node_modules/number-is-nan": { "version": "1.0.1", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -22676,6 +22751,7 @@ }, "node_modules/oauth-sign": { "version": "0.9.0", + "dev": true, "license": "Apache-2.0", "engines": { "node": "*" @@ -22901,6 +22977,7 @@ }, "node_modules/ora": { "version": "5.4.1", + "devOptional": true, "license": "MIT", "dependencies": { "bl": "^4.1.0", @@ -22922,6 +22999,7 @@ }, "node_modules/ora/node_modules/bl": { "version": "4.1.0", + "devOptional": true, "license": "MIT", "dependencies": { "buffer": "^5.5.0", @@ -22931,6 +23009,7 @@ }, "node_modules/ora/node_modules/buffer": { "version": "5.7.1", + "devOptional": true, "funding": [ { "type": "github", @@ -22953,6 +23032,7 @@ }, "node_modules/ora/node_modules/log-symbols": { "version": "4.1.0", + "devOptional": true, "license": "MIT", "dependencies": { "chalk": "^4.1.0", @@ -22967,6 +23047,7 @@ }, "node_modules/ora/node_modules/readable-stream": { "version": "3.6.2", + "devOptional": true, "license": "MIT", "dependencies": { "inherits": "^2.0.3", @@ -23239,6 +23320,7 @@ }, "node_modules/pacote": { "version": "11.3.5", + "dev": true, "license": "ISC", "dependencies": { "@npmcli/git": "^2.1.0", @@ -23270,6 +23352,7 @@ }, "node_modules/pacote/node_modules/@tootallnate/once": { "version": "1.1.2", + "dev": true, "license": "MIT", "engines": { "node": ">= 6" @@ -23277,6 +23360,7 @@ }, "node_modules/pacote/node_modules/agent-base": { "version": "6.0.2", + "dev": true, "license": "MIT", "dependencies": { "debug": "4" @@ -23287,6 +23371,7 @@ }, "node_modules/pacote/node_modules/http-proxy-agent": { "version": "4.0.1", + "dev": true, "license": "MIT", "dependencies": { "@tootallnate/once": "1", @@ -23299,6 +23384,7 @@ }, "node_modules/pacote/node_modules/https-proxy-agent": { "version": "5.0.1", + "dev": true, "license": "MIT", "dependencies": { "agent-base": "6", @@ -23310,6 +23396,7 @@ }, "node_modules/pacote/node_modules/make-fetch-happen": { "version": "9.1.0", + "dev": true, "license": "ISC", "dependencies": { "agentkeepalive": "^4.1.3", @@ -23335,6 +23422,7 @@ }, "node_modules/pacote/node_modules/mkdirp": { "version": "1.0.4", + "dev": true, "license": "MIT", "bin": { "mkdirp": "bin/cmd.js" @@ -23345,6 +23433,7 @@ }, "node_modules/pacote/node_modules/npm-package-arg": { "version": "8.1.5", + "dev": true, "license": "ISC", "dependencies": { "hosted-git-info": "^4.0.1", @@ -23357,6 +23446,7 @@ }, "node_modules/pacote/node_modules/npm-registry-fetch": { "version": "11.0.0", + "dev": true, "license": "ISC", "dependencies": { "make-fetch-happen": "^9.0.1", @@ -23372,6 +23462,7 @@ }, "node_modules/pacote/node_modules/socks-proxy-agent": { "version": "6.2.1", + "dev": true, "license": "MIT", "dependencies": { "agent-base": "^6.0.2", @@ -23384,6 +23475,7 @@ }, "node_modules/pacote/node_modules/validate-npm-package-name": { "version": "3.0.0", + "dev": true, "license": "ISC", "dependencies": { "builtins": "^1.0.3" @@ -23560,6 +23652,7 @@ }, "node_modules/path-exists": { "version": "4.0.0", + "devOptional": true, "license": "MIT", "engines": { "node": ">=8" @@ -23663,6 +23756,7 @@ }, "node_modules/performance-now": { "version": "2.1.0", + "dev": true, "license": "MIT" }, "node_modules/picocolors": { @@ -24158,6 +24252,7 @@ }, "node_modules/psl": { "version": "1.9.0", + "dev": true, "license": "MIT" }, "node_modules/public-encrypt": { @@ -24626,6 +24721,7 @@ }, "node_modules/read-package-json-fast": { "version": "2.0.3", + "dev": true, "license": "ISC", "dependencies": { "json-parse-even-better-errors": "^2.3.0", @@ -25069,6 +25165,7 @@ }, "node_modules/request": { "version": "2.88.2", + "dev": true, "license": "Apache-2.0", "dependencies": { "aws-sign2": "~0.7.0", @@ -25098,6 +25195,7 @@ }, "node_modules/request/node_modules/form-data": { "version": "2.3.3", + "dev": true, "license": "MIT", "dependencies": { "asynckit": "^0.4.0", @@ -25110,6 +25208,7 @@ }, "node_modules/request/node_modules/qs": { "version": "6.5.3", + "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.6" @@ -25221,6 +25320,7 @@ }, "node_modules/restore-cursor": { "version": "3.1.0", + "devOptional": true, "license": "MIT", "dependencies": { "onetime": "^5.1.0", @@ -26148,6 +26248,7 @@ }, "node_modules/spawn-error-forwarder": { "version": "1.0.0", + "dev": true, "license": "MIT" }, "node_modules/spawn-wrap": { @@ -26335,6 +26436,7 @@ }, "node_modules/sshpk": { "version": "1.17.0", + "dev": true, "license": "MIT", "dependencies": { "asn1": "~0.2.3", @@ -26358,6 +26460,7 @@ }, "node_modules/ssri": { "version": "8.0.1", + "dev": true, "license": "ISC", "dependencies": { "minipass": "^3.1.1" @@ -26420,6 +26523,7 @@ }, "node_modules/stream-combiner2": { "version": "1.1.1", + "dev": true, "license": "MIT", "dependencies": { "duplexer2": "~0.1.0", @@ -27022,6 +27126,7 @@ }, "node_modules/through2": { "version": "2.0.5", + "devOptional": true, "license": "MIT", "dependencies": { "readable-stream": "~2.3.6", @@ -27103,6 +27208,7 @@ }, "node_modules/toposort": { "version": "2.0.2", + "dev": true, "license": "MIT" }, "node_modules/totalist": { @@ -27115,6 +27221,7 @@ }, "node_modules/tough-cookie": { "version": "2.5.0", + "dev": true, "license": "BSD-3-Clause", "dependencies": { "psl": "^1.1.28", @@ -27136,6 +27243,7 @@ }, "node_modules/traverse": { "version": "0.6.7", + "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -27361,6 +27469,7 @@ }, "node_modules/tunnel-agent": { "version": "0.6.0", + "devOptional": true, "license": "Apache-2.0", "dependencies": { "safe-buffer": "^5.0.1" @@ -27559,6 +27668,7 @@ }, "node_modules/unique-filename": { "version": "1.1.1", + "dev": true, "license": "ISC", "dependencies": { "unique-slug": "^2.0.0" @@ -27566,6 +27676,7 @@ }, "node_modules/unique-slug": { "version": "2.0.2", + "dev": true, "license": "ISC", "dependencies": { "imurmurhash": "^0.1.4" @@ -27702,6 +27813,7 @@ }, "node_modules/uuid": { "version": "3.4.0", + "dev": true, "license": "MIT", "bin": { "uuid": "bin/uuid" @@ -27742,6 +27854,7 @@ }, "node_modules/verror": { "version": "1.10.0", + "dev": true, "engines": [ "node >=0.6.0" ], @@ -27797,6 +27910,7 @@ }, "node_modules/wcwidth": { "version": "1.0.1", + "devOptional": true, "license": "MIT", "dependencies": { "defaults": "^1.0.3" @@ -29175,6 +29289,7 @@ }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/monorepo-tools": "^1.1.10", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/command-exists": "^1.2.0", diff --git a/package.json b/package.json index af12edefb6..2fd326fa01 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "compile-exec": "npm run evergreen-release compile", "compile-all": "npm run compile-compass && npm run compile-exec", "evergreen-release": "cd packages/build && npm run evergreen-release --", - "release": "cd packages/build && npm run release --", "report-missing-help": "npm run report-missing-help --workspace @mongosh/shell-api", "report-supported-api": "npm run report-supported-api --workspace @mongosh/shell-api", "post-process-nyc": "ts-node scripts/nyc/post-process-nyc-output.ts", @@ -71,6 +70,8 @@ "prepare": "husky", "precommit": "precommit", "preinstall": "node scripts/sort-workspaces.js", + "bump": "npm run bump --workspace @mongosh/build", + "publish": "npm run publish --workspace @mongosh/build", "bump-auxiliary": "npm run bump-auxiliary --workspace @mongosh/build", "publish-auxiliary": "npm run publish-auxiliary --workspace @mongosh/build" }, diff --git a/packages/build/README.md b/packages/build/README.md index b39ea1e583..3a7d9e6df5 100644 --- a/packages/build/README.md +++ b/packages/build/README.md @@ -25,20 +25,11 @@ Execute the following steps to publish a new release: 1. Ensure there is a Jira _Release_ ticket in the [`MONGOSH` project](https://jira.mongodb.org/projects/MONGOSH) for the new release and move it to _In Progress_. 2. Verify that the Jira tickets you expect to be released are correctly mapped to the _Release_ ticket. Add any additional required documentation to the release ticket. -3. Trigger the draft release by running: - ``` - npm run release draft - ``` - Follow the instructions and ensure that the new draft tag to be created matches the expected release version. -4. Wait for Evergreen to finish the build and complete the draft stage.\ - _Repeat step 3 if there are any additional changes that need to be part of the release._ +3. Trigger the draft release by triggering the `Prepare mongosh Release` workflow. Set the release Jira ticket and ensure that the new draft tag that gets created matches the expected release version. +4. Wait for the workflow to create a PR for the release and ensure the changed files are correct. **Do not merge the PR!** 5. Sync main branch of the [mongodb-js/homebrew-core](https://github.com/mongodb-js/homebrew-core/) repository with the upstream. -6. Trigger the publication of the release by running: - ``` - npm run release publish - ``` - Follow the instructions and verify the inferred release version is correct. -7. Wait for Evergreen to finish the publication stage. +6. Trigger the `Release mongosh` workflow on the newly created `release/X.Y.Z` branch. This will start the release process and will automatically merge the PR once it is complete. +7. Wait for Evergreen to finish the publication stage and automatically merge the PR. 8. Close the Jira ticket for the release, post an update in the `#mongosh` Slack channel and ping the docs team. ### Branches and Tags diff --git a/packages/build/package.json b/packages/build/package.json index 186a3b4e17..d9ee536046 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -24,7 +24,6 @@ "check": "npm run lint && npm run depcheck", "depcheck": "depcheck", "evergreen-release": "ts-node -r ../../scripts/import-expansions.js src/index.ts", - "release": "ts-node src/index.ts trigger-release", "prettier": "prettier", "bump": "ts-node src/index.ts bump", "publish": "ts-node src/index.ts publish", @@ -44,6 +43,7 @@ }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/monorepo-tools": "^1.1.10", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@types/command-exists": "^1.2.0", diff --git a/packages/build/src/index.ts b/packages/build/src/index.ts index 665e90d946..d8827cb27c 100644 --- a/packages/build/src/index.ts +++ b/packages/build/src/index.ts @@ -2,14 +2,13 @@ import path from 'path'; import { validatePackageVariant } from './config'; import { downloadMongoDb } from '@mongodb-js/mongodb-downloader'; import { getArtifactUrl } from './evergreen'; -import { triggerRelease } from './local'; import type { ReleaseCommand } from './release'; import { release } from './release'; import type { Config, PackageVariant } from './config'; export { getArtifactUrl, downloadMongoDb }; -const validCommands: (ReleaseCommand | 'trigger-release')[] = [ +const validCommands: ReleaseCommand[] = [ 'bump', 'compile', 'package', @@ -19,12 +18,9 @@ const validCommands: (ReleaseCommand | 'trigger-release')[] = [ 'sign', 'download-crypt-shared-library', 'download-and-list-artifacts', - 'trigger-release', ] as const; -const isValidCommand = ( - cmd: string -): cmd is ReleaseCommand | 'trigger-release' => +const isValidCommand = (cmd: string): cmd is ReleaseCommand => (validCommands as string[]).includes(cmd); if (require.main === module) { @@ -38,31 +34,27 @@ if (require.main === module) { ); } - if (command === 'trigger-release') { - await triggerRelease(process.argv.slice(3)); - } else { - const config: Config = require(path.join( - __dirname, - '..', - '..', - '..', - 'config', - 'build.conf.js' - )); + const config: Config = require(path.join( + __dirname, + '..', + '..', + '..', + 'config', + 'build.conf.js' + )); - const cliBuildVariant = process.argv - .map((arg) => /^--build-variant=(.+)$/.exec(arg)) - .filter(Boolean)[0]; - if (cliBuildVariant) { - config.packageVariant = cliBuildVariant[1] as PackageVariant; - validatePackageVariant(config.packageVariant); - } + const cliBuildVariant = process.argv + .map((arg) => /^--build-variant=(.+)$/.exec(arg)) + .filter(Boolean)[0]; + if (cliBuildVariant) { + config.packageVariant = cliBuildVariant[1] as PackageVariant; + validatePackageVariant(config.packageVariant); + } - config.isDryRun ||= process.argv.includes('--dry-run'); - config.useAuxiliaryPackagesOnly ||= process.argv.includes('--auxiliary'); + config.isDryRun ||= process.argv.includes('--dry-run'); + config.useAuxiliaryPackagesOnly ||= process.argv.includes('--auxiliary'); - await release(command, config); - } + await release(command, config); })().then( () => process.exit(0), (err) => diff --git a/packages/build/src/local/index.ts b/packages/build/src/local/index.ts deleted file mode 100644 index bc1ec38cd6..0000000000 --- a/packages/build/src/local/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './trigger-release'; diff --git a/packages/build/src/local/trigger-release-draft.spec.ts b/packages/build/src/local/trigger-release-draft.spec.ts deleted file mode 100644 index ca4e109100..0000000000 --- a/packages/build/src/local/trigger-release-draft.spec.ts +++ /dev/null @@ -1,256 +0,0 @@ -import { expect } from 'chai'; -import sinon from 'sinon'; -import type { RepositoryStatus, TagDetails, TaggedCommit } from '../git'; -import { - computeNextTagNameFn, - triggerReleaseDraft, -} from './trigger-release-draft'; - -describe('local trigger-release-draft', function () { - describe('triggerReleaseDraft', function () { - let verifyGitStatus: sinon.SinonStub; - let getLatestDraftOrReleaseTagFromLog: sinon.SinonStub; - let choose: sinon.SinonStub; - let confirm: sinon.SinonStub; - let spawnSync: sinon.SinonStub; - - const cleanRepoStatus: RepositoryStatus = { - branch: { - local: 'main', - tracking: 'origin/main', - diverged: false, - }, - clean: true, - hasUnpushedTags: false, - }; - - beforeEach(function () { - verifyGitStatus = sinon.stub().returns(cleanRepoStatus); - getLatestDraftOrReleaseTagFromLog = sinon.stub(); - choose = sinon.stub(); - confirm = sinon.stub(); - spawnSync = sinon.stub(); - }); - - it('creates a new draft and pushes when everything is good', async function () { - const latestTag: TaggedCommit = { - commit: 'hash', - tag: { - draftVersion: 7, - releaseVersion: '0.8.0', - semverName: '0.8.0-draft.7', - }, - }; - - getLatestDraftOrReleaseTagFromLog.returns(latestTag); - confirm.resolves(true); - - await triggerReleaseDraft( - 'root', - verifyGitStatus, - getLatestDraftOrReleaseTagFromLog, - choose, - confirm, - spawnSync - ); - - expect(verifyGitStatus).to.have.been.called; - expect(choose).to.not.have.been.called; - expect(confirm).to.have.been.called; - expect(spawnSync).to.have.been.calledTwice; - expect(spawnSync.getCall(0)).calledWith( - 'git', - ['tag', 'v0.8.0-draft.8'], - sinon.match.any - ); - expect(spawnSync.getCall(1)).calledWith( - 'git', - ['push', 'origin', 'v0.8.0-draft.8'], - sinon.match.any - ); - }); - - it('asks for the bump type and pushes a new draft if previous tag was a release on main', async function () { - const latestTag: TaggedCommit = { - commit: 'hash', - tag: { - draftVersion: undefined, - releaseVersion: '0.8.0', - semverName: '0.8.0', - }, - }; - - getLatestDraftOrReleaseTagFromLog.returns(latestTag); - choose.resolves('minor'); - confirm.resolves(true); - - await triggerReleaseDraft( - 'root', - verifyGitStatus, - getLatestDraftOrReleaseTagFromLog, - choose, - confirm, - spawnSync - ); - - expect(verifyGitStatus).to.have.been.called; - expect(choose).to.have.been.called; - expect(confirm).to.have.been.called; - expect(spawnSync).to.have.been.calledTwice; - expect(spawnSync.getCall(0)).calledWith( - 'git', - ['tag', 'v0.9.0-draft.0'], - sinon.match.any - ); - expect(spawnSync.getCall(1)).calledWith( - 'git', - ['push', 'origin', 'v0.9.0-draft.0'], - sinon.match.any - ); - }); - - it('automatically does a patch when on a release branch (for a support release)', async function () { - const repoStatus: RepositoryStatus = { - branch: { - local: 'release/v0.8.2', - tracking: 'origin/release/v0.8.2', - diverged: false, - }, - clean: true, - hasUnpushedTags: false, - }; - - const latestTag: TaggedCommit = { - commit: 'hash', - tag: { - draftVersion: undefined, - releaseVersion: '0.8.2', - semverName: '0.8.2', - }, - }; - - verifyGitStatus.returns(repoStatus); - getLatestDraftOrReleaseTagFromLog.returns(latestTag); - confirm.resolves(true); - - await triggerReleaseDraft( - 'root', - verifyGitStatus, - getLatestDraftOrReleaseTagFromLog, - choose, - confirm, - spawnSync - ); - - expect(verifyGitStatus).to.have.been.called; - expect(confirm).to.have.been.calledTwice; - expect(spawnSync).to.have.been.calledTwice; - expect(spawnSync.getCall(0)).calledWith( - 'git', - ['tag', 'v0.8.3-draft.0'], - sinon.match.any - ); - expect(spawnSync.getCall(1)).calledWith( - 'git', - ['push', 'origin', 'v0.8.3-draft.0'], - sinon.match.any - ); - }); - - it('fails if no previous tag is found', async function () { - getLatestDraftOrReleaseTagFromLog.returns(undefined); - try { - await triggerReleaseDraft( - 'root', - verifyGitStatus, - getLatestDraftOrReleaseTagFromLog, - choose, - confirm, - spawnSync - ); - } catch (e: any) { - expect(e.message).to.contain( - 'Could not find a previous draft or release tag.' - ); - expect(verifyGitStatus).to.have.been.called; - expect(choose).to.not.have.been.called; - expect(confirm).to.not.have.been.called; - expect(spawnSync).to.not.have.been.called; - return; - } - expect.fail('Expected error'); - }); - - it('aborts if user does not confirm', async function () { - const latestTag: TaggedCommit = { - commit: 'hash', - tag: { - draftVersion: 7, - releaseVersion: '0.8.0', - semverName: '0.8.0-draft.7', - }, - }; - getLatestDraftOrReleaseTagFromLog.returns(latestTag); - confirm.onFirstCall().resolves(true); - confirm.onSecondCall().resolves(false); - - try { - await triggerReleaseDraft( - 'root', - verifyGitStatus, - getLatestDraftOrReleaseTagFromLog, - choose, - confirm, - spawnSync - ); - } catch (e: any) { - expect(e.message).to.contain('User aborted'); - expect(verifyGitStatus).to.have.been.called; - expect(choose).to.not.have.been.called; - expect(confirm).to.have.been.called; - expect(spawnSync).to.not.have.been.called; - return; - } - expect.fail('Expected error'); - }); - }); - - describe('computeNextTagName', function () { - const draftTag: TagDetails = { - semverName: '0.8.0-draft.8', - draftVersion: 8, - releaseVersion: '0.8.0', - }; - const releaseTag: TagDetails = { - semverName: '0.8.0', - draftVersion: undefined, - releaseVersion: '0.8.0', - }; - - it('computes the next draft bump', function () { - const result = computeNextTagNameFn(draftTag, 'draft'); - expect(result).to.equal('v0.8.0-draft.9'); - }); - it('computes the next patch bump', function () { - const result = computeNextTagNameFn(releaseTag, 'patch'); - expect(result).to.equal('v0.8.1-draft.0'); - }); - it('computes the next minor bump', function () { - const result = computeNextTagNameFn(releaseTag, 'minor'); - expect(result).to.equal('v0.9.0-draft.0'); - }); - it('computes the next major bump', function () { - const result = computeNextTagNameFn(releaseTag, 'major'); - expect(result).to.equal('v1.0.0-draft.0'); - }); - it('fails on unknown bump type', function () { - try { - computeNextTagNameFn(releaseTag, 'what' as any); - } catch (e: any) { - expect(e.message).to.contain('unexpected bump type'); - return; - } - expect.fail('Expected error'); - }); - }); -}); diff --git a/packages/build/src/local/trigger-release-draft.ts b/packages/build/src/local/trigger-release-draft.ts deleted file mode 100644 index 87c02f9ead..0000000000 --- a/packages/build/src/local/trigger-release-draft.ts +++ /dev/null @@ -1,133 +0,0 @@ -import assert from 'assert'; -import semver from 'semver'; -import type { TagDetails } from '../git'; -import { - getLatestDraftOrReleaseTagFromLog as getLatestDraftOrReleaseTagFromLogFn, - getReleaseVersionFromBranch, - verifyGitStatus as verifyGitStatusFn, -} from '../git'; -import { - choose as chooseFn, - confirm as confirmFn, - spawnSync as spawnSyncFn, -} from '../helpers'; - -type BumpType = 'draft' | 'patch' | 'minor' | 'major'; - -export async function triggerReleaseDraft( - repositoryRoot: string, - verifyGitStatus: typeof verifyGitStatusFn = verifyGitStatusFn, - getLatestDraftOrReleaseTagFromLog: typeof getLatestDraftOrReleaseTagFromLogFn = getLatestDraftOrReleaseTagFromLogFn, - choose: typeof chooseFn = chooseFn, - confirm: typeof confirmFn = confirmFn, - spawnSync: typeof spawnSyncFn = spawnSyncFn -): Promise { - console.info('Triggering process to create a new release draft...'); - - const repositoryStatus = verifyGitStatus(repositoryRoot); - const branchReleaseVersion = getReleaseVersionFromBranch( - repositoryStatus.branch?.local - ); - - const latestDraftOrReleaseTag = getLatestDraftOrReleaseTagFromLog( - repositoryRoot, - branchReleaseVersion - ); - if (!latestDraftOrReleaseTag) { - throw new Error('Could not find a previous draft or release tag.'); - } - console.info( - `-> Most recent tag: v${latestDraftOrReleaseTag.tag.semverName} on commit ${latestDraftOrReleaseTag.commit}` - ); - - let bumpType: BumpType | undefined = undefined; - if ( - branchReleaseVersion && - latestDraftOrReleaseTag.tag.draftVersion === undefined - ) { - console.info( - '-> You are on a release branch, last tag was a release - assuming patch...' - ); - bumpType = 'patch'; - } else if (latestDraftOrReleaseTag.tag.draftVersion !== undefined) { - console.info('-> Last tag was a draft - assuming another draft...'); - bumpType = 'draft'; - } - - let confirmInferred = false; - if (bumpType) { - confirmInferred = await confirm( - `-> Is it okay to continue with tag type ${bumpType}?`, - true - ); - } - - if (!bumpType || !confirmInferred) { - bumpType = (await choose( - '> Select the type of increment for the new version', - ['patch', 'minor', 'major'], - '... enter your choice:' - )) as BumpType; - } - - const nextTagName = computeNextTagNameFn( - latestDraftOrReleaseTag.tag, - bumpType - ); - console.info('-> New draft tag is:'); - console.info(` ${nextTagName}`); - - const confirmed = await confirm( - '!! Is this correct and should the draft process continue?' - ); - if (!confirmed) { - throw new Error('User aborted.'); - } - - console.info('... creating and pushing tag ...'); - spawnSync('git', ['tag', nextTagName], { - cwd: repositoryRoot, - encoding: 'utf-8', - }); - spawnSync('git', ['push', 'origin', nextTagName], { - cwd: repositoryRoot, - encoding: 'utf-8', - }); - - console.info('SUCCESS! Your new draft has been tagged and pushed.'); -} - -export function computeNextTagNameFn( - latestDraftOrReleaseTag: TagDetails, - bumpType: BumpType -): string { - if (bumpType === 'draft') { - assert(latestDraftOrReleaseTag.draftVersion !== undefined); - return `v${latestDraftOrReleaseTag.releaseVersion}-draft.${ - latestDraftOrReleaseTag.draftVersion + 1 - }`; - } - - let major = semver.major(latestDraftOrReleaseTag.releaseVersion); - let minor = semver.minor(latestDraftOrReleaseTag.releaseVersion); - let patch = semver.patch(latestDraftOrReleaseTag.releaseVersion); - - switch (bumpType) { - case 'patch': - patch += 1; - break; - case 'minor': - patch = 0; - minor += 1; - break; - case 'major': - patch = 0; - minor = 0; - major += 1; - break; - default: - throw new Error(`unexpected bump type ${bumpType}`); - } - - return `v${major}.${minor}.${patch}-draft.0`; -} diff --git a/packages/build/src/local/trigger-release-publish.spec.ts b/packages/build/src/local/trigger-release-publish.spec.ts deleted file mode 100644 index 7b63f9d423..0000000000 --- a/packages/build/src/local/trigger-release-publish.spec.ts +++ /dev/null @@ -1,266 +0,0 @@ -import { expect } from 'chai'; -import sinon from 'sinon'; -import type { EvergreenApi, EvergreenTask } from '../evergreen'; -import type { TaggedCommit } from '../git'; -import { - triggerReleasePublish, - verifyEvergreenStatusFn, -} from './trigger-release-publish'; - -describe('local trigger-release-publish', function () { - describe('triggerReleasePublish', function () { - let verifyGitStatus: sinon.SinonStub; - let getLatestDraftOrReleaseTagFromLog: sinon.SinonStub; - let confirm: sinon.SinonStub; - let verifyEvergreenStatus: sinon.SinonStub; - let spawnSync: sinon.SinonStub; - - beforeEach(function () { - verifyGitStatus = sinon.stub(); - getLatestDraftOrReleaseTagFromLog = sinon.stub(); - confirm = sinon.stub(); - verifyEvergreenStatus = sinon.stub(); - spawnSync = sinon.stub(); - }); - - it('creates a new release tag and pushes when everything is good', async function () { - const latestTag: TaggedCommit = { - commit: 'hash', - tag: { - draftVersion: 7, - releaseVersion: '0.8.0', - semverName: '0.8.0-draft.7', - }, - }; - getLatestDraftOrReleaseTagFromLog.returns(latestTag); - confirm.resolves(true); - - await triggerReleasePublish( - 'root', - verifyGitStatus, - getLatestDraftOrReleaseTagFromLog, - confirm, - verifyEvergreenStatus, - spawnSync - ); - - expect(verifyGitStatus).to.have.been.called; - expect(confirm).to.have.been.called; - expect(verifyEvergreenStatus).to.have.been.called; - expect(spawnSync).to.have.been.calledTwice; - expect(spawnSync.getCall(0)).calledWith( - 'git', - ['tag', 'v0.8.0', 'hash'], - sinon.match.any - ); - expect(spawnSync.getCall(1)).calledWith( - 'git', - ['push', 'origin', 'v0.8.0'], - sinon.match.any - ); - }); - - it('fails if no previous tag is found', async function () { - getLatestDraftOrReleaseTagFromLog.returns(undefined); - try { - await triggerReleasePublish( - 'root', - verifyGitStatus, - getLatestDraftOrReleaseTagFromLog, - confirm, - verifyEvergreenStatus, - spawnSync - ); - } catch (e: any) { - expect(e.message).to.contain( - 'Failed to find a prior tag to release from' - ); - expect(verifyGitStatus).to.have.been.called; - expect(confirm).to.not.have.been.called; - expect(verifyEvergreenStatus).to.not.have.been.called; - expect(spawnSync).to.not.have.been.called; - return; - } - expect.fail('Expected error'); - }); - - it('fails if the previous tag is not a draft', async function () { - const latestTag: TaggedCommit = { - commit: 'hash', - tag: { - draftVersion: undefined, - releaseVersion: '0.8.0', - semverName: '0.8.0', - }, - }; - getLatestDraftOrReleaseTagFromLog.returns(latestTag); - - try { - await triggerReleasePublish( - 'root', - verifyGitStatus, - getLatestDraftOrReleaseTagFromLog, - confirm, - verifyEvergreenStatus, - spawnSync - ); - } catch (e: any) { - expect(e.message).to.contain("but it's not a draft"); - expect(verifyGitStatus).to.have.been.called; - expect(confirm).to.not.have.been.called; - expect(verifyEvergreenStatus).to.not.have.been.called; - expect(spawnSync).to.not.have.been.called; - return; - } - expect.fail('Expected error'); - }); - - it('fails if evergreen check fails', async function () { - const latestTag: TaggedCommit = { - commit: 'hash', - tag: { - draftVersion: 7, - releaseVersion: '0.8.0', - semverName: '0.8.0-draft.7', - }, - }; - getLatestDraftOrReleaseTagFromLog.returns(latestTag); - confirm.resolves(true); - const expectedError = new Error('that failed'); - verifyEvergreenStatus.rejects(expectedError); - - try { - await triggerReleasePublish( - 'root', - verifyGitStatus, - getLatestDraftOrReleaseTagFromLog, - confirm, - verifyEvergreenStatus, - spawnSync - ); - } catch (e: any) { - expect(e).to.equal(expectedError); - expect(verifyGitStatus).to.have.been.called; - expect(confirm).to.have.been.called; - expect(spawnSync).to.not.have.been.called; - return; - } - expect.fail('Expected error'); - }); - - it('aborts if user does not confirm', async function () { - const latestTag: TaggedCommit = { - commit: 'hash', - tag: { - draftVersion: 7, - releaseVersion: '0.8.0', - semverName: '0.8.0-draft.7', - }, - }; - getLatestDraftOrReleaseTagFromLog.returns(latestTag); - confirm.resolves(false); - - try { - await triggerReleasePublish( - 'root', - verifyGitStatus, - getLatestDraftOrReleaseTagFromLog, - confirm, - verifyEvergreenStatus, - spawnSync - ); - } catch (e: any) { - expect(e.message).to.contain('User aborted'); - expect(verifyGitStatus).to.have.been.called; - expect(confirm).to.have.been.called; - expect(spawnSync).to.not.have.been.called; - return; - } - expect.fail('Expected error'); - }); - }); - - describe('verifyEvergreenStatus', function () { - let evergreenProvider: Promise; - let getTasks: sinon.SinonStub; - - const exampleTag: TaggedCommit = { - commit: 'sha', - tag: { - draftVersion: 5, - releaseVersion: '0.8.2', - semverName: '0.8.2-draft.5', - }, - }; - - const failedTask: EvergreenTask = { - task_id: 'task1', - version_id: 'v1', - build_variant: 'windows', - display_name: 'Task 1', - status: 'failed', - }; - const successTask: EvergreenTask = { - task_id: 'task2', - version_id: 'v2', - build_variant: 'windows', - display_name: 'Task 2', - status: 'success', - }; - - beforeEach(function () { - getTasks = sinon.stub(); - evergreenProvider = Promise.resolve({ - getTasks, - } as unknown as EvergreenApi); - }); - - it('works if all tasks are successful', async function () { - getTasks.resolves([successTask]); - await verifyEvergreenStatusFn(exampleTag, evergreenProvider); - expect(getTasks).to.have.been.calledWith( - 'mongosh', - 'sha', - 'v0.8.2-draft.5' - ); - }); - - it('fails if evergreen fails', async function () { - const expectedError = new Error('failed'); - getTasks.rejects(expectedError); - try { - await verifyEvergreenStatusFn(exampleTag, evergreenProvider); - } catch (e: any) { - expect(e).to.equal(expectedError); - return; - } - expect.fail('Expected error'); - }); - - it('fails if there are failed tasks and user cancels', async function () { - getTasks.resolves([successTask, failedTask]); - const confirm = sinon.stub().resolves(false); - try { - await verifyEvergreenStatusFn(exampleTag, evergreenProvider, confirm); - } catch (e: any) { - expect(e.message).to.contain( - 'Some Evergreen tasks were not successful' - ); - expect(getTasks).to.have.been.calledWith( - 'mongosh', - 'sha', - 'v0.8.2-draft.5' - ); - return; - } - expect.fail('Expected error'); - }); - - it('continues if there are failed tasks but user acknowledges', async function () { - getTasks.resolves([successTask, failedTask]); - const confirm = sinon.stub().resolves(true); - await verifyEvergreenStatusFn(exampleTag, evergreenProvider, confirm); - expect(confirm).to.have.been.called; - }); - }); -}); diff --git a/packages/build/src/local/trigger-release-publish.ts b/packages/build/src/local/trigger-release-publish.ts deleted file mode 100644 index 90dd06a94b..0000000000 --- a/packages/build/src/local/trigger-release-publish.ts +++ /dev/null @@ -1,93 +0,0 @@ -import { EvergreenApi } from '../evergreen'; -import type { TaggedCommit } from '../git'; -import { - getLatestDraftOrReleaseTagFromLog as getLatestDraftOrReleaseTagFromLogFn, - verifyGitStatus as verifyGitStatusFn, -} from '../git'; -import { confirm as confirmFn, spawnSync as spawnSyncFn } from '../helpers'; - -export async function triggerReleasePublish( - repositoryRoot: string, - verifyGitStatus: typeof verifyGitStatusFn = verifyGitStatusFn, - getLatestDraftOrReleaseTagFromLog: typeof getLatestDraftOrReleaseTagFromLogFn = getLatestDraftOrReleaseTagFromLogFn, - confirm: typeof confirmFn = confirmFn, - verifyEvergreenStatus: typeof verifyEvergreenStatusFn = verifyEvergreenStatusFn, - spawnSync: typeof spawnSyncFn = spawnSyncFn -): Promise { - console.info('Triggering process to publish a new release...'); - - verifyGitStatus(repositoryRoot); - - const latestDraftTag = getLatestDraftOrReleaseTagFromLog( - repositoryRoot, - undefined - ); - if (!latestDraftTag) { - throw new Error('Failed to find a prior tag to release from.'); - } - if (latestDraftTag.tag.draftVersion === undefined) { - throw new Error( - `Found prior tag v${latestDraftTag.tag.semverName} - but it's not a draft.` - ); - } - const releaseTag = `v${latestDraftTag.tag.releaseVersion}`; - - console.info('-> Found most recent draft tag:'); - console.info(` version: v${latestDraftTag.tag.semverName}`); - console.info(` commit: ${latestDraftTag.commit}`); - console.info(` release: ${releaseTag}`); - const confirmed = await confirm( - `!! Is this correct and should we tag ${latestDraftTag.commit} as ${releaseTag}?` - ); - if (!confirmed) { - throw new Error('User aborted.'); - } - - console.info('... verifying evergreen status ...'); - await verifyEvergreenStatus(latestDraftTag); - - console.info('... tagging commit and pushing ...'); - spawnSync('git', ['tag', releaseTag, latestDraftTag.commit], { - cwd: repositoryRoot, - encoding: 'utf-8', - }); - spawnSync('git', ['push', 'origin', releaseTag], { - cwd: repositoryRoot, - encoding: 'utf-8', - }); - - console.info('SUCCESS! Your new release has been tagged and published.'); -} - -export async function verifyEvergreenStatusFn( - latestDraftTag: TaggedCommit, - evergreenApiProvider: Promise = EvergreenApi.fromUserConfiguration(), - confirm: typeof confirmFn = confirmFn -): Promise { - const evergreenApi = await evergreenApiProvider; - const tasks = await evergreenApi.getTasks( - 'mongosh', - latestDraftTag.commit, - `v${latestDraftTag.tag.semverName}` - ); - const unsuccessfulTasks = tasks.filter((t) => t.status !== 'success'); - - if (!unsuccessfulTasks.length) { - return; - } - - console.error('!! Detected the following not successful tasks on Evergreen:'); - unsuccessfulTasks.forEach((t) => { - console.error(` > ${t.display_name} on ${t.build_variant}`); - }); - - const stillContinue = await confirm( - '!! Do you want to continue and still release despite non-successful tasks?' - ); - if (!stillContinue) { - console.error( - '!! Please trigger a new draft and ensure all tasks complete successfully.' - ); - throw new Error('Some Evergreen tasks were not successful.'); - } -} diff --git a/packages/build/src/local/trigger-release.ts b/packages/build/src/local/trigger-release.ts deleted file mode 100644 index fb6f2c9685..0000000000 --- a/packages/build/src/local/trigger-release.ts +++ /dev/null @@ -1,23 +0,0 @@ -import path from 'path'; -import { triggerReleaseDraft } from './trigger-release-draft'; -import { triggerReleasePublish } from './trigger-release-publish'; - -export async function triggerRelease(args: string[]): Promise { - if (args.length < 1) { - throw new Error('Missing command to trigger release: draft/publish'); - } - - const repositoryRoot = path.resolve(__dirname, '..', '..', '..', '..'); - - const command = args[0]; - switch (command) { - case 'draft': - await triggerReleaseDraft(repositoryRoot); - break; - case 'publish': - await triggerReleasePublish(repositoryRoot); - break; - default: - throw new Error(`Unknown command ${command} - must be draft or publish`); - } -} diff --git a/packages/build/src/mongosh-publisher.spec.ts b/packages/build/src/mongosh-publisher.spec.ts new file mode 100644 index 0000000000..a03f617938 --- /dev/null +++ b/packages/build/src/mongosh-publisher.spec.ts @@ -0,0 +1,209 @@ +/* eslint-disable @typescript-eslint/unbound-method */ +import chai, { expect } from 'chai'; +import sinon from 'sinon'; +import { Barque } from './barque'; +import type { Config } from './config'; +import { GithubRepo } from '@mongodb-js/devtools-github-repo'; +import { dummyConfig } from '../test/helpers'; +import { MongoshPublisher } from './mongosh-publisher'; + +chai.use(require('sinon-chai')); + +function createStubRepo(overrides?: any): GithubRepo { + return sinon.createStubInstance( + GithubRepo, + overrides + ) as unknown as GithubRepo; +} + +function createStubBarque(overrides?: any): Barque { + return sinon.createStubInstance(Barque, overrides) as unknown as Barque; +} + +describe('NpmPublisher publishMongosh', function () { + let config: Config; + let createAndPublishDownloadCenterConfig: sinon.SinonStub; + let getMostRecentDraftTagForRelease: sinon.SinonStub; + let publishToNpm: sinon.SinonStub; + let writeBuildInfo: sinon.SinonStub; + let publishToHomebrew: sinon.SinonStub; + let shouldDoPublicRelease: sinon.SinonStub; + let githubRepo: GithubRepo; + let mongoHomebrewCoreForkRepo: GithubRepo; + let homebrewCoreRepo: GithubRepo; + let barque: Barque; + + let testPublisher: MongoshPublisher; + + beforeEach(function () { + config = { ...dummyConfig }; + getMostRecentDraftTagForRelease = sinon.stub(); + githubRepo = createStubRepo({ + getMostRecentDraftTagForRelease, + }); + mongoHomebrewCoreForkRepo = createStubRepo(); + homebrewCoreRepo = createStubRepo(); + barque = createStubBarque({ + releaseToBarque: sinon.stub().resolves(['package-url']), + waitUntilPackagesAreAvailable: sinon.stub().resolves(), + }); + + testPublisher = new MongoshPublisher( + config, + githubRepo, + homebrewCoreRepo, + homebrewCoreRepo + ); + + createAndPublishDownloadCenterConfig = sinon + .stub(testPublisher, 'createAndPublishDownloadCenterConfig') + .resolves(); + publishToNpm = sinon.stub(testPublisher.npmPublisher, 'publish').resolves(); + writeBuildInfo = sinon.stub(testPublisher, 'writeBuildInfo').resolves(); + publishToHomebrew = sinon + .stub(testPublisher, 'publishToHomebrew') + .resolves(); + shouldDoPublicRelease = sinon + .stub(testPublisher, 'shouldDoPublicRelease') + .resolves(); + }); + + context('if is a public release', function () { + beforeEach(function () { + config.triggeringGitTag = 'v0.7.0'; + shouldDoPublicRelease.returns(true); + getMostRecentDraftTagForRelease.resolves({ + name: 'v0.7.0-draft.42', + sha: 'revision', + }); + + Object.assign(githubRepo, { + repo: { + owner: 'mongodb-js', + repo: 'mongosh', + }, + }); + }); + + context('validates configuration', function () { + it('fails if no draft tag is found', async function () { + getMostRecentDraftTagForRelease.resolves(undefined); + try { + await testPublisher.publishMongosh(barque); + } catch (e: any) { + return expect(e.message).to.contain('Could not find prior draft tag'); + } + expect.fail('Expected error'); + }); + + it('fails if draft tag SHA does not match revision', async function () { + getMostRecentDraftTagForRelease.resolves({ + name: 'v0.7.0-draft.42', + sha: 'wrong', + }); + try { + await testPublisher.publishMongosh(barque); + } catch (e: any) { + return expect(e.message).to.contain('Version mismatch'); + } + expect.fail('Expected error'); + }); + }); + + it('publishes artifacts to barque', async function () { + await testPublisher.publishMongosh(barque); + + expect(barque.releaseToBarque).to.have.been.callCount(26); + expect(barque.releaseToBarque).to.have.been.calledWith( + 'rpm-x64', + 'https://s3.amazonaws.com/mciuploads/project/v0.7.0-draft.42/mongodb-mongosh-0.7.0.x86_64.rpm' + ); + expect(barque.releaseToBarque).to.have.been.calledWith( + 'deb-x64', + 'https://s3.amazonaws.com/mciuploads/project/v0.7.0-draft.42/mongodb-mongosh_0.7.0_amd64.deb' + ); + expect(barque.releaseToBarque).to.have.been.calledWith( + 'rpm-arm64', + 'https://s3.amazonaws.com/mciuploads/project/v0.7.0-draft.42/mongodb-mongosh-0.7.0.aarch64.rpm' + ); + expect(barque.waitUntilPackagesAreAvailable).to.have.been.called; + }); + + it('updates the download center config', async function () { + await testPublisher.publishMongosh(barque); + + expect(createAndPublishDownloadCenterConfig).to.have.been.calledWith( + config.outputDir, + config.packageInformation, + config.downloadCenterAwsKey, + config.downloadCenterAwsSecret + ); + }); + + it('promotes the release in github', async function () { + await testPublisher.publishMongosh(barque); + + expect(githubRepo.promoteRelease).to.have.been.calledWith(config); + }); + + it('writes analytics config and then publishes NPM packages', async function () { + await testPublisher.publishMongosh(barque); + + expect(writeBuildInfo).to.have.been.calledOnceWith(config); + expect(publishToNpm).to.have.been.calledWith(); + expect(publishToNpm).to.have.been.calledAfter( + testPublisher.writeBuildInfo as any + ); + }); + it('publishes to homebrew', async function () { + await testPublisher.publishMongosh(barque); + + expect(publishToHomebrew).to.have.been.calledWith( + homebrewCoreRepo, + mongoHomebrewCoreForkRepo, + config.version + ); + expect(publishToHomebrew).to.have.been.calledAfter( + githubRepo.promoteRelease as any + ); + }); + }); + + context('if is not a public release', function () { + beforeEach(function () { + shouldDoPublicRelease.returns(false); + }); + + it('does not update the download center config', async function () { + await testPublisher.publishMongosh(barque); + + expect( + testPublisher.createAndPublishDownloadCenterConfig + ).not.to.have.been.called; + }); + + it('does not promote the release in github', async function () { + await testPublisher.publishMongosh(barque); + + expect(githubRepo.promoteRelease).not.to.have.been.called; + }); + + it('does not publish npm packages', async function () { + await testPublisher.publishMongosh(barque); + + expect(publishToNpm).not.to.have.been.called; + }); + + it('does not publish to homebrew', async function () { + await testPublisher.publishMongosh(barque); + + expect(publishToHomebrew).not.to.have.been.called; + }); + + it('does not release to barque', async function () { + await testPublisher.publishMongosh(barque); + + expect(barque.releaseToBarque).not.to.have.been.called; + }); + }); +}); diff --git a/packages/build/src/mongosh-publisher.ts b/packages/build/src/mongosh-publisher.ts new file mode 100644 index 0000000000..904db9da63 --- /dev/null +++ b/packages/build/src/mongosh-publisher.ts @@ -0,0 +1,176 @@ +import { writeBuildInfo as writeBuildInfoType } from './build-info'; +import { Barque } from './barque'; +import type { Config } from './config'; +import { + ALL_PACKAGE_VARIANTS, + getReleaseVersionFromTag, + shouldDoPublicRelease as shouldDoPublicReleaseFn, +} from './config'; +import { createAndPublishDownloadCenterConfig as createAndPublishDownloadCenterConfigFn } from './download-center'; +import { getArtifactUrl as getArtifactUrlFn } from './evergreen'; +import type { GithubRepo } from '@mongodb-js/devtools-github-repo'; +import { publishToHomebrew as publishToHomebrewFn } from './homebrew'; +import type { PackageInformationProvider } from './packaging'; +import { getPackageFile } from './packaging'; +import { NpmPublisher } from './npm-packages'; + +export class MongoshPublisher { + createAndPublishDownloadCenterConfig = createAndPublishDownloadCenterConfigFn; + writeBuildInfo = writeBuildInfoType; + publishToHomebrew = publishToHomebrewFn; + shouldDoPublicRelease = shouldDoPublicReleaseFn; + getEvergreenArtifactUrl = getArtifactUrlFn; + + config: Config; + mongoshGithubRepo: GithubRepo; + mongoHomebrewForkRepo: GithubRepo; + homebrewCoreRepo: GithubRepo; + npmPublisher: NpmPublisher; + + constructor( + config: Config, + githubRepo: GithubRepo, + mongoHomebrewForkRepo: GithubRepo, + homebrewCoreRepo: GithubRepo + ) { + this.config = config; + this.npmPublisher = new NpmPublisher(config); + this.mongoshGithubRepo = githubRepo; + this.mongoHomebrewForkRepo = mongoHomebrewForkRepo; + this.homebrewCoreRepo = homebrewCoreRepo; + } + + async publish() { + if (this.config.useAuxiliaryPackagesOnly === false) { + const barque = new Barque(this.config); + await this.publishMongosh(barque); + } else { + await this.publishAuxiliaryPackages(); + } + } + + async publishAuxiliaryPackages() { + if (!this.config.useAuxiliaryPackagesOnly) { + throw new Error( + 'This should only be used when publishing auxiliary packages' + ); + } + await this.npmPublisher.publish(); + } + + async publishMongosh(barque: Barque): Promise { + const config = this.config; + if (!this.shouldDoPublicRelease(config)) { + console.warn( + 'mongosh: Not triggering publish - configuration does not match a public release!' + ); + return; + } + + const releaseVersion = getReleaseVersionFromTag(config.triggeringGitTag); + const latestDraftTag = + await this.mongoshGithubRepo.getMostRecentDraftTagForRelease( + releaseVersion + ); + if (!latestDraftTag || !releaseVersion) { + throw new Error( + `Could not find prior draft tag for release version: ${ + releaseVersion ?? 'unknown' + }` + ); + } + if (latestDraftTag.sha !== config.revision) { + throw new Error( + `Version mismatch - latest draft tag was for revision ${ + latestDraftTag.sha + }, current revision is ${config.revision ?? 'unknown'}` + ); + } + + console.info( + 'mongosh: Re-using artifacts from most recent draft tag', + latestDraftTag.name + ); + + await this.publishArtifactsToBarque( + barque, + config.project as string, + releaseVersion, + latestDraftTag.name, + config.packageInformation as PackageInformationProvider, + !!config.isDryRun + ); + + await this.createAndPublishDownloadCenterConfig( + config.outputDir, + config.packageInformation as PackageInformationProvider, + config.downloadCenterAwsKey || '', + config.downloadCenterAwsSecret || '', + config.injectedJsonFeedFile || '', + !!config.isDryRun + ); + + await this.mongoshGithubRepo.promoteRelease(config); + + // ensures the segment api key to be present in the published packages + await this.writeBuildInfo(config, 'packaged'); + + await this.npmPublisher.publish(); + + await this.publishToHomebrew( + this.homebrewCoreRepo, + this.mongoHomebrewForkRepo, + config.version, + `https://github.com/${this.mongoshGithubRepo.repo.owner}/${this.mongoshGithubRepo.repo.repo}/releases/tag/v${config.version}`, + !!config.isDryRun + ); + + console.info('mongosh: finished release process.'); + } + + async publishArtifactsToBarque( + barque: Barque, + project: string, + releaseVersion: string, + mostRecentDraftTag: string, + packageInformation: PackageInformationProvider, + isDryRun: boolean + ): Promise { + const publishedPackages: string[] = []; + for await (const variant of ALL_PACKAGE_VARIANTS) { + const variantPackageInfo = packageInformation(variant); + const packageFile = getPackageFile(variant, () => ({ + ...variantPackageInfo, + metadata: { + ...variantPackageInfo.metadata, + version: releaseVersion, + }, + })); + const packageUrl = this.getEvergreenArtifactUrl( + project, + mostRecentDraftTag, + packageFile.path + ); + console.info( + `mongosh: Considering publishing ${variant} artifact to barque ${packageUrl}` + ); + const packageUrls = await barque.releaseToBarque( + variant, + packageUrl, + isDryRun + ); + for (const url of packageUrls) { + console.info(` -> ${url}`); + } + publishedPackages.push(...packageUrls); + } + + if (isDryRun) { + console.warn('Not waiting for package availability in dry run...'); + } else { + await barque.waitUntilPackagesAreAvailable(publishedPackages, 300); + } + + console.info('mongosh: Submitting to barque complete'); + } +} diff --git a/packages/build/src/npm-packages/bump.ts b/packages/build/src/npm-packages/bump.ts index f4c337e2df..c792940208 100644 --- a/packages/build/src/npm-packages/bump.ts +++ b/packages/build/src/npm-packages/bump.ts @@ -8,6 +8,7 @@ import { import { promises as fs } from 'fs'; import path from 'path'; import { getPackagesInTopologicalOrder } from '@mongodb-js/monorepo-tools'; +import { getPackageConfigurations } from './helpers'; /** Bumps only the main mongosh release packages to the set version. */ export async function bumpMongoshReleasePackages(): Promise { @@ -17,21 +18,14 @@ export async function bumpMongoshReleasePackages(): Promise { 'MONGOSH_RELEASE_VERSION version not specified during mongosh bump' ); } - console.info(`mongosh: Bumping package versions to ${version}`); - const monorepoRootPath = path.resolve(__dirname, '..', '..', '..', '..'); - const packages = await getPackagesInTopologicalOrder(monorepoRootPath); - - const workspaceNames = packages - .map((p) => p.name) - .filter((name) => MONGOSH_RELEASE_PACKAGES.includes(name)); - - const locations = [monorepoRootPath, ...packages.map((p) => p.location)]; - for (const location of locations) { - const packageJsonPath = path.join(location, 'package.json'); - const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8')); + console.info(`mongosh: Bumping package versions to ${version}`); + const packages = await getPackagesInTopologicalOrder(PROJECT_ROOT); + const packageConfigurations = await getPackageConfigurations(packages); + for (const [packageJsonPath, packageJson] of packageConfigurations) { packageJson.version = version; + for (const grouping of [ 'dependencies', 'devDependencies', @@ -43,7 +37,7 @@ export async function bumpMongoshReleasePackages(): Promise { } for (const name of Object.keys(packageJson[grouping])) { - if (!workspaceNames.includes(name)) { + if (!MONGOSH_RELEASE_PACKAGES.includes(name)) { continue; } packageJson[grouping][name] = version; diff --git a/packages/build/src/npm-packages/helpers.spec.ts b/packages/build/src/npm-packages/helpers.spec.ts new file mode 100644 index 0000000000..d7175b8d80 --- /dev/null +++ b/packages/build/src/npm-packages/helpers.spec.ts @@ -0,0 +1,82 @@ +import { expect } from 'chai'; +import path from 'path'; +import sinon from 'sinon'; +import type { PackageInfo } from '@mongodb-js/monorepo-tools'; +import { promises as fs } from 'fs'; +import { getPackageConfigurations } from './helpers'; + +describe('npm-packages helpers', function () { + before(function () { + if (process.version.startsWith('v16.')) return this.skip(); + }); + + describe('getPackageConfigurations', function () { + const packages: PackageInfo[] = [ + { + name: 'package1', + version: '1.0.0', + location: '/packages/package1', + private: false, + }, + { + name: 'package2', + version: '1.0.0', + location: '/packages/package2', + private: false, + }, + ]; + let readFileStub: sinon.SinonStub; + + beforeEach(function () { + readFileStub = sinon.stub(fs, 'readFile').throws('Unexpected path'); + readFileStub + .withArgs(path.join(packages[0].location, 'package.json')) + .resolves( + JSON.stringify({ + name: packages[0].name, + version: packages[0].version, + }) + ) + .withArgs(path.join(packages[1].location, 'package.json')) + .resolves( + JSON.stringify({ + name: packages[1].name, + version: packages[1].version, + }) + ); + }); + + afterEach(function () { + sinon.restore(); + }); + + it('should return package configurations', async function () { + const result = await getPackageConfigurations(packages); + + expect(result).to.deep.equal([ + [ + path.join(packages[0].location, 'package.json'), + { + name: packages[0].name, + version: packages[0].version, + }, + ], + [ + path.join(packages[1].location, 'package.json'), + { + name: packages[1].name, + version: packages[1].version, + }, + ], + ]); + + expect(readFileStub).has.callCount(2); + expect(readFileStub.firstCall.args[0]).to.equal( + path.join(packages[0].location, 'package.json') + ); + expect(readFileStub.secondCall.args[0]).to.equal( + path.join(packages[1].location, 'package.json') + ); + }); + }); +}); diff --git a/packages/build/src/npm-packages/helpers.ts b/packages/build/src/npm-packages/helpers.ts new file mode 100644 index 0000000000..642c6e945c --- /dev/null +++ b/packages/build/src/npm-packages/helpers.ts @@ -0,0 +1,19 @@ +import path from 'path'; +import { promises as fs } from 'fs'; +import type { PackageInfo } from '@mongodb-js/monorepo-tools'; + +export async function getPackageConfigurations( + packages: PackageInfo[] + // eslint-disable-next-line @typescript-eslint/no-explicit-any +): Promise<[path: string, contents: Record][]> { + return Promise.all( + packages.map(async (packageInfo) => { + const packageJsonPath = path.join(packageInfo.location, 'package.json'); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const packageJsonContents: Record = JSON.parse( + await fs.readFile(packageJsonPath, 'utf8') + ); + return [packageJsonPath, packageJsonContents]; + }) + ); +} diff --git a/packages/build/src/npm-packages/index.ts b/packages/build/src/npm-packages/index.ts index f4225bedce..d72a3efa53 100644 --- a/packages/build/src/npm-packages/index.ts +++ b/packages/build/src/npm-packages/index.ts @@ -1,2 +1,2 @@ export { bumpAuxiliaryPackages } from './bump'; -export { publishToNpm } from './publish'; +export { NpmPublisher } from './npm-publisher'; diff --git a/packages/build/src/npm-packages/list.spec.ts b/packages/build/src/npm-packages/list.spec.ts deleted file mode 100644 index d8ab29600d..0000000000 --- a/packages/build/src/npm-packages/list.spec.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { expect } from 'chai'; -import path from 'path'; -import type { SinonStub } from 'sinon'; -import sinon from 'sinon'; -import type { LernaPackageDescription } from './list'; -import { listNpmPackages } from './list'; -import { markBumpedFilesAsAssumeUnchanged } from './publish'; - -describe('npm-packages list', function () { - before(function () { - if (process.version.startsWith('v16.')) return this.skip(); - }); - - describe('listNpmPackages', function () { - it('lists packages', function () { - const packages = listNpmPackages(); - expect(packages.length).to.be.greaterThan(1); - for (const { name, version } of packages) { - expect(name).to.be.a('string'); - expect(version).to.be.a('string'); - } - }); - }); - - describe('markBumpedFilesAsAssumeUnchanged', function () { - let packages: LernaPackageDescription[]; - let expectedFiles: string[]; - let spawnSync: SinonStub; - - beforeEach(function () { - expectedFiles = [ - path.resolve(__dirname, '..', '..', '..', '..', 'lerna.json'), - path.resolve(__dirname, '..', '..', '..', '..', 'package.json'), - path.resolve(__dirname, '..', '..', '..', '..', 'package-lock.json'), - ]; - packages = listNpmPackages(); - for (const { location } of packages) { - expectedFiles.push(path.resolve(location, 'package.json')); - } - - spawnSync = sinon.stub(); - }); - - it('marks files with --assume-unchanged', function () { - markBumpedFilesAsAssumeUnchanged(packages, true, spawnSync); - expectedFiles.forEach((f) => { - expect(spawnSync).to.have.been.calledWith( - 'git', - ['update-index', '--assume-unchanged', f], - sinon.match.any - ); - }); - }); - - it('marks files with --no-assume-unchanged', function () { - markBumpedFilesAsAssumeUnchanged(packages, false, spawnSync); - expectedFiles.forEach((f) => { - expect(spawnSync).to.have.been.calledWith( - 'git', - ['update-index', '--no-assume-unchanged', f], - sinon.match.any - ); - }); - }); - }); -}); diff --git a/packages/build/src/npm-packages/list.ts b/packages/build/src/npm-packages/list.ts deleted file mode 100644 index 1b4b896b6b..0000000000 --- a/packages/build/src/npm-packages/list.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { LERNA_BIN, PROJECT_ROOT } from './constants'; -import { spawnSync } from '../helpers/spawn-sync'; - -export interface LernaPackageDescription { - name: string; - version: string; - private: boolean; - location: string; -} - -export function listNpmPackages(): LernaPackageDescription[] { - const lernaListOutput = spawnSync(LERNA_BIN, ['list', '--json', '--all'], { - cwd: PROJECT_ROOT, - encoding: 'utf8', - }); - - return JSON.parse(lernaListOutput.stdout); -} diff --git a/packages/build/src/npm-packages/npm-publisher.spec.ts b/packages/build/src/npm-packages/npm-publisher.spec.ts new file mode 100644 index 0000000000..5180153760 --- /dev/null +++ b/packages/build/src/npm-packages/npm-publisher.spec.ts @@ -0,0 +1,318 @@ +import { expect } from 'chai'; +import path from 'path'; +import type { SinonStub } from 'sinon'; +import sinon from 'sinon'; +import fs from 'fs/promises'; +import type { NpmPublisherConfig } from './npm-publisher'; +import { NpmPublisher } from './npm-publisher'; +import type { PackageInfo } from '@mongodb-js/monorepo-tools'; + +describe('npm-packages NpmPublisher', function () { + let testPublisher: NpmPublisher; + let getPackagesInTopologicalOrderStub: SinonStub; + let markBumpedFilesAsAssumeUnchangedStub: SinonStub; + let spawnSync: SinonStub; + let writeFileStub: sinon.SinonStub; + let readFileStub: sinon.SinonStub; + let setPublisherStub: sinon.SinonStub; + + const lernaBin = path.resolve( + __dirname, + '..', + '..', + '..', + '..', + 'node_modules', + '.bin', + 'lerna' + ); + const packages: PackageInfo[] = [ + { + name: 'packageA', + version: '0.7.0', + location: 'packages/package1', + } as PackageInfo, + { + name: 'mongosh', + version: '1.2.0', + location: 'packages/mongosh', + } as PackageInfo, + ]; + + function setupTestPublisher( + config: NpmPublisherConfig, + { stubPublisher = true } = {} + ) { + testPublisher = new NpmPublisher(config); + + getPackagesInTopologicalOrderStub = sinon.stub( + testPublisher, + 'getPackagesInTopologicalOrder' + ); + getPackagesInTopologicalOrderStub.resolves([]); + markBumpedFilesAsAssumeUnchangedStub = sinon + .stub(testPublisher, 'markBumpedFilesAsAssumeUnchanged') + .resolves(); + spawnSync = sinon.stub(testPublisher, 'spawnSync').resolves(); + + if (stubPublisher) { + setPublisherStub = sinon + .stub(testPublisher, 'setReleasePublisher') + .resolves(); + } + + for (const packageInfo of packages) { + readFileStub + .withArgs(path.join(packageInfo.location, 'package.json'), 'utf8') + .resolves( + JSON.stringify({ + name: packageInfo.name, + version: packageInfo.version, + }) + ); + } + } + + beforeEach(function () { + writeFileStub = sinon.stub(fs, 'writeFile'); + writeFileStub.resolves(); + + readFileStub = sinon.stub(fs, 'readFile'); + readFileStub.throws('Unset path read from stub'); + }); + + afterEach(function () { + sinon.restore(); + }); + + describe('publish', function () { + describe('when releasing mongosh', function () { + beforeEach(function () { + setupTestPublisher({ + isDryRun: false, + useAuxiliaryPackagesOnly: false, + publisher: 'test-publisher', + }); + }); + + afterEach(function () { + sinon.restore(); + }); + + it('throws if mongosh package is not found ', async function () { + const packages = [{ name: 'packageA', version: '0.7.0' }]; + getPackagesInTopologicalOrderStub.resolves(packages); + + try { + await testPublisher.publish(); + expect.fail('should throw'); + } catch (error) { + expect((error as Error).message).equals('mongosh package not found'); + } + }); + + it('throws if publisher is not set', function () { + getPackagesInTopologicalOrderStub.resolves(packages); + try { + new NpmPublisher({ + useAuxiliaryPackagesOnly: false, + publisher: '', + isDryRun: false, + }); + expect.fail('should throw'); + } catch (error) { + expect((error as Error).message).equals( + 'Publisher is required for publishing mongosh' + ); + } + }); + + it('calls setReleasePublisher when it is set', async function () { + getPackagesInTopologicalOrderStub.resolves(packages); + await testPublisher.publish(); + expect(setPublisherStub).calledOnceWith(testPublisher.config.publisher); + }); + + it('takes mongosh version and pushes tags', async function () { + getPackagesInTopologicalOrderStub.resolves(packages); + + await testPublisher.publish(); + + expect(spawnSync).calledWith('git', [ + 'tag', + '-a', + 'v1.2.0', + '-m', + 'v1.2.0', + ]); + expect(spawnSync).calledWith('git', ['push', '--follow-tags']); + }); + + it('calls lerna to publish packages', async function () { + getPackagesInTopologicalOrderStub.resolves(packages); + + await testPublisher.publish(); + + expect(markBumpedFilesAsAssumeUnchangedStub).to.have.been.calledWith( + packages, + true + ); + expect(spawnSync).to.have.been.calledWith( + lernaBin, + [ + 'publish', + 'from-package', + '--no-private', + '--no-changelog', + '--exact', + '--yes', + '--no-verify-access', + ], + sinon.match.any + ); + expect(markBumpedFilesAsAssumeUnchangedStub).to.have.been.calledWith( + packages, + false + ); + }); + + it('reverts the assume unchanged even on spawn failure', async function () { + getPackagesInTopologicalOrderStub.resolves(packages); + spawnSync.throws(new Error('meeep')); + + try { + await testPublisher.publish(); + } catch (e: any) { + expect(markBumpedFilesAsAssumeUnchangedStub).to.have.been.calledWith( + packages, + true + ); + expect(spawnSync).to.have.been.called; + expect(markBumpedFilesAsAssumeUnchangedStub).to.have.been.calledWith( + packages, + false + ); + return; + } + expect.fail('Expected error'); + }); + }); + + describe('when releasing auxiliary packages', function () { + beforeEach(function () { + setupTestPublisher({ + isDryRun: false, + useAuxiliaryPackagesOnly: true, + publisher: 'test-publisher', + }); + }); + + it('does not manually push tags with auxiliary packages', async function () { + getPackagesInTopologicalOrderStub.resolves(packages); + + await testPublisher.publish(); + + expect(spawnSync).not.calledWith('git', [ + 'tag', + '-a', + '1.2.0', + '-m', + '1.2.0', + ]); + expect(spawnSync).not.calledWith('git', ['push', '--follow-tags']); + }); + }); + }); + + describe('markBumpedFilesAsAssumeUnchanged', function () { + let expectedFiles: string[]; + let spawnSync: SinonStub; + + beforeEach(function () { + expectedFiles = [ + path.resolve(__dirname, '..', '..', '..', '..', 'lerna.json'), + path.resolve(__dirname, '..', '..', '..', '..', 'package.json'), + path.resolve(__dirname, '..', '..', '..', '..', 'package-lock.json'), + ]; + for (const { location } of packages) { + expectedFiles.push(path.resolve(location, 'package.json')); + } + + spawnSync = sinon.stub(); + }); + + it('marks files with --assume-unchanged', function () { + testPublisher.markBumpedFilesAsAssumeUnchanged(packages, true, spawnSync); + expectedFiles.forEach((f) => { + expect(spawnSync).to.have.been.calledWith( + 'git', + ['update-index', '--assume-unchanged', f], + sinon.match.any + ); + }); + }); + + it('marks files with --no-assume-unchanged', function () { + testPublisher.markBumpedFilesAsAssumeUnchanged( + packages, + false, + spawnSync + ); + expectedFiles.forEach((f) => { + expect(spawnSync).to.have.been.calledWith( + 'git', + ['update-index', '--no-assume-unchanged', f], + sinon.match.any + ); + }); + }); + }); + + describe('setReleasePublisher', function () { + const publisherName = 'test-publisher-name'; + beforeEach(function () { + setupTestPublisher( + { + isDryRun: false, + useAuxiliaryPackagesOnly: false, + publisher: 'test-publisher', + }, + { stubPublisher: false } + ); + }); + + afterEach(function () { + sinon.restore(); + }); + + it('should set the releasePublisher for each package and write the updated package.json', async function () { + getPackagesInTopologicalOrderStub.resolves(packages); + await testPublisher.setReleasePublisher(publisherName, packages); + + expect(readFileStub).has.callCount(packages.length); + expect(writeFileStub).has.callCount(packages.length); + + expect(writeFileStub.firstCall.args[0]).to.equal( + path.join(packages[0].location, 'package.json') + ); + expect( + JSON.parse(writeFileStub.firstCall.args[1] as string) + ).to.deep.equal({ + name: 'packageA', + version: '0.7.0', + releasePublisher: publisherName, + }); + + expect(writeFileStub.secondCall.args[0]).to.equal( + path.join(packages[1].location, 'package.json') + ); + expect( + JSON.parse(writeFileStub.secondCall.args[1] as string) + ).to.deep.equal({ + name: 'mongosh', + version: '1.2.0', + releasePublisher: publisherName, + }); + }); + }); +}); diff --git a/packages/build/src/npm-packages/npm-publisher.ts b/packages/build/src/npm-packages/npm-publisher.ts new file mode 100644 index 0000000000..0602393e3c --- /dev/null +++ b/packages/build/src/npm-packages/npm-publisher.ts @@ -0,0 +1,154 @@ +import { + EXCLUDE_RELEASE_PACKAGES, + LERNA_BIN, + MONGOSH_RELEASE_PACKAGES, + PROJECT_ROOT, +} from './constants'; +import { spawnSync as spawnSyncFn } from '../helpers/spawn-sync'; +import { type SpawnSyncOptionsWithStringEncoding } from 'child_process'; +import type { PackageInfo } from '@mongodb-js/monorepo-tools'; +import { getPackagesInTopologicalOrder as getPackagesInTopologicalOrderFn } from '@mongodb-js/monorepo-tools'; +import { getPackageConfigurations } from './helpers'; +import fs from 'fs/promises'; +import path from 'path'; + +export type NpmPublisherConfig = { + isDryRun?: boolean; + publisher?: string; + useAuxiliaryPackagesOnly?: boolean; +}; + +export class NpmPublisher { + getPackagesInTopologicalOrder = getPackagesInTopologicalOrderFn; + spawnSync = spawnSyncFn; + config: NpmPublisherConfig; + + constructor(config: NpmPublisherConfig) { + if (!config.useAuxiliaryPackagesOnly && !config.publisher) { + throw new Error('Publisher is required for publishing mongosh'); + } + + this.config = config; + } + + async publish(): Promise { + const { useAuxiliaryPackagesOnly, isDryRun, publisher } = this.config; + + const commandOptions: SpawnSyncOptionsWithStringEncoding = { + stdio: 'inherit', + cwd: PROJECT_ROOT, + encoding: 'utf8', + env: { + ...process.env, + ...(isDryRun ? { npm_config_dry_run: 'true' } : {}), + }, + }; + + let packages = ( + await this.getPackagesInTopologicalOrder(PROJECT_ROOT) + ).filter( + (packageConfig) => !EXCLUDE_RELEASE_PACKAGES.includes(packageConfig.name) + ); + + if (useAuxiliaryPackagesOnly) { + packages = packages.filter( + (packageConfig) => + !MONGOSH_RELEASE_PACKAGES.includes(packageConfig.name) + ); + } + if (publisher) { + await this.setReleasePublisher(publisher, packages); + } + // Lerna requires a clean repository for a publish from-package + // we use git update-index --assume-unchanged on files we know have been bumped + this.markBumpedFilesAsAssumeUnchanged(packages, true); + try { + this.spawnSync( + LERNA_BIN, + [ + 'publish', + 'from-package', + '--no-private', + '--no-changelog', + '--exact', + '--yes', + '--no-verify-access', + ], + commandOptions + ); + } finally { + this.markBumpedFilesAsAssumeUnchanged(packages, false); + } + + if (!useAuxiliaryPackagesOnly) { + const mongoshVersion = packages.find( + (packageConfig) => packageConfig.name === 'mongosh' + )?.version; + + if (!mongoshVersion) { + throw new Error('mongosh package not found'); + } + + this.spawnSync( + 'git', + ['tag', '-a', `v${mongoshVersion}`, '-m', `v${mongoshVersion}`], + commandOptions + ); + + this.spawnSync('git', ['push', '--follow-tags'], commandOptions); + } + } + + async setReleasePublisher( + publisher: string, + packages: PackageInfo[] + ): Promise { + const packageConfigurations = await getPackageConfigurations(packages); + + for (const [packageJsonPath, packageJson] of packageConfigurations) { + packageJson.releasePublisher = publisher; + + await fs.writeFile( + packageJsonPath, + JSON.stringify(packageJson, null, 2) + '\n' + ); + } + } + + markBumpedFilesAsAssumeUnchanged( + packages: PackageInfo[], + assumeUnchanged: boolean, + spawnSync: typeof spawnSyncFn = spawnSyncFn + ): void { + const filesToAssume = [ + path.resolve(PROJECT_ROOT, 'lerna.json'), + path.resolve(PROJECT_ROOT, 'package.json'), + path.resolve(PROJECT_ROOT, 'package-lock.json'), + ]; + for (const { location } of packages) { + filesToAssume.push(path.resolve(location, 'package.json')); + } + + for (const f of filesToAssume) { + spawnSync( + 'git', + [ + 'update-index', + assumeUnchanged ? '--assume-unchanged' : '--no-assume-unchanged', + f, + ], + { + stdio: 'inherit', + cwd: PROJECT_ROOT, + encoding: 'utf8', + }, + true + ); + console.info( + `File ${f} is now ${ + assumeUnchanged ? '' : 'NOT ' + }assumed to be unchanged` + ); + } + } +} diff --git a/packages/build/src/npm-packages/publish.spec.ts b/packages/build/src/npm-packages/publish.spec.ts deleted file mode 100644 index e431774f02..0000000000 --- a/packages/build/src/npm-packages/publish.spec.ts +++ /dev/null @@ -1,147 +0,0 @@ -import { expect } from 'chai'; -import path from 'path'; -import type { SinonStub } from 'sinon'; -import sinon from 'sinon'; -import { publishToNpm } from './publish'; - -describe('npm-packages publishToNpm', function () { - let listNpmPackages: SinonStub; - let markBumpedFilesAsAssumeUnchanged: SinonStub; - let spawnSync: SinonStub; - const lernaBin = path.resolve( - __dirname, - '..', - '..', - '..', - '..', - 'node_modules', - '.bin', - 'lerna' - ); - - beforeEach(function () { - listNpmPackages = sinon.stub(); - markBumpedFilesAsAssumeUnchanged = sinon.stub(); - spawnSync = sinon.stub(); - }); - - it('throws if mongosh is not existent when publishing all', function () { - const packages = [{ name: 'packageA', version: '0.7.0' }]; - listNpmPackages.returns(packages); - - expect(() => - publishToNpm( - { isDryRun: false, useAuxiliaryPackagesOnly: false }, - listNpmPackages, - markBumpedFilesAsAssumeUnchanged, - spawnSync - ) - ).throws('mongosh package not found'); - }); - - it('takes mongosh version and pushes tags', function () { - const packages = [ - { name: 'packageA', version: '0.7.0' }, - { name: 'mongosh', version: '1.2.0' }, - ]; - listNpmPackages.returns(packages); - - publishToNpm( - { isDryRun: false, useAuxiliaryPackagesOnly: false }, - listNpmPackages, - markBumpedFilesAsAssumeUnchanged, - spawnSync - ); - - expect(spawnSync).calledWith('git', ['tag', '-a', '1.2.0', '-m', '1.2.0']); - expect(spawnSync).calledWith('git', ['push', '--follow-tags']); - }); - - it('does not manually push tags with auxiliary packages', function () { - const packages = [ - { name: 'packageA', version: '0.7.0' }, - { name: 'mongosh', version: '1.2.0' }, - ]; - listNpmPackages.returns(packages); - - publishToNpm( - { isDryRun: false, useAuxiliaryPackagesOnly: true }, - listNpmPackages, - markBumpedFilesAsAssumeUnchanged, - spawnSync - ); - - expect(spawnSync).not.calledWith('git', [ - 'tag', - '-a', - '1.2.0', - '-m', - '1.2.0', - ]); - expect(spawnSync).not.calledWith('git', ['push', '--follow-tags']); - }); - - it('calls lerna to publish packages for a real version', function () { - const packages = [ - { name: 'packageA', version: '0.7.0' }, - { name: 'mongosh', version: '1.2.0' }, - ]; - listNpmPackages.returns(packages); - - publishToNpm( - { isDryRun: false, useAuxiliaryPackagesOnly: false }, - listNpmPackages, - markBumpedFilesAsAssumeUnchanged, - spawnSync - ); - - expect(markBumpedFilesAsAssumeUnchanged).to.have.been.calledWith( - packages, - true - ); - expect(spawnSync).to.have.been.calledWith( - lernaBin, - [ - 'publish', - 'from-package', - '--no-private', - '--no-changelog', - '--exact', - '--yes', - '--no-verify-access', - ], - sinon.match.any - ); - expect(markBumpedFilesAsAssumeUnchanged).to.have.been.calledWith( - packages, - false - ); - }); - - it('reverts the assume unchanged even on spawn failure', function () { - const packages = [{ name: 'packageA', version: '0.7.0' }]; - listNpmPackages.returns(packages); - spawnSync.throws(new Error('meeep')); - - try { - publishToNpm( - { isDryRun: false, useAuxiliaryPackagesOnly: false }, - listNpmPackages, - markBumpedFilesAsAssumeUnchanged, - spawnSync - ); - } catch (e: any) { - expect(markBumpedFilesAsAssumeUnchanged).to.have.been.calledWith( - packages, - true - ); - expect(spawnSync).to.have.been.called; - expect(markBumpedFilesAsAssumeUnchanged).to.have.been.calledWith( - packages, - false - ); - return; - } - expect.fail('Expected error'); - }); -}); diff --git a/packages/build/src/npm-packages/publish.ts b/packages/build/src/npm-packages/publish.ts deleted file mode 100644 index 638138065f..0000000000 --- a/packages/build/src/npm-packages/publish.ts +++ /dev/null @@ -1,110 +0,0 @@ -import path from 'path'; -import { - EXCLUDE_RELEASE_PACKAGES, - LERNA_BIN, - MONGOSH_RELEASE_PACKAGES, - PROJECT_ROOT, -} from './constants'; -import type { LernaPackageDescription } from './list'; -import { listNpmPackages as listNpmPackagesFn } from './list'; -import { spawnSync as spawnSyncFn } from '../helpers/spawn-sync'; -import type { SpawnSyncOptionsWithStringEncoding } from 'child_process'; - -export function publishToNpm( - { isDryRun = false, useAuxiliaryPackagesOnly = false }, - listNpmPackages: typeof listNpmPackagesFn = listNpmPackagesFn, - markBumpedFilesAsAssumeUnchangedFn: typeof markBumpedFilesAsAssumeUnchanged = markBumpedFilesAsAssumeUnchanged, - spawnSync: typeof spawnSyncFn = spawnSyncFn -): void { - const commandOptions: SpawnSyncOptionsWithStringEncoding = { - stdio: 'inherit', - cwd: PROJECT_ROOT, - encoding: 'utf8', - env: { - ...process.env, - ...(isDryRun ? { npm_config_dry_run: 'true' } : {}), - }, - }; - let packages = listNpmPackages().filter( - (packageConfig) => !EXCLUDE_RELEASE_PACKAGES.includes(packageConfig.name) - ); - - if (useAuxiliaryPackagesOnly) { - packages = packages.filter( - (packageConfig) => !MONGOSH_RELEASE_PACKAGES.includes(packageConfig.name) - ); - } - // Lerna requires a clean repository for a publish from-package - // we use git update-index --assume-unchanged on files we know have been bumped - markBumpedFilesAsAssumeUnchangedFn(packages, true); - try { - spawnSync( - LERNA_BIN, - [ - 'publish', - 'from-package', - '--no-private', - '--no-changelog', - '--exact', - '--yes', - '--no-verify-access', - ], - commandOptions - ); - } finally { - markBumpedFilesAsAssumeUnchangedFn(packages, false); - } - - if (!useAuxiliaryPackagesOnly) { - const mongoshVersion = packages.find( - (packageConfig) => packageConfig.name === 'mongosh' - )?.version; - - if (!mongoshVersion) { - throw new Error('mongosh package not found'); - } - - spawnSync( - 'git', - ['tag', '-a', mongoshVersion, '-m', mongoshVersion], - commandOptions - ); - - spawnSync('git', ['push', '--follow-tags'], commandOptions); - } -} - -export function markBumpedFilesAsAssumeUnchanged( - packages: LernaPackageDescription[], - assumeUnchanged: boolean, - spawnSync: typeof spawnSyncFn = spawnSyncFn -): void { - const filesToAssume = [ - path.resolve(PROJECT_ROOT, 'lerna.json'), - path.resolve(PROJECT_ROOT, 'package.json'), - path.resolve(PROJECT_ROOT, 'package-lock.json'), - ]; - for (const { location } of packages) { - filesToAssume.push(path.resolve(location, 'package.json')); - } - - for (const f of filesToAssume) { - spawnSync( - 'git', - [ - 'update-index', - assumeUnchanged ? '--assume-unchanged' : '--no-assume-unchanged', - f, - ], - { - stdio: 'inherit', - cwd: PROJECT_ROOT, - encoding: 'utf8', - }, - true - ); - console.info( - `File ${f} is now ${assumeUnchanged ? '' : 'NOT '}assumed to be unchanged` - ); - } -} diff --git a/packages/build/src/publish-auxiliary.ts b/packages/build/src/publish-auxiliary.ts deleted file mode 100644 index 6d465f80de..0000000000 --- a/packages/build/src/publish-auxiliary.ts +++ /dev/null @@ -1,11 +0,0 @@ -import type { Config } from './config'; -import { publishToNpm } from './npm-packages'; - -export function publishAuxiliaryPackages(config: Config) { - if (!config.useAuxiliaryPackagesOnly) { - throw new Error( - 'This should only be used when publishing auxiliary packages' - ); - } - publishToNpm(config); -} diff --git a/packages/build/src/publish-mongosh.spec.ts b/packages/build/src/publish-mongosh.spec.ts deleted file mode 100644 index 36d19f988d..0000000000 --- a/packages/build/src/publish-mongosh.spec.ts +++ /dev/null @@ -1,327 +0,0 @@ -import chai, { expect } from 'chai'; -import sinon from 'sinon'; -import type { writeBuildInfo as writeBuildInfoType } from './build-info'; -import { Barque } from './barque'; -import type { - Config, - shouldDoPublicRelease as shouldDoPublicReleaseFn, -} from './config'; -import type { createAndPublishDownloadCenterConfig as createAndPublishDownloadCenterConfigFn } from './download-center'; -import { GithubRepo } from '@mongodb-js/devtools-github-repo'; -import type { publishToHomebrew as publishToHomebrewType } from './homebrew'; -import type { publishToNpm as publishToNpmType } from './npm-packages'; -import { publishMongosh } from './publish-mongosh'; -import { dummyConfig } from '../test/helpers'; - -chai.use(require('sinon-chai')); - -function createStubRepo(overrides?: any): GithubRepo { - return sinon.createStubInstance( - GithubRepo, - overrides - ) as unknown as GithubRepo; -} - -function createStubBarque(overrides?: any): Barque { - return sinon.createStubInstance(Barque, overrides) as unknown as Barque; -} - -describe('publishMongosh', function () { - let config: Config; - let createAndPublishDownloadCenterConfig: typeof createAndPublishDownloadCenterConfigFn; - let publishToNpm: typeof publishToNpmType; - let writeBuildInfo: typeof writeBuildInfoType; - let publishToHomebrew: typeof publishToHomebrewType; - let shouldDoPublicRelease: typeof shouldDoPublicReleaseFn; - let githubRepo: GithubRepo; - let mongoHomebrewCoreForkRepo: GithubRepo; - let homebrewCoreRepo: GithubRepo; - let barque: Barque; - - beforeEach(function () { - config = { ...dummyConfig }; - - createAndPublishDownloadCenterConfig = sinon.spy(); - publishToNpm = sinon.spy(); - writeBuildInfo = sinon.spy(); - publishToHomebrew = sinon.spy(); - shouldDoPublicRelease = sinon.spy(); - githubRepo = createStubRepo(); - mongoHomebrewCoreForkRepo = createStubRepo(); - homebrewCoreRepo = createStubRepo(); - barque = createStubBarque({ - releaseToBarque: sinon.stub().resolves(['package-url']), - waitUntilPackagesAreAvailable: sinon.stub().resolves(), - }); - }); - - context('if is a public release', function () { - beforeEach(function () { - config.triggeringGitTag = 'v0.7.0'; - shouldDoPublicRelease = sinon.stub().returns(true); - githubRepo = createStubRepo({ - getMostRecentDraftTagForRelease: sinon - .stub() - .resolves({ name: 'v0.7.0-draft.42', sha: 'revision' }), - }); - Object.assign(githubRepo, { - repo: { - owner: 'mongodb-js', - repo: 'mongosh', - }, - }); - }); - - context('validates configuration', function () { - it('fails if no draft tag is found', async function () { - githubRepo = createStubRepo({ - getMostRecentDraftTagForRelease: sinon.stub().resolves(undefined), - }); - try { - await publishMongosh( - config, - githubRepo, - mongoHomebrewCoreForkRepo, - homebrewCoreRepo, - barque, - createAndPublishDownloadCenterConfig, - publishToNpm, - writeBuildInfo, - publishToHomebrew, - shouldDoPublicRelease - ); - } catch (e: any) { - return expect(e.message).to.contain('Could not find prior draft tag'); - } - expect.fail('Expected error'); - }); - - it('fails if draft tag SHA does not match revision', async function () { - githubRepo = createStubRepo({ - getMostRecentDraftTagForRelease: sinon - .stub() - .resolves({ name: 'v0.7.0-draft.42', sha: 'wrong' }), - }); - try { - await publishMongosh( - config, - githubRepo, - mongoHomebrewCoreForkRepo, - homebrewCoreRepo, - barque, - createAndPublishDownloadCenterConfig, - publishToNpm, - writeBuildInfo, - publishToHomebrew, - shouldDoPublicRelease - ); - } catch (e: any) { - return expect(e.message).to.contain('Version mismatch'); - } - expect.fail('Expected error'); - }); - }); - - it('publishes artifacts to barque', async function () { - await publishMongosh( - config, - githubRepo, - mongoHomebrewCoreForkRepo, - homebrewCoreRepo, - barque, - createAndPublishDownloadCenterConfig, - publishToNpm, - writeBuildInfo, - publishToHomebrew, - shouldDoPublicRelease - ); - - expect(barque.releaseToBarque).to.have.been.callCount(26); - expect(barque.releaseToBarque).to.have.been.calledWith( - 'rpm-x64', - 'https://s3.amazonaws.com/mciuploads/project/v0.7.0-draft.42/mongodb-mongosh-0.7.0.x86_64.rpm' - ); - expect(barque.releaseToBarque).to.have.been.calledWith( - 'deb-x64', - 'https://s3.amazonaws.com/mciuploads/project/v0.7.0-draft.42/mongodb-mongosh_0.7.0_amd64.deb' - ); - expect(barque.releaseToBarque).to.have.been.calledWith( - 'rpm-arm64', - 'https://s3.amazonaws.com/mciuploads/project/v0.7.0-draft.42/mongodb-mongosh-0.7.0.aarch64.rpm' - ); - expect(barque.waitUntilPackagesAreAvailable).to.have.been.called; - }); - - it('updates the download center config', async function () { - await publishMongosh( - config, - githubRepo, - mongoHomebrewCoreForkRepo, - homebrewCoreRepo, - barque, - createAndPublishDownloadCenterConfig, - publishToNpm, - writeBuildInfo, - publishToHomebrew, - shouldDoPublicRelease - ); - - expect(createAndPublishDownloadCenterConfig).to.have.been.calledWith( - config.outputDir, - config.packageInformation, - config.downloadCenterAwsKey, - config.downloadCenterAwsSecret - ); - }); - - it('promotes the release in github', async function () { - await publishMongosh( - config, - githubRepo, - mongoHomebrewCoreForkRepo, - homebrewCoreRepo, - barque, - createAndPublishDownloadCenterConfig, - publishToNpm, - writeBuildInfo, - publishToHomebrew, - shouldDoPublicRelease - ); - - expect(githubRepo.promoteRelease).to.have.been.calledWith(config); - }); - - it('writes analytics config and then publishes NPM packages', async function () { - await publishMongosh( - config, - githubRepo, - mongoHomebrewCoreForkRepo, - homebrewCoreRepo, - barque, - createAndPublishDownloadCenterConfig, - publishToNpm, - writeBuildInfo, - publishToHomebrew, - shouldDoPublicRelease - ); - - expect(writeBuildInfo).to.have.been.calledOnceWith(config); - expect(publishToNpm).to.have.been.calledWith(); - expect(publishToNpm).to.have.been.calledAfter(writeBuildInfo as any); - }); - it('publishes to homebrew', async function () { - await publishMongosh( - config, - githubRepo, - mongoHomebrewCoreForkRepo, - homebrewCoreRepo, - barque, - createAndPublishDownloadCenterConfig, - publishToNpm, - writeBuildInfo, - publishToHomebrew, - shouldDoPublicRelease - ); - - expect(publishToHomebrew).to.have.been.calledWith( - homebrewCoreRepo, - mongoHomebrewCoreForkRepo, - config.version - ); - expect(publishToHomebrew).to.have.been.calledAfter( - githubRepo.promoteRelease as any - ); - }); - }); - - context('if is not a public release', function () { - beforeEach(function () { - shouldDoPublicRelease = sinon.stub().returns(false); - }); - - it('does not update the download center config', async function () { - await publishMongosh( - config, - githubRepo, - mongoHomebrewCoreForkRepo, - homebrewCoreRepo, - barque, - createAndPublishDownloadCenterConfig, - publishToNpm, - writeBuildInfo, - publishToHomebrew, - shouldDoPublicRelease - ); - - expect(createAndPublishDownloadCenterConfig).not.to.have.been.called; - }); - - it('does not promote the release in github', async function () { - await publishMongosh( - config, - githubRepo, - mongoHomebrewCoreForkRepo, - homebrewCoreRepo, - barque, - createAndPublishDownloadCenterConfig, - publishToNpm, - writeBuildInfo, - publishToHomebrew, - shouldDoPublicRelease - ); - - expect(githubRepo.promoteRelease).not.to.have.been.called; - }); - - it('does not publish npm packages', async function () { - await publishMongosh( - config, - githubRepo, - mongoHomebrewCoreForkRepo, - homebrewCoreRepo, - barque, - createAndPublishDownloadCenterConfig, - publishToNpm, - writeBuildInfo, - publishToHomebrew, - shouldDoPublicRelease - ); - - expect(publishToNpm).not.to.have.been.called; - }); - - it('does not publish to homebrew', async function () { - await publishMongosh( - config, - githubRepo, - mongoHomebrewCoreForkRepo, - homebrewCoreRepo, - barque, - createAndPublishDownloadCenterConfig, - publishToNpm, - writeBuildInfo, - publishToHomebrew, - shouldDoPublicRelease - ); - - expect(publishToHomebrew).not.to.have.been.called; - }); - - it('does not release to barque', async function () { - await publishMongosh( - config, - githubRepo, - mongoHomebrewCoreForkRepo, - homebrewCoreRepo, - barque, - createAndPublishDownloadCenterConfig, - publishToNpm, - writeBuildInfo, - publishToHomebrew, - shouldDoPublicRelease - ); - - expect(barque.releaseToBarque).not.to.have.been.called; - }); - }); -}); diff --git a/packages/build/src/publish-mongosh.ts b/packages/build/src/publish-mongosh.ts deleted file mode 100644 index 726d82feed..0000000000 --- a/packages/build/src/publish-mongosh.ts +++ /dev/null @@ -1,145 +0,0 @@ -import type { writeBuildInfo as writeBuildInfoType } from './build-info'; -import type { Barque } from './barque'; -import type { Config } from './config'; -import { - ALL_PACKAGE_VARIANTS, - getReleaseVersionFromTag, - shouldDoPublicRelease as shouldDoPublicReleaseFn, -} from './config'; -import type { createAndPublishDownloadCenterConfig as createAndPublishDownloadCenterConfigFn } from './download-center'; -import { getArtifactUrl as getArtifactUrlFn } from './evergreen'; -import type { GithubRepo } from '@mongodb-js/devtools-github-repo'; -import type { publishToHomebrew as publishToHomebrewType } from './homebrew'; -import type { publishToNpm as publishToNpmType } from './npm-packages'; -import type { PackageInformationProvider } from './packaging'; -import { getPackageFile } from './packaging'; - -export async function publishMongosh( - config: Config, - mongoshGithubRepo: GithubRepo, - mongodbHomebrewForkGithubRepo: GithubRepo, - homebrewCoreGithubRepo: GithubRepo, - barque: Barque, - createAndPublishDownloadCenterConfig: typeof createAndPublishDownloadCenterConfigFn, - publishToNpm: typeof publishToNpmType, - writeBuildInfo: typeof writeBuildInfoType, - publishToHomebrew: typeof publishToHomebrewType, - shouldDoPublicRelease: typeof shouldDoPublicReleaseFn = shouldDoPublicReleaseFn, - getEvergreenArtifactUrl: typeof getArtifactUrlFn = getArtifactUrlFn -): Promise { - if (!shouldDoPublicRelease(config)) { - console.warn( - 'mongosh: Not triggering publish - configuration does not match a public release!' - ); - return; - } - - if (config.isDryRun) { - console.warn('Performing dry-run publish only'); - } - - const releaseVersion = getReleaseVersionFromTag(config.triggeringGitTag); - const latestDraftTag = - await mongoshGithubRepo.getMostRecentDraftTagForRelease(releaseVersion); - if (!latestDraftTag || !releaseVersion) { - throw new Error( - `Could not find prior draft tag for release version: ${releaseVersion}` - ); - } - if (latestDraftTag.sha !== config.revision) { - throw new Error( - `Version mismatch - latest draft tag was for revision ${latestDraftTag.sha}, current revision is ${config.revision}` - ); - } - - console.info( - 'mongosh: Re-using artifacts from most recent draft tag', - latestDraftTag.name - ); - - await publishArtifactsToBarque( - barque, - config.project as string, - releaseVersion, - latestDraftTag.name, - config.packageInformation as PackageInformationProvider, - !!config.isDryRun, - getEvergreenArtifactUrl - ); - - await createAndPublishDownloadCenterConfig( - config.outputDir, - config.packageInformation as PackageInformationProvider, - config.downloadCenterAwsKey || '', - config.downloadCenterAwsSecret || '', - config.injectedJsonFeedFile || '', - !!config.isDryRun - ); - - await mongoshGithubRepo.promoteRelease(config); - - // ensures the segment api key to be present in the published packages - await writeBuildInfo(config, 'packaged'); - - publishToNpm({ - isDryRun: config.isDryRun, - useAuxiliaryPackagesOnly: config.useAuxiliaryPackagesOnly, - }); - - await publishToHomebrew( - homebrewCoreGithubRepo, - mongodbHomebrewForkGithubRepo, - config.version, - `https://github.com/${mongoshGithubRepo.repo.owner}/${mongoshGithubRepo.repo.repo}/releases/tag/v${config.version}`, - !!config.isDryRun - ); - - console.info('mongosh: finished release process.'); -} - -async function publishArtifactsToBarque( - barque: Barque, - project: string, - releaseVersion: string, - mostRecentDraftTag: string, - packageInformation: PackageInformationProvider, - isDryRun: boolean, - getEvergreenArtifactUrl: typeof getArtifactUrlFn -): Promise { - const publishedPackages: string[] = []; - for await (const variant of ALL_PACKAGE_VARIANTS) { - const variantPackageInfo = packageInformation(variant); - const packageFile = getPackageFile(variant, () => ({ - ...variantPackageInfo, - metadata: { - ...variantPackageInfo.metadata, - version: releaseVersion, - }, - })); - const packageUrl = getEvergreenArtifactUrl( - project, - mostRecentDraftTag, - packageFile.path - ); - console.info( - `mongosh: Considering publishing ${variant} artifact to barque ${packageUrl}` - ); - const packageUrls = await barque.releaseToBarque( - variant, - packageUrl, - isDryRun - ); - for (const url of packageUrls) { - console.info(` -> ${url}`); - } - publishedPackages.push(...packageUrls); - } - - if (isDryRun) { - console.warn('Not waiting for package availability in dry run...'); - } else { - await barque.waitUntilPackagesAreAvailable(publishedPackages, 300); - } - - console.info('mongosh: Submitting to barque complete'); -} diff --git a/packages/build/src/release.ts b/packages/build/src/release.ts index 6460a25494..e87f6d3eff 100644 --- a/packages/build/src/release.ts +++ b/packages/build/src/release.ts @@ -1,29 +1,22 @@ import { Octokit } from '@octokit/rest'; -import { writeBuildInfo } from './build-info'; -import { Barque } from './barque'; import { runCompile } from './compile'; import type { Config } from './config'; import { getReleaseVersionFromTag, redactConfig } from './config'; -import { - createAndPublishDownloadCenterConfig, - uploadArtifactToDownloadCenter, -} from './download-center'; +import { uploadArtifactToDownloadCenter } from './download-center'; import { downloadArtifactFromEvergreen, uploadArtifactToEvergreen, } from './evergreen'; import { GithubRepo } from '@mongodb-js/devtools-github-repo'; -import { publishToHomebrew } from './homebrew'; -import { bumpAuxiliaryPackages, publishToNpm } from './npm-packages'; +import { bumpAuxiliaryPackages } from './npm-packages'; import { runPackage } from './packaging'; import { runDraft } from './run-draft'; -import { publishMongosh } from './publish-mongosh'; import { runUpload } from './run-upload'; import { runSign } from './packaging/run-sign'; import { runDownloadAndListArtifacts } from './run-download-and-list-artifacts'; import { runDownloadCryptLibrary } from './packaging/run-download-crypt-library'; import { bumpMongoshReleasePackages } from './npm-packages/bump'; -import { publishAuxiliaryPackages } from './publish-auxiliary'; +import { MongoshPublisher } from './mongosh-publisher'; export type ReleaseCommand = | 'bump' @@ -114,21 +107,13 @@ export async function release( } else if (command === 'download-and-list-artifacts') { await runDownloadAndListArtifacts(config); } else if (command === 'publish') { - if (config.useAuxiliaryPackagesOnly) { - publishAuxiliaryPackages(config); - } else { - await publishMongosh( - config, - githubRepo, - mongoHomebrewForkRepo, - homebrewCoreRepo, - new Barque(config), - createAndPublishDownloadCenterConfig, - publishToNpm, - writeBuildInfo, - publishToHomebrew - ); - } + const mongoshPublisher = new MongoshPublisher( + config, + githubRepo, + mongoHomebrewForkRepo, + homebrewCoreRepo + ); + await mongoshPublisher.publish(); } else { throw new Error(`Unknown command: ${command}`); } diff --git a/packages/build/test/helpers.ts b/packages/build/test/helpers.ts index 27568d0bc0..c95c16d876 100644 --- a/packages/build/test/helpers.ts +++ b/packages/build/test/helpers.ts @@ -57,6 +57,7 @@ export const dummyConfig: Config = Object.freeze({ notaryAuthToken: 'notaryAuthToken', isCi: true, platform: 'linux', + publisher: 'dummy-test-publisher', repo: { owner: 'owner', repo: 'repo',