.github/workflows/integration.yml

@@ -167,7 +167,7 @@ jobs:
             exit 1
           fi
           echo "- Validating user-agent set to an empty string"
-          expected="actions/github-script octokit-core.js/"
+          expected="octokit-core.js/"
           if [[ "${{steps.user-agent-empty.outputs.result}}" != "$expected"* ]]; then
             echo $'::error::\u274C' "Expected user-agent to start with '$expected', got ${{steps.user-agent-empty.outputs.result}}"
             exit 1

dist/index.js

@@ -36267,11 +36267,9 @@ async function main() {
     const retries = parseInt(core.getInput('retries'));
     const exemptStatusCodes = parseNumberArray(core.getInput('retry-exempt-status-codes'));
     const [retryOpts, requestOpts] = getRetryOptions(retries, exemptStatusCodes, utils.defaults);
-    const baseUserAgent = userAgent || 'actions/github-script';
-    const finalUserAgent = getUserAgentWithOrchestrationId(baseUserAgent);
     const opts = {
         log: debug ? console : undefined,
-        userAgent: finalUserAgent,
+        userAgent: userAgent || undefined,
         previews: previews ? previews.split(',') : undefined,
         retry: retryOpts,
         request: requestOpts
@@ -36315,20 +36313,6 @@ function handleError(err) {
     console.error(err);
     core.setFailed(`Unhandled error: ${err}`);
 }
-/**
- * Gets the user agent string with orchestration ID appended if available
- * @param userAgent The base user agent string
- * @returns The user agent string with orchestration ID appended if ACTIONS_ORCHESTRATION_ID is set
- */
-function getUserAgentWithOrchestrationId(userAgent) {
-    const orchestrationId = process.env['ACTIONS_ORCHESTRATION_ID'];
-    if (!orchestrationId) {
-        return userAgent;
-    }
-    // Sanitize orchestration ID - replace invalid characters with underscore
-    const sanitized = orchestrationId.replace(/[^a-zA-Z0-9._-]/g, '_');
-    return `${userAgent} actions_orchestration_id/${sanitized}`;
-}
 
 })();
 

src/main.ts

@@ -39,12 +39,9 @@ async function main(): Promise<void> {
     defaultGitHubOptions
   )
 
-  const baseUserAgent = userAgent || 'actions/github-script'
-  const finalUserAgent = getUserAgentWithOrchestrationId(baseUserAgent)
-
   const opts: Options = {
     log: debug ? console : undefined,
-    userAgent: finalUserAgent,
+    userAgent: userAgent || undefined,
     previews: previews ? previews.split(',') : undefined,
     retry: retryOpts,
     request: requestOpts
@@ -99,20 +96,3 @@ function handleError(err: any): void {
   console.error(err)
   core.setFailed(`Unhandled error: ${err}`)
 }
-
-/**
- * Gets the user agent string with orchestration ID appended if available
- * @param userAgent The base user agent string
- * @returns The user agent string with orchestration ID appended if ACTIONS_ORCHESTRATION_ID is set
- */
-function getUserAgentWithOrchestrationId(userAgent: string): string {
-  const orchestrationId = process.env['ACTIONS_ORCHESTRATION_ID']
-  if (!orchestrationId) {
-    return userAgent
-  }
-
-  // Sanitize orchestration ID - replace invalid characters with underscore
-  const sanitized = orchestrationId.replace(/[^a-zA-Z0-9._-]/g, '_')
-
-  return `${userAgent} actions_orchestration_id/${sanitized}`
-}