fix issues with env undefined, cloned options so a function doesn't mutate its inputs

Author: shazron

package.json

@@ -70,8 +70,9 @@
   },
   "repository": "adobe/aio-cli-plugin-runtime",
   "scripts": {
-    "eslint-fix": "eslint src test e2e --fix",
-    "posttest": "eslint src test e2e",
+    "lint-fix": "eslint src test e2e --fix",
+    "lint": "eslint src test e2e",
+    "posttest": "npm run lint",
     "test": "npm run unit-tests",
     "unit-tests": "jest --ci",
     "prepack": "oclif manifest && oclif readme --no-aliases",

src/DeployServiceCommand.js

@@ -19,73 +19,74 @@ const { getCliEnv } = require('@adobe/aio-lib-env')
 const RuntimeBaseCommand = require('./RuntimeBaseCommand')
 
 class DeployServiceCommand extends RuntimeBaseCommand {
-
 /**
  * Retrieves an access token for Adobe I/O CLI authentication.
  * This function handles both CLI and custom contexts, setting up the appropriate
  * authentication context and retrieving the corresponding access token.
- * 
+ *
  * @async
  * @function getAccessToken
- * @param {Object} [options] - Options for token retrieval
- * @param {boolean} [options.useCachedToken=false] - Whether to use a cached token instead of requesting a new one
+ * @param {object} [options] - Options for token retrieval
+ * @param {string} [options.env] - The environment to use (e.g. 'prod', 'stage')
+ * @param {boolean} [options.useCachedToken] - Whether to use a cached token instead of requesting a new one
  * @returns {Promise<{accessToken: string|null, env: string}>} An object containing:
  *   - accessToken: The retrieved access token for authentication, or null if token retrieval failed
- *   - env: The current CLI environment (e.g. 'prod', 'stage')
+ *   - env: The current CLI environment
  * @throws {Error} If token retrieval fails or context setup fails
  */
-async getAccessToken({ useCachedToken = false } = {}) {
-  const env = getCliEnv()
-  let contextName = CLI // default
-  const currentContext = await context.getCurrent() // potential override
+  async getAccessToken ({ env = getCliEnv(), useCachedToken = false } = {}) {
+    let contextName = CLI // default
+    const currentContext = await context.getCurrent() // potential override
+
+    if (currentContext !== CLI) {
+      contextName = currentContext
+    } else {
+      await context.setCli({ 'cli.bare-output': true }, false) // set this globally
+    }
 
-  if (currentContext !== CLI) {
-    contextName = currentContext
-  } else {
-    await context.setCli({ 'cli.bare-output': true }, false) // set this globally
-  }
+    let accessToken = null
+    if (useCachedToken) {
+      const contextConfig = await context.get(contextName)
+      accessToken = contextConfig?.access_token?.token
+    } else {
+      accessToken = await getToken(contextName)
+    }
 
-  let accessToken = null
-  if (useCachedToken) {
-    const contextConfig = await context.get(contextName)
-    accessToken = contextConfig?.access_token?.token
-  } else {
-    accessToken = await getToken(contextName)
+    return { accessToken, env }
   }
 
-  return { accessToken, env }
-}
-
-
   getAuthHandler () {
+    const env = getCliEnv()
     return {
       getAuthHeader: async () => {
         this.debug(`Retrieving CLI Token using env=${env}`)
-        const { accessToken } = await this.getAccessToken()
+        const { accessToken } = await this.getAccessToken({ env })
 
         return `Bearer ${accessToken}`
       }
     }
   }
 
-  async setRuntimeApiHostAndAuthHandler(options) {
-    if (!options.useRuntimeAuth) {
+  async setRuntimeApiHostAndAuthHandler (options) {
+    let _options = structuredClone(options)
+    if (!_options?.useRuntimeAuth) {
       const endpoint = process.env.AIO_DEPLOY_SERVICE_URL ?? PropertyDefault.DEPLOYSERVICEURL
-      options.apihost = `${endpoint}/runtime`
-      options.auth_handler = this.getAuthHandler()
+      _options = _options ?? {}
+      _options.apihost = `${endpoint}/runtime`
+      _options.auth_handler = this.getAuthHandler()
     }
 
-    return options
+    return _options
   }
 
   async wsk (options) {
-    if (!options) {
-      options = await super.getOptions()
-      options =await this.setRuntimeApiHostAndAuthHandler(options)
+    let _options = structuredClone(options)
+    if (!_options) {
+      _options = await super.getOptions()
+      _options = await this.setRuntimeApiHostAndAuthHandler(_options)
     }
-    return runtimeLib.init(options)
+    return runtimeLib.init(_options)
   }
-
 }
 
 DeployServiceCommand.flags = {

src/RuntimeBaseCommand.js

@@ -18,14 +18,11 @@ const debug = createDebug('aio-cli-plugin-runtime')
 const http = require('http')
 const runtimeLib = require('@adobe/aio-lib-runtime')
 const config = require('@adobe/aio-lib-core-config')
-const { getToken, context } = require('@adobe/aio-lib-ims')
-const { getCliEnv } = require('@adobe/aio-lib-env')
-const { CLI } = require('@adobe/aio-lib-ims/src/context')
 
 /**
- * @typedef {Object} WskCreateOptions
+ * @typedef {object} WskCreateOptions
  * @property {boolean} [useRuntimeAuth=false] - Whether to use Runtime authentication
- * @property {Object} [wskClientOptions] - The options to pass to the wsk client. If not provided, will be generated from getOptions()
+ * @property {object} [wskClientOptions] - The options to pass to the wsk client. If not provided, will be generated from getOptions()
  */
 
 class RuntimeBaseCommand extends Command {