Skip to content

Commit be829f3

Browse files
nirvaninnirvanin
committed
JPI-396 - add github token param
1 parent 0775fb3 commit be829f3

File tree

8 files changed

+111
-37
lines changed

8 files changed

+111
-37
lines changed

‎lib/cleanup.js‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
1515
}) : function(o, v) {
1616
o["default"] = v;
1717
});
18-
var __importStar = (this && this.__importStar) || function (mod) {
19-
if (mod && mod.__esModule) return mod;
20-
var result = {};
21-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22-
__setModuleDefault(result, mod);
23-
return result;
24-
};
18+
var __importStar = (this && this.__importStar) || (function () {
19+
var ownKeys = function(o) {
20+
ownKeys = Object.getOwnPropertyNames || function (o) {
21+
var ar = [];
22+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23+
return ar;
24+
};
25+
return ownKeys(o);
26+
};
27+
return function (mod) {
28+
if (mod && mod.__esModule) return mod;
29+
var result = {};
30+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31+
__setModuleDefault(result, mod);
32+
return result;
33+
};
34+
})();
2535
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2636
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
2737
return new (P || (P = Promise))(function (resolve, reject) {

‎lib/job-summary.js‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
1515
}) : function(o, v) {
1616
o["default"] = v;
1717
});
18-
var __importStar = (this && this.__importStar) || function (mod) {
19-
if (mod && mod.__esModule) return mod;
20-
var result = {};
21-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22-
__setModuleDefault(result, mod);
23-
return result;
24-
};
18+
var __importStar = (this && this.__importStar) || (function () {
19+
var ownKeys = function(o) {
20+
ownKeys = Object.getOwnPropertyNames || function (o) {
21+
var ar = [];
22+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23+
return ar;
24+
};
25+
return ownKeys(o);
26+
};
27+
return function (mod) {
28+
if (mod && mod.__esModule) return mod;
29+
var result = {};
30+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31+
__setModuleDefault(result, mod);
32+
return result;
33+
};
34+
})();
2535
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2636
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
2737
return new (P || (P = Promise))(function (resolve, reject) {

‎lib/main.js‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
1515
}) : function(o, v) {
1616
o["default"] = v;
1717
});
18-
var __importStar = (this && this.__importStar) || function (mod) {
19-
if (mod && mod.__esModule) return mod;
20-
var result = {};
21-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22-
__setModuleDefault(result, mod);
23-
return result;
24-
};
18+
var __importStar = (this && this.__importStar) || (function () {
19+
var ownKeys = function(o) {
20+
ownKeys = Object.getOwnPropertyNames || function (o) {
21+
var ar = [];
22+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23+
return ar;
24+
};
25+
return ownKeys(o);
26+
};
27+
return function (mod) {
28+
if (mod && mod.__esModule) return mod;
29+
var result = {};
30+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31+
__setModuleDefault(result, mod);
32+
return result;
33+
};
34+
})();
2535
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2636
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
2737
return new (P || (P = Promise))(function (resolve, reject) {

‎lib/oidc-utils.js‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
1919
}) : function(o, v) {
2020
o["default"] = v;
2121
});
22-
var __importStar = (this && this.__importStar) || function (mod) {
23-
if (mod && mod.__esModule) return mod;
24-
var result = {};
25-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
26-
__setModuleDefault(result, mod);
27-
return result;
28-
};
22+
var __importStar = (this && this.__importStar) || (function () {
23+
var ownKeys = function(o) {
24+
ownKeys = Object.getOwnPropertyNames || function (o) {
25+
var ar = [];
26+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
27+
return ar;
28+
};
29+
return ownKeys(o);
30+
};
31+
return function (mod) {
32+
if (mod && mod.__esModule) return mod;
33+
var result = {};
34+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
35+
__setModuleDefault(result, mod);
36+
return result;
37+
};
38+
})();
2939
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3040
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3141
return new (P || (P = Promise))(function (resolve, reject) {

‎lib/utils.js‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
1515
}) : function(o, v) {
1616
o["default"] = v;
1717
});
18-
var __importStar = (this && this.__importStar) || function (mod) {
19-
if (mod && mod.__esModule) return mod;
20-
var result = {};
21-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22-
__setModuleDefault(result, mod);
23-
return result;
24-
};
18+
var __importStar = (this && this.__importStar) || (function () {
19+
var ownKeys = function(o) {
20+
ownKeys = Object.getOwnPropertyNames || function (o) {
21+
var ar = [];
22+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23+
return ar;
24+
};
25+
return ownKeys(o);
26+
};
27+
return function (mod) {
28+
if (mod && mod.__esModule) return mod;
29+
var result = {};
30+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31+
__setModuleDefault(result, mod);
32+
return result;
33+
};
34+
})();
2535
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2636
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
2737
return new (P || (P = Promise))(function (resolve, reject) {
@@ -281,7 +291,13 @@ class Utils {
281291
}
282292
static configJFrogServers(jfrogCredentials) {
283293
return __awaiter(this, void 0, void 0, function* () {
284-
let cliConfigCmd = ['config'];
294+
let cliConfigCmd = [];
295+
let githubToken = jfrogCredentials.githubToken;
296+
if (!!githubToken) {
297+
// Github Token
298+
cliConfigCmd = cliConfigCmd.concat('--github-token', githubToken);
299+
}
300+
cliConfigCmd = cliConfigCmd.concat('config');
285301
for (let configToken of Utils.getConfigTokens()) {
286302
// Mark the credentials as secrets to prevent them from being printed in the logs or exported to other workflows
287303
core.setSecret(configToken);

‎src/types.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export interface JfrogCredentials {
1313
oidcProviderName?: string;
1414
oidcTokenId?: string;
1515
oidcAudience: string;
16+
githubToken?: string;
1617
}
1718

1819
/**

‎src/utils.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,13 @@ export class Utils {
317317
}
318318

319319
public static async configJFrogServers(jfrogCredentials: JfrogCredentials) {
320-
let cliConfigCmd: string[] = ['config'];
320+
let cliConfigCmd: string[] = [];
321+
let githubToken: string | undefined = jfrogCredentials.githubToken;
322+
if (!!githubToken) {
323+
// Github Token
324+
cliConfigCmd = cliConfigCmd.concat('--github-token', githubToken);
325+
}
326+
cliConfigCmd = cliConfigCmd.concat('config');
321327
for (let configToken of Utils.getConfigTokens()) {
322328
// Mark the credentials as secrets to prevent them from being printed in the logs or exported to other workflows
323329
core.setSecret(configToken);

‎test/main.spec.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,4 +422,15 @@ describe('getJfrogCliConfigArgs', () => {
422422
expect(configString).toContain('--access-token test-access-token');
423423
expect(configString).not.toContain('--username test-user');
424424
});
425+
426+
it('should use github token if provided', async () => {
427+
const creds: JfrogCredentials = {
428+
jfrogUrl: 'https://example.jfrog.io',
429+
accessToken: 'abc',
430+
githubToken: 'githubToken',
431+
} as JfrogCredentials;
432+
const args: string[] | undefined = await Utils.getJfrogCliConfigArgs(creds);
433+
expect(args).toContain('--github-token');
434+
expect(args).toContain('githubToken');
435+
});
425436
});

0 commit comments

Comments
 (0)