leap_salesforce 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44ffa8e3367450ab36724adf3fc899d2cb95afe6f53d35e691f0b195abb76951
-  data.tar.gz: 913a39e2840894dd0c1a906a301ae864b1e368b9ebc80fa4e547315c06c25497
+  metadata.gz: 91e7d68b35916d600c053d7ec95f01bc26694eebf0bf176da4fa595b07506087
+  data.tar.gz: c3466149eaef469e70359c88c6d3ea3e125adea0f6b1bffbcdf5415699088d98
 SHA512:
-  metadata.gz: b0f4e1e61acf32114e51fe16451ea745d92198eb3944177885bc0f3cbc36bada65bc70c5efaa596978422b31246eaf3cd16aeab927ede42662dff79aa74d97dd
-  data.tar.gz: a8f1cfaea86a0766dbe58889e46c9a51370c2a934140bb37f55d5da235b31af7640aa2b79d70125aa6b9626d92d722d35c19d85d89e018f21d0b3f8210409ba1
+  metadata.gz: c6daeecb2f063de6d7b615e16c9ab2931988c74404c53f5ef7d1ab5e79f21645ddcf6587bc377204c5f13314e97e8d6c70bcaaa63188668b5837fe728e1f530d
+  data.tar.gz: 6afc1a7aa1b7d0574a6821adf1eb5844a91c394f96158e5f970c4f7ee67b986544c1cc42aeb0d92310399482ea8e66de672a994e6cbf5b2192690aed8ea6130a

data/.gitlab-ci.yml

@@ -1,7 +1,7 @@
 include:
   - template: Code-Quality.gitlab-ci.yml
 
-image: ruby:3.0
+image: ruby:3.3
 
 stages:
   - test
@@ -13,7 +13,12 @@ variables:
   client_id: $client_id
   client_secret: $client_secret
   SERVER_KEY_PASSWORD: $SERVER_KEY_PASSWORD
-  LANG: 'UTF-8'
+ # LANG: 'UTF-8'
+  LC_CTYPE: en_US
+  LANG: en_US.UTF-8
+  LANGUAGE: en_US.UTF-8
+  LC_ALL: en_US.UTF-8
+  RUBYOPT: "-KU -E utf-8:utf-8"
 
 pages:
   stage: deploy
@@ -208,7 +213,7 @@ pages:
 
     local file=$(mktemp)
     echo $org_auth_url > $file
-    local cmd="sfdx force:auth:sfdxurl:store --sfdxurlfile $file --setalias $alias_to_set --json" && (echo $cmd >&2)
+    local cmd="sfdx force:auth:sfdxurl:store --sfdxurlfile $file --alias $alias_to_set --json" && (echo $cmd >&2)
     local output=$($cmd)
 
     sfdx force:config:set defaultusername=$alias_to_set
@@ -231,7 +236,7 @@ pages:
     echo "org_username=$org_username" >&2
 
     # Parse the SFDX Auth URL for the given org
-    local cmd="sfdx force:org:display --verbose --targetusername $org_username --json" && (echo $cmd >&2)
+    local cmd="sfdx force:org:display --verbose --target-org $org_username --json" && (echo $cmd >&2)
     local output=$($cmd)
     org_auth_url="$(jq -r '.result.sfdxAuthUrl' <<< $output)"
 
@@ -258,7 +263,7 @@ pages:
     echo "org_username=$org_username" >&2
     echo "limit_name=$limit_name" >&2
 
-    local cmd="sfdx force:limits:api:display --targetusername $org_username --json" && (echo $cmd >&2)
+    local cmd="sfdx force:limits:api:display --target-org $org_username --json" && (echo $cmd >&2)
     local limits=$($cmd) && (echo $limits | jq '.' >&2)
     local limit=$(jq -r '.result[] | select(.name == env.limit_name)' <<< $limits)
 
@@ -426,7 +431,7 @@ pages:
     fi
 
     # install the package
-    local cmd="sfdx force:package:install --targetusername $org_username --package $package_version_id --wait 10 --publishwait 10 --noprompt --json" && (echo $cmd >&2)
+    local cmd="sfdx force:package:install --target-org $org_username --package $package_version_id --wait 10 --publishwait 10 --noprompt --json" && (echo $cmd >&2)
     local output=$($cmd) && (echo $output | jq '.' >&2)
 
     # assert no error response
@@ -470,7 +475,7 @@ pages:
       exit 1;
     fi
 
-    local cmd="sfdx force:org:open --targetusername $org_username --urlonly --json" && (echo $cmd >&2)
+    local cmd="sfdx force:org:open --target-org $org_username --urlonly --json" && (echo $cmd >&2)
     local output=$($cmd) # don't echo/expose the output which contains the auth url
     local url=$(jq -r ".result.url" <<< $output)
 
