Merge pull request #217 from srinandan/master

enable windows build for edgemicroctl
apigee-internal · Feb 10, 2019 · 197d7cf · 197d7cf
2 parents a6129f2 + c3c5f6b
commit 197d7cf
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/cli/lib/gateway.js b/cli/lib/gateway.js
@@ -177,6 +177,9 @@ Gateway.prototype.start = (options) => {
             if (configurl) opts.configurl = configurl;
             var self = this;
             edgeconfig.get(opts, (err, newConfig) => {
+                if(validator(newConfig) == false && !err) {
+                    err = {};
+                }
                 if (err) {
                     // failed to check new config. so try to check again after pollInterval
                     console.error('Failed to check for change in Config. Will retry after ' + pollInterval + ' seconds');
@@ -337,3 +340,31 @@ function hasConfigChanged(oldConfig, newConfig) {
         return true;
     }
 }
+
+function validator(newConfig) {
+
+    //checkObject(newConfig.product_to_proxy) && 
+    //checkObject(newConfig.product_to_api_resource)
+
+    if (checkObject(newConfig) &&
+        checkObject(newConfig.analytics) && 
+        checkObject(newConfig.analytics.source) && 
+        checkObject(newConfig.analytics.proxy) && 
+        checkObject(newConfig.analytics.key) && 
+        checkObject(newConfig.analytics.secret) &&
+        checkObject(newConfig.analytics.uri) &&
+        checkObject(newConfig.edgemicro) && 
+        checkObject(newConfig.edgemicro.port) && 
+        checkObject(newConfig.edgemicro.max_connections) &&
+        checkObject(newConfig.headers) && 
+        Array.isArray(newConfig.proxies)) { 
+        debug("configuration incomplete or invalid, skipping configuration");
+        return false;
+    }
+
+    return true;
+}
+
+function checkObject (o) {
+    return (typeof o === 'object' && o instanceof Object && !(o instanceof Array));
+}
diff --git a/kubernetes/edgemicroctl/.goreleaser.yml b/kubernetes/edgemicroctl/.goreleaser.yml
@@ -6,6 +6,7 @@ builds:
     goos:
       - linux
       - darwin
+      - windows
 archive:
   name_template: "{{ .ProjectName }}_{{.Tag}}_{{ .Os }}_{{ .Arch }}"
   replacements:
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ builds: @@
         goos:
           - linux
           - darwin
+          - windows
     archive:
       name_template: "{{ .ProjectName }}_{{.Tag}}_{{ .Os }}_{{ .Arch }}"
       replacements:
@@ Expand Down @@