@spinnaker/titus 0.5.13 → 0.5.17

package/dist/serverGroup/details/scalingPolicy/targetTracking/TitusTargetTrackingChart.d.ts

@@ -1,11 +1,9 @@
 /// <reference types="react" />
-import type { Subject } from 'rxjs';
 import type { IAmazonServerGroup, ITargetTrackingConfiguration } from '@spinnaker/amazon';
 export interface ITitusTargetTrackingChartProps {
-    alarmUpdated?: Subject<void>;
     config: ITargetTrackingConfiguration;
     serverGroup: IAmazonServerGroup;
     unit?: string;
     updateUnit?: (unit: string) => void;
 }
-export declare const TitusTargetTrackingChart: ({ alarmUpdated, config, serverGroup, unit, updateUnit, }: ITitusTargetTrackingChartProps) => JSX.Element;
+export declare const TitusTargetTrackingChart: ({ config, serverGroup, unit, updateUnit }: ITitusTargetTrackingChartProps) => JSX.Element;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spinnaker/titus",
   "license": "Apache-2.0",
-  "version": "0.5.13",
+  "version": "0.5.17",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -13,9 +13,9 @@
     "lib": "npm run build"
   },
   "dependencies": {
-    "@spinnaker/amazon": "^0.11.0",
-    "@spinnaker/core": "^0.14.1",
-    "@spinnaker/docker": "^0.0.118",
+    "@spinnaker/amazon": "^0.12.2",
+    "@spinnaker/core": "^0.16.0",
+    "@spinnaker/docker": "^0.0.122",
     "@spinnaker/mocks": "1.0.7",
     "@uirouter/angularjs": "1.0.26",
     "@uirouter/react": "1.0.7",
@@ -33,8 +33,8 @@
     "rxjs": "6.6.7"
   },
   "devDependencies": {
-    "@spinnaker/eslint-plugin": "^3.0.0",
-    "@spinnaker/scripts": "^0.2.2",
+    "@spinnaker/eslint-plugin": "^3.0.1",
+    "@spinnaker/scripts": "^0.2.4",
     "@types/angular": "1.6.26",
     "@types/angular-ui-bootstrap": "0.13.41",
     "@types/lodash": "4.14.64",
@@ -44,5 +44,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "b36e5fa30e23cd60007e6839b0dab5e41bd410d5"
+  "gitHead": "59026ea6af7b81ffb8e8c59e18f43396906ddafb"
 }

package/src/instance/details/titusInstanceDetailsUtils.spec.ts

