@spinnaker/amazon 0.11.0 → 0.12.2

package/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html

@@ -1,107 +0,0 @@
-<div>
-  <dl class="dl-horizontal dl-narrow">
-    <dt>Whenever</dt>
-    <dd>
-      {{ $ctrl.alarm.statistic }} of {{ $ctrl.alarm.metricName }} is
-      <span ng-bind-html="$ctrl.alarm.comparator"></span> {{ $ctrl.alarm.threshold }}
-    </dd>
-    <dt>for at least</dt>
-    <dd>{{ $ctrl.alarm.evaluationPeriods }} consecutive periods of {{ $ctrl.alarm.period }} seconds</dd>
-    <dt>then</dt>
-    <dd ng-if="$ctrl.policy.stepAdjustments.length">
-      <div ng-repeat="stepAdjustment in $ctrl.policy.stepAdjustments">
-        <span ng-if="$ctrl.policy.stepAdjustments.length > 1">
-          if {{ $ctrl.alarm.metricName }}
-          <span ng-if="$ctrl.alarm.comparisonOperator.indexOf('Greater') === 0">
-            <span
-              ng-if="
-                stepAdjustment.metricIntervalUpperBound !== undefined &&
-                stepAdjustment.metricIntervalLowerBound !== undefined
-              "
-            >
-              is between
-              {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound }}
-              and
-              {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound }}
-            </span>
-            <span ng-if="stepAdjustment.metricIntervalUpperBound === undefined">
-              is greater than {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound }}
-            </span>
-          </span>
-
-          <span ng-if="$ctrl.alarm.comparisonOperator.indexOf('Less') === 0">
-            <span
-              ng-if="
-                stepAdjustment.metricIntervalUpperBound !== undefined &&
-                stepAdjustment.metricIntervalLowerBound !== undefined
-              "
-            >
-              is between
-              {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalLowerBound }}
-              and
-              {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound }}
-            </span>
-            <span ng-if="stepAdjustment.metricIntervalLowerBound === undefined">
-              is less than {{ $ctrl.alarm.threshold + stepAdjustment.metricIntervalUpperBound }}
-            </span> </span
-          >,
-        </span>
-        <span ng-if="$ctrl.policy.adjustmentType === 'ExactCapacity'">
-          set capacity to {{ stepAdjustment.scalingAdjustment }} instance<span
-            ng-if="stepAdjustment.scalingAdjustment > 1"
-            >s</span
-          >
-        </span>
-        <span
-          ng-if="
-            $ctrl.policy.adjustmentType === 'ChangeInCapacity' ||
-            $ctrl.policy.adjustmentType === 'PercentChangeInCapacity'
-          "
-        >
-          {{ stepAdjustment.operator }} capacity
-          <span ng-if="$ctrl.policy.adjustmentType === 'PercentChangeInCapacity'">
-            by {{ stepAdjustment.absAdjustment }}%
-          </span>
-          <span ng-if="$ctrl.policy.adjustmentType === 'ChangeInCapacity'">
-            by {{ stepAdjustment.absAdjustment }} instance<span ng-if="stepAdjustment.absAdjustment > 1">s</span>
-          </span>
-        </span>
-      </div>
-    </dd>
-    <dd ng-if="!$ctrl.policy.stepAdjustments.length">
-      <span ng-if="$ctrl.policy.adjustmentType === 'ExactCapacity'">
-        set capacity to {{ $ctrl.policy.scalingAdjustment }} instance<span ng-if="$ctrl.policy.scalingAdjustment > 1"
-          >s</span
-        >
-      </span>
-      <span
-        ng-if="
-          $ctrl.policy.adjustmentType === 'ChangeInCapacity' ||
-          $ctrl.policy.adjustmentType === 'PercentChangeInCapacity'
-        "
-      >
-        {{ $ctrl.policy.operator }} capacity
-        <span ng-if="$ctrl.policy.adjustmentType === 'PercentChangeInCapacity'">
-          by {{ $ctrl.policy.absAdjustment }}%
-        </span>
-        <span ng-if="$ctrl.policy.adjustmentType === 'ChangeInCapacity'">
-          by {{ $ctrl.policy.absAdjustment }} instance<span ng-if="$ctrl.policy.absAdjustment > 1">s</span>
-        </span>
-      </span>
-    </dd>
-    <dt ng-if="$ctrl.policy.minAdjustmentMagnitude">in</dt>
-    <dd ng-if="$ctrl.policy.minAdjustmentMagnitude">
-      increments of at least {{ $ctrl.policy.minAdjustmentMagnitude }} instance<span
-        ng-if="$ctrl.policy.minAdjustmentMagnitude > 1"
-        >s</span
-      >
-    </dd>
-    <dt ng-if="$ctrl.showWait">wait</dt>
-    <dd ng-if="$ctrl.policy.cooldown">{{ $ctrl.policy.cooldown }} seconds before allowing another scaling activity.</dd>
-    <dd ng-if="$ctrl.showWait && $ctrl.policy.estimatedInstanceWarmup">
-      {{ $ctrl.policy.estimatedInstanceWarmup }} seconds to warm up after each step.
-    </dd>
-  </dl>
-
-  <metric-alarm-chart alarm="$ctrl.policy.alarms[0]" server-group="$ctrl.serverGroup"></metric-alarm-chart>
-</div>

