fix: debug actions via aio app run for extensions (file not found) (#160

)
adobe · Aug 9, 2021 · 8248789 · 8248789
1 parent 8d4a4b9
commit 8248789
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/generators/add-vscode-config/index.js b/generators/add-vscode-config/index.js
@@ -137,10 +137,16 @@ class AddVsCodeConfig extends Generator {
     const remoteRoot = this.options[Option.REMOTE_ROOT]
     const envFile = this.options[Option.ENV_FILE]
 
+    // make sure the action path is a relative path, using appConfig.root
+    let actionFileRelativePath = action.function
+    if (path.isAbsolute(actionFileRelativePath)) {
+      actionFileRelativePath = path.relative(appConfig.root, actionFileRelativePath)
+    }
+
     const launchConfig = createPwaNodeLaunchConfiguration({
       packageName,
       actionName,
-      actionFileRelativePath: action.function,
+      actionFileRelativePath,
       envFileRelativePath: envFile,
       remoteRoot,
       nodeVersion

diff --git a/test/generators/add-vscode-config/index.test.js b/test/generators/add-vscode-config/index.test.js
@@ -18,7 +18,13 @@ jest.mock('fs-extra')
 const theGeneratorPath = require.resolve('../../../generators/add-vscode-config')
 const Generator = require('yeoman-generator')
 
-const createOptions = () => {
+const createOptions = ({ actionPathIsAbsolute = false } = {}) => {
+  const root = '/root'
+  let actionPath = path.join('src', 'actions', 'action-1')
+  if (actionPathIsAbsolute) {
+    actionPath = path.join(root, actionPath)
+  }
+
   return {
     'app-config': {
       app: {
@@ -36,7 +42,7 @@ const createOptions = () => {
             __APP_PACKAGE__: {
               actions: {
                 'action-1': {
-                  function: path.join('src', 'actions', 'action-1')
+                  function: actionPath
                 }
               }
             }
@@ -47,7 +53,7 @@ const createOptions = () => {
         src: 'html',
         distDev: 'dist-dev'
       },
-      root: 'root'
+      root
     },
     'frontend-url': 'https://localhost:9080',
     'env-file': 'my/.env'
@@ -292,6 +298,28 @@ test('output check', async () => {
   assert.JSONFileContent(destFile, createTestLaunchConfiguration(options['app-config'].ow.package, true))
 })
 
+test('output check (action path is absolute)', async () => {
+  const options = createOptions({ actionPathIsAbsolute: true })
+  const pkg = options['app-config'].manifest.full.packages.__APP_PACKAGE__
+  pkg.actions['action-1'].runtime = 'nodejs:14'
+  pkg.actions['action-1'].annotations = {
+    'require-adobe-auth': true
+  }
+  options['app-config'].ow.apihost = 'https://adobeioruntime.net'
+  options['destination-file'] = 'foo/bar.json'
+
+  fs.lstatSync.mockReturnValue({
+    isDirectory: () => false
+  })
+
+  const result = helpers.run(theGeneratorPath).withOptions(options)
+  await expect(result).resolves.not.toThrow()
+
+  const destFile = options['destination-file']
+  assert.file(destFile) // destination file is written
+  assert.JSONFileContent(destFile, createTestLaunchConfiguration(options['app-config'].ow.package, true))
+})
+
 test('output check (custom package)', async () => {
   const customPackage = 'my-custom-package'
   const options = createOptions()