Skip to content

Commit 32379b6

Browse files
committed
refactor: app slug name
1 parent 5207c76 commit 32379b6

File tree

4 files changed

+24
-28
lines changed

4 files changed

+24
-28
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@ jobs:
2222
with:
2323
app_id: ${{ secrets.APP_ID }}
2424
private_key: ${{ secrets.PRIVATE_KEY }}
25-
env_name: bot_token
2625
- name: 📦 Release
2726
uses: wow-actions/release-github-action@v1
2827
with:
2928
GITHUB_TOKEN: ${{ env.bot_token }}
30-
GIT_COMMITTER_NAME: wow-actions-bot
31-
GIT_COMMITTER_EMAIL: wow-actions-bot@users.noreply.github.com
29+
GIT_COMMITTER_NAME: ${{ env.bot_name }}
30+
GIT_COMMITTER_EMAIL: ${{ env.bot_name }}@users.noreply.github.com
3231
- name: 📦 Build
3332
run: yarn build

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ inputs:
1111
fallback:
1212
description: The fallback token when bot token generate failed.
1313
required: false
14-
app_login_name:
14+
app_slug_name:
1515
description: The app login name exported to `env` or saved to `secrets`.
1616
required: false
1717
default: BOT_NAME

src/action.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@ import * as util from './util'
33

44
export async function run() {
55
try {
6-
const token = await util.getAppToken()
7-
const loginName = util.getAppLoginName()
8-
const tokenName = util.getAppTokenName()
6+
const { token, slug } = await util.getAppInfo()
7+
const appSlugName = util.getAppSlugName()
8+
const appTokenName = util.getAppTokenName()
99

1010
const saveToSecret = core.getBooleanInput('secret')
1111
if (saveToSecret) {
12-
await util.createSecret(token, loginName, token)
13-
await util.createSecret(token, tokenName, token)
14-
core.info(`Secrets "${loginName}" and "${tokenName}" was created`)
12+
await util.createSecret(token, appSlugName, slug)
13+
await util.createSecret(token, appTokenName, token)
14+
core.info(`Secrets "${appSlugName}" and "${appTokenName}" was created`)
1515
}
1616

1717
core.setSecret(token)
1818

19-
core.setOutput('bot_name', token)
20-
core.setOutput('bot_token', token)
19+
core.setOutput('BOT_NAME', slug)
20+
core.setOutput('BOT_TOKEN', token)
2121

22-
core.exportVariable(loginName, token)
23-
core.exportVariable(tokenName, token)
22+
core.exportVariable(appSlugName, slug)
23+
core.exportVariable(appTokenName, token)
2424
} catch (e) {
2525
core.error(e)
2626
core.setFailed(e.message)
@@ -32,12 +32,12 @@ export async function cleanup() {
3232
const clean = core.getBooleanInput('clean')
3333
const saveToSecret = core.getBooleanInput('secret')
3434
if (saveToSecret && clean) {
35-
const token = await util.getAppToken()
36-
const loginName = util.getAppLoginName()
37-
const tokenName = util.getAppTokenName()
38-
await util.deleteSecret(token, loginName)
39-
await util.deleteSecret(token, tokenName)
40-
core.info(`Secrets "${loginName}" and "${tokenName}" was removed`)
35+
const { token } = await util.getAppInfo()
36+
const appSlugName = util.getAppSlugName()
37+
const appTokenName = util.getAppTokenName()
38+
await util.deleteSecret(token, appSlugName)
39+
await util.deleteSecret(token, appTokenName)
40+
core.info(`Secrets "${appSlugName}" and "${appTokenName}" was removed`)
4141
}
4242
} catch (e) {
4343
core.error(e)

src/util.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ import sodium from 'libsodium-wrappers'
55
import { Octokit } from '@octokit/core'
66
import { createAppAuth } from '@octokit/auth-app'
77

8-
export function getAppLoginName() {
9-
return core.getInput('app_login_name') || 'BOT_NAME'
8+
export function getAppSlugName() {
9+
return core.getInput('app_slug_name') || 'BOT_NAME'
1010
}
1111

1212
export function getAppTokenName() {
1313
return core.getInput('app_token_name') || 'BOT_TOKEN'
1414
}
1515

16-
export async function getAppToken() {
16+
export async function getAppInfo() {
1717
const fallback = core.getInput('fallback')
1818
const required = fallback == null
1919
const appId = Number(core.getInput('app_id', { required }))
2020
const privateKeyInput = core.getInput('private_key', { required })
2121

2222
if (appId == null || privateKeyInput == null) {
23-
return Promise.resolve(fallback)
23+
return Promise.resolve({ token: fallback, slug: '' })
2424
}
2525

2626
const privateKey = isBase64(privateKeyInput)
@@ -47,10 +47,7 @@ export async function getAppToken() {
4747
installationId: install.data.id,
4848
})
4949

50-
// eslint-disable-next-line no-console
51-
console.log(install.data)
52-
53-
return token
50+
return { token, slug: install.data.app_slug }
5451
}
5552

5653
async function makeSecret(octokit: Octokit, value: string) {

0 commit comments

Comments
 (0)