package/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.ts

@@ -1,31 +0,0 @@
-import type { IComponentOptions } from 'angular';
-import { module } from 'angular';
-import { AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_CHART_METRICALARMCHART_COMPONENT } from '../chart/MetricAlarmChart';
-
-const scalingPolicyPopover: IComponentOptions = {
-  bindings: {
-    policy: '=',
-    serverGroup: '=',
-  },
-  templateUrl: require('./scalingPolicyPopover.component.html'),
-  controller() {
-    this.$onInit = () => {
-      this.alarm = this.policy.alarms[0];
-
-      let showWait = false;
-      if (this.policy.cooldown) {
-        showWait = true;
-      }
-      if (this.policy.stepAdjustments && this.policy.stepAdjustments.length) {
-        showWait = this.policy.stepAdjustments[0].operator !== 'decrease';
-      }
-      this.showWait = showWait;
-    };
-  },
-};
-
-export const SCALING_POLICY_POPOVER = 'spinnaker.amazon.serverGroup.details.scalingPolicy.popover.component';
-module(SCALING_POLICY_POPOVER, [AMAZON_SERVERGROUP_DETAILS_SCALINGPOLICY_CHART_METRICALARMCHART_COMPONENT]).component(
-  'awsScalingPolicyPopover',
-  scalingPolicyPopover,
-);

package/src/serverGroup/details/scalingPolicy/scalingPolicySummary.component.less

@@ -1,15 +0,0 @@
-scaling-policy-summary {
-  .alarm-name {
-    word-break: break-all;
-  }
-  .actions {
-    font-size: 85%;
-    margin: 0 0 15px 0;
-    border-bottom: 1px solid var(--color-alto);
-
-    .btn-left {
-      padding-left: 0;
-      border-left-width: 0;
-    }
-  }
-}

package/src/serverGroup/details/scalingPolicy/stepPolicySummary.component.ts

@@ -1,10 +0,0 @@
-import { module } from 'angular';
-import { react2angular } from 'react2angular';
-import { withErrorBoundary } from '@spinnaker/core';
-import { StepPolicySummary } from './StepPolicySummary';
-
-export const STEP_POLICY_SUMMARY_COMPONENT = 'spinnaker.amazon.scalingPolicy.stepPolicySummary.component';
-module(STEP_POLICY_SUMMARY_COMPONENT, []).component(
-  'stepPolicySummary',
-  react2angular(withErrorBoundary(StepPolicySummary, 'stepPolicySummary'), ['application', 'policy', 'serverGroup']),
-);

package/src/serverGroup/details/scalingPolicy/targetTracking/TargetTrackingPolicy.config.ts

@@ -1,6 +0,0 @@
-import { ScalingPolicyTypeRegistry } from '../ScalingPolicyTypeRegistry';
-
-ScalingPolicyTypeRegistry.registerPolicyType({
-  type: 'TargetTrackingScaling',
-  summaryTemplateUrl: require('./targetTrackingSummary.html'),
-});

package/src/serverGroup/details/scalingPolicy/targetTracking/targetTracking.module.ts

@@ -1,8 +0,0 @@
-import { module } from 'angular';
-
-import './TargetTrackingPolicy.config';
-import { TARGET_TRACKING_CHART_COMPONENT } from './targetTrackingChart.component';
-import { TARGET_TRACKING_SUMMARY_COMPONENT } from './targetTrackingSummary.component';
-
-export const TARGET_TRACKING_MODULE = 'spinnaker.amazon.scalingPolicy.targetTracking';
-module(TARGET_TRACKING_MODULE, [TARGET_TRACKING_CHART_COMPONENT, TARGET_TRACKING_SUMMARY_COMPONENT]);

package/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingChart.component.ts

@@ -1,16 +0,0 @@
-import { module } from 'angular';
-import { react2angular } from 'react2angular';
-import { withErrorBoundary } from '@spinnaker/core';
-import { TargetTrackingChart } from './TargetTrackingChart';
-
-export const TARGET_TRACKING_CHART_COMPONENT = 'spinnaker.amazon.scalingPolicy.targetTracking.chart.component';
-module(TARGET_TRACKING_CHART_COMPONENT, []).component(
-  'targetTrackingChart',
-  react2angular(withErrorBoundary(TargetTrackingChart, 'targetTrackingChart'), [
-    'alarmUpdated',
-    'config',
-    'serverGroup',
-    'unit',
-    'updateUnit',
-  ]),
-);