@@ -517,7 +522,7 @@ pages:
     echo $scratch_org_username > SCRATCH_ORG_USERNAME.txt
 
     # Get the auth URL
-    local cmd="sfdx force:org:display --verbose --targetusername $org_username --json" && (echo $cmd >&2)
+    local cmd="sfdx force:org:display --verbose --target-org $org_username --json" && (echo $cmd >&2)
     local output=$($cmd)
     org_auth_url="$(jq -r '.result.sfdxAuthUrl' <<< $output)"
     echo $org_auth_url > SCRATCH_ORG_AUTH_URL.txt
@@ -535,7 +540,7 @@ pages:
   function get_scratch_org_usernames() {
     local devhub=$1
     local orgname=$2
-    local result=$(sfdx force:data:soql:query --targetusername $devhub --query "SELECT SignupUsername FROM ScratchOrgInfo WHERE OrgName='$orgname'" --json)
+    local result=$(sfdx force:data:soql:query --target-org $devhub --query "SELECT SignupUsername FROM ScratchOrgInfo WHERE OrgName='$orgname'" --json)
     local usernames=$(jq -r ".result.records|map(.SignupUsername)|.[]" <<< $result)
     echo $usernames
   }
@@ -595,29 +600,32 @@ pages:
     local usernames=$(get_scratch_org_usernames $devhub_username $scratch_org_name)
     for scratch_org_username in $usernames; do
       echo "Deleting $scratch_org_username"
-      local cmd="sfdx force:data:record:delete --sobjecttype ScratchOrgInfo --targetusername $devhub_username --where "'"SignupUsername='$scratch_org_username'"'" --json" && (echo $cmd >&2)
+      local cmd="sfdx force:data:record:delete --sobjecttype ScratchOrgInfo --target-org $devhub_username --where "'"SignupUsername='$scratch_org_username'"'" --json" && (echo $cmd >&2)
       local output=$($cmd) && (echo $output | jq '.' >&2)
     done
   }
 
   function setup_integration_env() {
-    # Decrypt server key
+    echo "Decrypt server key"
     openssl aes-256-cbc -d -md md5 -in assets/server.key.enc -out assets/server.key -k $SERVER_KEY_PASSWORD
     ls -la assets
-    install_jq
-    install_salesforce_cli
+    #install_jq
+    #install_salesforce_cli
     # Integrated test
-    gem install bundler rake
-    bundle install
-    sfdx force:auth:jwt:grant --clientid "$SF_CONSUMER_KEY" --jwtkeyfile assets/server.key --username "$SF_USERNAME" --setdefaultdevhubusername --setalias HubOrg
+    
+    sfdx force:auth:jwt:grant --client-id "$SF_CONSUMER_KEY" --jwt-key-file assets/server.key --username "$SF_USERNAME" --set-default-dev-hub --alias HubOrg
   }
 
 test:
-  image: ruby:3.0
+  image: registry.gitlab.com/iqa_public/labs/salesforce_cicd_demo:latest
   script:
     # Decrypt server key
     - *sfdx_helpers
     - setup_integration_env
+    #- openssl aes-256-cbc -d -md md5 -in assets/server.key.enc -out assets/server.key -k $SERVER_KEY_PASSWORD
+    #- ls -la assets
+    - gem install bundler rake
+    - bundle install
     - bundle exec rake check_oauth   # Check OAuth
     - bundle exec rake leaps:create_soql_objects
     - bundle exec rake leaps:create_enums

data/ChangeLog

@@ -1,3 +1,9 @@
+Version 1.3.0
+* Updated sfdx commands to use new terms, not deprecated ones
+
+Version 1.2.2
+* Fix issue with sfdx logging in with new access token format
+
 Version 1.2.1
 * Debug SOAP login request so it can be debugged
 

data/Rakefile

@@ -45,9 +45,10 @@ end
 
 desc 'Example of cleaning up data'
 task :remove_contacts do
+  require 'parallel'
   contacts = Contact.where first_name: '!null'
   puts "Deleting #{contacts.size} contacts"
-  contacts.each do |contact|
+  Parallel.each(contacts) do |contact|
     contact.delete
     print '.'
   end

data/leap_salesforce.gemspec

@@ -27,6 +27,7 @@ It reads the Metadata from Salesforce and creates the foundation for API tests.'
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'parallel'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'semaphore_test_boosters'

data/lib/leap_salesforce/auth.rb

@@ -107,11 +107,11 @@ module LeapSalesforce
 
       def from_output(variable)
         var_line = sfdx_display_output.lines.find do |line|
