remove unused arguments
This commit is contained in:
parent
34b372292b
commit
cf08f5a9cd
8 changed files with 11 additions and 30 deletions
5
lib/api-client.js
generated
5
lib/api-client.js
generated
|
|
@ -32,11 +32,6 @@ function parseAuth(auth) {
|
||||||
const c = auth.indexOf(':');
|
const c = auth.indexOf(':');
|
||||||
if (c !== -1) {
|
if (c !== -1) {
|
||||||
return 'basic ' + Buffer.from(auth).toString('base64');
|
return 'basic ' + Buffer.from(auth).toString('base64');
|
||||||
// return {
|
|
||||||
// username: auth.substring(0, c),
|
|
||||||
// password: auth.substring(c + 1),
|
|
||||||
// on2fa: async () => { throw new Error(''); }
|
|
||||||
// };
|
|
||||||
}
|
}
|
||||||
// Otherwise use the token as it is
|
// Otherwise use the token as it is
|
||||||
return auth;
|
return auth;
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAAsC;AACtC,wDAA0C;AAC1C,0EAAgD;AAEhD,iCAAyD;AAE5C,QAAA,YAAY,GAAG,UAAS,UAAkB,EAAE,YAAoB,EAAE,aAAa,GAAG,KAAK;IAClG,IAAI,iBAAU,EAAE,IAAI,CAAC,aAAa,EAAE;QAClC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;KAClD;IACD,OAAO,IAAI,MAAM,CAAC,MAAM,CACtB;QACE,IAAI,EAAE,SAAS,CAAC,UAAU,CAAC;QAC3B,OAAO,EAAE,YAAY;QACrB,SAAS,EAAE,eAAe;QAC1B,GAAG,EAAE,2BAAe,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;KACzC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,kDAAkD;AAClD,oCAAoC;AACpC,SAAS,SAAS,CAAC,IAAY;IAC7B,yCAAyC;IACzC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;QACZ,OAAO,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACvD,WAAW;QACX,oCAAoC;QACpC,qCAAqC;QACrC,gDAAgD;QAChD,KAAK;KACN;IAED,mCAAmC;IACnC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,uFAAuF;AACvF,oFAAoF;AACpF,+CAA+C;AAC/C,SAAgB,mBAAmB,CAAC,aAAa,GAAG,KAAK;IACvD,OAAO,oBAAY,CACjB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EACtB,0BAAmB,CAAC,gBAAgB,CAAC,EACrC,aAAa,CAAC,CAAC;AACnB,CAAC;AALD,kDAKC"}
|
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAAsC;AACtC,wDAA0C;AAC1C,0EAAgD;AAEhD,iCAAyD;AAE5C,QAAA,YAAY,GAAG,UAAS,UAAkB,EAAE,YAAoB,EAAE,aAAa,GAAG,KAAK;IAClG,IAAI,iBAAU,EAAE,IAAI,CAAC,aAAa,EAAE;QAClC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;KAClD;IACD,OAAO,IAAI,MAAM,CAAC,MAAM,CACtB;QACE,IAAI,EAAE,SAAS,CAAC,UAAU,CAAC;QAC3B,OAAO,EAAE,YAAY;QACrB,SAAS,EAAE,eAAe;QAC1B,GAAG,EAAE,2BAAe,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;KACzC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,kDAAkD;AAClD,oCAAoC;AACpC,SAAS,SAAS,CAAC,IAAY;IAC7B,yCAAyC;IACzC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;QACZ,OAAO,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;KACxD;IAED,mCAAmC;IACnC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,uFAAuF;AACvF,oFAAoF;AACpF,+CAA+C;AAC/C,SAAgB,mBAAmB,CAAC,aAAa,GAAG,KAAK;IACvD,OAAO,oBAAY,CACjB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EACtB,0BAAmB,CAAC,gBAAgB,CAAC,EACrC,aAAa,CAAC,CAAC;AACnB,CAAC;AALD,kDAKC"}
|
||||||
5
lib/cli.js
generated
5
lib/cli.js
generated
|
|
@ -39,16 +39,13 @@ program
|
||||||
.requiredOption('--repository <repository>', 'Repository name')
|
.requiredOption('--repository <repository>', 'Repository name')
|
||||||
.requiredOption('--commit <commit>', 'SHA of commit that was analyzed')
|
.requiredOption('--commit <commit>', 'SHA of commit that was analyzed')
|
||||||
.requiredOption('--ref <ref>', 'Name of ref that was analyzed')
|
.requiredOption('--ref <ref>', 'Name of ref that was analyzed')
|
||||||
.requiredOption('--analysis-key <key>', 'Identifies the analysis, for use matching up equivalent analyses on different commits')
|
|
||||||
.requiredOption('--github-url <url>', 'URL of GitHub instance')
|
.requiredOption('--github-url <url>', 'URL of GitHub instance')
|
||||||
.requiredOption('--github-auth <auth>', 'GitHub Apps token, or of the form "username:token" if using a personal access token')
|
.requiredOption('--github-auth <auth>', 'GitHub Apps token, or of the form "username:token" if using a personal access token')
|
||||||
.option('--checkout-path <path>', 'Checkout path (default: current working directory)')
|
.option('--checkout-path <path>', 'Checkout path (default: current working directory)')
|
||||||
.option('--analysis-name <name>', 'Display name of the analysis (default: same as analysis-key')
|
|
||||||
.option('--environment <env>', 'Environment (default: empty)')
|
|
||||||
.action(async (cmd) => {
|
.action(async (cmd) => {
|
||||||
const logger = logging_1.getCLILogger();
|
const logger = logging_1.getCLILogger();
|
||||||
try {
|
try {
|
||||||
await upload_lib.upload(cmd.sarifFile, repository_1.parseRepositoryNwo(cmd.repository), cmd.commit, cmd.ref, cmd.analysisKey, cmd.analysisName || cmd.analysisKey, undefined, cmd.checkoutPath || process.cwd(), cmd.environment, cmd.githubAuth, parseGithubApiUrl(cmd.githubUrl), 'cli', logger);
|
await upload_lib.upload(cmd.sarifFile, repository_1.parseRepositoryNwo(cmd.repository), cmd.commit, cmd.ref, undefined, undefined, undefined, cmd.checkoutPath || process.cwd(), undefined, cmd.githubAuth, parseGithubApiUrl(cmd.githubUrl), 'cli', logger);
|
||||||
}
|
}
|
||||||
catch (e) {
|
catch (e) {
|
||||||
logger.error("Upload failed");
|
logger.error("Upload failed");
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yCAAoC;AACpC,2CAA6B;AAE7B,uCAAyC;AACzC,6CAAkD;AAClD,yDAA2C;AAE3C,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAC9B,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AAezB,SAAS,iBAAiB,CAAC,QAAgB;IACzC,IAAI;QACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE9B,kDAAkD;QAClD,0CAA0C;QAC1C,IAAI,GAAG,CAAC,QAAQ,KAAK,YAAY,IAAI,GAAG,CAAC,QAAQ,KAAK,gBAAgB,EAAE;YACtE,OAAO,wBAAwB,CAAC;SACjC;QAED,gDAAgD;QAChD,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE;YAC1C,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;SACrD;QAED,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;KAEvB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,IAAI,QAAQ,sBAAsB,CAAC,CAAC;KACrD;AACH,CAAC;AAED,OAAO;KACJ,OAAO,CAAC,QAAQ,CAAC;KACjB,WAAW,CAAC,6EAA6E,CAAC;KAC1F,cAAc,CAAC,qBAAqB,EAAE,sBAAsB,CAAC;KAC7D,cAAc,CAAC,2BAA2B,EAAE,iBAAiB,CAAC;KAC9D,cAAc,CAAC,mBAAmB,EAAE,iCAAiC,CAAC;KACtE,cAAc,CAAC,aAAa,EAAE,+BAA+B,CAAC;KAC9D,cAAc,CAAC,sBAAsB,EAAE,uFAAuF,CAAC;KAC/H,cAAc,CAAC,oBAAoB,EAAE,wBAAwB,CAAC;KAC9D,cAAc,CAAC,sBAAsB,EAAE,qFAAqF,CAAC;KAC7H,MAAM,CAAC,wBAAwB,EAAE,oDAAoD,CAAC;KACtF,MAAM,CAAC,wBAAwB,EAAE,6DAA6D,CAAC;KAC/F,MAAM,CAAC,qBAAqB,EAAE,8BAA8B,CAAC;KAC7D,MAAM,CAAC,KAAK,EAAE,GAAe,EAAE,EAAE;IAChC,MAAM,MAAM,GAAG,sBAAY,EAAE,CAAC;IAC9B,IAAI;QACF,MAAM,UAAU,CAAC,MAAM,CACrB,GAAG,CAAC,SAAS,EACb,+BAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,EAClC,GAAG,CAAC,MAAM,EACV,GAAG,CAAC,GAAG,EACP,GAAG,CAAC,WAAW,EACf,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,WAAW,EACnC,SAAS,EACT,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,EAAE,EACjC,GAAG,CAAC,WAAW,EACf,GAAG,CAAC,UAAU,EACd,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,EAChC,KAAK,EACL,MAAM,CAAC,CAAC;KACX;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC9B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC,CAAC,CAAC;AAEL,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
|
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yCAAoC;AACpC,2CAA6B;AAE7B,uCAAyC;AACzC,6CAAkD;AAClD,yDAA2C;AAE3C,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAC9B,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AAYzB,SAAS,iBAAiB,CAAC,QAAgB;IACzC,IAAI;QACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE9B,kDAAkD;QAClD,0CAA0C;QAC1C,IAAI,GAAG,CAAC,QAAQ,KAAK,YAAY,IAAI,GAAG,CAAC,QAAQ,KAAK,gBAAgB,EAAE;YACtE,OAAO,wBAAwB,CAAC;SACjC;QAED,gDAAgD;QAChD,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE;YAC1C,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;SACrD;QAED,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;KAEvB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,IAAI,QAAQ,sBAAsB,CAAC,CAAC;KACrD;AACH,CAAC;AAED,OAAO;KACJ,OAAO,CAAC,QAAQ,CAAC;KACjB,WAAW,CAAC,6EAA6E,CAAC;KAC1F,cAAc,CAAC,qBAAqB,EAAE,sBAAsB,CAAC;KAC7D,cAAc,CAAC,2BAA2B,EAAE,iBAAiB,CAAC;KAC9D,cAAc,CAAC,mBAAmB,EAAE,iCAAiC,CAAC;KACtE,cAAc,CAAC,aAAa,EAAE,+BAA+B,CAAC;KAC9D,cAAc,CAAC,oBAAoB,EAAE,wBAAwB,CAAC;KAC9D,cAAc,CAAC,sBAAsB,EAAE,qFAAqF,CAAC;KAC7H,MAAM,CAAC,wBAAwB,EAAE,oDAAoD,CAAC;KACtF,MAAM,CAAC,KAAK,EAAE,GAAe,EAAE,EAAE;IAChC,MAAM,MAAM,GAAG,sBAAY,EAAE,CAAC;IAC9B,IAAI;QACF,MAAM,UAAU,CAAC,MAAM,CACrB,GAAG,CAAC,SAAS,EACb,+BAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,EAClC,GAAG,CAAC,MAAM,EACV,GAAG,CAAC,GAAG,EACP,SAAS,EACT,SAAS,EACT,SAAS,EACT,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,EAAE,EACjC,SAAS,EACT,GAAG,CAAC,UAAU,EACd,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,EAChC,KAAK,EACL,MAAM,CAAC,CAAC;KACX;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC9B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC,CAAC,CAAC;AAEL,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -24,11 +24,6 @@ function parseAuth(auth: string): string {
|
||||||
const c = auth.indexOf(':');
|
const c = auth.indexOf(':');
|
||||||
if (c !== -1) {
|
if (c !== -1) {
|
||||||
return 'basic ' + Buffer.from(auth).toString('base64');
|
return 'basic ' + Buffer.from(auth).toString('base64');
|
||||||
// return {
|
|
||||||
// username: auth.substring(0, c),
|
|
||||||
// password: auth.substring(c + 1),
|
|
||||||
// on2fa: async () => { throw new Error(''); }
|
|
||||||
// };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Otherwise use the token as it is
|
// Otherwise use the token as it is
|
||||||
|
|
|
||||||
12
src/cli.ts
12
src/cli.ts
|
|
@ -13,12 +13,9 @@ interface UploadArgs {
|
||||||
repository: string;
|
repository: string;
|
||||||
commit: string;
|
commit: string;
|
||||||
ref: string;
|
ref: string;
|
||||||
analysisKey: string;
|
|
||||||
githubUrl: string;
|
githubUrl: string;
|
||||||
githubAuth: string;
|
githubAuth: string;
|
||||||
analysisName: string | undefined;
|
|
||||||
checkoutPath: string | undefined;
|
checkoutPath: string | undefined;
|
||||||
environment: string | undefined;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function parseGithubApiUrl(inputUrl: string): string {
|
function parseGithubApiUrl(inputUrl: string): string {
|
||||||
|
|
@ -50,12 +47,9 @@ program
|
||||||
.requiredOption('--repository <repository>', 'Repository name')
|
.requiredOption('--repository <repository>', 'Repository name')
|
||||||
.requiredOption('--commit <commit>', 'SHA of commit that was analyzed')
|
.requiredOption('--commit <commit>', 'SHA of commit that was analyzed')
|
||||||
.requiredOption('--ref <ref>', 'Name of ref that was analyzed')
|
.requiredOption('--ref <ref>', 'Name of ref that was analyzed')
|
||||||
.requiredOption('--analysis-key <key>', 'Identifies the analysis, for use matching up equivalent analyses on different commits')
|
|
||||||
.requiredOption('--github-url <url>', 'URL of GitHub instance')
|
.requiredOption('--github-url <url>', 'URL of GitHub instance')
|
||||||
.requiredOption('--github-auth <auth>', 'GitHub Apps token, or of the form "username:token" if using a personal access token')
|
.requiredOption('--github-auth <auth>', 'GitHub Apps token, or of the form "username:token" if using a personal access token')
|
||||||
.option('--checkout-path <path>', 'Checkout path (default: current working directory)')
|
.option('--checkout-path <path>', 'Checkout path (default: current working directory)')
|
||||||
.option('--analysis-name <name>', 'Display name of the analysis (default: same as analysis-key')
|
|
||||||
.option('--environment <env>', 'Environment (default: empty)')
|
|
||||||
.action(async (cmd: UploadArgs) => {
|
.action(async (cmd: UploadArgs) => {
|
||||||
const logger = getCLILogger();
|
const logger = getCLILogger();
|
||||||
try {
|
try {
|
||||||
|
|
@ -64,11 +58,11 @@ program
|
||||||
parseRepositoryNwo(cmd.repository),
|
parseRepositoryNwo(cmd.repository),
|
||||||
cmd.commit,
|
cmd.commit,
|
||||||
cmd.ref,
|
cmd.ref,
|
||||||
cmd.analysisKey,
|
undefined,
|
||||||
cmd.analysisName || cmd.analysisKey,
|
undefined,
|
||||||
undefined,
|
undefined,
|
||||||
cmd.checkoutPath || process.cwd(),
|
cmd.checkoutPath || process.cwd(),
|
||||||
cmd.environment,
|
undefined,
|
||||||
cmd.githubAuth,
|
cmd.githubAuth,
|
||||||
parseGithubApiUrl(cmd.githubUrl),
|
parseGithubApiUrl(cmd.githubUrl),
|
||||||
'cli',
|
'cli',
|
||||||
|
|
|
||||||
|
|
@ -126,8 +126,8 @@ export async function upload(
|
||||||
repositoryNwo: RepositoryNwo,
|
repositoryNwo: RepositoryNwo,
|
||||||
commitOid: string,
|
commitOid: string,
|
||||||
ref: string,
|
ref: string,
|
||||||
analysisKey: string,
|
analysisKey: string | undefined,
|
||||||
analysisName: string,
|
analysisName: string | undefined,
|
||||||
workflowRunID: number | undefined,
|
workflowRunID: number | undefined,
|
||||||
checkoutPath: string,
|
checkoutPath: string,
|
||||||
environment: string | undefined,
|
environment: string | undefined,
|
||||||
|
|
@ -203,8 +203,8 @@ async function uploadFiles(
|
||||||
repositoryNwo: RepositoryNwo,
|
repositoryNwo: RepositoryNwo,
|
||||||
commitOid: string,
|
commitOid: string,
|
||||||
ref: string,
|
ref: string,
|
||||||
analysisKey: string,
|
analysisKey: string | undefined,
|
||||||
analysisName: string,
|
analysisName: string | undefined,
|
||||||
workflowRunID: number | undefined,
|
workflowRunID: number | undefined,
|
||||||
checkoutPath: string,
|
checkoutPath: string,
|
||||||
environment: string | undefined,
|
environment: string | undefined,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue