@spinnaker/titus 0.5.10 → 0.5.15

package/src/titus.module.ts

@@ -21,6 +21,11 @@ import { TITUS_SECURITYGROUP_SECURITYGROUP_READ_SERVICE } from './securityGroup/
 import { TITUS_SERVERGROUP_CONFIGURE_SERVERGROUPCOMMANDBUILDER } from './serverGroup/configure/ServerGroupCommandBuilder';
 import { TITUS_SERVERGROUP_CONFIGURE_SERVERGROUP_CONFIGURE_TITUS_MODULE } from './serverGroup/configure/serverGroup.configure.titus.module';
 import { TitusCloneServerGroupModal } from './serverGroup/configure/wizard/TitusCloneServerGroupModal';
+import {
+  TitusTargetTrackingChart,
+  TitusUpsertScalingPolicyModal,
+  TitusUpsertTargetTrackingModal,
+} from './serverGroup/details';
 import { TITUS_SERVERGROUP_DETAILS_CAPACITYDETAILSSECTION } from './serverGroup/details/capacityDetailsSection.component';
 import { TITUS_SERVERGROUP_DETAILS_LAUNCHCONFIGSECTION } from './serverGroup/details/launchConfigSection.component';
 import { TITUS_SERVERGROUP_DETAILS_SERVERGROUPDETAILS_TITUS_CONTROLLER } from './serverGroup/details/serverGroupDetails.titus.controller';
@@ -63,6 +68,9 @@ module(TITUS_MODULE, [
       configurationService: 'titusServerGroupConfigurationService',
       skipUpstreamStageCheck: true,
       checkForImageProviders: true,
+      TargetTrackingChart: TitusTargetTrackingChart,
+      UpsertStepPolicyModal: TitusUpsertScalingPolicyModal,
+      UpsertTargetTrackingModal: TitusUpsertTargetTrackingModal,
     },
     securityGroup: {
       reader: 'titusSecurityGroupReader',

package/src/titus.settings.ts

@@ -1,4 +1,5 @@
-import { IProviderSettings, SETTINGS } from '@spinnaker/core';
+import type { IProviderSettings } from '@spinnaker/core';
+import { SETTINGS } from '@spinnaker/core';
 
 export interface ITitusProviderSettings extends IProviderSettings {
   defaults: {

package/src/validation/ApplicationNameValidator.ts

@@ -1,4 +1,5 @@
-import { ApplicationNameValidator, FirewallLabels, IApplicationNameValidator } from '@spinnaker/core';
+import type { IApplicationNameValidator } from '@spinnaker/core';
+import { ApplicationNameValidator, FirewallLabels } from '@spinnaker/core';
 
 class TitusApplicationNameValidator implements IApplicationNameValidator {
   private validateSpecialCharacters(name: string, errors: string[]): void {

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,32 +0,0 @@
-import { IComponentOptions, IController, module } from 'angular';
-
-import { Application, IServerGroup } from '@spinnaker/core';
-import { 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,129 +0,0 @@
-import { IComponentController, IComponentOptions, module } from 'angular';
-
-import { ITargetTrackingConfiguration, ITargetTrackingPolicy } from '@spinnaker/amazon';
-import {
-  AccountService,
-  Application,
-  ConfirmationModalService,
-  IServerGroup,
-  ITaskMonitorConfig,
-  ReactModal,
-  TaskExecutor,
-} from '@spinnaker/core';
-
-import { IUpsertTargetTrackingModalProps, 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>