feat!: remove deprecated inputs (#213)
BREAKING CHANGE: Removed deprecated inputs (`app_id`, `private_key`, `skip_token_revoke`) and made `app-id` and `private-key` required in the action configuration.
This commit is contained in:
+2
-14
@@ -7,18 +7,10 @@ branding:
|
|||||||
inputs:
|
inputs:
|
||||||
app-id:
|
app-id:
|
||||||
description: "GitHub App ID"
|
description: "GitHub App ID"
|
||||||
required: false # TODO: When 'app_id' is removed, make 'app-id' required
|
required: true
|
||||||
app_id:
|
|
||||||
description: "GitHub App ID"
|
|
||||||
required: false
|
|
||||||
deprecationMessage: "'app_id' is deprecated and will be removed in a future version. Use 'app-id' instead."
|
|
||||||
private-key:
|
private-key:
|
||||||
description: "GitHub App private key"
|
description: "GitHub App private key"
|
||||||
required: false # TODO: When 'private_key' is removed, make 'private-key' required
|
required: true
|
||||||
private_key:
|
|
||||||
description: "GitHub App private key"
|
|
||||||
required: false
|
|
||||||
deprecationMessage: "'private_key' is deprecated and will be removed in a future version. Use 'private-key' instead."
|
|
||||||
owner:
|
owner:
|
||||||
description: "The owner of the GitHub App installation (defaults to current repository owner)"
|
description: "The owner of the GitHub App installation (defaults to current repository owner)"
|
||||||
required: false
|
required: false
|
||||||
@@ -28,10 +20,6 @@ inputs:
|
|||||||
skip-token-revoke:
|
skip-token-revoke:
|
||||||
description: "If truthy, the token will not be revoked when the current job is complete"
|
description: "If truthy, the token will not be revoked when the current job is complete"
|
||||||
required: false
|
required: false
|
||||||
skip_token_revoke:
|
|
||||||
description: "If truthy, the token will not be revoked when the current job is complete"
|
|
||||||
required: false
|
|
||||||
deprecationMessage: "'skip_token_revoke' is deprecated and will be removed in a future version. Use 'skip-token-revoke' instead."
|
|
||||||
# Make GitHub API configurable to support non-GitHub Cloud use cases
|
# Make GitHub API configurable to support non-GitHub Cloud use cases
|
||||||
# see https://github.com/actions/create-github-app-token/issues/77
|
# see https://github.com/actions/create-github-app-token/issues/77
|
||||||
github-api-url:
|
github-api-url:
|
||||||
|
|||||||
+2
-5
@@ -5,9 +5,7 @@
|
|||||||
* @param {import("@octokit/request").request} request
|
* @param {import("@octokit/request").request} request
|
||||||
*/
|
*/
|
||||||
export async function post(core, request) {
|
export async function post(core, request) {
|
||||||
const skipTokenRevoke = Boolean(
|
const skipTokenRevoke = Boolean(core.getInput("skip-token-revoke"));
|
||||||
core.getInput("skip-token-revoke") || core.getInput("skip_token_revoke")
|
|
||||||
);
|
|
||||||
|
|
||||||
if (skipTokenRevoke) {
|
if (skipTokenRevoke) {
|
||||||
core.info("Token revocation was skipped");
|
core.info("Token revocation was skipped");
|
||||||
@@ -35,8 +33,7 @@ export async function post(core, request) {
|
|||||||
});
|
});
|
||||||
core.info("Token revoked");
|
core.info("Token revoked");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
core.warning(
|
core.warning(`Token revocation failed: ${error.message}`);
|
||||||
`Token revocation failed: ${error.message}`)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,9 +3,9 @@
|
|||||||
import core from "@actions/core";
|
import core from "@actions/core";
|
||||||
import { createAppAuth } from "@octokit/auth-app";
|
import { createAppAuth } from "@octokit/auth-app";
|
||||||
|
|
||||||
|
import { getPermissionsFromInputs } from "./lib/get-permissions-from-inputs.js";
|
||||||
import { main } from "./lib/main.js";
|
import { main } from "./lib/main.js";
|
||||||
import request from "./lib/request.js";
|
import request from "./lib/request.js";
|
||||||
import { getPermissionsFromInputs } from "./lib/get-permissions-from-inputs.js";
|
|
||||||
|
|
||||||
if (!process.env.GITHUB_REPOSITORY) {
|
if (!process.env.GITHUB_REPOSITORY) {
|
||||||
throw new Error("GITHUB_REPOSITORY missing, must be set to '<owner>/<repo>'");
|
throw new Error("GITHUB_REPOSITORY missing, must be set to '<owner>/<repo>'");
|
||||||
@@ -15,16 +15,8 @@ if (!process.env.GITHUB_REPOSITORY_OWNER) {
|
|||||||
throw new Error("GITHUB_REPOSITORY_OWNER missing, must be set to '<owner>'");
|
throw new Error("GITHUB_REPOSITORY_OWNER missing, must be set to '<owner>'");
|
||||||
}
|
}
|
||||||
|
|
||||||
const appId = core.getInput("app-id") || core.getInput("app_id");
|
const appId = core.getInput("app-id");
|
||||||
if (!appId) {
|
const privateKey = core.getInput("private-key");
|
||||||
// The 'app_id' input was previously required, but it and 'app-id' are both optional now, until the former is removed. Still, we want to ensure that at least one of them is set.
|
|
||||||
throw new Error("Input required and not supplied: app-id");
|
|
||||||
}
|
|
||||||
const privateKey = core.getInput("private-key") || core.getInput("private_key");
|
|
||||||
if (!privateKey) {
|
|
||||||
// The 'private_key' input was previously required, but it and 'private-key' are both optional now, until the former is removed. Still, we want to ensure that at least one of them is set.
|
|
||||||
throw new Error("Input required and not supplied: private-key");
|
|
||||||
}
|
|
||||||
const owner = core.getInput("owner");
|
const owner = core.getInput("owner");
|
||||||
const repositories = core
|
const repositories = core
|
||||||
.getInput("repositories")
|
.getInput("repositories")
|
||||||
@@ -32,9 +24,7 @@ const repositories = core
|
|||||||
.map((s) => s.trim())
|
.map((s) => s.trim())
|
||||||
.filter((x) => x !== "");
|
.filter((x) => x !== "");
|
||||||
|
|
||||||
const skipTokenRevoke = Boolean(
|
const skipTokenRevoke = Boolean(core.getInput("skip-token-revoke"));
|
||||||
core.getInput("skip-token-revoke") || core.getInput("skip_token_revoke"),
|
|
||||||
);
|
|
||||||
|
|
||||||
const permissions = getPermissionsFromInputs(process.env);
|
const permissions = getPermissionsFromInputs(process.env);
|
||||||
|
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "create-github-app-token",
|
"name": "create-github-app-token",
|
||||||
"version": "1.11.6",
|
"version": "1.12.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "create-github-app-token",
|
"name": "create-github-app-token",
|
||||||
"version": "1.11.6",
|
"version": "1.12.0",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@actions/core": "^1.11.1",
|
"@actions/core": "^1.11.1",
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
process.env.GITHUB_REPOSITORY_OWNER = "actions";
|
|
||||||
process.env.GITHUB_REPOSITORY = "actions/create-github-app-token";
|
|
||||||
|
|
||||||
// Verify `main` exits with an error when neither the `app-id` nor `app_id` input is set.
|
|
||||||
try {
|
|
||||||
await import("../main.js");
|
|
||||||
} catch (error) {
|
|
||||||
console.error(error.message);
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
process.env.GITHUB_REPOSITORY_OWNER = "actions";
|
|
||||||
process.env.GITHUB_REPOSITORY = "actions/create-github-app-token";
|
|
||||||
process.env["INPUT_APP-ID"] = "123456";
|
|
||||||
|
|
||||||
// Verify `main` exits with an error when neither the `private-key` nor `private_key` input is set.
|
|
||||||
try {
|
|
||||||
await import("../main.js");
|
|
||||||
} catch (error) {
|
|
||||||
console.error(error.message);
|
|
||||||
}
|
|
||||||
@@ -12,9 +12,7 @@ Generated by [AVA](https://avajs.dev).
|
|||||||
|
|
||||||
> stdout
|
> stdout
|
||||||
|
|
||||||
`app_id — 'app_id' is deprecated and will be removed in a future version. Use 'app-id' instead.␊
|
''
|
||||||
private_key — 'private_key' is deprecated and will be removed in a future version. Use 'private-key' instead.␊
|
|
||||||
skip_token_revoke — 'skip_token_revoke' is deprecated and will be removed in a future version. Use 'skip-token-revoke' instead.`
|
|
||||||
|
|
||||||
## main-custom-github-api-url.test.js
|
## main-custom-github-api-url.test.js
|
||||||
|
|
||||||
@@ -39,16 +37,6 @@ Generated by [AVA](https://avajs.dev).
|
|||||||
POST /api/v3/app/installations/123456/access_tokens␊
|
POST /api/v3/app/installations/123456/access_tokens␊
|
||||||
{"repositories":["create-github-app-token"]}`
|
{"repositories":["create-github-app-token"]}`
|
||||||
|
|
||||||
## main-missing-app-id.test.js
|
|
||||||
|
|
||||||
> stderr
|
|
||||||
|
|
||||||
'Input required and not supplied: app-id'
|
|
||||||
|
|
||||||
> stdout
|
|
||||||
|
|
||||||
''
|
|
||||||
|
|
||||||
## main-missing-owner.test.js
|
## main-missing-owner.test.js
|
||||||
|
|
||||||
> stderr
|
> stderr
|
||||||
@@ -59,16 +47,6 @@ Generated by [AVA](https://avajs.dev).
|
|||||||
|
|
||||||
''
|
''
|
||||||
|
|
||||||
## main-missing-private-key.test.js
|
|
||||||
|
|
||||||
> stderr
|
|
||||||
|
|
||||||
'Input required and not supplied: private-key'
|
|
||||||
|
|
||||||
> stdout
|
|
||||||
|
|
||||||
''
|
|
||||||
|
|
||||||
## main-missing-repository.test.js
|
## main-missing-repository.test.js
|
||||||
|
|
||||||
> stderr
|
> stderr
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user