Merge pull request #12 from IBM/refactor_functions

Refactor run method into functions

Author: Fryguy

dist/index.js

@@ -12,80 +12,100 @@ function colorize(string, color) {
   return `\u001b[${code};1m${string}\u001b[0m`
 }
 
-/**
- * The main function for the action.
- * @returns {Promise<void>} Resolves when the action is complete.
- */
-async function run() {
-  try {
-    core.startGroup('Installing IBM Cloud CLI')
-    if (process.platform == 'win32') {
-      await exec.exec(`powershell -command "iex (New-Object Net.WebClient).DownloadString('https://clis.cloud.ibm.com/install/powershell')"`)
-      // Add to PATH for the current step
-      process.env.PATH += ';C:\\Program Files\\IBM\\Cloud\\bin'
-      // Add to GITHUB_PATH for future steps
-      await exec.exec(`powershell -command "Add-Content $env:GITHUB_PATH 'C:\\Program Files\\IBM\\Cloud\\bin'"`)
-    } else if (process.platform == 'darwin') {
-      await exec.exec('/bin/bash -c "curl -fsSL https://clis.cloud.ibm.com/install/osx | sh"')
-    } else {
-      await exec.exec('/bin/bash -c "curl -fsSL https://clis.cloud.ibm.com/install/linux | sh"')
-    }
-    core.endGroup()
-
-    core.startGroup('Disable version checking')
-    await exec.exec('ibmcloud', ['config', '--check-version=false'])
-    core.endGroup()
+async function installCLI() {
+  core.startGroup('Installing IBM Cloud CLI')
+  if (process.platform == 'win32') {
+    await exec.exec(`powershell -command "iex (New-Object Net.WebClient).DownloadString('https://clis.cloud.ibm.com/install/powershell')"`)
+    // Add to PATH for the current step
+    process.env.PATH += ';C:\\Program Files\\IBM\\Cloud\\bin'
+    // Add to GITHUB_PATH for future steps
+    await exec.exec(`powershell -command "Add-Content $env:GITHUB_PATH 'C:\\Program Files\\IBM\\Cloud\\bin'"`)
+  } else if (process.platform == 'darwin') {
+    await exec.exec('/bin/bash -c "curl -fsSL https://clis.cloud.ibm.com/install/osx | sh"')
+  } else {
+    await exec.exec('/bin/bash -c "curl -fsSL https://clis.cloud.ibm.com/install/linux | sh"')
+  }
+  core.endGroup()
+}
 
-    // Capture the version output
-    let version = ''
-    await exec.exec('ibmcloud', ['--version'], {
-      listeners: {stdout: (data) => { version += data.toString() }}
-    });
-    version = version.match(/\d+\.\d+\.\d+/)?.[0]
-    core.setOutput('version', version)
+async function disableVersionChecking() {
+  core.startGroup('Disable version checking')
+  await exec.exec('ibmcloud', ['config', '--check-version=false'])
+  core.endGroup()
+}
 
-    const plugins = core.getInput('plugins').replace('\n', ' ').replace(',', ' ').split(' ').map(p => p.trim()).filter(p => p)
-    if (plugins.length > 0) {
-      core.startGroup('Installing IBM Cloud CLI plugins')
-      await exec.exec('ibmcloud', ['plugin', 'install', ...plugins])
-      core.endGroup()
-      await exec.exec('ibmcloud', ['plugin', 'list'])
-    }
+async function captureVersion() {
+  let version = ''
+  await exec.exec('ibmcloud', ['--version'], {
+    listeners: {stdout: (data) => { version += data.toString() }}
+  });
+  version = version.match(/\d+\.\d+\.\d+/)?.[0]
+  core.setOutput('version', version)
+}
 
-    core.startGroup('Set API endpoint')
-    const api = core.getInput('api')
-    await exec.exec('ibmcloud', ['api', api])
+async function installPlugins() {
+  const plugins = core.getInput('plugins').replace('\n', ' ').replace(',', ' ').split(' ').map(p => p.trim()).filter(p => p)
+  if (plugins.length > 0) {
+    core.startGroup('Installing IBM Cloud CLI plugins')
+    await exec.exec('ibmcloud', ['plugin', 'install', ...plugins])
     core.endGroup()
+    await exec.exec('ibmcloud', ['plugin', 'list'])
+  }
+}
+
+async function setApiEndpoint() {
+  core.startGroup('Set API endpoint')
+  const api = core.getInput('api')
+  await exec.exec('ibmcloud', ['api', api])
+  core.endGroup()
+}
 
-    const apiKey = core.getInput('api_key')
+async function login() {
+  const apiKey = core.getInput('api_key')
+  if (apiKey.length > 0) {
+    const api    = core.getInput('api')
     const region = core.getInput('region')
     const group  = core.getInput('group')
-    if (apiKey.length > 0) {
-      core.startGroup('Login to IBM Cloud')
 
-      // Mimic the ibmcloud login output since we will run it silent later
-      core.info(`[command]/usr/local/bin/ibmcloud login -r ${region} -g ${group}`)
-      core.info(`API endpoint: ${colorize(api, 'cyan')}`)
-      core.info('Logging in with API key from environment variable...')
-      core.info('Authenticating...')
+    core.startGroup('Login to IBM Cloud')
 
-      try {
-        await exec.exec('ibmcloud', ['login', '-r', region, '-g', group], {
-          env: {
-            'IBMCLOUD_API_KEY': apiKey,
-            ...process.env
-          },
-          silent: true // Intentionally suppress the output to avoid the ibmcloud target at the end of login
-        })
-        core.info(colorize('OK', 'green'))
-      } catch(e) {
-        core.info(colorize('FAILED', 'red'))
-        core.info('Unable to authenticate')
-        throw e
-      } finally {
-        core.endGroup()
-      }
+    // Mimic the ibmcloud login output since we will run it silent later
+    core.info(`[command]/usr/local/bin/ibmcloud login -r ${region} -g ${group}`)
+    core.info(`API endpoint: ${colorize(api, 'cyan')}`)
+    core.info('Logging in with API key from environment variable...')
+    core.info('Authenticating...')
+
+    try {
+      await exec.exec('ibmcloud', ['login', '-r', region, '-g', group], {
+        env: {
+          'IBMCLOUD_API_KEY': apiKey,
+          ...process.env
+        },
+        silent: true // Intentionally suppress the output to avoid the ibmcloud target at the end of login
+      })
+      core.info(colorize('OK', 'green'))
+    } catch(e) {
+      core.info(colorize('FAILED', 'red'))
+      core.info('Unable to authenticate')
+      throw e
+    } finally {
+      core.endGroup()
     }
+  }
+}
+
+/**
+ * The main function for the action.
+ * @returns {Promise<void>} Resolves when the action is complete.
+ */
+async function run() {
+  try {
+    await installCLI()
+    await disableVersionChecking()
+    await captureVersion()
+    await installPlugins()
+    await setApiEndpoint()
+    await login()
   } catch (error) {
     // Fail the workflow run if an error occurs
     core.setFailed(error.message)