@@ -1,10 +1,10 @@
-import {
+import type {
   IAmazonApplicationLoadBalancer,
   IAmazonHealth,
   IAmazonTargetGroupHealth,
   ITargetGroup,
 } from '@spinnaker/amazon';
-import { Application } from '@spinnaker/core';
+import type { Application } from '@spinnaker/core';
 import { mockHealth, mockInstance, mockLoadBalancer, mockLoadBalancerHealth } from '@spinnaker/mocks';
 import {
   applyTargetGroupInfoToHealthMetric,

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

@@ -1,16 +1,7 @@
 import { module } from 'angular';
 
-import { TITUS_SERVERGROUP_DETAILS_SCALINGPOLICY_ALARMBASEDSUMMARY_COMPONENT } from './alarmBasedSummary.component';
 import { TITUS_CREATE_SCALING_POLICY_BUTTON } from './createScalingPolicyButton.component';
-import { SCALING_POLICY_SUMMARY } from './scalingPolicySummary.component';
-import { TARGET_TRACKING_MODULE } from './targetTracking/targetTracking.module';
 import { TITUS_SERVERGROUP_CUSTOM_SCALING_COMPONENT } from './titusCustomScalingPolicy.component';
 
 export const SCALING_POLICY_MODULE = 'spinnaker.titus.scalingPolicy.module';
-module(SCALING_POLICY_MODULE, [
-  SCALING_POLICY_SUMMARY,
-  TITUS_CREATE_SCALING_POLICY_BUTTON,
-  TARGET_TRACKING_MODULE,
-  TITUS_SERVERGROUP_DETAILS_SCALINGPOLICY_ALARMBASEDSUMMARY_COMPONENT,
-  TITUS_SERVERGROUP_CUSTOM_SCALING_COMPONENT,
-]);
+module(SCALING_POLICY_MODULE, [TITUS_CREATE_SCALING_POLICY_BUTTON, TITUS_SERVERGROUP_CUSTOM_SCALING_COMPONENT]);

package/src/serverGroup/details/scalingPolicy/targetTracking/TitusTargetTrackingChart.tsx

@@ -1,25 +1,17 @@
 import * as React from 'react';
-import type { Subject } from 'rxjs';
 
 import type { IAmazonServerGroup, IScalingPolicyAlarm, ITargetTrackingConfiguration } from '@spinnaker/amazon';
 import { MetricAlarmChart } from '@spinnaker/amazon';
 import type { ICloudMetricStatistics } from '@spinnaker/core';
 
 export interface ITitusTargetTrackingChartProps {
-  alarmUpdated?: Subject<void>;
   config: ITargetTrackingConfiguration;
   serverGroup: IAmazonServerGroup;
   unit?: string;
   updateUnit?: (unit: string) => void;
 }
 
-export const TitusTargetTrackingChart = ({
-  alarmUpdated,
-  config,
-  serverGroup,
-  unit,
-  updateUnit,
-}: ITitusTargetTrackingChartProps) => {
+export const TitusTargetTrackingChart = ({ config, serverGroup, unit, updateUnit }: ITitusTargetTrackingChartProps) => {
   const [alarm, setAlarm] = React.useState<IScalingPolicyAlarm>({
     alarmName: null,
     alarmArn: null,
@@ -59,15 +51,7 @@ export const TitusTargetTrackingChart = ({
     if (unit) {
       updateUnit(stats.unit);
     }
-    alarmUpdated?.next();
   };
 
-  return (
-    <MetricAlarmChart
-      alarm={alarm}
-      alarmUpdated={alarmUpdated}
-      onChartLoaded={onChartLoaded}
-      serverGroup={serverGroup}
-    />
-  );
+  return <MetricAlarmChart alarm={alarm} onChartLoaded={onChartLoaded} serverGroup={serverGroup} />;
 };

package/src/serverGroup/details/serverGroupDetails.html

@@ -134,12 +134,12 @@
     </collapsible-section>
 
     <collapsible-section heading="Scaling Policies">
-      <titus-scaling-policy-summary
+      <scaling-policy-summary
         ng-repeat="policy in serverGroup.scalingPolicies"
         policy="policy"
         server-group="serverGroup"
         application="ctrl.application"
-      ></titus-scaling-policy-summary>
+      ></scaling-policy-summary>
       <titus-create-scaling-policy-button
         server-group="serverGroup"
         application="ctrl.application"

package/dist/serverGroup/details/scalingPolicy/alarmBasedSummary.component.d.ts

@@ -1,2 +0,0 @@
-export const TITUS_SERVERGROUP_DETAILS_SCALINGPOLICY_ALARMBASEDSUMMARY_COMPONENT: "spinnaker.titus.serverGroup.details.scalingPolicy.alarmBasedSummary.component";
-export const name: "spinnaker.titus.serverGroup.details.scalingPolicy.alarmBasedSummary.component";

package/dist/serverGroup/details/scalingPolicy/scalingPolicySummary.component.d.ts

@@ -1 +0,0 @@
-export declare const SCALING_POLICY_SUMMARY = "spinnaker.titus.scalingPolicy.details.summary.component";

package/dist/serverGroup/details/scalingPolicy/targetTracking/targetTracking.module.d.ts

@@ -1 +0,0 @@
-export declare const TARGET_TRACKING_MODULE = "spinnaker.titus.scalingPolicy.targetTracking";

package/dist/serverGroup/details/scalingPolicy/targetTracking/targetTrackingChart.component.d.ts

@@ -1 +0,0 @@
-export declare const TARGET_TRACKING_CHART_COMPONENT = "spinnaker.titus.scalingPolicy.targetTracking.chart.component";

package/dist/serverGroup/details/scalingPolicy/targetTracking/targetTrackingSummary.component.d.ts

@@ -1,7 +0,0 @@
-export interface IAlarmRenderingServerGroup {
-    type: string;
-    name: string;
-    account: string;
-    region: string;
-}
-export declare const TARGET_TRACKING_SUMMARY_COMPONENT = "spinnaker.titus.scalingPolicy.targetTracking.summary.component";

package/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.html

@@ -1,30 +0,0 @@
-<span class="label label-default">{{ $ctrl.policy.policyType | robotToHuman | uppercase }}</span>
-<span class="label small" ng-if="$ctrl.policy.status.state !== 'Applied'">({{ $ctrl.policy.status.state }})</span>
-<div ng-repeat="alarm in $ctrl.policy.alarms track by $index">
-  <div
-    uib-popover-template="$ctrl.popoverTemplate"
-    popover-placement="left"
-    popover-title="{{ $ctrl.policy.policyName }}"
-    popover-trigger="'mouseenter'"
-  >
-    <div>
-      <strong>Whenever</strong>
-      {{ alarm.statistic }} of <span class="alarm-name">{{ alarm.metricName }}</span> is
-      <span ng-bind-html="alarm.comparator"></span> {{ alarm.threshold }}
-    </div>
-    <div>
-      <strong>for at least</strong>
-      {{ alarm.evaluationPeriods }} consecutive periods of {{ alarm.period }} seconds
-    </div>
-  </div>
-  <div class="actions text-right">
-    <button class="btn btn-xs btn-link" ng-click="$ctrl.editPolicy()">
-      <span class="glyphicon glyphicon-cog" uib-tooltip="Edit policy"></span>
-      <span class="sr-only">Edit policy</span>
-    </button>
-    <button class="btn btn-xs btn-link" ng-click="$ctrl.deletePolicy()">
-      <span class="glyphicon glyphicon-trash" uib-tooltip="Delete policy"></span>
-      <span class="sr-only">Delete policy</span>
-    </button>
-  </div>
-</div>

package/src/serverGroup/details/scalingPolicy/alarmBasedSummary.component.js

@@ -1,81 +0,0 @@
-'use strict';
-
-import { module } from 'angular';
-
-import { AccountService, ConfirmationModalService, ReactModal, TaskExecutor } from '@spinnaker/core';
-
-import { UpsertScalingPolicyModal } from './upsert/UpsertScalingPolicyModal';
-
-import './scalingPolicySummary.component.less';
-
-export const TITUS_SERVERGROUP_DETAILS_SCALINGPOLICY_ALARMBASEDSUMMARY_COMPONENT =
-  'spinnaker.titus.serverGroup.details.scalingPolicy.alarmBasedSummary.component';
-export const name = TITUS_SERVERGROUP_DETAILS_SCALINGPOLICY_ALARMBASEDSUMMARY_COMPONENT; // for backwards compatibility
-module(TITUS_SERVERGROUP_DETAILS_SCALINGPOLICY_ALARMBASEDSUMMARY_COMPONENT, []).component('titusAlarmBasedSummary', {
-  bindings: {
-    policy: '=',
-    serverGroup: '=',
-    application: '=',
-  },
-  templateUrl: require('./alarmBasedSummary.component.html'),
-  controller: [
-    '$uibModal',
-    function ($uibModal) {
-      this.$onInit = () => {
-        AccountService.getAccountDetails(this.serverGroup.account).then((details) => {
-          // alarmServerGroup is used to trick the chart rendering into using AWS metrics
-          this.alarmServerGroup = {
-            type: 'aws',
-            name: this.serverGroup.name,
-            account: details.awsAccount,
-            region: this.serverGroup.region,
-          };
-        });
-      };
-
-      this.popoverTemplate = require('./popover/scalingPolicyDetails.popover.html');
-
-      this.editPolicy = () => {
-        const upsertProps = {
-          app: this.application,
-          policy: this.policy,
-          serverGroup: this.serverGroup,
-        };
-        const modalProps = { dialogClassName: 'wizard-modal modal-lg' };
-        ReactModal.show(UpsertScalingPolicyModal, upsertProps, modalProps);
-      };
-
-      this.deletePolicy = () => {
-        const { application, policy, serverGroup } = this;
-        const taskMonitor = {
-          application,
-          title: 'Deleting scaling policy ' + policy.id,
-        };
-
-        const submitMethod = () =>
-          TaskExecutor.executeTask({
-            application,
-            description: 'Delete scaling policy ' + policy.id,
-            job: [
-              {
-                type: 'deleteScalingPolicy',
-                cloudProvider: 'titus',
-                credentials: serverGroup.account,
-                region: serverGroup.region,
-                scalingPolicyID: policy.id,
-                serverGroupName: serverGroup.name,
-              },
-            ],
-          });
-
-        ConfirmationModalService.confirm({
-          header: `Really delete ${policy.id}?`,
-          buttonText: 'Delete scaling policy',
-          account: serverGroup.account,
-          taskMonitorConfig: taskMonitor,
-          submitMethod: submitMethod,
-        });
-      };
-    },
-  ],
-});

package/src/serverGroup/details/scalingPolicy/alarmBasedSummary.template.html

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

package/src/serverGroup/details/scalingPolicy/popover/scalingPolicyDetails.popover.html

@@ -1 +0,0 @@
-<aws-scaling-policy-popover policy="$ctrl.policy" server-group="$ctrl.alarmServerGroup"></aws-scaling-policy-popover>

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

@@ -1,15 +0,0 @@
-titus-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/scalingPolicySummary.component.ts

@@ -1,33 +0,0 @@
-import type { IComponentOptions, IController } from 'angular';
-import { module } from 'angular';
-
-import type { Application, IServerGroup } from '@spinnaker/core';
-import type { ITitusPolicy } from '../../../domain';
-
-class ScalingPolicyDetailsSummaryController implements IController {
-  public templateUrl: string;
-  public policy: ITitusPolicy;
-  public serverGroup: IServerGroup;
-  public application: Application;
-
-  public $onInit() {
-    if (this.policy.targetPolicyDescriptor) {
-      this.templateUrl = require('./targetTracking/targetTrackingSummary.html');
-    } else {
-      this.templateUrl = require('./alarmBasedSummary.template.html');
-    }
-  }
-}
-
-const component: IComponentOptions = {
-  bindings: {
-    policy: '<',
-    serverGroup: '<',
-    application: '<',
-  },
-  controller: ScalingPolicyDetailsSummaryController,
-  template: `<div ng-include src="$ctrl.templateUrl"></div>`,
-};
-
-export const SCALING_POLICY_SUMMARY = 'spinnaker.titus.scalingPolicy.details.summary.component';
-module(SCALING_POLICY_SUMMARY, []).component('titusScalingPolicySummary', component);

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

@@ -1,7 +0,0 @@
-import { module } from 'angular';
-
-import { TARGET_TRACKING_CHART_COMPONENT } from './targetTrackingChart.component';
-import { TARGET_TRACKING_SUMMARY_COMPONENT } from './targetTrackingSummary.component';
-
-export const TARGET_TRACKING_MODULE = 'spinnaker.titus.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 { TitusTargetTrackingChart } from './TitusTargetTrackingChart';
-
-export const TARGET_TRACKING_CHART_COMPONENT = 'spinnaker.titus.scalingPolicy.targetTracking.chart.component';
-module(TARGET_TRACKING_CHART_COMPONENT, []).component(
-  'titusTargetTrackingChart',
-  react2angular(withErrorBoundary(TitusTargetTrackingChart, 'targetTrackingChart'), [
-    'alarmUpdated',
-    'config',
-    'serverGroup',
-    'unit',
-    'updateUnit',
-  ]),
-);

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

@@ -1,4 +0,0 @@
-<titus-target-tracking-chart
-  config="$ctrl.policy.targetTrackingConfiguration"
-  server-group="$ctrl.alarmServerGroup"
-></titus-target-tracking-chart>

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

@@ -1,124 +0,0 @@
-import type { IComponentController, IComponentOptions } from 'angular';
-import { module } from 'angular';
-
-import type { ITargetTrackingConfiguration, ITargetTrackingPolicy } from '@spinnaker/amazon';
-import type { Application, IServerGroup, ITaskMonitorConfig } from '@spinnaker/core';
-import { AccountService, ConfirmationModalService, ReactModal, TaskExecutor } from '@spinnaker/core';
-
-import type { IUpsertTargetTrackingModalProps } from './UpsertTargetTrackingModal';
-import { UpsertTargetTrackingModal } from './UpsertTargetTrackingModal';
-
-export interface IAlarmRenderingServerGroup {
-  type: string;
-  name: string;
-  account: string;
-  region: string;
-}
-
-interface ITitusPolicy extends ITargetTrackingPolicy {
-  id: string;
-}
-
-class TargetTrackingSummaryController implements IComponentController {
-  public policy: ITitusPolicy;
-  public serverGroup: IServerGroup;
-  public alarmServerGroup: IAlarmRenderingServerGroup;
-  public application: Application;
-  public config: ITargetTrackingConfiguration;
-  public popoverTemplate = require('./targetTrackingPopover.html');
-
-  constructor() {}
-
-  public $onInit() {
-    this.config = this.policy.targetTrackingConfiguration;
-    AccountService.getAccountDetails(this.serverGroup.account).then((details) => {
-      // alarmServerGroup is used to trick the chart rendering into using AWS metrics
-      this.alarmServerGroup = {
-        type: 'aws',
-        name: this.serverGroup.name,
-        account: details.awsAccount,
-        region: this.serverGroup.region,
-      };
-    });
-  }
-
-  public editPolicy(): void {
-    const upsertProps = {
-      app: this.application,
-      policy: this.policy,
-      serverGroup: this.serverGroup,
-    } as IUpsertTargetTrackingModalProps;
-    const modalProps = { dialogClassName: 'wizard-modal modal-lg' };
-    ReactModal.show(UpsertTargetTrackingModal, upsertProps, modalProps);
-  }
-
-  public deletePolicy(): void {
-    const { application, serverGroup, policy } = this;
-    const taskMonitor: ITaskMonitorConfig = {
-      application: this.application,
-      title: 'Deleting scaling policy ' + this.policy.id,
-    };
-
-    ConfirmationModalService.confirm({
-      header: `Really delete ${policy.id}?`,
-      buttonText: 'Delete scaling policy',
-      account: this.serverGroup.account,
-      taskMonitorConfig: taskMonitor,
-      submitMethod: () =>
-        TaskExecutor.executeTask({
-          application,
-          description: 'Delete scaling policy ' + policy.id,
-          job: [
-            {
-              type: 'deleteScalingPolicy',
-              cloudProvider: 'titus',
-              credentials: serverGroup.account,
-              region: serverGroup.region,
-              scalingPolicyID: policy.id,
-              serverGroupName: serverGroup.name,
-            },
-          ],
-        }),
-    });
-  }
-}
-
-const component: IComponentOptions = {
-  bindings: {
-    policy: '<',
-    serverGroup: '<',
-    application: '<',
-  },
-  controller: TargetTrackingSummaryController,
-  template: `
-    <div uib-popover-template="$ctrl.popoverTemplate"
-       popover-placement="left"
-       popover-title="Policy {{$ctrl.policy.id}}"
-       popover-trigger="'mouseenter'">
-      <p>
-        <span class="label label-default">TARGET TRACKING</span>
-        <span class="label small" ng-if="$ctrl.policy.status.state !== 'Applied'">({{$ctrl.policy.status.state}})</span>
-        <div>
-          <strong>Target</strong>
-          {{$ctrl.config.predefinedMetricSpecification.predefinedMetricType}}
-          {{$ctrl.config.customizedMetricSpecification.metricName}}
-          <span ng-if="$ctrl.config.customizedMetricSpecification">({{$ctrl.config.customizedMetricSpecification.statistic}})</span>
-          @ {{$ctrl.config.targetValue}}
-        </div>
-      </p>
-      <div class="actions text-right">
-        <button class="btn btn-xs btn-link" ng-click="$ctrl.editPolicy()">
-          <span class="glyphicon glyphicon-cog" uib-tooltip="Edit policy"></span>
-          <span class="sr-only">Edit policy</span>
-        </button>
-        <button class="btn btn-xs btn-link" ng-click="$ctrl.deletePolicy()">
-          <span class="glyphicon glyphicon-trash" uib-tooltip="Delete policy"></span>
-          <span class="sr-only">Delete policy</span>
-        </button>
-      </div>
-    </div>
-  `,
-};
-
-export const TARGET_TRACKING_SUMMARY_COMPONENT = 'spinnaker.titus.scalingPolicy.targetTracking.summary.component';
-module(TARGET_TRACKING_SUMMARY_COMPONENT, []).component('titusTargetTrackingSummary', component);

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

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