Merge branch 'master' into dependabot/pip/Solutions/CiscoUmbrella/Dat…

…a-Connectors/urllib3-1.26.19

.github/workflows/ScanSecrets.yaml

@@ -15,4 +15,4 @@ jobs:
       uses: trufflesecurity/trufflehog@main
       continue-on-error: true
       with:
-        extra_args: --exclude-paths=.script/SecretScanning/Excludepathlist --no-verification
+        extra_args: --exclude-paths=.script/SecretScanning/Excludepathlist --only-verified

.github/workflows/runAsimSchemaAndDataTesters.yaml

@@ -78,11 +78,27 @@ jobs:
     name: Run ASim Sample Data Ingestion
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
+      - name: Checkout pull request branch
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0 
-      - name: Setup Python
+            ref: ${{github.event.pull_request.head.ref}}
+            repository: ${{github.event.pull_request.head.repo.full_name}}
+            persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token.
+            fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository.
+      - name: Setup git config
+        run: |
+              git config --local user.name "github-actions[bot]"
+              git config --local user.email "<>"
+      - name: Merge master into pull request branch
+        run: |
+              git merge origin/master
+              Conflicts=$(git ls-files -u | wc -l)
+              if [ "$Conflicts" -gt 0 ] ; then
+                echo "There is a merge conflict. Aborting"
+                git merge --abort
+                exit 1
+              fi
+      - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: '3.x'
@@ -112,8 +128,9 @@ jobs:
               # Download the file
               echo "Downloading script from the master: $url"
               curl -o "$filePath" "$url"
+              chmod +x "$filePath"
               # Execute the script
-              python3 "$filePath" ${{ github.event.pull_request.number }}
+              python "$filePath" "${{ github.event.pull_request.number }}"
   Run-ASim-Schema-Data-tests:
     needs: Run-ASim-Sample-Data-Ingest
     name: Run ASim Schema and Data tests
@@ -175,8 +192,6 @@ jobs:
             # Execute the script
             & $filePath
           azPSVersion: "latest"
-          errorActionPreference: continue
-          failOnStandardError: false
   Run-ASim-Parser-Filtering-Tests:
     needs: Run-ASim-Sample-Data-Ingest
     name: Run ASim Parser Filtering tests