From 8a9be954248650e910f34f59f397f9a953594362 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 6 Jan 2026 22:30:38 +0000 Subject: [PATCH] Move helper method to end of file and revert package-lock.json changes Co-authored-by: TingluoHuang <1750815+TingluoHuang@users.noreply.github.com> --- dist/index.js | 34 +++++++++++++++++----------------- package-lock.json | 24 +++--------------------- src/main.ts | 40 ++++++++++++++++++++-------------------- 3 files changed, 40 insertions(+), 58 deletions(-) diff --git a/dist/index.js b/dist/index.js index a133e53..1568028 100644 --- a/dist/index.js +++ b/dist/index.js @@ -36258,23 +36258,6 @@ const wrapRequire = new Proxy(require, { process.on('unhandledRejection', handleError); main().catch(handleError); -/** - * 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 - only keep alphanumeric, dots, hyphens, and underscores - const sanitized = orchestrationId.replace(/[^a-zA-Z0-9._-]/g, ''); - if (!sanitized) { - return userAgent; - } - return `${userAgent} orchestration-id/${sanitized}`; -} async function main() { const token = core.getInput('github-token', { required: true }); const debug = core.getBooleanInput('debug'); @@ -36332,6 +36315,23 @@ 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 - only keep alphanumeric, dots, hyphens, and underscores + const sanitized = orchestrationId.replace(/[^a-zA-Z0-9._-]/g, ''); + if (!sanitized) { + return userAgent; + } + return `${userAgent} orchestration-id/${sanitized}`; +} })(); diff --git a/package-lock.json b/package-lock.json index bb96252..93edb73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -134,7 +134,6 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.0.tgz", "integrity": "sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==", "dev": true, - "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.22.13", @@ -1280,7 +1279,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.0.1.tgz", "integrity": "sha512-lyeeeZyESFo+ffI801SaBKmCfsvarO+dgV8/0gD8u1d87clbEdWsP5yC+dSj3zLhb2eIf5SJrn6vDz9AheETHw==", - "peer": true, "dependencies": { "@octokit/auth-token": "^4.0.0", "@octokit/graphql": "^7.0.0", @@ -1764,7 +1762,6 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.5.tgz", "integrity": "sha512-bIZVSGx2UME/lmhLcjdVc7ePBwn7CLqKarUBL4me1C5feOd663liTGjMBGVcGr+BhnSLeP4SgwdvNnnkbIdkCw==", "dev": true, - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "6.7.5", "@typescript-eslint/types": "6.7.5", @@ -1958,7 +1955,6 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", "dev": true, - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -2316,7 +2312,6 @@ "url": "https://github.com/sponsors/ai" } ], - "peer": true, "dependencies": { "caniuse-lite": "^1.0.30001541", "electron-to-chromium": "^1.4.535", @@ -3097,7 +3092,6 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz", "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==", "dev": true, - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -4583,7 +4577,6 @@ "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", "dev": true, - "peer": true, "dependencies": { "@jest/core": "^29.7.0", "@jest/types": "^29.6.3", @@ -6204,7 +6197,6 @@ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true, - "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -7087,7 +7079,6 @@ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -7447,7 +7438,6 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.0.tgz", "integrity": "sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==", "dev": true, - "peer": true, "requires": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.22.13", @@ -8323,7 +8313,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.0.1.tgz", "integrity": "sha512-lyeeeZyESFo+ffI801SaBKmCfsvarO+dgV8/0gD8u1d87clbEdWsP5yC+dSj3zLhb2eIf5SJrn6vDz9AheETHw==", - "peer": true, "requires": { "@octokit/auth-token": "^4.0.0", "@octokit/graphql": "^7.0.0", @@ -8734,7 +8723,6 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.5.tgz", "integrity": "sha512-bIZVSGx2UME/lmhLcjdVc7ePBwn7CLqKarUBL4me1C5feOd663liTGjMBGVcGr+BhnSLeP4SgwdvNnnkbIdkCw==", "dev": true, - "peer": true, "requires": { "@typescript-eslint/scope-manager": "6.7.5", "@typescript-eslint/types": "6.7.5", @@ -8843,8 +8831,7 @@ "version": "8.10.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", - "dev": true, - "peer": true + "dev": true }, "acorn-jsx": { "version": "5.3.2", @@ -9102,7 +9089,6 @@ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", "dev": true, - "peer": true, "requires": { "caniuse-lite": "^1.0.30001541", "electron-to-chromium": "^1.4.535", @@ -9660,7 +9646,6 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz", "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==", "dev": true, - "peer": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -10697,7 +10682,6 @@ "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", "dev": true, - "peer": true, "requires": { "@jest/core": "^29.7.0", "@jest/types": "^29.6.3", @@ -11927,8 +11911,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", - "dev": true, - "peer": true + "dev": true }, "prettier-linter-helpers": { "version": "1.0.0", @@ -12538,8 +12521,7 @@ "version": "5.2.2", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", - "dev": true, - "peer": true + "dev": true }, "unbox-primitive": { "version": "1.0.2", diff --git a/src/main.ts b/src/main.ts index 3b32fc9..f9456a2 100644 --- a/src/main.ts +++ b/src/main.ts @@ -23,26 +23,6 @@ type Options = { request?: RequestRequestOptions } -/** - * 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 - only keep alphanumeric, dots, hyphens, and underscores - const sanitized = orchestrationId.replace(/[^a-zA-Z0-9._-]/g, '') - if (!sanitized) { - return userAgent - } - - return `${userAgent} orchestration-id/${sanitized}` -} - async function main(): Promise { const token = core.getInput('github-token', {required: true}) const debug = core.getBooleanInput('debug') @@ -119,3 +99,23 @@ 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 - only keep alphanumeric, dots, hyphens, and underscores + const sanitized = orchestrationId.replace(/[^a-zA-Z0-9._-]/g, '') + if (!sanitized) { + return userAgent + } + + return `${userAgent} orchestration-id/${sanitized}` +}