Skip to content

Commit 5f4f998

Browse files
authored
Merge pull request #2733 from github/marcogario/remove_proxy_password
start-proxy: Remove unusued proxy_password input
2 parents 43cffee + e2f043d commit 5f4f998

File tree

4 files changed

+1
-33
lines changed

4 files changed

+1
-33
lines changed

lib/start-proxy-action.js

-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/start-proxy-action.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/start-proxy-action.ts

-15
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const UPDATEJOB_PROXY = "update-job-proxy";
1414
const UPDATEJOB_PROXY_VERSION = "v2.0.20241023203727";
1515
const UPDATEJOB_PROXY_URL_PREFIX =
1616
"https://github.com/github/codeql-action/releases/download/codeql-bundle-v2.18.1/";
17-
const PROXY_USER = "proxy_user";
1817
const KEY_SIZE = 2048;
1918
const KEY_EXPIRY_YEARS = 2;
2019

@@ -107,12 +106,10 @@ async function runWrapper() {
107106
);
108107

109108
const ca = generateCertificateAuthority();
110-
const proxyAuth = getProxyAuth();
111109

112110
const proxyConfig: ProxyConfig = {
113111
all_credentials: credentials,
114112
ca,
115-
proxy_auth: proxyAuth,
116113
};
117114

118115
// Start the Proxy
@@ -181,18 +178,6 @@ async function startProxy(
181178
}
182179
}
183180

184-
// getProxyAuth returns the authentication information for the proxy itself.
185-
function getProxyAuth(): BasicAuthCredentials | undefined {
186-
const proxy_password = actionsUtil.getOptionalInput("proxy_password");
187-
if (proxy_password) {
188-
return {
189-
username: PROXY_USER,
190-
password: proxy_password,
191-
};
192-
}
193-
return;
194-
}
195-
196181
async function getProxyBinaryPath(): Promise<string> {
197182
const proxyFileName =
198183
process.platform === "win32" ? `${UPDATEJOB_PROXY}.exe` : UPDATEJOB_PROXY;

start-proxy/action.yml

-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ inputs:
99
registries_credentials:
1010
description: Base64 encoded JSON configuration for the URLs and credentials of the package registries
1111
required: false
12-
proxy_password:
13-
required: false
14-
description: The password of the proxy
1512
token:
1613
description: GitHub token to use for authenticating with this instance of GitHub, used to upload debug artifacts.
1714
default: ${{ github.token }}

0 commit comments

Comments
 (0)