@spinnaker/google 0.2.4 → 0.2.12

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@spinnaker/google",
   "license": "Apache-2.0",
-  "version": "0.2.4",
+  "version": "0.2.12",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "clean": "shx rm -rf dist",
     "prepublishOnly": "npm run build",
@@ -13,7 +16,7 @@
     "lib": "npm run build"
   },
   "dependencies": {
-    "@spinnaker/core": "^0.23.0",
+    "@spinnaker/core": "^0.28.0",
     "@uirouter/angularjs": "1.0.26",
     "angular": "1.6.10",
     "angular-ui-bootstrap": "2.5.0",
@@ -26,8 +29,8 @@
     "ui-select": "0.19.8"
   },
   "devDependencies": {
-    "@spinnaker/eslint-plugin": "^3.0.1",
-    "@spinnaker/scripts": "^0.3.0",
+    "@spinnaker/eslint-plugin": "^3.0.2",
+    "@spinnaker/scripts": "^0.4.0",
     "@types/angular": "1.6.26",
     "@types/angular-mocks": "1.5.10",
     "@types/angular-ui-bootstrap": "0.13.41",
@@ -37,5 +40,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "21bd84315ab519ae2c72adb6605b237b728352a0"
+  "gitHead": "20d6ca89f39a5f44a802a1ccaffd669587450d76"
 }

package/src/autoscalingPolicy/components/metricSettings/metricSettings.component.js

