coverage 100%

Author: purplecabbage

src/utils.js

@@ -21,7 +21,7 @@ const globby = require('globby')
 const path = require('path')
 const archiver = require('archiver')
 // this is a static list that comes from here: https://developer.adobe.com/runtime/docs/guides/reference/runtimes/
-const SupportedRuntimes = ['nodejs:10', 'nodejs:12', 'nodejs:14', 'nodejs:16', 'nodejs:18']
+const SupportedRuntimes = ['sequence', 'nodejs:10', 'nodejs:12', 'nodejs:14', 'nodejs:16', 'nodejs:18']
 const DEFAULT_PACKAGE_RESERVED_NAME = 'default'
 
 /**
@@ -1491,12 +1491,12 @@ async function deployPackage (entities, ow, logger, imsOrgId) {
 
   for (const action of entities.actions) {
     const retAction = cloneDeep(action)
-    if (!SupportedRuntimes.includes(retAction?.exec?.kind)) {
-      const supportedServerRuntimes = ( await getSupportedServerRuntimes(apihost) ).sort().reverse()
+    if (retAction?.exec?.kind && !isSupportedActionKind(retAction)) {
+      const supportedServerRuntimes = (await getSupportedServerRuntimes(apihost)).sort().reverse()
       if (supportedServerRuntimes.includes(retAction?.exec?.kind)) {
         aioLogger.debug(`Local node kinds mismatch with server supported kinds ${supportedServerRuntimes}`)
       } else {
-        throw new Error(`Unsupported node version '${retAction.exec.kind}' in action ${retAction.name}.\n` +
+        throw new Error(`Unsupported node version '${retAction?.exec?.kind}' in action ${retAction.name}.\n` +
           `Supported runtimes on ${apihost}: ${supportedServerRuntimes}`)
       }
     }

test/utils.test.js

@@ -765,12 +765,41 @@ describe('deployPackage', () => {
       json: () => result
     })
 
-    const supportedClientRuntimes = ['nodejs:10', 'nodejs:12', 'nodejs:14', 'nodejs:16', 'nodejs:18']
-    const supportedServerRuntimes = await utils.getSupportedServerRuntimes(initOptions.apihost)
+    await expect(() =>
+      utils.deployPackage(JSON.parse(fs.readFileSync('/basic_manifest_unsupported_kind.json')), ow, mockLogger, imsOrgId)
+    ).rejects.toThrow(/Unsupported node version 'nodejs:8/)
+  })
+
+  test('basic manifest - local `kind` list missing', async () => {
+    const imsOrgId = 'MyIMSOrgId'
+    const mockLogger = jest.fn()
+    const actionOptions = {
+      apiKey: 'my-key',
+      namespace: 'my-namespace'
+    }
+    const initOptions = {
+      apihost: 'https://adobeio.adobeioruntime.net'
+    }
+    ow.mockResolvedProperty('actions.client.options', actionOptions)
+    ow.mockResolvedProperty(owInitOptions, initOptions)
+
+    const result = {
+      runtimes: {
+        nodejs: [
+          { kind: 'nodejs:8' }, // server says it supports nodejs:8!
+          { kind: 'nodejs:16' }
+        ]
+      }
+    }
+    mockFetch.mockResolvedValue({
+      ok: true,
+      status: 200,
+      json: () => result
+    })
 
     await expect(() =>
       utils.deployPackage(JSON.parse(fs.readFileSync('/basic_manifest_unsupported_kind.json')), ow, mockLogger, imsOrgId)
-    ).rejects.toThrow(`Unsupported node version 'nodejs:8' in action hello/helloAction. Supported versions are ${supportedClientRuntimes}. Supported runtimes on ${initOptions.apihost}: ${supportedServerRuntimes}`)
+    ).not.toThrow()
   })
 
   test('basic manifest (fetch error)', async () => {
@@ -2243,10 +2272,20 @@ describe('validateActionRuntime', () => {
     expect(() => utils.validateActionRuntime({ exec: { kind: 'nodejs:16' } })).not.toThrow()
     expect(() => utils.validateActionRuntime({ exec: { kind: 'nodejs:18' } })).not.toThrow()
   })
-
-  test('invalid nodejs version', async () => {
-    const func = () => utils.validateActionRuntime({ exec: { kind: 'nodejs:17' } })
-    expect(func).toThrowError('Unsupported node version')
+  test('no exec', () => {
+    expect(utils.validateActionRuntime({})).toBeUndefined()
+  })
+  test('no runtime kind', () => {
+    expect(utils.validateActionRuntime({ exec: {} })).toBeUndefined()
+  })
+  test('valid runtime kind', () => {
+    expect(utils.validateActionRuntime({ exec: { kind: 'nodejs:14' } })).toBeUndefined()
+  })
+  test('valid runtime kind - toLower', () => {
+    expect(() => utils.validateActionRuntime({ exec: { kind: 'NODEJS:14' } })).toThrowError('Unsupported node version')
+  })
+  test('invalid nodejs version', () => {
+    expect(() => utils.validateActionRuntime({ exec: { kind: 'nodejs:17' } })).toThrowError('Unsupported node version')
   })
 
   test('dumpActionsBuiltInfo might catch some errors under unlikely conditions', async () => {