Replaced SFDX commands with latest sf

.github/workflows/build-deploy-docs.yml

@@ -18,8 +18,8 @@ jobs:
       - run: yarn
       - run: yarn prepack
       - run: npm i @salesforce/cli -g
-      - run: echo y|sfdx plugins:install sfdx-hardis
-      - run: sfdx hardis:doc:plugin:generate
+      - run: echo y|sf plugins install sfdx-hardis
+      - run: sf hardis:doc:plugin:generate
       # Deploy docs with mkdocs-material
       - uses: actions/setup-python@v2
         with:

defaults/ci/.github/workflows/check-deploy.yml

@@ -41,9 +41,9 @@ jobs:
       run: |
         npm install --no-cache @salesforce/cli --global
         sf plugins install @salesforce/plugin-packaging
-        echo 'y' | sfdx plugins:install sfdx-hardis
-        echo 'y' | sfdx plugins:install sfdx-essentials
-        echo 'y' | sfdx plugins:install sfdx-git-delta
+        echo 'y' | sf plugins:install sfdx-hardis
+        echo 'y' | sf plugins:install sfdx-essentials
+        echo 'y' | sf plugins:install sfdx-git-delta
         sf version --verbose --json
     # Login & check deploy with test classes & code coverage
     - name: Login & Simulate deployment
@@ -68,5 +68,5 @@ jobs:
         FORCE_COLOR: "1"
       run: |
         echo "Simulate SFDX deployment using Hardis against \"$CONFIG_BRANCH\""
-        sfdx hardis:auth:login
-        sfdx hardis:project:deploy:sources:dx --check
+        sf hardis:auth:login
+        sf hardis:project:deploy:sources:dx --check

defaults/ci/.github/workflows/process-deploy.yml

@@ -38,10 +38,10 @@ jobs:
         run: |
           npm install @salesforce/cli --global
           sf plugins install @salesforce/plugin-packaging
-          echo 'y' | sfdx plugins:install sfdx-hardis
-          echo 'y' | sfdx plugins:install sfdx-essentials
-          # echo 'y' | sfdx plugins:install sfdmu # Disabled while it does not play well with @salesforce/cli
-          echo 'y' | sfdx plugins:install sfdx-git-delta
+          echo 'y' | sf plugins:install sfdx-hardis
+          echo 'y' | sf plugins:install sfdx-essentials
+          # echo 'y' | sf plugins:install sfdmu # Disabled while it does not play well with @salesforce/cli
+          echo 'y' | sf plugins:install sfdx-git-delta
             sf version --verbose --json
       # Set env branch variable (github.ref_name seems to not work)
       - name: Set env.BRANCH
@@ -69,5 +69,5 @@ jobs:
           FORCE_COLOR: "1"
         run: |
           echo "Process SFDX deployment using Hardis against \"$CONFIG_BRANCH\""
-          sfdx hardis:auth:login
-          sfdx hardis:project:deploy:sources:dx
+          sf hardis:auth:login
+          sf hardis:project:deploy:sources:dx

defaults/ci/.gitlab-ci.yml

@@ -83,8 +83,8 @@ check_deploy_to_target_branch_org:
     ORG_ALIAS: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
   script:
     - '[ -z "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ] && exit 0;' # Skip this job if it is launched from web UI and we are not in merge request context
-    - sfdx hardis:auth:login
-    - sfdx hardis:project:deploy:sources:dx --check
+    - sf hardis:auth:login
+    - sf hardis:project:deploy:sources:dx --check
 
 # Create scratch org to check the sources push & the unit tests
 create_scratch_org:
@@ -101,8 +101,8 @@ create_scratch_org:
       - $USE_SCRATCH_ORGS == "false"
   interruptible: true
   script:
-    - sfdx hardis:auth:login --devhub
-    - sfdx hardis:scratch:create
+    - sf hardis:auth:login --devhub
+    - sf hardis:scratch:create
   artifacts:
     when: always
     expire_in: 60 minutes
@@ -121,8 +121,8 @@ refresh_scratch_org_pool:
       - $SCRATCH_ORG_POOL == "true"
   interruptible: true
   script:
-    - sfdx hardis:auth:login --devhub
-    - sfdx hardis:scratch:pool:refresh
+    - sf hardis:auth:login --devhub
+    - sf hardis:scratch:pool:refresh
   artifacts:
     when: always
 
@@ -145,8 +145,8 @@ test_apex:
       artifacts: true
   script:
     - sleep 120 # Orgs just created can be not ready yet, let's wait a while before running tests
-    - sfdx hardis:auth:login --scratchorg || true
-    - sfdx hardis:org:test:apex
+    - sf hardis:auth:login --scratchorg || true
+    - sf hardis:org:test:apex
   artifacts:
     when: always
     paths:
@@ -187,9 +187,9 @@ clean:
     - job: create_scratch_org
     - job: test_apex
   script:
-    - sfdx hardis:auth:login --devhub
-    - sfdx hardis:auth:login --scratchorg || true
-    - sfdx force:org:delete --noprompt || true
+    - sf hardis:auth:login --devhub
+    - sf hardis:auth:login --scratchorg || true
+    - sf force:org:delete --noprompt || true
 
 # Simulate deployment to related org
 # Is triggered only when scheduled, or via manual launch
