Skip to content

Commit f88459c

Browse files
cklincklin
committed
Use getRepositoryNwo()
1 parent b22f334 commit f88459c

10 files changed

+32
-61
lines changed

‎src/analyze-action.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { EnvVar } from "./environment";
2626
import { Features } from "./feature-flags";
2727
import { Language } from "./languages";
2828
import { getActionsLogger, Logger } from "./logging";
29-
import { parseRepositoryNwo } from "./repository";
29+
import { getRepositoryNwo } from "./repository";
3030
import * as statusReport from "./status-report";
3131
import {
3232
ActionName,
@@ -251,9 +251,7 @@ async function run() {
251251
logger,
252252
);
253253

254-
const repositoryNwo = parseRepositoryNwo(
255-
util.getRequiredEnvParam("GITHUB_REPOSITORY"),
256-
);
254+
const repositoryNwo = getRepositoryNwo();
257255

258256
const gitHubVersion = await getGitHubVersion();
259257

@@ -359,7 +357,7 @@ async function run() {
359357
actionsUtil.getRequiredInput("wait-for-processing") === "true"
360358
) {
361359
await uploadLib.waitForProcessing(
362-
parseRepositoryNwo(util.getRequiredEnvParam("GITHUB_REPOSITORY")),
360+
getRepositoryNwo(),
363361
uploadResult.sarifID,
364362
getActionsLogger(),
365363
);

‎src/analyze.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import { EnvVar } from "./environment";
2222
import { FeatureEnablement, Feature } from "./feature-flags";
2323
import { isScannedLanguage, Language } from "./languages";
2424
import { Logger, withGroupAsync } from "./logging";
25+
import { getRepositoryNwo } from "./repository";
2526
import { DatabaseCreationTimings, EventReport } from "./status-report";
2627
import { ToolsFeature } from "./tools-features";
2728
import { endTracingForCluster } from "./tracer-config";
@@ -389,15 +390,13 @@ async function getFileDiffsWithBasehead(
389390
branches: PullRequestBranches,
390391
logger: Logger,
391392
): Promise<FileDiff[] | undefined> {
392-
const ownerRepo = util.getRequiredEnvParam("GITHUB_REPOSITORY").split("/");
393-
const owner = ownerRepo[0];
394-
const repo = ownerRepo[1];
393+
const repositoryNwo = getRepositoryNwo();
395394
const basehead = `${branches.base}...${branches.head}`;
396395
try {
397396
const response = await getApiClient().rest.repos.compareCommitsWithBasehead(
398397
{
399-
owner,
400-
repo,
398+
owner: repositoryNwo.owner,
399+
repo: repositoryNwo.repo,
401400
basehead,
402401
per_page: 1,
403402
},

‎src/api-client.ts

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as retry from "@octokit/plugin-retry";
44
import consoleLogLevel from "console-log-level";
55

66
import { getActionVersion, getRequiredInput } from "./actions-util";
7-
import { parseRepositoryNwo } from "./repository";
7+
import { getRepositoryNwo } from "./repository";
88
import {
99
ConfigurationError,
1010
getRequiredEnvParam,
@@ -123,17 +123,15 @@ export async function getGitHubVersion(): Promise<GitHubVersion> {
123123
* Get the path of the currently executing workflow relative to the repository root.
124124
*/
125125
export async function getWorkflowRelativePath(): Promise<string> {
126-
const repo_nwo = getRequiredEnvParam("GITHUB_REPOSITORY").split("/");
127-
const owner = repo_nwo[0];
128-
const repo = repo_nwo[1];
126+
const repo_nwo = getRepositoryNwo();
129127
const run_id = Number(getRequiredEnvParam("GITHUB_RUN_ID"));
130128

131129
const apiClient = getApiClient();
132130
const runsResponse = await apiClient.request(
133131
"GET /repos/:owner/:repo/actions/runs/:run_id?exclude_pull_requests=true",
134132
{
135-
owner,
136-
repo,
133+
owner: repo_nwo.owner,
134+
repo: repo_nwo.repo,
137135
run_id,
138136
},
139137
);
@@ -218,9 +216,7 @@ export async function listActionsCaches(
218216
key: string,
219217
ref: string,
220218
): Promise<ActionsCacheItem[]> {
221-
const repositoryNwo = parseRepositoryNwo(
222-
getRequiredEnvParam("GITHUB_REPOSITORY"),
223-
);
219+
const repositoryNwo = getRepositoryNwo();
224220

225221
return await getApiClient().paginate(
226222
"GET /repos/{owner}/{repo}/actions/caches",
@@ -235,9 +231,7 @@ export async function listActionsCaches(
235231

236232
/** Delete an Actions cache item by its ID. */
237233
export async function deleteActionsCache(id: number) {
238-
const repositoryNwo = parseRepositoryNwo(
239-
getRequiredEnvParam("GITHUB_REPOSITORY"),
240-
);
234+
const repositoryNwo = getRepositoryNwo();
241235

242236
await getApiClient().rest.actions.deleteActionsCacheById({
243237
owner: repositoryNwo.owner,

‎src/autobuild.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import { EnvVar } from "./environment";
99
import { Feature, featureConfig, Features } from "./feature-flags";
1010
import { isTracedLanguage, Language } from "./languages";
1111
import { Logger } from "./logging";
12-
import { parseRepositoryNwo } from "./repository";
12+
import { getRepositoryNwo } from "./repository";
1313
import { ToolsFeature } from "./tools-features";
14-
import { BuildMode, getRequiredEnvParam } from "./util";
14+
import { BuildMode } from "./util";
1515

1616
export async function determineAutobuildLanguages(
1717
codeql: CodeQL,
@@ -117,9 +117,7 @@ export async function setupCppAutobuild(codeql: CodeQL, logger: Logger) {
117117
const envVar = featureConfig[Feature.CppDependencyInstallation].envVar;
118118
const featureName = "C++ automatic installation of dependencies";
119119
const gitHubVersion = await getGitHubVersion();
120-
const repositoryNwo = parseRepositoryNwo(
121-
getRequiredEnvParam("GITHUB_REPOSITORY"),
122-
);
120+
const repositoryNwo = getRepositoryNwo();
123121
const features = new Features(
124122
gitHubVersion,
125123
repositoryNwo,

‎src/init-action-post-helper.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Config } from "./config-utils";
1010
import { EnvVar } from "./environment";
1111
import { Feature, FeatureEnablement } from "./feature-flags";
1212
import { Logger } from "./logging";
13-
import { RepositoryNwo, parseRepositoryNwo } from "./repository";
13+
import { RepositoryNwo, getRepositoryNwo } from "./repository";
1414
import { JobStatus } from "./status-report";
1515
import * as uploadLib from "./upload-lib";
1616
import {
@@ -255,9 +255,7 @@ async function removeUploadedSarif(
255255
const client = getApiClient();
256256

257257
try {
258-
const repositoryNwo = parseRepositoryNwo(
259-
getRequiredEnvParam("GITHUB_REPOSITORY"),
260-
);
258+
const repositoryNwo = getRepositoryNwo();
261259

262260
// Wait to make sure the analysis is ready for download before requesting it.
263261
await delay(5000);

‎src/init-action-post.ts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import * as debugArtifacts from "./debug-artifacts";
1717
import { Features } from "./feature-flags";
1818
import * as initActionPostHelper from "./init-action-post-helper";
1919
import { getActionsLogger } from "./logging";
20-
import { parseRepositoryNwo } from "./repository";
20+
import { getRepositoryNwo } from "./repository";
2121
import {
2222
StatusReportBase,
2323
sendStatusReport,
@@ -26,12 +26,7 @@ import {
2626
ActionName,
2727
getJobStatusDisplayName,
2828
} from "./status-report";
29-
import {
30-
checkDiskUsage,
31-
checkGitHubVersionInRange,
32-
getRequiredEnvParam,
33-
wrapError,
34-
} from "./util";
29+
import { checkDiskUsage, checkGitHubVersionInRange, wrapError } from "./util";
3530

3631
interface InitPostStatusReport
3732
extends StatusReportBase,
@@ -52,9 +47,7 @@ async function runWrapper() {
5247
const gitHubVersion = await getGitHubVersion();
5348
checkGitHubVersionInRange(gitHubVersion, logger);
5449

55-
const repositoryNwo = parseRepositoryNwo(
56-
getRequiredEnvParam("GITHUB_REPOSITORY"),
57-
);
50+
const repositoryNwo = getRepositoryNwo();
5851
const features = new Features(
5952
gitHubVersion,
6053
repositoryNwo,

‎src/init-action.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import {
4444
import { Language } from "./languages";
4545
import { getActionsLogger, Logger } from "./logging";
4646
import { OverlayDatabaseMode } from "./overlay-database-utils";
47-
import { parseRepositoryNwo } from "./repository";
47+
import { getRepositoryNwo } from "./repository";
4848
import { ToolsSource } from "./setup-codeql";
4949
import {
5050
ActionName,
@@ -281,9 +281,7 @@ async function run() {
281281
checkGitHubVersionInRange(gitHubVersion, logger);
282282
checkActionVersion(getActionVersion(), gitHubVersion);
283283

284-
const repositoryNwo = parseRepositoryNwo(
285-
getRequiredEnvParam("GITHUB_REPOSITORY"),
286-
);
284+
const repositoryNwo = getRepositoryNwo();
287285

288286
const features = new Features(
289287
gitHubVersion,

‎src/status-report.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { DocUrl } from "./doc-url";
1717
import { EnvVar } from "./environment";
1818
import { getRef } from "./git-utils";
1919
import { Logger } from "./logging";
20+
import { getRepositoryNwo } from "./repository";
2021
import {
2122
ConfigurationError,
2223
isHTTPError,
@@ -393,16 +394,15 @@ export async function sendStatusReport<S extends StatusReportBase>(
393394
return;
394395
}
395396

396-
const nwo = getRequiredEnvParam("GITHUB_REPOSITORY");
397-
const [owner, repo] = nwo.split("/");
397+
const nwo = getRepositoryNwo();
398398
const client = getApiClient();
399399

400400
try {
401401
await client.request(
402402
"PUT /repos/:owner/:repo/code-scanning/analysis/status",
403403
{
404-
owner,
405-
repo,
404+
owner: nwo.owner,
405+
repo: nwo.repo,
406406
data: statusReportJSON,
407407
},
408408
);

‎src/upload-lib.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import * as fingerprints from "./fingerprints";
2121
import * as gitUtils from "./git-utils";
2222
import { initCodeQL } from "./init";
2323
import { Logger } from "./logging";
24-
import { parseRepositoryNwo, RepositoryNwo } from "./repository";
24+
import { getRepositoryNwo, RepositoryNwo } from "./repository";
2525
import { ToolsFeature } from "./tools-features";
2626
import * as util from "./util";
2727
import {
@@ -624,11 +624,7 @@ export async function uploadFiles(
624624
logger.debug(`Number of results in upload: ${numResultInSarif}`);
625625

626626
// Make the upload
627-
const sarifID = await uploadPayload(
628-
payload,
629-
parseRepositoryNwo(util.getRequiredEnvParam("GITHUB_REPOSITORY")),
630-
logger,
631-
);
627+
const sarifID = await uploadPayload(payload, getRepositoryNwo(), logger);
632628

633629
logger.endGroup();
634630

‎src/upload-sarif-action.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { getActionVersion, getTemporaryDirectory } from "./actions-util";
55
import { getGitHubVersion } from "./api-client";
66
import { Features } from "./feature-flags";
77
import { Logger, getActionsLogger } from "./logging";
8-
import { parseRepositoryNwo } from "./repository";
8+
import { getRepositoryNwo } from "./repository";
99
import {
1010
createStatusReportBase,
1111
sendStatusReport,
@@ -20,7 +20,6 @@ import {
2020
checkActionVersion,
2121
checkDiskUsage,
2222
getErrorMessage,
23-
getRequiredEnvParam,
2423
initializeEnvironment,
2524
isInTestMode,
2625
wrapError,
@@ -63,9 +62,7 @@ async function run() {
6362
// Make inputs accessible in the `post` step.
6463
actionsUtil.persistInputs();
6564

66-
const repositoryNwo = parseRepositoryNwo(
67-
getRequiredEnvParam("GITHUB_REPOSITORY"),
68-
);
65+
const repositoryNwo = getRepositoryNwo();
6966
const features = new Features(
7067
gitHubVersion,
7168
repositoryNwo,
@@ -100,7 +97,7 @@ async function run() {
10097
core.debug("In test mode. Waiting for processing is disabled.");
10198
} else if (actionsUtil.getRequiredInput("wait-for-processing") === "true") {
10299
await upload_lib.waitForProcessing(
103-
parseRepositoryNwo(getRequiredEnvParam("GITHUB_REPOSITORY")),
100+
getRepositoryNwo(),
104101
uploadResult.sarifID,
105102
logger,
106103
);

0 commit comments

Comments
 (0)