Pipeline improvements (#6)

* Pipeline improvements

Author: jamessimone

.forceignore

@@ -0,0 +1,4 @@
+# .forceignore v2
+**/jsconfig.json
+**/.eslintrc.json
+**/__tests__

.github/workflows/deploy.yml

@@ -76,13 +76,17 @@ jobs:
       - name: Install & run SFDX Scanner
         run: npm run scan
 
-      # Store secret for dev hub
-      - name: 'Populate auth file with DEVHUB_SFDX_URL secret'
+      # Authenticate using JWT flow
+      - name: 'Auth to dev hub'
         shell: bash
         run: |
-          echo ${{ env.DEVHUB_SFDX_URL }} > ./DEVHUB_SFDX_URL.txt
+          echo "${{ env.DEVHUB_SERVER_KEY }}" > ./jwt-server.key
+          npx sfdx force:auth:jwt:grant --clientid ${{ env.DEVHUB_CONSUMER_KEY }} --username ${{ env.DEVHUB_USERNAME }} --jwtkeyfile ./jwt-server.key --setdefaultdevhubusername
+          npx sfdx config:set defaultusername=${{ env.DEVHUB_USERNAME }}
         env:
-          DEVHUB_SFDX_URL: ${{ secrets.DEVHUB_SFDX_URL }}
+          DEVHUB_USERNAME: ${{ secrets.DEVHUB_USERNAME }}
+          DEVHUB_CONSUMER_KEY: ${{ secrets.DEVHUB_CONSUMER_KEY }}
+          DEVHUB_SERVER_KEY: ${{ secrets.DEVHUB_SERVER_KEY }}
 
       - name: 'Deploy & Test'
         shell: pwsh

README.md

@@ -5,12 +5,12 @@
 
 ## Deployment
 
-<a href="https://login.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008SjREAA0">
+<a href="https://login.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008SjZEAA0">
   <img alt="Deploy to Salesforce"
        src="./media/deploy-package-to-prod.png">
 </a>
 
-<a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008SjREAA0">
+<a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008SjZEAA0">
   <img alt="Deploy to Salesforce Sandbox"
        src="./media/deploy-package-to-sandbox.png">
 </a>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "salesforce-round-robin",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Round robin records in Salesforce (SFDC) using Flow or Apex. Performant, fair, fast assignment with configurable user pools",
   "repository": {
     "type": "git",

scripts/build-and-promote-package.ps1

@@ -25,13 +25,6 @@ function Start-Package-Promotion {
   Write-Debug "Finished package promotion!"
 }
 
-if(Test-Path ".\DEVHUB_SFDX_URL.txt") {
-  npx sfdx auth:sfdxurl:store -f ./DEVHUB_SFDX_URL.txt -a packaging-org
-  npx sfdx force:config:set defaultdevhubusername=packaging-org
-} else {
-  throw 'No packaging auth info!'
-}
-
 # Create/promote package version(s)
 $currentBranch = Get-Current-Git-Branch
 if ($currentBranch -eq "main") {

scripts/test.ps1

@@ -2,8 +2,13 @@ $DebugPreference = 'Continue'
 $ErrorActionPreference = 'Stop'
 # This is also the same script that runs on Github via the Github Action configured in .github/workflows - there, the
 # DEVHUB_SFDX_URL.txt file is populated in a build step
-$testInvocation = 'npx sfdx force:apex:test:run -r human -w 20 -c -d ./tests/apex'
+$testInvocation = 'npx sfdx force:apex:test:run -s RoundRobinTestSuite -r human -w 20 -c -d ./tests/apex'
 $scratchOrgName = 'round-robin-scratch'
+function Start-Deploy() {
+  Write-Debug "Deploying source ..."
+  npx sfdx force:source:deploy -p core
+  npx sfdx force:source:deploy -p integration-tests
+}
 
 function Start-Tests() {
   Write-Debug "Starting test run ..."
@@ -27,60 +32,25 @@ function Start-Tests() {
   }
 }
 
-function Reset-SFDX-Json() {
-  Write-Debug "Resetting SFDX project JSON at project root"
-  Copy-Item -Path ./scripts/sfdx-project.json -Destination ./sfdx-project.json -Force
-  Remove-Item -Path ./scripts/sfdx-project.json
-}
-
 Write-Debug "Starting build script"
 
-# Authorize Dev Hub using prior creds. There's some issue with the flags --setdefaultdevhubusername and --setdefaultusername both being passed when run remotely
-
-npx sfdx auth:sfdxurl:store -f ./DEVHUB_SFDX_URL.txt -a round-robin
-npx sfdx config:set defaultusername=round-robin defaultdevhubusername=round-robin
-
-# For local dev, store currently auth'd org to return to
-# Also store test command shared between script branches, below
 $scratchOrgAllotment = ((npx sfdx force:limits:api:display --json | ConvertFrom-Json).result | Where-Object -Property name -eq "DailyScratchOrgs").remaining
 
 Write-Debug "Total remaining scratch orgs for the day: $scratchOrgAllotment"
 Write-Debug "Test command to use: $testInvocation"
 
-$shouldDeployToSandbox = $false
-
 if($scratchOrgAllotment -gt 0) {
-  Write-Debug "Beginning scratch org creation"
-  # Create Scratch Org
-  $scratchOrgCreateMessage = npx sfdx force:org:create -f config/project-scratch-def.json -a $scratchOrgName -s -d 1
-  # Sometimes SFDX lies (UTC date problem?) about the number of scratch orgs remaining in a given day
-  # The other issue is that this doesn't throw, so we have to test the response message ourselves
-  if($scratchOrgCreateMessage -eq 'The signup request failed because this organization has reached its active scratch org limit') {
-    throw $1
-  }
-  # Deploy
-  Write-Debug 'Pushing source to scratch org ...'
-  npx sfdx force:source:push
-  # Run tests
-  Start-Tests
-} else {
-  $shouldDeployToSandbox = $true
-}
-
-if($shouldDeployToSandbox) {
-  Write-Debug "No scratch orgs remaining, running tests on sandbox"
-
   try {
-    # Deploy
-    Write-Debug "Deploying source to sandbox ..."
-    npx sfdx force:source:deploy -p core
-    npx sfdx force:source:deploy -p integration-tests
-    Start-Tests
+    Write-Debug "Beginning scratch org creation"
+    # Create Scratch Org
+    npx sfdx force:org:create -f config/project-scratch-def.json -a $scratchOrgName -s -d 1
   } catch {
-    throw 'Error deploying to sandbox!'
+    # Do nothing, we'll just try to deploy to the Dev Hub instead
   }
 }
 
+Start-Deploy
+Start-Tests
 
 Write-Debug "Build + testing finished successfully"
 

sfdx-project.json

@@ -6,7 +6,7 @@
             "package": "salesforce-round-robin",
             "path": "core",
             "versionName": "Better error handling when assignment Ids don't exist",
-            "versionNumber": "0.0.3.0",
+            "versionNumber": "0.0.4.0",
             "versionDescription": "Invocable & Apex-ready Round Robin Assigner for Salesforce Flow, Process Builder, Apex and more",
             "releaseNotesUrl": "https://github.com/jamessimone/salesforce-round-robin/releases/latest"
         },
@@ -21,6 +21,7 @@
         "salesforce-round-robin": "0Ho6g000000GnClCAK",
         "[email protected]": "04t6g000008SjNvAAK",
         "[email protected]": "04t6g000008SjOFAA0",
-        "[email protected]": "04t6g000008SjREAA0"
+        "[email protected]": "04t6g000008SjREAA0",
+        "[email protected]": "04t6g000008SjZEAA0"
     }
 }