@@ -16,91 +16,93 @@ module(GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_METRICSETTINGS_METRICSETTINGS_COMPONE
     },
     templateUrl: require('./metricSettings.component.html'),
     controller: function () {
-      const multipleAllowedFor = {
-        cpuUtilization: false,
-        loadBalancingUtilization: false,
-        customMetricUtilizations: true,
-      };
-
-      const metricTypes = Object.keys(multipleAllowedFor);
-
-      this.targetTypesToDisplayMap = {
-        GAUGE: 'Gauge',
-        DELTA_PER_SECOND: 'Delta / second',
-        DELTA_PER_MINUTE: 'Delta / minute',
-      };
-
-      this.metricScopeTypesToDisplayMap = {
-        TIME_SERIES_PER_INSTANCE: 'Time series per instance',
-        SINGLE_TIME_SERIES_PER_GROUP: 'Single time series per group',
-      };
-
-      this.scalingpolicyTypesToDisplayMap = {
-        UTILIZATION_TARGET: 'Utilization target',
-        SINGLE_INSTANCE_ASSIGNMENT: 'singleInstanceAssignment',
-      };
-
-      this.addMetric = (metricType) => {
-        if (multipleAllowedFor[metricType]) {
-          this.policy[metricType] = this.policy[metricType] || [];
-          this.policy[metricType].push({});
-        } else if (emptyOrUndefined(this.policy[metricType])) {
-          this.policy[metricType] = { utilizationTarget: null };
+      this.$onInit = () => {
+        const multipleAllowedFor = {
+          cpuUtilization: false,
+          loadBalancingUtilization: false,
+          customMetricUtilizations: true,
+        };
+
+        const metricTypes = Object.keys(multipleAllowedFor);
+
+        this.targetTypesToDisplayMap = {
+          GAUGE: 'Gauge',
+          DELTA_PER_SECOND: 'Delta / second',
+          DELTA_PER_MINUTE: 'Delta / minute',
+        };
+
+        this.metricScopeTypesToDisplayMap = {
+          TIME_SERIES_PER_INSTANCE: 'Time series per instance',
+          SINGLE_TIME_SERIES_PER_GROUP: 'Single time series per group',
+        };
+
+        this.scalingpolicyTypesToDisplayMap = {
+          UTILIZATION_TARGET: 'Utilization target',
+          SINGLE_INSTANCE_ASSIGNMENT: 'singleInstanceAssignment',
+        };
+
+        this.addMetric = (metricType) => {
+          if (multipleAllowedFor[metricType]) {
+            this.policy[metricType] = this.policy[metricType] || [];
+            this.policy[metricType].push({});
+          } else if (emptyOrUndefined(this.policy[metricType])) {
+            this.policy[metricType] = { utilizationTarget: null };
+          }
+        };
+
+        this.deleteMetric = (metricType, index) => {
+          if (multipleAllowedFor[metricType]) {
+            this.policy[metricType].splice(index, 1);
+          } else {
+            // sending an empty object to the API deletes the policy.
+            this.policy[metricType] = {};
+          }
+        };
+
+        this.showMetric = (metricType) => {
+          const metric = this.policy[metricType];
+          // should not show policy form if the policy is undefined or an empty object.
+          return !emptyOrUndefined(metric);
+        };
+
+        this.isSingleTimeSeriesPerGroup = (scopeType, index) => {
+          if (this.policy.customMetricUtilizations[index].metricExportScope === scopeType) return true;
+        };
+
+        this.isScalingPolicySingleInstanceAssignment = (policyType, index) => {
+          if (this.policy.customMetricUtilizations[index].scalingpolicy === policyType) return true;
+        };
+
+        this.showNoMetricsWarning = () => {
+          return _.every(
+            metricTypes.map((type) => {
+              return _.some([
+                multipleAllowedFor[type] && !_.get(this.policy, [type, 'length']),
+                emptyOrUndefined(this.policy[type]),
+              ]);
+            }),
+          );
+        };
+
+        this.setUtilizationTargetFromDisplay = (metricType, value) => {
+          this.policy[metricType].utilizationTarget = value / 100;
+        };
+
+        this.initializeTargetDisplay = (metricType) => {
+          this[`${metricType}TargetDisplay`] = safeDecimalToPercent(this.policy[metricType].utilizationTarget);
+        };
+
+        function safeDecimalToPercent(value) {
+          if (value === 0) {
+            return 0;
+          }
+          return value ? Math.round(value * 100) : undefined;
         }
-      };
 
-      this.deleteMetric = (metricType, index) => {
-        if (multipleAllowedFor[metricType]) {
-          this.policy[metricType].splice(index, 1);
-        } else {
-          // sending an empty object to the API deletes the policy.
-          this.policy[metricType] = {};
+        function emptyOrUndefined(value) {
+          return _.isEqual(value, {}) || _.isUndefined(value);
         }
       };
-
-      this.showMetric = (metricType) => {
-        const metric = this.policy[metricType];
-        // should not show policy form if the policy is undefined or an empty object.
-        return !emptyOrUndefined(metric);
-      };
-
-      this.isSingleTimeSeriesPerGroup = (scopeType, index) => {
-        if (this.policy.customMetricUtilizations[index].metricExportScope === scopeType) return true;
-      };
-
-      this.isScalingPolicySingleInstanceAssignment = (policyType, index) => {
-        if (this.policy.customMetricUtilizations[index].scalingpolicy === policyType) return true;
-      };
-
-      this.showNoMetricsWarning = () => {
-        return _.every(
-          metricTypes.map((type) => {
-            return _.some([
-              multipleAllowedFor[type] && !_.get(this.policy, [type, 'length']),
-              emptyOrUndefined(this.policy[type]),
-            ]);
-          }),
-        );
-      };
-
-      this.setUtilizationTargetFromDisplay = (metricType, value) => {
-        this.policy[metricType].utilizationTarget = value / 100;
-      };
-
-      this.initializeTargetDisplay = (metricType) => {
-        this[`${metricType}TargetDisplay`] = safeDecimalToPercent(this.policy[metricType].utilizationTarget);
-      };
-
-      function safeDecimalToPercent(value) {
-        if (value === 0) {
-          return 0;
-        }
-        return value ? Math.round(value * 100) : undefined;
-      }
-
-      function emptyOrUndefined(value) {
-        return _.isEqual(value, {}) || _.isUndefined(value);
-      }
     },
   },
 );

package/src/autoscalingPolicy/components/scalingSchedules/scalingSchedules.component.js

@@ -16,44 +16,46 @@ module(GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_SCALINGSCHEDULES_SCALINGSCHEDULES_COM
     },
     templateUrl: require('./scalingSchedules.component.html'),
     controller: function () {
-      const multipleAllowedFor = {
-        scalingSchedules: true,
-      };
-
-      this.timezones = timezones;
-
-      this.addSchedule = (scheduleType) => {
-        if (multipleAllowedFor[scheduleType]) {
-          this.policy[scheduleType] = this.policy[scheduleType] || [];
-          this.policy[scheduleType].push({});
-        } else if (emptyOrUndefined(this.policy[scheduleType])) {
-          this.policy[scheduleType] = {};
-        }
-      };
-
-      this.deleteSchedule = (scheduleType, index) => {
-        if (multipleAllowedFor[scheduleType]) {
-          this.policy[scheduleType].splice(index, 1);
-        } else {
-          // sending an empty object to the API deletes the policy.
-          this.policy[scheduleType] = {};
+      this.$onInit = () => {
+        const multipleAllowedFor = {
+          scalingSchedules: true,
+        };
+
+        this.timezones = timezones;
+
+        this.addSchedule = (scheduleType) => {
+          if (multipleAllowedFor[scheduleType]) {
+            this.policy[scheduleType] = this.policy[scheduleType] || [];
+            this.policy[scheduleType].push({});
+          } else if (emptyOrUndefined(this.policy[scheduleType])) {
+            this.policy[scheduleType] = {};
+          }
+        };
+
+        this.deleteSchedule = (scheduleType, index) => {
+          if (multipleAllowedFor[scheduleType]) {
+            this.policy[scheduleType].splice(index, 1);
+          } else {
+            // sending an empty object to the API deletes the policy.
+            this.policy[scheduleType] = {};
+          }
+        };
+
+        this.selectTimezone = (timezone, index) => {
+          const { scalingSchedules } = this.policy;
+          const schedule = scalingSchedules[index];
+          scalingSchedules[index] = { ...schedule, timezone };
+
+          this.updatePolicy({
+            ...this.policy,
+            scalingSchedules: [...scalingSchedules],
+          });
+        };
+
+        function emptyOrUndefined(value) {
+          return _.isEqual(value, {}) || _.isUndefined(value);
         }
       };
-
-      this.selectTimezone = (timezone, index) => {
-        const { scalingSchedules } = this.policy;
-        const schedule = scalingSchedules[index];
-        scalingSchedules[index] = { ...schedule, timezone };
-
-        this.updatePolicy({
-          ...this.policy,
-          scalingSchedules: [...scalingSchedules],
-        });
-      };
-
-      function emptyOrUndefined(value) {
-        return _.isEqual(value, {}) || _.isUndefined(value);
-      }
     },
   },
 );

package/src/loadBalancer/configure/http/backendService/backendService.component.js

@@ -18,60 +18,62 @@ module(GOOGLE_LOADBALANCER_CONFIGURE_HTTP_BACKENDSERVICE_BACKENDSERVICE_COMPONEN
     },
     templateUrl: require('./backendService.component.html'),
     controller: function () {
-      this.backingData = this.command.backingData;
-      this.loadBalancer = this.command.loadBalancer;
-      const servicesByName = this.backingData.backendServicesKeyedByName;
+      this.$onInit = () => {
+        this.backingData = this.command.backingData;
+        this.loadBalancer = this.command.loadBalancer;
+        const servicesByName = this.backingData.backendServicesKeyedByName;
 
-      this.onBackendServiceSelect = (selectedBackendService) => {
-        assign(selectedBackendService);
-        this.command.onHealthCheckSelected(selectedBackendService.healthCheck, this.command);
-      };
+        this.onBackendServiceSelect = (selectedBackendService) => {
+          assign(selectedBackendService);
+          this.command.onHealthCheckSelected(selectedBackendService.healthCheck, this.command);
+        };
 
-      this.toggleEditExisting = () => {
-        this.editExisting = !this.editExisting;
-        if (!this.editExisting) {
-          const template = new BackendServiceTemplate();
-          assign(template);
-        } else {
-          delete this.backendService.name;
-        }
-      };
+        this.toggleEditExisting = () => {
+          this.editExisting = !this.editExisting;
+          if (!this.editExisting) {
+            const template = new BackendServiceTemplate();
+            assign(template);
+          } else {
+            delete this.backendService.name;
+          }
+        };
 
-      this.getAllHealthChecks = () => {
-        const allHealthChecks = this.loadBalancer.healthChecks.concat(this.backingData.healthChecks);
-        return _.chain(allHealthChecks)
-          .filter((hc) => hc.account === this.loadBalancer.credentials || !hc.account)
-          .map((hc) => hc.name)
-          .uniq()
-          .value();
-      };
+        this.getAllHealthChecks = () => {
+          const allHealthChecks = this.loadBalancer.healthChecks.concat(this.backingData.healthChecks);
+          return _.chain(allHealthChecks)
+            .filter((hc) => hc.account === this.loadBalancer.credentials || !hc.account)
+            .map((hc) => hc.name)
+            .uniq()
+            .value();
+        };
 
-      this.getSessionAffinitySuggestions = () => {
-        if (this.loadBalancer.loadBalancerType === 'HTTP') {
-          return ['None', 'Client IP', 'Generated Cookie'];
-        } else {
-          return ['None', 'Client IP', 'Generated Cookie', 'Header Field', 'HTTP Cookie'];
-        }
-      };
+        this.getSessionAffinitySuggestions = () => {
+          if (this.loadBalancer.loadBalancerType === 'HTTP') {
+            return ['None', 'Client IP', 'Generated Cookie'];
+          } else {
+            return ['None', 'Client IP', 'Generated Cookie', 'Header Field', 'HTTP Cookie'];
+          }
+        };
 
-      this.getAllServiceNames = () => {
-        return this.command.backingData.backendServices
-          .filter((service) => service.account === this.loadBalancer.credentials)
-          .map((service) => service.name);
-      };
+        this.getAllServiceNames = () => {
+          return this.command.backingData.backendServices
+            .filter((service) => service.account === this.loadBalancer.credentials)
+            .map((service) => service.name);
+        };
 
-      this.maxCookieTtl = 60 * 60 * 24; // One day.
+        this.maxCookieTtl = 60 * 60 * 24; // One day.
 
-      const getBackendServiceName = () => {
-        return _.get(this, 'backendService.name');
-      };
+        const getBackendServiceName = () => {
+          return _.get(this, 'backendService.name');
+        };
 
-      if (servicesByName[getBackendServiceName()]) {
-        this.editExisting = true;
-      }
+        if (servicesByName[getBackendServiceName()]) {
+          this.editExisting = true;
+        }
 
-      const assign = (toAssign) => {
-        this.loadBalancer.backendServices[this.index] = this.backendService = toAssign;
+        const assign = (toAssign) => {
+          this.loadBalancer.backendServices[this.index] = this.backendService = toAssign;
+        };
       };
     },
   },

package/src/loadBalancer/configure/http/basicSettings/basicSettings.component.js

@@ -15,30 +15,32 @@ module(GOOGLE_LOADBALANCER_CONFIGURE_HTTP_BASICSETTINGS_BASICSETTINGS_COMPONENT,
     },
     templateUrl: require('./basicSettings.component.html'),
     controller: function () {
-      const c = this.command;
-      this.loadBalancer = c.loadBalancer;
-      this.accounts = c.backingData.accounts;
-      const loadBalancerMap = c.backingData.loadBalancerMap;
+      this.$onInit = () => {
+        const c = this.command;
+        this.loadBalancer = c.loadBalancer;
+        this.accounts = c.backingData.accounts;
+        const loadBalancerMap = c.backingData.loadBalancerMap;
 
-      this.getName = (loadBalancer, applicationName) => {
-        const loadBalancerName = [applicationName, loadBalancer.stack || '', loadBalancer.detail || ''].join('-');
-        return _.trimEnd(loadBalancerName, '-');
-      };
+        this.getName = (loadBalancer, applicationName) => {
+          const loadBalancerName = [applicationName, loadBalancer.stack || '', loadBalancer.detail || ''].join('-');
+          return _.trimEnd(loadBalancerName, '-');
+        };
 
-      this.updateName = (lb, appName) => {
-        lb.urlMapName = this.getName(lb, appName);
-      };
+        this.updateName = (lb, appName) => {
+          lb.urlMapName = this.getName(lb, appName);
+        };
 
-      this.accountChanged = (account) => {
-        this.existingLoadBalancerNames = _.get(loadBalancerMap, [account, 'urlMapNames']) || [];
-        c.onAccountChange(c);
-      };
+        this.accountChanged = (account) => {
+          this.existingLoadBalancerNames = _.get(loadBalancerMap, [account, 'urlMapNames']) || [];
+          c.onAccountChange(c);
+        };
 
-      if (!this.loadBalancer.name) {
-        this.updateName(this.loadBalancer, this.application.name);
-      }
+        if (!this.loadBalancer.name) {
+          this.updateName(this.loadBalancer, this.application.name);
+        }
 
-      this.existingLoadBalancerNames = _.get(loadBalancerMap, [this.loadBalancer.credentials, 'urlMapNames']) || [];
+        this.existingLoadBalancerNames = _.get(loadBalancerMap, [this.loadBalancer.credentials, 'urlMapNames']) || [];
+      };
     },
   },
 );