-          line.start_with? variable
+          line.strip.start_with? variable
         end
         raise LeapSalesforce::SetupError, "Error retrieving from #{sfdx_display_output}" unless var_line
 
-        var_line.split[-1]
+        var_line.strip.split[-1]
       end
     end
   end

data/lib/leap_salesforce/get_prod_auth.sh

@@ -1,2 +1,2 @@
-sfdx force:auth:jwt:grant --clientid "$SF_CONSUMER_KEY" --jwtkeyfile "$JWT_FOLDER"/server.key --username "$SF_USERNAME" --setdefaultdevhubusername --setalias HubOrg
-sfdx force:org:display --targetusername "$SF_USERNAME"
+sfdx force:auth:jwt:grant --client-id "$SF_CONSUMER_KEY" --jwt-key-file "$JWT_FOLDER"/server.key --username "$SF_USERNAME" --set-default-dev-hub --alias HubOrg
+sfdx force:org:display --target-org "$SF_USERNAME"

data/lib/leap_salesforce/get_scratch_auth_jwt.sh

@@ -1,3 +1,3 @@
 # Get scratch ORG logging in via jwtkeyfile
-sfdx force:auth:jwt:grant --clientid "$SF_CONSUMER_KEY" --jwtkeyfile "$JWT_FOLDER"/server.key --username "$SF_USERNAME" --setdefaultdevhubusername --setalias HubOrg
-sfdx force:org:display --targetusername "$SCRATCH_ORG_ALIAS"
+sfdx force:auth:jwt:grant --client-id "$SF_CONSUMER_KEY" --jwt-key-file "$JWT_FOLDER"/server.key --username "$SF_USERNAME" --set-default-dev-hub --alias HubOrg
+sfdx force:org:display --target-org "$SCRATCH_ORG_ALIAS"

data/lib/leap_salesforce/get_scratch_auth_url.sh

@@ -1,4 +1,4 @@
 # Get scratch ORG logging in via Auth url
 #echo $org_auth_url > $file
-sfdx force:auth:sfdxurl:store --sfdxurlfile "$file" --setalias HubOrg --json
-sfdx force:org:display --targetusername "$SCRATCH_ORG_ALIAS"
+sfdx force:auth:sfdxurl:store --sfdxurlfile "$file" --alias HubOrg --json
+sfdx force:org:display --target-org "$SCRATCH_ORG_ALIAS"

data/lib/leap_salesforce/rake/sfdx.rake

@@ -4,7 +4,7 @@
 namespace :sfdx do
   def login
     puts 'Note these tasks are a work in progress'
-    puts `sfdx force:auth:jwt:grant --clientid $SF_CONSUMER_KEY --jwtkeyfile "$JWT_FOLDER"/server.key --username $SF_USERNAME --setdefaultdevhubusername --setalias HubOrg`
+    puts `sfdx force:auth:jwt:grant --client-id $SF_CONSUMER_KEY --jwt-key-file "$JWT_FOLDER"/server.key --username $SF_USERNAME --set-default-dev-hub --alias HubOrg`
   end
 
   desc 'Login with credentials'
@@ -13,13 +13,13 @@ namespace :sfdx do
   desc 'Display details about user'
   task :display do
     login
-    puts `sfdx force:org:display --targetusername samuel.garratt@brave-otter-ttxype.com`
+    puts `sfdx force:org:display --target-org samuel.garratt@brave-otter-ttxype.com`
   end
 
   desc 'Create dev environment'
   task :create_dev do
     login
-    puts `sfdx force:org:create --targetdevhubusername HubOrg --setdefaultusername --definitionfile config/project-scratch-def.json --setalias $SCRATCH_ORG_ALIAS --wait 10 --durationdays 7`
+    puts `sfdx force:org:create --targetdevhubusername HubOrg --setdefaultusername --definitionfile config/project-scratch-def.json --alias $SCRATCH_ORG_ALIAS --wait 10 --durationdays 7`
   end
 
   desc 'Open environment in browser'
@@ -31,6 +31,6 @@ namespace :sfdx do
   desc 'Delete dev environment'
   task :delete_dev do
     login
-    puts `sfdx force:org:delete --targetusername $SCRATCH_ORG_ALIAS --noprompt`
+    puts `sfdx force:org:delete --target-org $SCRATCH_ORG_ALIAS --noprompt`
   end
 end

data/lib/leap_salesforce/version.rb

@@ -2,5 +2,5 @@
 
 module LeapSalesforce
   # @return [String] Version of leap salesforce
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leap_salesforce
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - IQA
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2024-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -371,7 +385,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Helps with setting up integrated automated test frameworks against Salesforce.