Support shorthand forms for getRemoteConfig#3973
Conversation
a2218f1 to
12821cf
Compare
There was a problem hiding this comment.
Warning
- Copilot's review of this pull request may be incomplete because some of the changed files are excluded by your Copilot content exclusion settings. See Excluding content from Copilot for details.
Pull request overview
This PR extends remote configuration file support by enhancing getRemoteConfig to accept shorthand remote addresses (optional owner, path, and ref with sensible defaults), and refactors environment access to be more testable via an Env wrapper.
Changes:
- Added
parseRemoteFileAddress(and tests) to parse shorthand remote config references with defaults for owner/path/ref. - Moved
getRemoteConfigintosrc/config/file.tsand updated callers to use the new parsing logic. - Introduced
ActionsEnvVarsand anEnvabstraction to reduce raw string usage and improve testability.
Show a summary per file
| File | Description |
|---|---|
| src/util.ts | Adds Env accessor helpers and refactors env var getters. |
| src/testing-utils.ts | Adds getTestEnv() and tightens typing for default Actions env vars. |
| src/environment.ts | Introduces Env interface abstraction for environment access. |
| src/config/remote-file.ts | New parser for shorthand remote config references and defaults. |
| src/config/remote-file.test.ts | Unit tests for remote file address parsing and defaults. |
| src/config/file.ts | Adds getRemoteConfig() using parsed remote address components. |
| src/config-utils.ts | Switches to the new getRemoteConfig() implementation. |
| src/config-utils.test.ts | Removes a test that no longer matches the supported shorthand syntax. |
| src/api-client.ts | Replaces raw env var names with ActionsEnvVars. |
| src/actions-util.ts | Adds ActionsEnvVars enum and updates env var usages. |
| lib/entry-points.js | Changed but excluded from review (generated/contents unavailable). |
Copilot's findings
Files excluded by content exclusion policy (1)
- lib/entry-points.js
- Files reviewed: 10/11 changed files
- Comments generated: 6
mario-campos
left a comment
There was a problem hiding this comment.
Looks solid! I left a few comments, but minor stuff.
| if (nwoParts.length !== 2 || nwoParts[0].trim().length === 0) { | ||
| // This shouldn't happen, so we should throw if `GITHUB_REPOSITORY` doesn't match | ||
| // our expectations. | ||
| throw new Error( | ||
| `Expected ${ActionsEnvVars.GITHUB_REPOSITORY} to contain a name with owner, but got '${currentRepoNwo}'.`, | ||
| ); | ||
| } |
There was a problem hiding this comment.
Nit: if it shouldn't happen, should we check for it?
| test("parseRemoteFileAddress accepts remote address without an owner", async (t) => { | ||
| const env = getTestEnv(); | ||
| const owner = "test-owner"; | ||
| const getRequired = sinon.stub(env, "getRequired"); | ||
| getRequired | ||
| .withArgs(ActionsEnvVars.GITHUB_REPOSITORY) | ||
| .returns(`${owner}/current-repo`); | ||
|
|
||
| t.deepEqual(parseRemoteFileAddress(env, "repo@ref"), { | ||
| owner, | ||
| repo: "repo", | ||
| path: DEFAULT_CONFIG_FILE_NAME, | ||
| ref: "ref", | ||
| } satisfies RemoteFileAddress); | ||
|
|
||
| t.deepEqual(parseRemoteFileAddress(env, "repo"), { | ||
| owner, | ||
| repo: "repo", | ||
| path: DEFAULT_CONFIG_FILE_NAME, | ||
| ref: DEFAULT_CONFIG_FILE_REF, | ||
| } satisfies RemoteFileAddress); | ||
| }); |
There was a problem hiding this comment.
What about test cases for repo/path and repo/path@ref?
| test("parseRemoteFileAddress throws for invalid `GITHUB_REPOSITORY`", async (t) => { | ||
| const env = getTestEnv(); | ||
| const getRequired = sinon.stub(env, "getRequired"); | ||
| getRequired.withArgs(ActionsEnvVars.GITHUB_REPOSITORY).returns(`not-valid`); | ||
|
|
||
| t.throws(() => parseRemoteFileAddress(env, "repo@ref"), { | ||
| instanceOf: Error, | ||
| }); | ||
| }); |
There was a problem hiding this comment.
Similarly to my comment above, I think this is overkill, but also know that it's a nitpick.
| ref: DEFAULT_CONFIG_FILE_REF, | ||
| } satisfies RemoteFileAddress); | ||
|
|
||
| t.deepEqual(parseRemoteFileAddress(env, "owner/repo/path@"), { |
There was a problem hiding this comment.
I think this should be invalid, for the same reason that /repo@ref is invalid.
Edit: Also, I just noticed the expected format below does not seem to indicate that this should be a correct format:
Expected format [<owner>/]<repository>[/<file-path>][@<ref>]
| return parseUserConfig( | ||
| logger, | ||
| configFile, | ||
| Buffer.from(fileContents, "base64").toString("binary"), |
There was a problem hiding this comment.
| Buffer.from(fileContents, "base64").toString("binary"), | |
| Buffer.from(fileContents, "base64").toString("utf8"), |
UTF-8?
This is a follow-up to #3963 which modifies
getRemoteConfigto accept shorthand addresses for remote files. Concretely, theowner,path, andrefcomponents are now optional and default to the owner of the current repo (as given byGITHUB_REPOSITORY),.github/codeql-action.yaml, andmainrespectively.Examples:
owner/reporesolves toowner/repo/.github/codeql-action.yaml@mainowner/repo@devresolves toowner/repo/.github/codeql-action.yaml@devowner/repo/.github/codeql/config.ymlresolves toowner/repo/.github/codeql/config.yml@mainNotes for reviewers
pathcomponentmainmay not always be the default branch for the target repo, but that's OK since it can be manually set to a different ref if needed.getRemoteConfigalready had a similar (but not equivalent) shorthand format. I then updated that instead so that the components other than the repo are optional. However, this isn't as nice, because/is used as a separator and can also appear in thepathcomponent. That means e.g. it is not possible with this format to specify a repo + path since it would be interpreted as owner + repo by the regex instead.Risk assessment
For internal use only. Please select the risk level of this change:
Which use cases does this change impact?
Workflow types:
dynamicworkflows (Default Setup, Code Quality, ...).Products:
analysis-kinds: code-scanning.analysis-kinds: code-quality.Environments:
github.comand/or GitHub Enterprise Cloud with Data Residency.How did/will you validate this change?
.test.tsfiles).pr-checks).If something goes wrong after this change is released, what are the mitigation and rollback strategies?
How will you know if something goes wrong after this change is released?
Are there any special considerations for merging or releasing this change?
Merge / deployment checklist