fix: ensure raw_output is a string

Signed-off-by: Avi Miller <[email protected]>

.github/workflows/sanity-test.yml

@@ -23,19 +23,21 @@ jobs:
       OCI_CLI_REGION: ${{ secrets.OCI_CLI_REGION }}
 
     steps:
-      - name: Checkout
-        id: checkout
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
       - name: Get object storage namespace
         id: test-action-get-os-ns
         uses: ./
         with:
-          command: os ns get
+          command: 'iam compartment list --compartment-id-in-subtree=true'
+          query: "data[?name=='github-actions'].id"
+          silent: false
 
-      - name: Output object storage namespace
-        id: output-os-ns
-        run: echo "${{ steps.test-action-get-os-ns.outputs.output }}"
+      - name: Echo object storage namespace
+        id: echo-os-ns-get
+        run: |
+          echo "Output: ${{ steps.test-action-get-os-ns.outputs.output}}"
+          echo "Raw output: ${{ steps.test-action-get-os-ns.outputs.raw_output}}"
 
       - name: Test non-JSON output
         id: test-non-json-output

README.md

@@ -65,14 +65,14 @@ jobs:
       OCI_CLI_REGION: ${{ secrets.OCI_CLI_REGION }}
     steps:
       - name: Retrieve the OCID of a named compartment in tenancy
-        uses: oracle-actions/[email protected].0
+        uses: oracle-actions/[email protected].1
         id: find-compartment-id
         with:
           command: 'iam compartment list --compartment-id-in-subtree=true'
           query: "data[?name=='testing'].id"
 
       - name: Retrieve the display name and shape of the instances in my compartment
-        uses: oracle-actions/[email protected].0
+        uses: oracle-actions/[email protected].1
         id: find-instances
         with:
           command: 'compute instance list --compartment-id ${{ steps.find-compartment-id.outputs.raw_output }}'

package.json

@@ -1,12 +1,29 @@
 {
   "name": "@oracle-actions/run-oci-cli-command",
-  "version": "1.3.0",
+  "description": "Run an Oracle Cloud Infrastructure (OCI) CLI command",
+  "version": "1.3.1",
   "author": {
     "name": "Oracle Cloud Infrastructure",
     "email": "[email protected]"
   },
-  "description": "Run an Oracle Cloud Infrastructure (OCI) CLI command",
-  "main": "src/main.ts",
+  "private": true,
+  "homepage": "https://github.com/oracle-actions/run-oci-cli-command#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/oracle-actions/run-oci-cli-command.git"
+  },
+  "bugs": {
+    "url": "https://github.com/oracle-actions/run-oci-cli-command/issues"
+  },
+  "keywords": [
+    "github",
+    "actions",
+    "oracle-cloud",
+    "oracle-cloud-infrastructure"
+  ],
+  "exports": {
+    ".": "./dist/index.js"
+  },
   "engines": {
     "node": ">=20"
   },
@@ -15,29 +32,15 @@
     "format:write": "npx prettier --write .",
     "format:check": "npx prettier --check .",
     "lint": "npx eslint . -c ./.github/linters/.eslintrc.yml",
-    "package": "npx ncc build src/main.ts -o dist --source-map --license LICENSE.txt",
+    "package": "npx ncc build src/index.ts -o dist --source-map --license LICENSE.txt",
     "all": "npm run format:write && npm run lint && npm run package"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/oracle-actions/run-oci-cli-command.git"
-  },
   "files": [
     "LICENSE.txt",
     "THIRD_PARTY_LICENSES.txt",
     "dist/*"
   ],
-  "keywords": [
-    "github",
-    "actions",
-    "oracle-cloud",
-    "oracle-cloud-infrastructure"
-  ],
   "license": "UPL-1.0",
-  "bugs": {
-    "url": "https://github.com/oracle-actions/run-oci-cli-command/issues"
-  },
-  "homepage": "https://github.com/oracle-actions/run-oci-cli-command#readme",
   "dependencies": {
     "@actions/core": "^1.10.1",
     "@actions/exec": "^1.1.1",

src/index.ts

@@ -0,0 +1,7 @@
+/* Copyright (c) 2024, Oracle and/or its affiliates.
+ * Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
+ */
+import { runOciCliCommand } from './main'
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+runOciCliCommand()

src/main.ts

@@ -32,7 +32,7 @@ function isJson(item: string): boolean {
  * data.
  *
  */
-async function runOciCliCommand(): Promise<void> {
+export async function runOciCliCommand(): Promise<void> {
   if (!fs.existsSync(path.join(os.homedir(), '.oci-cli-installed'))) {
     core.startGroup('Installing Oracle Cloud Infrastructure CLI')
     const cli = await exec.getExecOutput('python -m pip install oci-cli')
@@ -56,7 +56,6 @@ async function runOciCliCommand(): Promise<void> {
   if (silent) core.setSecret(cliCommand)
 
   const cliResult = await exec.getExecOutput(cliCommand, [], { silent: silent })
-  let stdout = {}
   let output = ''
   let raw_output = ''
 
@@ -65,10 +64,10 @@ async function runOciCliCommand(): Promise<void> {
       output = cliResult.stdout
       raw_output = cliResult.stdout
     } else {
-      stdout = JSON.parse(cliResult.stdout)
+      const stdout = JSON.parse(cliResult.stdout)
       output = JSON.stringify(JSON.stringify(stdout))
       if (Object.keys(stdout).length == 1) {
-        raw_output = Object.keys(stdout)[0]
+        raw_output = String(Object.values(stdout)[0])
       }
     }
 
@@ -82,10 +81,3 @@ async function runOciCliCommand(): Promise<void> {
     core.setFailed(`Failed: ${JSON.stringify(stderr)}`)
   }
 }
-
-/**
- * Requires OCI CLI environment variables to be set
- */
-runOciCliCommand().catch(e => {
-  if (e instanceof Error) core.setFailed(e.message)
-})