Detect the default group

Signed-off-by: Jason Frey <fryguy9@gmail.com>

Author: Fryguy

.github/workflows/test.yml

@@ -162,6 +162,21 @@ jobs:
         ibmcloud target | grep -q '^Region:\s\+us-south$' &&
         ibmcloud target | grep -q '^Resource group:\s\+default$'
 
+  test-login-with-region:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+    - name: Set up ibmcloud CLI
+      uses: ./
+      with:
+        api_key: ${{ secrets.IBMCLOUD_API_KEY }}
+        region: us-east
+    - name: Check logged in
+      run: |
+        ibmcloud target | grep -q '^User:\s\+${{ secrets.IBMCLOUD_USER }}$' &&
+        ibmcloud target | grep -q '^Region:\s\+us-east$' &&
+        ibmcloud target | grep -q '^Resource group:\s\+default$'
+
   test-login-with-region-and-group:
     runs-on: ubuntu-latest
     steps:

README.md

@@ -30,7 +30,7 @@ steps:
 
 - `region`: (optional - default: `us-south`) Region to access on IBM Cloud.
 
-- `group`: (optional - default: `default`) Resource group to access on IBM Cloud.
+- `group`: (optional - default: detection of default group) Resource group to access on IBM Cloud.
 
 - `api`: (optional - default: `https://cloud.ibm.com`) API endpoint to IBM Cloud.
 

action.yml

@@ -12,7 +12,6 @@ inputs:
     default: us-south
   group:
     description: Resource group to access on IBM Cloud.
-    default: default
   api:
     description: API endpoint to IBM Cloud.
     default: https://cloud.ibm.com

dist/index.js

@@ -66,34 +66,101 @@ async function setApiEndpoint() {
   core.endGroup()
 }
 
-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')
+async function getDefaultResourceGroup() {
+  let output = ''
+  await exec.exec('ibmcloud', ['resource', 'groups', '--default', '--output', 'json'], {
+    env: {
+      'IBMCLOUD_API_KEY': apiKey,
+      ...process.env
+    },
+    listeners: {stdout: (data) => { output += data.toString() }},
+    silent: true // Intentionally suppress the output to avoid the ibmcloud target at the end
+  })
 
-    core.startGroup('Login to IBM Cloud')
+  try {
+    const groups = JSON.parse(output)
+    if (groups && groups.length > 0 && groups[0].name) {
+      return groups[0].name
+    }
+  } catch (e) {
+    // Ignore JSON parsing errors as we will return null
+  }
 
-    // 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...')
+  return null
+}
+
+async function loginWithParams(apiKey, params) {
+  const api = core.getInput('api')
+
+  // Mimic the ibmcloud login output since we will run it silent later
+  core.info(`[command]/usr/local/bin/ibmcloud login ${params.join(' ')}`)
+  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', params, {
+      env: {
+        'IBMCLOUD_API_KEY': apiKey,
+        ...process.env
+      },
+      silent: true // Intentionally suppress the output to avoid the ibmcloud target at the end
+    })
+
+    // Mimic the ibmcloud login results on success
+    core.info(colorize('OK', 'green'))
+  } catch(e) {
+    // Mimic the ibmcloud login results on failure
+    core.info(colorize('FAILED', 'red'))
+    core.info('Unable to authenticate')
+    throw e
+  }
+}
+
+async function loginWithRegion(apiKey, region) {
+  await loginWithParams(apiKey, ['-r', region])
+
+  group = await getDefaultResourceGroup()
+  if (group) {
+    core.info(`Targeting resource group ${colorize(group, 'cyan')}`)
 
     try {
-      await exec.exec('ibmcloud', ['login', '-r', region, '-g', group], {
+      await exec.exec('ibmcloud', ['target', '-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
+        silent: true // Intentionally suppress the output to avoid the ibmcloud target at the end
       })
-      core.info(colorize('OK', 'green'))
+      // Mimic the ibmcloud target results on success
+      core.info(`Targeted resource group ${colorize(group, 'cyan')}`)
     } catch(e) {
+      // Mimic the ibmcloud target results on failure
       core.info(colorize('FAILED', 'red'))
-      core.info('Unable to authenticate')
       throw e
+    }
+  } else {
+    core.warning('Could not determine default resource group.')
+  }
+}
+
+async function loginWithRegionAndGroup(apiKey, region, group) {
+  await loginWithParams(apiKey, ['-r', region, '-g', group])
+}
+
+async function login() {
+  const apiKey = core.getInput('api_key')
+  if (apiKey.length > 0) {
+    const region = core.getInput('region')
+    const group  = core.getInput('group')
+
+    core.startGroup('Login to IBM Cloud')
+    try {
+      if (group) {
+        await loginWithRegionAndGroup(apiKey, region, group)
+      } else {
+        await loginWithRegion(apiKey, region)
+      }
     } finally {
       core.endGroup()
     }