Merge branch 'master' into saml-integration

Author: Matthew Dobson

app.js

@@ -0,0 +1,16 @@
+'use strict';
+
+var run = require('./cli/lib/gateway')();
+const os = require('os');
+
+const options = {};
+
+options.env = process.env.EDGEMICRO_ENV;
+options.key = process.env.EDGEMICRO_KEY;
+options.secret = process.env.EDGEMICRO_SECRET;
+options.org = process.env.EDGEMICRO_ORG;
+options.configDir = process.env.EDGEMICRO_CONFIG_DIR;
+options.processes = process.env.EDGEMICRO_PROCESSES || os.cpus().length;
+options.port = process.env.PORT || 8000;
+
+run.start(options);

app.yaml

@@ -0,0 +1,31 @@
+#       Copyright 2017, Google, Inc.
+# 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.
+#
+# [START runtime]
+service: microgateway
+runtime: nodejs
+env: flex
+automatic_scaling:
+  min_num_instances: 1
+  max_num_instances: 2
+resources:
+  cpu: 1
+  memory_gb: 2
+  disk_size_gb: 10
+env_variables:
+  EDGEMICRO_KEY: 'microgateway-key'
+  EDGEMICRO_SECRET: 'microgateway-secret'
+  EDGEMICRO_CONFIG_DIR: '/app/config'
+  EDGEMICRO_ENV: 'env-name'
+  EDGEMICRO_ORG: 'org-name'
+# [END runtime]

cli/lib/cert-lib.js

@@ -101,7 +101,6 @@ CertLogic.prototype.installPrivateCert = function(options, callback) {
 
     const privateKey = keys.serviceKey;
     const publicKey = keys.certificate;
-
     const async = require('async');
     async.series(
       [
@@ -132,8 +131,8 @@ CertLogic.prototype.installPrivateCert = function(options, callback) {
         } else {
           callback(null, publicKey);
         }
-      }
-    );
+      );
+    });
   });
 }
 
@@ -179,8 +178,8 @@ CertLogic.prototype.installCertWithPassword = function(options, callback) {
         } else {
           callback(null, publicKey);
         }
-      }
-    );
+      );    
+    });
   });
 }
 

manifest.yml

@@ -0,0 +1,14 @@
+---
+applications:
+- name: edgemicro-app
+  memory: 512M
+  instances: 1
+  host: edgemicro-app
+  path: .
+  buildpack: nodejs_buildpack
+  env: 
+    EDGEMICRO_KEY: 'microgateway-key'
+    EDGEMICRO_SECRET: 'microgateway-secret'
+    EDGEMICRO_CONFIG_DIR: '/app/config'
+    EDGEMICRO_ENV: 'env-name'
+    EDGEMICRO_ORG: 'org-name'

package.json

@@ -51,7 +51,7 @@
     }
   },
   "scripts": {
-    "start": "./cli/edgemicro start",
+    "start": "node app.js",
     "package": "node cli/package.js",
     "test": "mocha --timeout 17000 tests"
   },
@@ -84,5 +84,10 @@
     "Matt Dobson <mdobson@apigee.com> (https://github.com/mdobson)",
     "Mitch Fierro <fierro.mitch@gmail.com> (https://github.com/f1erro)"
   ],
-  "author": "Kevin Swiber <kswiber@gmail.com>"
+  "author": "Kevin Swiber <kswiber@gmail.com>",
+  "engines" : { 
+     "node" : ">= 4.8.2",
+     "npm": ">=3.10.8"
+  },
+  "cpu" : [ "!arm", "!mips" ]
 }