Merge pull request #9 from fahamutech/joshua

Joshua

Author: joshuamshana

.dockerignore

@@ -3,7 +3,11 @@ node_modules
 specs
 .env
 .gitignore
-Dockerfile
+.github
 gulpfile.js
 README.md
-src/function/myF
+src/function/myF
+/BFastFunctionExample.git
+BFastFunctionExample.git
+.npmrc
+src/function/myF

.idea/dictionaries/joshua.xml

@@ -4,19 +4,20 @@ WORKDIR /faas
 
 RUN apk update
 RUN apk upgrade
-# RUN apk add unzip
 RUN apk add curl
 RUN apk add git
+RUN apk add bash
 
-# RUN  curl -L https://github.com/fahamutech/BFastFunction/archive/v1.4.10.zip > /tmp/app.zip && unzip /tmp/app.zip -d /faas
-
-# RUN cp -r /faas/BFastFunction-1.4.10/* /faas
-# RUN rm -r /faas/BFastFunction-1.4.10
 COPY *.json ./
 RUN npm ci --only=production
-# RUN apk del unzip
-# RUN rm /tmp/app.zip
+
+COPY ./docker-entrypoint.sh /usr/local/bin/
+RUN ln -s /usr/local/bin/docker-entrypoint.sh / # backwards compat
 
 COPY . ./
 
-CMD [ "npm","run","start" ]
+#RUN ls /usr/local/bin
+
+RUN ["chmod", "+x", "/usr/local/bin/docker-entrypoint.sh"]
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
+#CMD [ "npm run start" ]

.idea/vcs.xml

@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+
+#if [ "$1" = 'npm run start' ]; then
+
+rm -r /faas/src/function/myF || echo "continue..."
+# git clone "${GIT_CLONE_URL}" /faas/src/function/myF
+#
+#  if [ -z "${GIT_TOKEN}" ]; then
+#    git clone "${GIT_CLONE_URL}" /faas/src/function/myF
+#  fi
+#
+#  if [ -z "$(ls -A "$PGDATA")" ]; then
+#    gosu postgres initdb
+#  fi
+#
+#  exec gosu postgres "$@"
+#fi
+
+exec npm run start "$@"

.idea/workspace.xml

@@ -1,6 +1,6 @@
 {
   "name": "bfastfunction",
-  "version": "1.7.2",
+  "version": "1.8.0",
   "private": true,
   "scripts": {
     "start": "node src/index.js",
@@ -19,8 +19,7 @@
     "express-http-proxy": "^1.6.0",
     "glob": "^7.1.4",
     "isomorphic-git": "^0.67.2",
-    "morgan": "~1.9.1",
-    "pm2": "^4.1.2"
+    "morgan": "~1.9.1"
   },
   "devDependencies": {
     "chai": "^4.2.0",

Dockerfile

@@ -2,7 +2,7 @@
 
 const glob = require('glob');
 
-module.exports.FaaSController = class {
+class FaaSController {
 
     /**
      * get function from uploaded files. This function return an object which contain name of function as object property
@@ -16,24 +16,34 @@ module.exports.FaaSController = class {
     getFunctions() {
         return new Promise((resolve, reject) => {
             try {
+                const bfastConfig = require('../function/myF/bfast.json');
+                // console.log(bfastConfig);
+                // console.log(bfastConfig && bfastConfig.ignore && Array.isArray(bfastConfig.ignore));
                 glob(`${__dirname}/../function/**/*.js`, {
                     // cwd: path.join(__dirname, `../function/`),
                     absolute: true,
-                    ignore: ['**/node_modules/**', '**/specs/**', '**/*.specs.js']
+                    ignore: bfastConfig && bfastConfig.ignore && Array.isArray(bfastConfig.ignore) ?
+                        bfastConfig.ignore :
+                        ['**/node_modules/**', '**/specs/**', '**/*.specs.js']
                 }, (err, files) => {
                     if (err) {
                         reject({message: err});
                     }
                     let functions = {
-                        mambo: function (req, response) {
-                            response.json({message: 'Powa!'});
+                        mambo: {
+                            onRequest: function (req, response) {
+                                response.json({message: 'Powa!'});
+                            }
                         }
                     };
                     files.forEach(file => {
                         const fileModule = require(file);
                         const functionNames = Object.keys(fileModule);
                         functionNames.forEach(name => {
-                            functions[name] = fileModule[name];
+                            if (fileModule[name] && typeof fileModule[name] === "object"
+                                && fileModule[name].onRequest) {
+                                functions[name] = fileModule[name];
+                            }
                         });
                     });
                     resolve(functions);
@@ -52,9 +62,14 @@ module.exports.FaaSController = class {
     getNames() {
         return new Promise(((resolve, reject) => {
             try {
+                const bfastConfig = require('../function/myF/bfast.json');
+                // console.log(bfastConfig);
+                // console.log(bfastConfig && bfastConfig.ignore && Array.isArray(bfastConfig.ignore));
                 const names = [];
                 glob(`${__dirname}/../function/**/*.js`, {
-                    ignore: ['**/node_modules/**', '**/specs/**', '**/*.specs.js']
+                    ignore: bfastConfig && bfastConfig.ignore && Array.isArray(bfastConfig.ignore) ?
+                        bfastConfig.ignore :
+                        ['**/node_modules/**', '**/specs/**', '**/*.specs.js']
                 }, (err, files) => {
                     if (err) {
                         reject({message: err});
@@ -63,7 +78,10 @@ module.exports.FaaSController = class {
                         const fileModule = require(file);
                         const functionNames = Object.keys(fileModule);
                         functionNames.forEach(name => {
-                            names.push(name);
+                            if (fileModule[name] && typeof fileModule[name] === "object"
+                                && fileModule[name].onRequest) {
+                                names.push(name);
+                            }
                         });
                     });
                     resolve({names: names});
@@ -74,4 +92,6 @@ module.exports.FaaSController = class {
         }));
     }
 
-};
+}
+
+module.exports = FaaSController;