mirror of
https://github.com/webfactory/ssh-agent.git
synced 2024-11-25 02:18:03 +00:00
default to true and remove need to monkeypatch getBoolean
This commit is contained in:
parent
79fe588704
commit
9683b6d018
2 changed files with 4 additions and 17 deletions
|
@ -6,6 +6,9 @@ inputs:
|
||||||
required: true
|
required: true
|
||||||
ssh-auth-sock:
|
ssh-auth-sock:
|
||||||
description: 'Where to place the SSH Agent auth socket'
|
description: 'Where to place the SSH Agent auth socket'
|
||||||
|
log-public-key:
|
||||||
|
description: 'Whether or not to log public key fingerprints'
|
||||||
|
default: true
|
||||||
runs:
|
runs:
|
||||||
using: 'node12'
|
using: 'node12'
|
||||||
main: 'dist/index.js'
|
main: 'dist/index.js'
|
||||||
|
|
18
index.js
18
index.js
|
@ -4,25 +4,9 @@ const fs = require('fs');
|
||||||
const crypto = require('crypto');
|
const crypto = require('crypto');
|
||||||
const { home, sshAgent, sshAdd } = require('./paths.js');
|
const { home, sshAgent, sshAdd } = require('./paths.js');
|
||||||
|
|
||||||
// FIXME: slightly modified version of never version of core.getBooleanInput
|
|
||||||
// as that doesn't respect required:false
|
|
||||||
core.getBooleanInput = function getBooleanInput(name, options) {
|
|
||||||
const trueValue = ['true', 'True', 'TRUE']
|
|
||||||
const falseValue = ['false', 'False', 'FALSE']
|
|
||||||
const val = core.getInput(name, options)
|
|
||||||
if (!val) return false // replace with default InputOption
|
|
||||||
if (trueValue.includes(val)) return true
|
|
||||||
if (falseValue.includes(val)) return false
|
|
||||||
throw new TypeError(
|
|
||||||
`Input does not meet YAML 1.2 "Core Schema" specification: ${name}\n` +
|
|
||||||
`Support boolean input list: \`true | True | TRUE | false | False | FALSE\``
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const privateKey = core.getInput('ssh-private-key');
|
const privateKey = core.getInput('ssh-private-key');
|
||||||
const logPublicKey = core.getBooleanInput('log-public-key', {required: false});
|
const logPublicKey = core.getBooleanInput('log-public-key');
|
||||||
|
|
||||||
if (!privateKey) {
|
if (!privateKey) {
|
||||||
core.setFailed("The ssh-private-key argument is empty. Maybe the secret has not been configured, or you are using a wrong secret name in your workflow file.");
|
core.setFailed("The ssh-private-key argument is empty. Maybe the secret has not been configured, or you are using a wrong secret name in your workflow file.");
|
||||||
|
|
Loading…
Reference in a new issue