package/src/loadBalancer/configure/http/healthCheck/healthCheck.component.js

@@ -19,49 +19,51 @@ module(GOOGLE_LOADBALANCER_CONFIGURE_HTTP_HEALTHCHECK_HEALTHCHECK_COMPONENT, [])
     },
     templateUrl: require('./healthCheck.component.html'),
     controller: function () {
-      this.max = Number.MAX_SAFE_INTEGER;
-      this.backingData = this.command.backingData;
-      this.loadBalancer = this.command.loadBalancer;
-      const healthChecksByName = this.backingData.healthChecksKeyedByName;
+      this.$onInit = () => {
+        this.max = Number.MAX_SAFE_INTEGER;
+        this.backingData = this.command.backingData;
+        this.loadBalancer = this.command.loadBalancer;
+        const healthChecksByName = this.backingData.healthChecksKeyedByName;
 
-      this.onHealthCheckSelect = (selectedHealthCheck) => {
-        assign(selectedHealthCheck);
-      };
+        this.onHealthCheckSelect = (selectedHealthCheck) => {
+          assign(selectedHealthCheck);
+        };
 
-      this.getAllHealthCheckNames = () => {
-        return this.command.backingData.healthChecks
-          .filter((hc) => hc.account === this.loadBalancer.credentials)
-          .map((hc) => hc.name);
-      };
+        this.getAllHealthCheckNames = () => {
+          return this.command.backingData.healthChecks
+            .filter((hc) => hc.account === this.loadBalancer.credentials)
+            .map((hc) => hc.name);
+        };
 
-      this.toggleEditExisting = () => {
-        this.editExisting = !this.editExisting;
-        if (!this.editExisting) {
-          assign(new HealthCheckTemplate());
-        } else {
-          delete this.healthCheck.name;
-        }
-      };
+        this.toggleEditExisting = () => {
+          this.editExisting = !this.editExisting;
+          if (!this.editExisting) {
+            assign(new HealthCheckTemplate());
+          } else {
+            delete this.healthCheck.name;
+          }
+        };
 
-      const assign = (toAssign) => {
-        this.loadBalancer.healthChecks[this.index] = this.healthCheck = toAssign;
-      };
+        const assign = (toAssign) => {
+          this.loadBalancer.healthChecks[this.index] = this.healthCheck = toAssign;
+        };
 
-      const getHealthCheckName = () => {
-        return _.get(this, 'healthCheck.name');
-      };
+        const getHealthCheckName = () => {
+          return _.get(this, 'healthCheck.name');
+        };
 
-      this.onProtocolChange = () => {
-        if (this.healthCheck.healthCheckType !== this.healthCheckType) {
-          assign(Object.assign({}, new HealthCheckTemplate(), { healthCheckType: this.healthCheckType }));
-        }
-      };
+        this.onProtocolChange = () => {
+          if (this.healthCheck.healthCheckType !== this.healthCheckType) {
+            assign(Object.assign({}, new HealthCheckTemplate(), { healthCheckType: this.healthCheckType }));
+          }
+        };
 
-      if (healthChecksByName[getHealthCheckName()]) {
-        this.editExisting = true;
-      }
+        if (healthChecksByName[getHealthCheckName()]) {
+          this.editExisting = true;
+        }
 
-      this.healthCheckType = this.healthCheck.healthCheckType;
+        this.healthCheckType = this.healthCheck.healthCheckType;
+      };
     },
   },
 );

package/src/loadBalancer/configure/http/hostRule/hostRule.component.js

@@ -19,15 +19,17 @@ module(GOOGLE_LOADBALANCER_CONFIGURE_HTTP_HOSTRULE_HOSTRULE_COMPONENT, [
   },
   templateUrl: require('./hostRule.component.html'),
   controller: function () {
-    this.loadBalancer = this.command.loadBalancer;
-    const pathRules = this.hostRule.pathMatcher.pathRules;
+    this.$onInit = () => {
+      this.loadBalancer = this.command.loadBalancer;
+      const pathRules = this.hostRule.pathMatcher.pathRules;
 
-    this.addPathRule = () => {
-      pathRules.push(new PathRuleTemplate());
-    };
+      this.addPathRule = () => {
+        pathRules.push(new PathRuleTemplate());
+      };
 
-    this.deletePathRule = (index) => {
-      pathRules.splice(index, 1);
+      this.deletePathRule = (index) => {
+        pathRules.splice(index, 1);
+      };
     };
   },
 });