package/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.component.ts

@@ -1,14 +0,0 @@
-import { module } from 'angular';
-import { react2angular } from 'react2angular';
-import { withErrorBoundary } from '@spinnaker/core';
-import { TargetTrackingSummary } from './TargetTrackingSummary';
-
-export const TARGET_TRACKING_SUMMARY_COMPONENT = 'spinnaker.amazon.scalingPolicy.targetTracking.summary.component';
-module(TARGET_TRACKING_SUMMARY_COMPONENT, []).component(
-  'targetTrackingSummary',
-  react2angular(withErrorBoundary(TargetTrackingSummary, 'stepPolicySummary'), [
-    'application',
-    'policy',
-    'serverGroup',
-  ]),
-);

package/src/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.html

@@ -1,5 +0,0 @@
-<target-tracking-summary
-  policy="$ctrl.policy"
-  server-group="$ctrl.serverGroup"
-  application="$ctrl.application"
-></target-tracking-summary>

package/src/vpc/vpcTag.directive.js

@@ -1,34 +0,0 @@
-'use strict';
-
-import { module } from 'angular';
-
-import { VpcReader } from '../vpc/VpcReader';
-
-export const AMAZON_VPC_VPCTAG_DIRECTIVE = 'spinnaker.amazon.vpc.tag.directive';
-export const name = AMAZON_VPC_VPCTAG_DIRECTIVE; // for backwards compatibility
-module(AMAZON_VPC_VPCTAG_DIRECTIVE, []).directive('vpcTag', function () {
-  return {
-    restrict: 'E',
-    scope: {
-      vpcId: '=',
-    },
-    template: '<span class="vpc-tag">{{vpcLabel}}</span>',
-    link: function (scope) {
-      function applyLabel() {
-        if (!scope.vpcId) {
-          scope.vpcLabel = 'None (EC2 Classic)';
-        } else {
-          VpcReader.getVpcName(scope.vpcId).then(function (name) {
-            scope.vpcLabel = '(' + scope.vpcId + ')';
-
-            if (name) {
-              scope.vpcLabel = name + ' ' + scope.vpcLabel;
-            }
-          });
-        }
-      }
-
-      scope.$watch('vpcId', applyLabel, true);
-    },
-  };
-});

package/src/vpc/vpcTag.directive.spec.js

@@ -1,60 +0,0 @@
-'use strict';
-
-import { VpcReader } from '../vpc/VpcReader';
-
-describe('Directives: vpcTag', function () {
-  var $q;
-
-  beforeEach(window.module(require('./vpcTag.directive').name));
-
-  beforeEach(
-    window.inject(function ($rootScope, $compile, _$q_) {
-      this.scope = $rootScope.$new();
-      this.compile = $compile;
-      $q = _$q_;
-    }),
-  );
-
-  describe('vpc tag rendering - no VPC provided', function () {
-    it('displays default message when no vpcId supplied', function () {
-      var domNode = this.compile('<vpc-tag></vpc-tag>')(this.scope);
-      this.scope.$digest();
-      expect(domNode.find('span').text()).toBe('None (EC2 Classic)');
-    });
-
-    it('displays default message when undefined vpcId supplied', function () {
-      var domNode = this.compile('<vpc-tag vpc-id="notDefined"></vpc-tag>')(this.scope);
-      this.scope.$digest();
-      expect(domNode.find('span').text()).toBe('None (EC2 Classic)');
-    });
-
-    it('displays default message when null vpcId supplied', function () {
-      this.scope.vpcId = null;
-      var domNode = this.compile('<vpc-tag vpc-id="vpcId"></vpc-tag>')(this.scope);
-      this.scope.$digest();
-      expect(domNode.find('span').text()).toBe('None (EC2 Classic)');
-    });
-  });
-
-  describe('vpc tag rendering - VPC provided', function () {
-    it('displays vpc name when found', function () {
-      spyOn(VpcReader, 'getVpcName').and.callFake(function () {
-        return $q.when('Main VPC');
-      });
-      this.scope.vpcId = 'vpc-1';
-      var domNode = this.compile('<vpc-tag vpc-id="vpcId"></vpc-tag>')(this.scope);
-      this.scope.$digest();
-      expect(domNode.find('span').text()).toBe('Main VPC (vpc-1)');
-    });
-
-    it('displays vpc id when not found', function () {
-      spyOn(VpcReader, 'getVpcName').and.callFake(function () {
-        return $q.when(null);
-      });
-      this.scope.vpcId = 'vpc-2';
-      var domNode = this.compile('<vpc-tag vpc-id="vpcId"></vpc-tag>')(this.scope);
-      this.scope.$digest();
-      expect(domNode.find('span').text()).toBe('(vpc-2)');
-    });
-  });
-});