support for blackbox actions

Fixes #46
Fixes #762

Author: starpit

app/content/js/ui.js

@@ -1408,7 +1408,20 @@ const ui = (function() {
                     if (renderThirdParty(entity)) {
                         // then the third party rendering took care of it
                     } else {
-                        if (entity.exec.code) {
+                        // this is the container for the code
+                        const code = sidecar.querySelector('.action-content .action-source')
+
+                        if (entity.exec.kind === 'blackbox') {
+                            // show the image name
+                            const clicky = document.createElement('a')
+                            clicky.className = 'clickable clickable-blatant'
+                            code.appendChild(document.createTextNode('dockerhub image: '))
+                            code.appendChild(clicky)
+                            clicky.innerText = entity.exec.image
+                            clicky.setAttribute('href', `https://hub.docker.com/r/${entity.exec.image}`)
+                            clicky.setAttribute('target', '_blank')
+
+                        } else if (entity.exec.code) {
                             //
                             // show the action's code
                             //
@@ -1417,7 +1430,6 @@ const ui = (function() {
                                 //
                                 // render the textual source code
                                 //
-                                const code = sidecar.querySelector('.action-content .action-source')
 
                                 code.className = `action-source ${uiNameForKind(entity.exec.kind.substring(0, entity.exec.kind.indexOf(':')))}`
                                 code.innerText = beautify(entity.exec.kind, entity.exec.code)

app/plugins/ui/commands/openwhisk-core.js

@@ -567,36 +567,44 @@ specials.actions = {
         } else if (verb !== 'update' || argv[0]) {
             // for action create, or update and the user gave a
             // positional param... find the input file
-            const filepath = ui.findFile(expandHomeDir(argv[0])),
-                  isBinary = argv[0].endsWith('.zip'),
-                  encoding = isBinary ? 'base64' : 'utf8'
+            if (options.docker) {
+                // blackbox action!
+                options.action.exec.kind = 'blackbox'
+                options.action.exec.image = argv[0]
 
-            options.action.exec.code = fs.readFileSync(filepath).toString(encoding)
+            } else {
+                // otherwise, find the file named by argv[0]
+                const filepath = ui.findFile(expandHomeDir(argv[0])),
+                      isBinary = argv[0].endsWith('.zip'),
+                      encoding = isBinary ? 'base64' : 'utf8'
 
-            if (!options.action.annotations) options.action.annotations = []
-            options.action.annotations.push({ key: 'file', value: filepath })
+                options.action.exec.code = fs.readFileSync(filepath).toString(encoding)
 
-            if (isBinary) {
-                // add an annotation to indicate that this is a managed action
-                options.action.annotations.push({ key: 'wskng.combinators', value: [{
-                    type: 'action.kind',
-                    role: 'replacement',
-                    badge: 'zip'
-                }]})
+                if (!options.action.annotations) options.action.annotations = []
+                options.action.annotations.push({ key: 'file', value: filepath })
 
-                options.action.annotations.push({ key: 'binary', value: true })
-            }
+                if (isBinary) {
+                    // add an annotation to indicate that this is a managed action
+                    options.action.annotations.push({ key: 'wskng.combinators', value: [{
+                        type: 'action.kind',
+                        role: 'replacement',
+                        badge: 'zip'
+                    }]})
+
+                    options.action.annotations.push({ key: 'binary', value: true })
+                }
 
-            eventBus.emit('/action/update', { file: filepath, action: { name: options.name, namespace: options.namespace } })
+                eventBus.emit('/action/update', { file: filepath, action: { name: options.name, namespace: options.namespace } })
 
-            // set the default kind
-            if (!options.action.exec.kind) {
-                if (options.kind) {
-                    options.action.exec.kind = options.kind
-                } else {
-                    const extension = filepath.substring(filepath.lastIndexOf('.') + 1)
-                    if (extension) {
-                        options.action.exec.kind = extensionToKind[extension] || extension
+                // set the default kind
+                if (!options.action.exec.kind) {
+                    if (options.kind) {
+                        options.action.exec.kind = options.kind
+                    } else {
+                        const extension = filepath.substring(filepath.lastIndexOf('.') + 1)
+                        if (extension) {
+                            options.action.exec.kind = extensionToKind[extension] || extension
+                        }
                     }
                 }
             }

app/plugins/ui/commands/openwhisk-usage.js

@@ -84,6 +84,7 @@ const actionMix = params.concat(annotations).concat(limits).concat([
     { name: '--kind', allowed: ['nodejs', 'python', 'swift', 'php'], allowedIsPrefixMatch: true, defaultValue: 'nodejs', docs: 'the action runtime' },
     { name: '--sequence', boolean: true, example: 'a1,a2,a3', docs: 'create a sequence of the given actions' },
     { name: '--copy', boolean: true, advanced: true, docs: 'copy the action named by the second parameter to a new action named by the first' },
+    { name: '--docker', boolean: true, docs: 'create a blackbox action from a dockerhub image' },
     { name: '--web', boolean: true, docs: 'web export the action' },
     { name: '--content-type', hidden: true }
 ])

tests/tests/passes/03/blackbox-action.js

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2018 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const common = require('../../../lib/common'),
+      openwhisk = require('../../../lib/openwhisk'),
+      ui = require('../../../lib/ui'),
+      assert = require('assert'),
+      keys = ui.keys,
+      cli = ui.cli,
+      sidecar = ui.sidecar,
+      actionName = 'foo',
+      actionName2 = 'foo2'
+
+describe('blackbox actions', function() {
+    before(common.before(this))
+    after(common.after(this))
+
+    it('should have an active repl', () => cli.waitForRepl(this.app))
+
+    it('should create a blackbox action variant 1', () => cli.do(`wsk action create --docker bb1 openwhisk/example`, this.app)
+       .then(cli.expectOK)
+       .then(sidecar.expectOpen)
+       .then(sidecar.expectShowing('bb1'))
+       .then(() => this.app.client.getText(ui.selectors.SIDECAR_ACTION_SOURCE))
+       .then(txt => assert.equal(txt, 'dockerhub image: openwhisk/example'))
+       .catch(common.oops(this)))
+
+    it('should create a blackbox action variant 2', () => cli.do(`wsk action create bb2 --docker openwhisk/example`, this.app)
+       .then(cli.expectOK)
+       .then(sidecar.expectOpen)
+       .then(sidecar.expectShowing('bb2'))
+       .catch(common.oops(this)))
+
+    it('should create a blackbox action variant 3', () => cli.do(`wsk action create bb3 openwhisk/example --docker`, this.app)
+       .then(cli.expectOK)
+       .then(sidecar.expectOpen)
+       .then(sidecar.expectShowing('bb3'))
+       .catch(common.oops(this)))
+
+    it(`should invoke bb2`, () => cli.do(`invoke bb2`, this.app)
+       .then(cli.expectOK)
+       .then(sidecar.expectOpen)
+       .then(sidecar.expectShowing('bb2'))
+       .then(() => this.app.client.getText(ui.selectors.SIDECAR_ACTIVATION_RESULT))
+       .then(ui.expectStruct({
+           "args": {},
+           "msg": "Hello from arbitrary C program!"
+       }))
+       .catch(common.oops(this)))
+})