comments pt 2

Author: baileympearson

node/generate_release.mjs

@@ -32,7 +32,7 @@ const generated = template
   .replaceAll("RELEASE_TAG", tag)
   .replaceAll("EVERGREEN_PROJECT", EVERGREEN_PROJECTS[npmPackage] ?? "")
   .replaceAll("IGNORE_INSTALL_SCRIPTS", isNative)
-  .replaceAll("SILK_ASSET_GROUP", assetGroup ?? "''");
+  .replaceAll("SILK_ASSET_GROUP", assetGroup ? `'${assetGroup}'` : "''");
 
 const project = EVERGREEN_PROJECTS[npmPackage];
 if (!project) {

node/get_version_info/action.yml

@@ -9,10 +9,10 @@ runs:
   using: composite
   steps:
     - name: Get release version and release package file name
-      id: get_version
+      id: get_version_info
       shell: bash
       run: |
         package_version=$(jq --raw-output '.version' package.json)
-        echo "package_version=${package_version}" >> "$GITHUB_ENV"
-        echo "package_file=${{ inputs.npm_package_name }}-${package_version}.tgz" >> "$GITHUB_ENV"
-        echo "commit=$(git rev-parse HEAD)" >> $GITHUB_ENV
+        echo "package_version=${package_version}" >> "$GITHUB_OUTPUT"
+        echo "package_file=${{ inputs.npm_package_name }}-${package_version}.tgz" >> "$GITHUB_OUTPUT"
+        echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT

node/release_template.yml

@@ -44,6 +44,7 @@ jobs:
           ignore_install_scripts: IGNORE_INSTALL_SCRIPTS
 
       - name: Load version and package info
+        id: load_version_info
         uses: baileympearson/drivers-github-tools/node/get_version_info@add-signing-env-action-for-node
         with:
           npm_package_name: RELEASE_PACKAGE
@@ -59,12 +60,12 @@ jobs:
 
       - name: Copy sbom file to release assets
         shell: bash
-        if: ${{ 'SILK_ASSET_GROUP' == '' }}
+        if: ${{ SILK_ASSET_GROUP == '' }}
         run: cp sbom.json ${{ env.S3_ASSETS }}/sbom.json
 
       # only used for mongodb-client-encryption
       - name: Augment SBOM and copy to release assets
-        if: ${{ 'SILK_ASSET_GROUP' != '' }}
+        if: ${{ SILK_ASSET_GROUP != '' }}
         uses: mongodb-labs/drivers-github-tools/sbom@v2
         with:
           silk_asset_group: SILK_ASSET_GROUP
@@ -73,19 +74,19 @@ jobs:
       - name: Generate authorized pub report
         uses: mongodb-labs/drivers-github-tools/full-report@v2
         with:
-          release_version: ${{ env.package_version }}
+          release_version: ${{ steps.load_version_info.output.package_version }}
           product_name: RELEASE_PACKAGE
           sarif_report_target_ref: RELEASE_BRANCH
           third_party_dependency_tool: n/a
           dist_filenames: artifacts/*
           token: ${{ github.token }}
           sbom_file_name: sbom.json
           evergreen_project: EVERGREEN_PROJECT
-          evergreen_commit: ${{ env.commit }}
+          evergreen_commit: ${{ steps.load_version_info.output.commit }}
 
       - uses: mongodb-labs/drivers-github-tools/upload-s3-assets@v2
         with:
-          version: ${{ env.package_version }}
+          version: ${{ steps.load_version_info.output.package_version }}
           product_name: RELEASE_PACKAGE
           dry_run: ${{ needs.release_please.outputs.release_created == '' }}
 

node/sign_node_package/action.yml

@@ -39,6 +39,7 @@ runs:
       run: mkdir ${{ inputs.artifact_directory }}
 
     - name: Load version and package info
+      id: load_version_info
       uses: baileympearson/drivers-github-tools/node/get_version_info@add-signing-env-action-for-node
       with:
         npm_package_name: ${{ inputs.npm_package_name }}
@@ -58,14 +59,14 @@ runs:
         if [[ $FILENAMES =~ '*' ]]; then
           FILENAMES=$(ls $FILENAMES | sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/ /g')
         fi
-        FILENAMES="$FILENAMES ${{ env.package_file }}"
+        FILENAMES="$FILENAMES ${{ steps.load_version_info.outputs.package_file }}"
         echo "FILES_TO_SIGN=${FILENAMES}" >> "$GITHUB_ENV"
 
     - name: Determine what files to sign (non-native packages, with only the release tarball)
       if: ${{ inputs.sign_native != 'true' }}
       shell: bash
       run: |
-        FILENAMES="${{ env.package_file }}"
+        FILENAMES="${{ steps.load_version_info.outputs.package_file }}"
         echo "FILES_TO_SIGN=${FILENAMES}" >> "$GITHUB_ENV"
 
     - name: Create detached signature
@@ -82,8 +83,8 @@ runs:
         ls -la artifacts/
 
     - name: "Upload release artifacts"
-      if: ${{ inputs.dry_run == false }}
-      run: gh release upload v${{ env.package_version }} artifacts/*.*
+      if: ${{ inputs.dry_run == 'false' }}
+      run: gh release upload v${{ steps.load_version_info.outputs.package_version }} artifacts/*.*
       shell: bash
       env:
         GH_TOKEN: ${{ github.token }}