From d6aa85af6613b93a9823ae432b698f8dfcfdc528 Mon Sep 17 00:00:00 2001
From: Vince Grassia <593223+vgrassia@users.noreply.github.com>
Date: Tue, 5 Sep 2023 16:52:03 -0400
Subject: [PATCH] Update Version Bump workflow inputs (#6143)

---
 .github/workflows/version-auto-bump.yml |   3 +-
 .github/workflows/version-bump.yml      | 113 ++++++++++++++----------
 2 files changed, 68 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/version-auto-bump.yml b/.github/workflows/version-auto-bump.yml
index 857099db51..7b1a787d94 100644
--- a/.github/workflows/version-auto-bump.yml
+++ b/.github/workflows/version-auto-bump.yml
@@ -44,4 +44,5 @@ jobs:
     uses: ./.github/workflows/version-bump.yml
     with:
       version_number: ${{ needs.setup.outputs.version_number }}
-      client: "Desktop"
+      bump_desktop: true
+    secrets: inherit
diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml
index 420ef456ec..563facdb40 100644
--- a/.github/workflows/version-bump.yml
+++ b/.github/workflows/version-bump.yml
@@ -4,16 +4,22 @@ name: Version Bump
 on:
   workflow_dispatch:
     inputs:
-      client:
-        description: "Client Project"
-        required: true
-        type: choice
-        options:
-          - Browser
-          - CLI
-          - Desktop
-          - Web
-          - All
+      bump_browser:
+        description: "Browser Project Version Bump"
+        type: boolean
+        default: false
+      bump_cli:
+        description: "CLI Project Version Bump"
+        type: boolean
+        default: false
+      bump_desktop:
+        description: "Desktop Project Version Bump"
+        type: boolean
+        default: false
+      bump_web:
+        description: "Web Project Version Bump"
+        type: boolean
+        default: false
       version_number:
         description: "New Version"
         required: true
@@ -23,9 +29,10 @@ on:
       version_number:
         required: true
         type: string
-      client:
-        required: true
-        type: string
+      bump_desktop:
+        description: "Desktop Project Version Bump"
+        type: boolean
+        default: false
 
 defaults:
   run:
@@ -33,8 +40,8 @@ defaults:
 
 jobs:
   bump_version:
-    name: "Bump ${{ github.event.inputs.client }} Version"
-    runs-on: ubuntu-20.04
+    name: "Bump Version"
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout Branch
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -42,7 +49,7 @@ jobs:
       - name: Login to Azure - Prod Subscription
         uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7
         with:
-         creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
@@ -62,13 +69,27 @@ jobs:
       - name: Create Version Branch
         id: branch
         env:
-          CLIENT_NAME: ${{ github.event.inputs.client }}
-          VERSION: ${{ github.event.inputs.version_number }}
+          VERSION: ${{ inputs.version_number }}
         run: |
-          CLIENT=$(python -c "print('$CLIENT_NAME'.lower())")
-          echo "client=$CLIENT" >> $GITHUB_OUTPUT
+          CLIENTS=()
+          if [[ ${{ inputs.bump_browser }} == true ]]; then
+            CLIENTS+=("browser")
+          fi
+          if [[ ${{ inputs.bump_cli }} == true ]]; then
+            CLIENTS+=("cli")
+          fi
+          if [[ ${{ inputs.bump_desktop }} == true ]]; then
+            CLIENTS+=("desktop")
+          fi
+          if [[ ${{ inputs.bump_web }} == true ]]; then
+            CLIENTS+=("web")
+          fi
+          printf -v joined '%s,' "${CLIENTS[@]}"
+          echo "client=${joined%,}" >> $GITHUB_OUTPUT
 
-          git switch -c ${CLIENT}_version_bump_${VERSION}
+          BRANCH=version_bump_${VERSION}_${GITHUB_SHA:0:7}
+          echo "branch=$BRANCH" >> $GITHUB_OUTPUT
+          git switch -c ${BRANCH}
 
       ########################
       # VERSION BUMP SECTION #
@@ -76,27 +97,27 @@ jobs:
 
       ### Browser
       - name: Bump Browser Version
-        if: ${{ github.event.inputs.client == 'Browser' || github.event.inputs.client == 'All' }}
+        if: ${{ inputs.bump_browser == true }}
         env:
-          VERSION: ${{ github.event.inputs.version_number }}
+          VERSION: ${{ inputs.version_number }}
         run: npm version --workspace=@bitwarden/browser ${VERSION}
 
       - name: Bump Browser Version - Manifest
-        if: ${{ github.event.inputs.client == 'Browser' || github.event.inputs.client == 'All' }}
+        if: ${{ inputs.bump_browser == true }}
         uses: bitwarden/gh-actions/version-bump@67ab95d7a466bcefdedf3f93cbc10bcff436edfe
         with:
-          version: ${{ github.event.inputs.version_number }}
+          version: ${{ inputs.version_number }}
           file_path: "apps/browser/src/manifest.json"
 
       - name: Bump Browser Version - Manifest v3
-        if: ${{ github.event.inputs.client == 'Browser' || github.event.inputs.client == 'All' }}
+        if: ${{ inputs.bump_browser == true }}
         uses: bitwarden/gh-actions/version-bump@67ab95d7a466bcefdedf3f93cbc10bcff436edfe
         with:
-          version: ${{ github.event.inputs.version_number }}
+          version: ${{ inputs.version_number }}
           file_path: "apps/browser/src/manifest.v3.json"
 
       - name: Run Prettier after Browser Version Bump
-        if: ${{ github.event.inputs.client == 'Browser' || github.event.inputs.client == 'All' }}
+        if: ${{ inputs.bump_browser == true }}
         run: |
           npm install -g prettier
           prettier --write apps/browser/src/manifest.json
@@ -104,30 +125,30 @@ jobs:
 
       ### CLI
       - name: Bump CLI Version
-        if: ${{ github.event.inputs.client == 'CLI' || github.event.inputs.client == 'All' }}
+        if: ${{ inputs.bump_cli == true }}
         env:
-          VERSION: ${{ github.event.inputs.version_number }}
+          VERSION: ${{ inputs.version_number }}
         run: npm version --workspace=@bitwarden/cli ${VERSION}
 
       ### Desktop
       - name: Bump Desktop Version - Root
-        if: ${{ github.event.inputs.client == 'Desktop' || github.event.inputs.client == 'All' }}
+        if: ${{ inputs.bump_desktop == true }}
         env:
-          VERSION: ${{ github.event.inputs.version_number }}
+          VERSION: ${{ inputs.version_number }}
         run: npm version --workspace=@bitwarden/desktop ${VERSION}
 
       - name: Bump Desktop Version - App
-        if: ${{ github.event.inputs.client == 'Desktop' || github.event.inputs.client == 'All' }}
+        if: ${{ inputs.bump_desktop == true }}
         env:
-          VERSION: ${{ github.event.inputs.version_number }}
+          VERSION: ${{ inputs.version_number }}
         run: npm version ${VERSION}
         working-directory: "apps/desktop/src"
 
       ### Web
       - name: Bump Web Version
-        if: ${{ github.event.inputs.client == 'Web' || github.event.inputs.client == 'All' }}
+        if: ${{ inputs.bump_web == true }}
         env:
-          VERSION: ${{ github.event.inputs.version_number }}
+          VERSION: ${{ inputs.version_number }}
         run: npm version --workspace=@bitwarden/web-vault ${VERSION}
 
       ########################
@@ -151,27 +172,26 @@ jobs:
         if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
         env:
           CLIENT: ${{ steps.branch.outputs.client }}
-          VERSION: ${{ github.event.inputs.version_number }}
+          VERSION: ${{ inputs.version_number }}
         run: git commit -m "Bumped ${CLIENT} version to ${VERSION}" -a
 
       - name: Push changes
         if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
         env:
-          CLIENT: ${{ steps.branch.outputs.client }}
-          VERSION: ${{ github.event.inputs.version_number }}
-        run: git push -u origin ${CLIENT}_version_bump_${VERSION}
+          BRANCH: ${{ steps.branch.outputs.branch }}
+        run: git push -u origin ${BRANCH}
 
       - name: Create Bump Version PR
         if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
         env:
-          PR_BRANCH: "${{ steps.branch.outputs.client }}_version_bump_${{ github.event.inputs.version_number }}"
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           BASE_BRANCH: master
-          TITLE: "Bump ${{ github.event.inputs.client }} version to ${{ github.event.inputs.version_number }}"
+          BRANCH: ${{ steps.branch.outputs.branch }}
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          TITLE: "Bump ${{ steps.branch.outputs.client }} version to ${{ inputs.version_number }}"
         run: |
           gh pr create --title "$TITLE" \
-            --base "$BASE" \
-            --head "$PR_BRANCH" \
+            --base "$BASE_BRANCH" \
+            --head "$BRANCH" \
             --label "version update" \
             --label "automated pr" \
             --body "
@@ -183,5 +203,4 @@ jobs:
               - [X] Other
 
               ## Objective
-              Automated ${{ github.event.inputs.client }} version bump to ${{ github.event.inputs.version_number }}"
-
+              Automated ${{ steps.branch.outputs.client }} version bump to ${{ inputs.version_number }}"