ci: use stricter || user-agent validation checks

Require UA to both start with the expected prefix AND contain
'octokit-core.js/' rather than passing if either pattern matches.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: salmanmkc

.github/workflows/integration.yml

@@ -156,20 +156,20 @@ jobs:
       - run: |
           echo "- Validating user-agent default"
           ua="${{steps.user-agent-default.outputs.result}}"
-          if [[ "$ua" != "actions/github-script octokit-core.js/"* ]] && [[ "$ua" != "actions/github-script actions_orchestration_id/"* ]]; then
-            echo $'::error::\u274C' "Expected user-agent to start with 'actions/github-script', got $ua"
+          if [[ "$ua" != "actions/github-script"* ]] || [[ "$ua" != *"octokit-core.js/"* ]]; then
+            echo $'::error::\u274C' "Expected user-agent to start with 'actions/github-script' and contain 'octokit-core.js/', got $ua"
             exit 1
           fi
           echo "- Validating user-agent set to a value"
           ua="${{steps.user-agent-set.outputs.result}}"
-          if [[ "$ua" != "foobar octokit-core.js/"* ]] && [[ "$ua" != "foobar actions_orchestration_id/"* ]]; then
-            echo $'::error::\u274C' "Expected user-agent to start with 'foobar', got $ua"
+          if [[ "$ua" != "foobar"* ]] || [[ "$ua" != *"octokit-core.js/"* ]]; then
+            echo $'::error::\u274C' "Expected user-agent to start with 'foobar' and contain 'octokit-core.js/', got $ua"
             exit 1
           fi
           echo "- Validating user-agent set to an empty string"
           ua="${{steps.user-agent-empty.outputs.result}}"
-          if [[ "$ua" != "actions/github-script octokit-core.js/"* ]] && [[ "$ua" != "actions/github-script actions_orchestration_id/"* ]]; then
-            echo $'::error::\u274C' "Expected user-agent to start with 'actions/github-script', got $ua"
+          if [[ "$ua" != "actions/github-script"* ]] || [[ "$ua" != *"octokit-core.js/"* ]]; then
+            echo $'::error::\u274C' "Expected user-agent to start with 'actions/github-script' and contain 'octokit-core.js/', got $ua"
             exit 1
           fi
           echo $'\u2705 Test passed' | tee -a $GITHUB_STEP_SUMMARY