diff --git a/dist/main.cjs b/dist/main.cjs index c212ad4..2ad1836 100644 --- a/dist/main.cjs +++ b/dist/main.cjs @@ -42526,31 +42526,30 @@ async function main(appId2, privateKey2, owner2, repositories2, permissions2, co parsedOwner = owner3; parsedRepositoryNames = [repo]; core3.info( - `owner and repositories not set, creating token for the current repository ("${repo}")` + `Inputs 'owner' and 'repositories' are not set. Creating token for this repository (${owner3}/${repo}).` ); } if (owner2 && repositories2.length === 0) { parsedOwner = owner2; core3.info( - `repositories not set, creating token for all repositories for given owner "${owner2}"` + `Input 'repositories' is not set. Creating token for all repositories owned by ${owner2}.` ); } if (!owner2 && repositories2.length > 0) { parsedOwner = String(process.env.GITHUB_REPOSITORY_OWNER); parsedRepositoryNames = repositories2; core3.info( - `owner not set, creating owner for given repositories "${repositories2.join( - "," - )}" in current owner ("${parsedOwner}")` + `No 'owner' input provided. Using default owner '${parsedOwner}' to create token for the following repositories:${repositories2.map((repo) => ` +- ${parsedOwner}/${repo}`).join("")}` ); } if (owner2 && repositories2.length > 0) { parsedOwner = owner2; parsedRepositoryNames = repositories2; core3.info( - `owner and repositories set, creating token for repositories "${repositories2.join( - "," - )}" owned by "${owner2}"` + `Inputs 'owner' and 'repositories' are set. Creating token for the following repositories: + ${repositories2.map((repo) => ` +- ${parsedOwner}/${repo}`).join("")}` ); } const auth5 = createAppAuth2({ diff --git a/lib/main.js b/lib/main.js index 3440d9a..f07947f 100644 --- a/lib/main.js +++ b/lib/main.js @@ -21,7 +21,7 @@ export async function main( core, createAppAuth, request, - skipTokenRevoke, + skipTokenRevoke ) { let parsedOwner = ""; let parsedRepositoryNames = []; @@ -33,7 +33,7 @@ export async function main( parsedRepositoryNames = [repo]; core.info( - `owner and repositories not set, creating token for the current repository ("${repo}")`, + `Inputs 'owner' and 'repositories' are not set. Creating token for this repository (${owner}/${repo}).` ); } @@ -42,7 +42,7 @@ export async function main( parsedOwner = owner; core.info( - `repositories not set, creating token for all repositories for given owner "${owner}"`, + `Input 'repositories' is not set. Creating token for all repositories owned by ${owner}.` ); } @@ -52,9 +52,9 @@ export async function main( parsedRepositoryNames = repositories; core.info( - `owner not set, creating owner for given repositories "${repositories.join( - ",", - )}" in current owner ("${parsedOwner}")`, + `No 'owner' input provided. Using default owner '${parsedOwner}' to create token for the following repositories:${repositories + .map((repo) => `\n- ${parsedOwner}/${repo}`) + .join("")}` ); } @@ -64,9 +64,8 @@ export async function main( parsedRepositoryNames = repositories; core.info( - `owner and repositories set, creating token for repositories "${repositories.join( - ",", - )}" owned by "${owner}"`, + `Inputs 'owner' and 'repositories' are set. Creating token for the following repositories: + ${repositories.map((repo) => `\n- ${parsedOwner}/${repo}`).join("")}` ); } @@ -87,18 +86,18 @@ export async function main( auth, parsedOwner, parsedRepositoryNames, - permissions, + permissions ), { onFailedAttempt: (error) => { core.info( `Failed to create token for "${parsedRepositoryNames.join( - ",", - )}" (attempt ${error.attemptNumber}): ${error.message}`, + "," + )}" (attempt ${error.attemptNumber}): ${error.message}` ); }, retries: 3, - }, + } )); } else { // Otherwise get the installation for the owner, which can either be an organization or a user account @@ -107,11 +106,11 @@ export async function main( { onFailedAttempt: (error) => { core.info( - `Failed to create token for "${parsedOwner}" (attempt ${error.attemptNumber}): ${error.message}`, + `Failed to create token for "${parsedOwner}" (attempt ${error.attemptNumber}): ${error.message}` ); }, retries: 3, - }, + } )); } @@ -157,7 +156,7 @@ async function getTokenFromRepository( auth, parsedOwner, parsedRepositoryNames, - permissions, + permissions ) { // https://docs.github.com/rest/apps/apps?apiVersion=2022-11-28#get-a-repository-installation-for-the-authenticated-app const response = await request("GET /repos/{owner}/{repo}/installation", { diff --git a/package-lock.json b/package-lock.json index 3c4d2c8..4e9016c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "create-github-app-token", - "version": "2.0.1", + "version": "2.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "create-github-app-token", - "version": "2.0.1", + "version": "2.0.2", "license": "MIT", "dependencies": { "@actions/core": "^1.11.1", diff --git a/package.json b/package.json index 0bd67f8..64a62e6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "create-github-app-token", "private": true, "type": "module", - "version": "2.0.1", + "version": "2.0.2", "description": "GitHub Action for creating a GitHub App Installation Access Token", "scripts": { "build": "esbuild main.js post.js --bundle --outdir=dist --out-extension:.js=.cjs --platform=node --target=node20.0.0 --packages=bundle", diff --git a/tests/snapshots/index.js.md b/tests/snapshots/index.js.md index eeb7387..e419536 100644 --- a/tests/snapshots/index.js.md +++ b/tests/snapshots/index.js.md @@ -22,7 +22,9 @@ Generated by [AVA](https://avajs.dev). > stdout - `owner and repositories set, creating token for repositories "create-github-app-token" owned by "actions"␊ + `Inputs 'owner' and 'repositories' are set. Creating token for the following repositories:␊ + ␊ + - actions/create-github-app-token␊ ::add-mask::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ ␊ ::set-output name=token::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ @@ -65,7 +67,7 @@ Generated by [AVA](https://avajs.dev). > stdout - `owner and repositories not set, creating token for the current repository ("create-github-app-token")␊ + `Inputs 'owner' and 'repositories' are not set. Creating token for this repository (actions/create-github-app-token).␊ ::add-mask::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ ␊ ::set-output name=token::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ @@ -89,7 +91,9 @@ Generated by [AVA](https://avajs.dev). > stdout - `owner and repositories set, creating token for repositories "failed-repo" owned by "actions"␊ + `Inputs 'owner' and 'repositories' are set. Creating token for the following repositories:␊ + ␊ + - actions/failed-repo␊ ::add-mask::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ ␊ ::set-output name=token::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ @@ -113,7 +117,7 @@ Generated by [AVA](https://avajs.dev). > stdout - `repositories not set, creating token for all repositories for given owner "smockle"␊ + `Input 'repositories' is not set. Creating token for all repositories owned by smockle.␊ Failed to create token for "smockle" (attempt 1): GitHub API not available␊ ::add-mask::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ ␊ @@ -138,7 +142,9 @@ Generated by [AVA](https://avajs.dev). > stdout - `owner and repositories set, creating token for repositories "failed-repo" owned by "actions"␊ + `Inputs 'owner' and 'repositories' are set. Creating token for the following repositories:␊ + ␊ + - actions/failed-repo␊ Failed to create token for "failed-repo" (attempt 1): GitHub API not available␊ ::add-mask::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ ␊ @@ -163,7 +169,11 @@ Generated by [AVA](https://avajs.dev). > stdout - `owner and repositories set, creating token for repositories "create-github-app-token,toolkit,checkout" owned by "actions"␊ + `Inputs 'owner' and 'repositories' are set. Creating token for the following repositories:␊ + ␊ + - actions/create-github-app-token␊ + - actions/toolkit␊ + - actions/checkout␊ ::add-mask::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ ␊ ::set-output name=token::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ @@ -186,7 +196,11 @@ Generated by [AVA](https://avajs.dev). > stdout - `owner and repositories set, creating token for repositories "create-github-app-token,toolkit,checkout" owned by "actions"␊ + `Inputs 'owner' and 'repositories' are set. Creating token for the following repositories:␊ + ␊ + - actions/create-github-app-token␊ + - actions/toolkit␊ + - actions/checkout␊ ::add-mask::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ ␊ ::set-output name=token::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ @@ -209,7 +223,9 @@ Generated by [AVA](https://avajs.dev). > stdout - `owner and repositories set, creating token for repositories "create-github-app-token" owned by "actions"␊ + `Inputs 'owner' and 'repositories' are set. Creating token for the following repositories:␊ + ␊ + - actions/create-github-app-token␊ ::add-mask::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ ␊ ::set-output name=token::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ @@ -232,7 +248,7 @@ Generated by [AVA](https://avajs.dev). > stdout - `repositories not set, creating token for all repositories for given owner "actions"␊ + `Input 'repositories' is not set. Creating token for all repositories owned by actions.␊ ::add-mask::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ ␊ ::set-output name=token::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ @@ -255,7 +271,8 @@ Generated by [AVA](https://avajs.dev). > stdout - `owner not set, creating owner for given repositories "create-github-app-token" in current owner ("actions")␊ + `No 'owner' input provided. Using default owner 'actions' to create token for the following repositories:␊ + - actions/create-github-app-token␊ ::add-mask::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ ␊ ::set-output name=token::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ @@ -278,7 +295,7 @@ Generated by [AVA](https://avajs.dev). > stdout - `owner and repositories not set, creating token for the current repository ("create-github-app-token")␊ + `Inputs 'owner' and 'repositories' are not set. Creating token for this repository (actions/create-github-app-token).␊ ::add-mask::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ ␊ ::set-output name=token::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ @@ -301,7 +318,7 @@ Generated by [AVA](https://avajs.dev). > stdout - `owner and repositories not set, creating token for the current repository ("create-github-app-token")␊ + `Inputs 'owner' and 'repositories' are not set. Creating token for this repository (actions/create-github-app-token).␊ ::add-mask::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ ␊ ::set-output name=token::ghs_16C7e42F292c6912E7710c838347Ae178B4a␊ diff --git a/tests/snapshots/index.js.snap b/tests/snapshots/index.js.snap index 14f1a6c..e66c3d5 100644 Binary files a/tests/snapshots/index.js.snap and b/tests/snapshots/index.js.snap differ