@@ -206,8 +206,8 @@ check_deploy_to_current_branch_org:
       - $SCRATCH_ORG_POOL == "true"
   interruptible: true
   script:
-    - sfdx hardis:auth:login
-    - sfdx hardis:project:deploy:sources:dx --check
+    - sf hardis:auth:login
+    - sf hardis:project:deploy:sources:dx --check
 
 # Deploy to branch related org when detecting new commit (after a merged merge request)
 # Don't forget to define variable DEPLOY_BRANCHES to match your branches in .gitlab-ci-config.yml
@@ -224,5 +224,5 @@ deploy_to_org:
       - $SCRATCH_ORG_POOL == "true"
   interruptible: true
   script:
-    - sfdx hardis:auth:login
-    - sfdx hardis:project:deploy:sources:dx
+    - sf hardis:auth:login
+    - sf hardis:project:deploy:sources:dx

defaults/ci/azure-pipelines-checks.yml

@@ -58,16 +58,16 @@ jobs:
       - script: |
           npm install @salesforce/cli --global
           sf plugins install @salesforce/plugin-packaging
-          echo 'y' | sfdx plugins:install sfdx-hardis
-          echo 'y' | sfdx plugins:install sfdx-essentials
-          echo 'y' | sfdx plugins:install sfdx-git-delta
+          echo 'y' | sf plugins:install sfdx-hardis
+          echo 'y' | sf plugins:install sfdx-essentials
+          echo 'y' | sf plugins:install sfdx-git-delta
           sf version --verbose --json
         displayName: "Install SFDX & plugins"
 
       # Login & check deployment to PR target branch related org (configuration: https://hardisgroupcom.github.io/sfdx-hardis/salesforce-ci-cd-setup-auth/ )
       - script: |
-          sfdx hardis:auth:login
-          sfdx hardis:project:deploy:sources:dx --check
+          sf hardis:auth:login
+          sf hardis:project:deploy:sources:dx --check
         env:
           SFDX_CLIENT_ID_INTEGRATION: $(SFDX_CLIENT_ID_INTEGRATION)
           SFDX_CLIENT_KEY_INTEGRATION: $(SFDX_CLIENT_KEY_INTEGRATION)

defaults/ci/azure-pipelines-deployment.yml

@@ -51,17 +51,17 @@ jobs:
       - script: |
           npm install @salesforce/cli --global
           sf plugins install @salesforce/plugin-packaging
-          echo 'y' | sfdx plugins:install sfdx-hardis
-          echo 'y' | sfdx plugins:install sfdx-essentials
-          echo 'y' | sfdx plugins:install sfdmu
-          echo 'y' | sfdx plugins:install sfdx-git-delta
+          echo 'y' | sf plugins:install sfdx-hardis
+          echo 'y' | sf plugins:install sfdx-essentials
+          echo 'y' | sf plugins:install sfdmu
+          echo 'y' | sf plugins:install sfdx-git-delta
           sf version --verbose --json
         displayName: "Install SFDX & plugins"
 
       # Login & Deploy sfdx sources to related org (configuration: https://hardisgroupcom.github.io/sfdx-hardis/salesforce-ci-cd-setup-auth/ )
       - script: |
-          sfdx hardis:auth:login
-          sfdx hardis:project:deploy:sources:dx
+          sf hardis:auth:login
+          sf hardis:project:deploy:sources:dx
         env:
           SFDX_CLIENT_ID_INTEGRATION: $(SFDX_CLIENT_ID_INTEGRATION)
           SFDX_CLIENT_KEY_INTEGRATION: $(SFDX_CLIENT_KEY_INTEGRATION)

defaults/ci/bitbucket-pipelines.yml

@@ -24,17 +24,17 @@ pipelines:
             script:
               - npm install --no-cache @salesforce/cli --global
               - sf plugins install @salesforce/plugin-packaging
-              - echo 'y' | sfdx plugins:install sfdx-hardis
-              - echo 'y' | sfdx plugins:install sfdx-essentials
-              - echo 'y' | sfdx plugins:install sfdx-git-delta
+              - echo 'y' | sf plugins:install sfdx-hardis
+              - echo 'y' | sf plugins:install sfdx-essentials
+              - echo 'y' | sf plugins:install sfdx-git-delta
               - sf version --verbose --json
               - export BRANCH_NAME=$(echo "$BITBUCKET_PR_DESTINATION_BRANCH" | sed 's/refs\/heads\///')
               - export CI_COMMIT_REF_NAME=$BRANCH_NAME
               - export ORG_ALIAS=$BRANCH_NAME
               - export CONFIG_BRANCH=$BRANCH_NAME
               - export FORCE_COLOR=1
-              - sfdx hardis:auth:login
-              - sfdx hardis:project:deploy:sources:dx --check
+              - sf hardis:auth:login
+              - sf hardis:project:deploy:sources:dx --check
 
   branches:
     # Add all your major branches here
