@spinnaker/google 0.2.4 → 0.2.11

package/src/loadBalancer/configure/http/listeners/listener.component.js

@@ -20,61 +20,62 @@ module(GOOGLE_LOADBALANCER_CONFIGURE_HTTP_LISTENERS_LISTENER_COMPONENT, [GCE_ADD
     },
     templateUrl: require('./listener.component.html'),
     controller: function () {
-      this.certificates = this.command.backingData.certificates;
-      const loadBalancerMap = this.command.backingData.loadBalancerMap;
+      this.$onInit = () => {
+        this.certificates = this.command.backingData.certificates;
+        const loadBalancerMap = this.command.backingData.loadBalancerMap;
 
-      this.getName = (listener, applicationName) => {
-        const listenerName = [applicationName, listener.stack || '', listener.detail || ''].join('-');
-        return _.trimEnd(listenerName, '-');
-      };
+        this.getName = (listener, applicationName) => {
+          const listenerName = [applicationName, listener.stack || '', listener.detail || ''].join('-');
+          return _.trimEnd(listenerName, '-');
+        };
 
-      this.getCertificates = () => {
-        return this.command.backingData.certificates
-          .filter((certificate) => certificate.account === this.command.loadBalancer.credentials)
-          .map((certificate) => certificate.name);
-      };
+        this.getCertificates = () => {
+          return this.command.backingData.certificates
+            .filter((certificate) => certificate.account === this.command.loadBalancer.credentials)
+            .map((certificate) => certificate.name);
+        };
 
-      this.getSubnets = () => {
-        const ret = this.command.backingData.subnetMap[this.command.loadBalancer.network]
-          .filter((subnet) => subnet.region === this.command.loadBalancer.region)
-          .map((subnet) => subnet.name);
-        return _.uniq(ret);
-      };
+        this.getSubnets = () => {
+          const ret = this.command.backingData.subnetMap[this.command.loadBalancer.network]
+            .filter((subnet) => subnet.region === this.command.loadBalancer.region)
+            .map((subnet) => subnet.name);
+          return _.uniq(ret);
+        };
 
-      this.getInternalAddresses = () => {
-        const ret = this.command.backingData.addresses.filter(
-          (address) =>
-            address.addressType === 'INTERNAL' && address.subnetwork.split('/').pop() === this.listener.subnet,
-        );
-        return ret;
-      };
+        this.getInternalAddresses = () => {
+          return this.command.backingData.addresses.filter(
+            (address) =>
+              address.addressType === 'INTERNAL' && address.subnetwork.split('/').pop() === this.listener.subnet,
+          );
+        };
 
-      this.updateName = (listener, appName) => {
-        listener.name = this.getName(listener, appName);
-      };
+        this.updateName = (listener, appName) => {
+          listener.name = this.getName(listener, appName);
+        };
 
-      this.localListenerHasSameName = () => {
-        return (
-          this.command.loadBalancer.listeners.filter((listener) => listener.name === this.listener.name).length > 1
-        );
-      };
-
-      this.existingListenerNames = () => {
-        return _.get(loadBalancerMap, [this.command.loadBalancer.credentials, 'listeners']);
-      };
+        this.localListenerHasSameName = () => {
+          return (
+            this.command.loadBalancer.listeners.filter((listener) => listener.name === this.listener.name).length > 1
+          );
+        };
 
-      this.isHttps = (port) => port === 443 || port === '443';
+        this.existingListenerNames = () => {
+          return _.get(loadBalancerMap, [this.command.loadBalancer.credentials, 'listeners']);
+        };
 
-      if (!this.listener.name) {
-        this.updateName(this.listener, this.application.name);
-      }
+        this.isHttps = (port) => port === 443 || port === '443';
 
-      this.onAddressSelect = (address) => {
-        if (address) {
-          this.listener.ipAddress = address.address;
-        } else {
-          this.listener.ipAddress = null;
+        if (!this.listener.name) {
+          this.updateName(this.listener, this.application.name);
         }
+
+        this.onAddressSelect = (address) => {
+          if (address) {
+            this.listener.ipAddress = address.address;
+          } else {
+            this.listener.ipAddress = null;
+          }
+        };
       };
     },
   },

package/src/loadBalancer/details/loadBalancerType/loadBalancerType.component.js

@@ -12,16 +12,18 @@ module(GOOGLE_LOADBALANCER_DETAILS_LOADBALANCERTYPE_LOADBALANCERTYPE_COMPONENT,
     loadBalancer: '=',
   },
   controller: function () {
-    this.type = (function (lb) {
-      if (lb.loadBalancerType === 'HTTP') {
-        if (_.isString(lb.certificate)) {
-          return 'HTTPS';
+    this.$onInit = () => {
+      this.type = (function (lb) {
+        if (lb.loadBalancerType === 'HTTP') {
+          if (_.isString(lb.certificate)) {
+            return 'HTTPS';
+          } else {
+            return 'HTTP';
+          }
         } else {
-          return 'HTTP';
+          return lb.loadBalancerType;
         }
-      } else {
-        return lb.loadBalancerType;
-      }
-    })(this.loadBalancer);
+      })(this.loadBalancer);
+    };
   },
 });