From 8a49d4e709898358616b2eac71cd2db4706b129e Mon Sep 17 00:00:00 2001 From: jbristowe Date: Wed, 21 Jul 2021 18:37:48 +1000 Subject: [PATCH] chore: removed getBooleanInput (redundant) --- src/get-boolean-input.ts | 42 ------------------------ src/index.ts | 12 +++---- src/input-parameters.ts | 69 ++++++++++++++++++++-------------------- 3 files changed, 40 insertions(+), 83 deletions(-) delete mode 100644 src/get-boolean-input.ts diff --git a/src/get-boolean-input.ts b/src/get-boolean-input.ts deleted file mode 100644 index 31ac869d..00000000 --- a/src/get-boolean-input.ts +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Gets the input value of the boolean type in the YAML specification. - * The return value is also in boolean type. - * ref: https://yaml.org/type/bool.html - * - * @param name name of the input to get - * @returns boolean - */ -export function getBooleanInput(name: string): boolean { - const trueValue = [ - 'true', - 'True', - 'TRUE', - 'yes', - 'Yes', - 'YES', - 'y', - 'Y', - 'on', - 'On', - 'ON' - ] - const falseValue = [ - 'false', - 'False', - 'FALSE', - 'no', - 'No', - 'NO', - 'n', - 'N', - 'off', - 'Off', - 'OFF' - ] - const val: string = ( - process.env[`INPUT_${name.replace(/ /g, '_').toUpperCase()}`] || '' - ).trim() - if (trueValue.includes(val)) return true - if (falseValue.includes(val)) return false - return false -} diff --git a/src/index.ts b/src/index.ts index 6bf3081c..8ea406cd 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,13 +1,13 @@ -import * as core from '@actions/core' -import * as octopus from './create-release' -import * as inputs from './input-parameters' +import {setFailed} from '@actions/core' +import {createRelease} from './create-release' +import {get} from './input-parameters' async function run(): Promise { try { - const inputParameters = inputs.get() - await octopus.createRelease(inputParameters) + const inputParameters = get() + await createRelease(inputParameters) } catch (error) { - core.setFailed(error.message) + setFailed(error.message) } } diff --git a/src/input-parameters.ts b/src/input-parameters.ts index 0fbe2444..d1aea335 100644 --- a/src/input-parameters.ts +++ b/src/input-parameters.ts @@ -1,5 +1,4 @@ -import * as core from '@actions/core' -import {getBooleanInput} from './get-boolean-input' +import {getBooleanInput, getInput} from '@actions/core' export interface InputParameters { apiKey: string @@ -51,49 +50,49 @@ export interface InputParameters { export function get(): InputParameters { return { - apiKey: core.getInput('api_key'), + apiKey: getInput('api_key'), cancelOnTimeout: getBooleanInput('cancel_on_timeout'), - channel: core.getInput('channel'), - configFile: core.getInput('config_file'), + channel: getInput('channel'), + configFile: getInput('config_file'), debug: getBooleanInput('debug'), defaultPackageVersion: getBooleanInput('default_package_version'), - deployAt: core.getInput('deploy_at'), - deployTo: core.getInput('deploy_to'), - deploymentCheckSleepCycle: core.getInput('deployment_check_sleep_cycle'), - deploymentTimeout: core.getInput('deployment_timeout'), - excludeMachines: core.getInput('exclude_machines'), + deployAt: getInput('deploy_at'), + deployTo: getInput('deploy_to'), + deploymentCheckSleepCycle: getInput('deployment_check_sleep_cycle'), + deploymentTimeout: getInput('deployment_timeout'), + excludeMachines: getInput('exclude_machines'), force: getBooleanInput('force'), forcePackageDownload: getBooleanInput('force_package_download'), - guidedFailure: core.getInput('guided_failure'), + guidedFailure: getInput('guided_failure'), ignoreChannelRules: getBooleanInput('ignore_channel_rules'), ignoreExisting: getBooleanInput('ignore_existing'), ignoreSslErrors: getBooleanInput('ignore_ssl_errors'), - logLevel: core.getInput('log_level'), - noDeployAfter: core.getInput('no_deploy_after'), + logLevel: getInput('log_level'), + noDeployAfter: getInput('no_deploy_after'), noRawLog: getBooleanInput('no_raw_log'), - package: core.getInput('package'), - packagePrerelease: core.getInput('package_prerelease'), - packageVersion: core.getInput('package_version'), - packagesFolder: core.getInput('packages_folder'), - password: core.getInput('password'), + package: getInput('package'), + packagePrerelease: getInput('package_prerelease'), + packageVersion: getInput('package_version'), + packagesFolder: getInput('packages_folder'), + password: getInput('password'), progress: getBooleanInput('progress'), - project: core.getInput('project'), - proxy: core.getInput('proxy'), - proxyPassword: core.getInput('proxy_password'), - proxyUsername: core.getInput('proxy_username'), - rawLogFile: core.getInput('raw_log_file'), - releaseNotes: core.getInput('release_notes'), - releaseNotesFile: core.getInput('release_notes_file'), - releaseNumber: core.getInput('release_number'), - server: core.getInput('server'), - skip: core.getInput('skip'), - space: core.getInput('space'), - specificMachines: core.getInput('specific_machines'), - tenant: core.getInput('tenant'), - tenantTag: core.getInput('tenant_tag'), - timeout: core.getInput('timeout'), - username: core.getInput('user'), - variable: core.getInput('variable'), + project: getInput('project'), + proxy: getInput('proxy'), + proxyPassword: getInput('proxy_password'), + proxyUsername: getInput('proxy_username'), + rawLogFile: getInput('raw_log_file'), + releaseNotes: getInput('release_notes'), + releaseNotesFile: getInput('release_notes_file'), + releaseNumber: getInput('release_number'), + server: getInput('server'), + skip: getInput('skip'), + space: getInput('space'), + specificMachines: getInput('specific_machines'), + tenant: getInput('tenant'), + tenantTag: getInput('tenant_tag'), + timeout: getInput('timeout'), + username: getInput('user'), + variable: getInput('variable'), waitForDeployment: getBooleanInput('wait_for_deployment'), whatIf: getBooleanInput('what_if') }