@@ -44,14 +44,14 @@ pipelines:
           script:
               - npm install --no-cache @salesforce/cli --global
               - sf plugins install @salesforce/plugin-packaging
-              - echo 'y' | sfdx plugins:install sfdx-hardis
-              - echo 'y' | sfdx plugins:install sfdx-essentials
-              - echo 'y' | sfdx plugins:install sfdx-git-delta
+              - echo 'y' | sf plugins:install sfdx-hardis
+              - echo 'y' | sf plugins:install sfdx-essentials
+              - echo 'y' | sf plugins:install sfdx-git-delta
               - sf version --verbose --json
               - export BRANCH_NAME=$(echo "$BITBUCKET_BRANCH" | sed 's/refs\/heads\///')
               - export CI_COMMIT_REF_NAME=$BRANCH_NAME
               - export CONFIG_BRANCH=$BRANCH_NAME
               - export ORG_ALIAS=$BRANCH_NAME
               - export FORCE_COLOR=1
-              - sfdx hardis:auth:login
-              - sfdx hardis:project:deploy:sources:dx
+              - sf hardis:auth:login
+              - sf hardis:project:deploy:sources:dx

defaults/mkdocs/.github/workflows/build-deploy-docs.yml

@@ -18,8 +18,8 @@ jobs:
       - run: yarn
       - run: yarn prepack
       - run: npm i @salesforce/cli -g
-      - run: echo y|sfdx plugins:install sfdx-hardis
-      - run: sfdx hardis:doc:plugin:generate
+      - run: echo y|sf plugins:install sfdx-hardis
+      - run: sf hardis:doc:plugin:generate
       # Deploy docs with mkdocs-material
       - uses: actions/setup-python@v2
         with:

defaults/monitoring/.github/workflows/org-monitoring.yml

@@ -47,9 +47,9 @@ jobs:
       run: |
         npm install --no-cache @salesforce/cli --global
         sf plugins install @salesforce/plugin-packaging
-        echo 'y' | sfdx plugins:install sfdx-hardis
-        echo 'y' | sfdx plugins:install sfdx-essentials
-        echo 'y' | sfdx plugins:install sfdx-git-delta
+        echo 'y' | sf plugins:install sfdx-hardis
+        echo 'y' | sf plugins:install sfdx-essentials
+        echo 'y' | sf plugins:install sfdx-git-delta
         sf version --verbose --json
     # Login & check deploy with test classes & code coverage
     - name: Login & Retrieve Metadata
@@ -69,8 +69,8 @@ jobs:
         FORCE_COLOR: "1"
       run: |
         echo "Monitoring sfdx-hardis: Metadata Backup for \"$CONFIG_BRANCH\""
-        sfdx hardis:auth:login
-        sfdx hardis:org:monitor:backup
+        sf hardis:auth:login
+        sf hardis:org:monitor:backup
 
     # Push new commit if applicable
     # (for now works only on PR from same repository, not from forks)
@@ -117,9 +117,9 @@ jobs:
       run: |
         npm install --no-cache @salesforce/cli --global
         sf plugins install @salesforce/plugin-packaging
-        echo 'y' | sfdx plugins:install sfdx-hardis
-        echo 'y' | sfdx plugins:install sfdx-essentials
-        echo 'y' | sfdx plugins:install sfdx-git-delta
+        echo 'y' | sf plugins:install sfdx-hardis
+        echo 'y' | sf plugins:install sfdx-essentials
+        echo 'y' | sf plugins:install sfdx-git-delta
         sf version --verbose --json
     # Login & check deploy with test classes & code coverage
     - name: Login & Run apex tests
@@ -140,8 +140,8 @@ jobs:
       run: |
         echo "Run apex tests against \"$CONFIG_BRANCH\""
         git pull origin ${{ env.BRANCH }}
-        sfdx hardis:auth:login
-        sfdx hardis:org:test:apex
+        sf hardis:auth:login
+        sf hardis:org:test:apex
 
     - name: Upload artifacts
       if:  success() || failure()
@@ -215,9 +215,9 @@ jobs:
       run: |
         npm install --no-cache @salesforce/cli --global
         sf plugins install @salesforce/plugin-packaging
-        echo 'y' | sfdx plugins:install sfdx-hardis
-        echo 'y' | sfdx plugins:install sfdx-essentials
-        echo 'y' | sfdx plugins:install sfdx-git-delta
+        echo 'y' | sf plugins:install sfdx-hardis
+        echo 'y' | sf plugins:install sfdx-essentials
+        echo 'y' | sf plugins:install sfdx-git-delta
         sf version --verbose --json
     # Login & check deploy with test classes & code coverage
     - name: Login & Run monitoring checks
@@ -238,8 +238,8 @@ jobs:
       run: |
         echo "Run Monitoring checks against \"$CONFIG_BRANCH\""
         git pull origin ${{ env.BRANCH }}
-        sfdx hardis:auth:login
-        sfdx hardis:org:monitor:all
+        sf hardis:auth:login
+        sf hardis:org:monitor:all
 
     - name: Upload artifacts
       if:  success() || failure()