Simplify boolean inputs

ageorgou · ageorgou · commit afab03754856 · 2021-08-22T08:15:50.000+01:00
diff --git a/action.yml b/action.yml
@@ -24,11 +24,13 @@ inputs:
     description: "The branch name to push the diagram to (branch will be created if it does not yet exist). For example: diagram"
     required: false
   push:
-    description: "Whether to push the new commit back to the repository. Default: true"
+    description: "Whether to push the new commit back to the repository. Must be true or false. Default: true"
     required: false
+    default: true
   upload:
-    description: "Whether to upload the new diagram as an artiface. Default: false"
+    description: "Whether to upload the new diagram as an artiface. Must be true or false. Default: false"
     required: false
+    default: false
 runs:
   using: "node12"
   main: "index.js"
diff --git a/src/index.jsx b/src/index.jsx
@@ -68,7 +68,7 @@ const main = async () => {
     return
   }
 
-  const shouldPush = getAsBoolean(core.getInput('push'), true)
+  const shouldPush = core.getBooleanInput('push')
   if (shouldPush) {
     core.startGroup('Commit and push diagram')
     await exec('git', ['commit', '-m', commitMessage])
@@ -85,7 +85,7 @@ const main = async () => {
     core.endGroup()
   }
 
-  const shouldUpload = getAsBoolean(core.getInput('upload'), false)
+  const shouldUpload = core.getBooleanInput('upload')
   if (shouldUpload) {
     core.startGroup('Upload diagram to artifacts')
     const client = artifact.create()
@@ -125,7 +125,3 @@ function execWithOutput(command, args) {
     }
   })
 }
-
-function getAsBoolean(option, defaultValue) {
-  return option === '' ? defaultValue : (option.toLowerCase() === 'true')
-}

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ const main = async () => {`
`68`	`68`	`return`
`69`	`69`	`}`
`70`	`70`
`71`		`- const shouldPush = getAsBoolean(core.getInput('push'), true)`
	`71`	`+ const shouldPush = core.getBooleanInput('push')`
`72`	`72`	`if (shouldPush) {`
`73`	`73`	`core.startGroup('Commit and push diagram')`
`74`	`74`	`await exec('git', ['commit', '-m', commitMessage])`
`@@ -85,7 +85,7 @@ const main = async () => {`
`85`	`85`	`core.endGroup()`
`86`	`86`	`}`
`87`	`87`
`88`		`- const shouldUpload = getAsBoolean(core.getInput('upload'), false)`
	`88`	`+ const shouldUpload = core.getBooleanInput('upload')`
`89`	`89`	`if (shouldUpload) {`
`90`	`90`	`core.startGroup('Upload diagram to artifacts')`
`91`	`91`	`const client = artifact.create()`
`@@ -125,7 +125,3 @@ function execWithOutput(command, args) {`
`125`	`125`	`}`
`126`	`126`	`})`
`127`	`127`	`}`
`128`		`-`
`129`		`-function getAsBoolean(option, defaultValue) {`
`130`		`- return option === '' ? defaultValue : (option.toLowerCase() === 'true')`
`131`		`-}`