@spinnaker/amazon 0.14.2 → 0.14.4

package/dist/pipeline/stages/deleteLambda/index.d.ts

@@ -1 +1,2 @@
 export * from './LambdaDeleteStage';
+export declare const AMAZON_PIPELINE_STAGES_LAMBDA_DELETE = "spinnaker.amazon.pipeline.stage.Aws.LambdaDeleteStage";

package/dist/pipeline/stages/deployLambda/index.d.ts

@@ -1 +1,2 @@
 export * from './config/LambdaDeploymentStage';
+export declare const AMAZON_PIPELINE_STAGES_LAMBDA_DEPLOY = "spinnaker.amazon.pipeline.stage.Aws.LambdaDeploymentStage";

package/dist/pipeline/stages/invokeLambda/index.d.ts

@@ -1 +1,2 @@
 export * from './LambdaInvokeStage';
+export declare const AMAZON_PIPELINE_STAGES_LAMBDA_INVOKE = "spinnaker.amazon.pipeline.stage.Aws.LambdaInvokeStage";

package/dist/pipeline/stages/routeLambda/index.d.ts

@@ -1 +1,2 @@
 export * from './LambdaRouteStage';
+export declare const AMAZON_PIPELINE_STAGES_LAMBDA_ROUTE = "spinnaker.amazon.pipeline.stage.Aws.LambdaTrafficRoutingStage";

package/dist/pipeline/stages/updateCodeLambda/index.d.ts

@@ -1 +1,2 @@
 export * from './LambdaUpdateCodeStage';
+export declare const AMAZON_PIPELINE_STAGES_LAMBDA_UPDATE = "spinnaker.amazon.pipeline.stage.Aws.LambdaUpdateCodeStage";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spinnaker/amazon",
   "license": "Apache-2.0",
-  "version": "0.14.2",
+  "version": "0.14.4",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "publishConfig": {
@@ -16,7 +16,7 @@
     "lib": "npm run build"
   },
   "dependencies": {
-    "@spinnaker/core": "^0.27.0",
+    "@spinnaker/core": "^0.29.0",
     "@uirouter/angularjs": "1.0.26",
     "@uirouter/core": "6.0.8",
     "@uirouter/react": "1.0.7",
@@ -44,7 +44,7 @@
   "devDependencies": {
     "@spinnaker/eslint-plugin": "^3.0.2",
     "@spinnaker/mocks": "1.0.7",
-    "@spinnaker/scripts": "^0.3.1",
+    "@spinnaker/scripts": "^0.4.0",
     "@types/angular": "1.6.26",
     "@types/angular-ui-bootstrap": "0.13.41",
     "@types/classnames": "2.2.0",
@@ -58,5 +58,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "217b75396c5ec25d9b2019a849593b0b8d52e916"
+  "gitHead": "082a084908e13888d640e88a5bd6e1571479de14"
 }

package/src/aws.module.ts

@@ -26,22 +26,26 @@ import { AWS_LOAD_BALANCER_MODULE } from './loadBalancer/loadBalancer.module';
 import amazonLogo from './logo/amazon.logo.svg';
 import { AMAZON_PIPELINE_STAGES_BAKE_AWSBAKESTAGE } from './pipeline/stages/bake/awsBakeStage';
 import { AMAZON_PIPELINE_STAGES_CLONESERVERGROUP_AWSCLONESERVERGROUPSTAGE } from './pipeline/stages/cloneServerGroup/awsCloneServerGroupStage';
+import { AMAZON_PIPELINE_STAGES_LAMBDA_DELETE } from './pipeline/stages/deleteLambda';
 import { CLOUD_FORMATION_CHANGE_SET_INFO } from './pipeline/stages/deployCloudFormation/CloudFormationChangeSetInfo';
 import { CLOUDFORMATION_TEMPLATE_ENTRY } from './pipeline/stages/deployCloudFormation/cloudFormationTemplateEntry.component';
 import { DEPLOY_CLOUDFORMATION_STACK_STAGE } from './pipeline/stages/deployCloudFormation/deployCloudFormationStackStage';
 import { AWS_EVALUATE_CLOUD_FORMATION_CHANGE_SET_EXECUTION_SERVICE } from './pipeline/stages/deployCloudFormation/evaluateCloudFormationChangeSetExecution.service';
+import { AMAZON_PIPELINE_STAGES_LAMBDA_DEPLOY } from './pipeline/stages/deployLambda';
 import { AMAZON_PIPELINE_STAGES_DESTROYASG_AWSDESTROYASGSTAGE } from './pipeline/stages/destroyAsg/awsDestroyAsgStage';
 import { AMAZON_PIPELINE_STAGES_DISABLEASG_AWSDISABLEASGSTAGE } from './pipeline/stages/disableAsg/awsDisableAsgStage';
 import { AMAZON_PIPELINE_STAGES_DISABLECLUSTER_AWSDISABLECLUSTERSTAGE } from './pipeline/stages/disableCluster/awsDisableClusterStage';
 import { AMAZON_PIPELINE_STAGES_ENABLEASG_AWSENABLEASGSTAGE } from './pipeline/stages/enableAsg/awsEnableAsgStage';
 import { AMAZON_PIPELINE_STAGES_FINDAMI_AWSFINDAMISTAGE } from './pipeline/stages/findAmi/awsFindAmiStage';
 import { AMAZON_PIPELINE_STAGES_FINDIMAGEFROMTAGS_AWSFINDIMAGEFROMTAGSSTAGE } from './pipeline/stages/findImageFromTags/awsFindImageFromTagsStage';
+import { AMAZON_PIPELINE_STAGES_LAMBDA_INVOKE } from './pipeline/stages/invokeLambda';
 import { AMAZON_PIPELINE_STAGES_MODIFYSCALINGPROCESS_MODIFYSCALINGPROCESSSTAGE } from './pipeline/stages/modifyScalingProcess/modifyScalingProcessStage';
 import { AMAZON_PIPELINE_STAGES_RESIZEASG_AWSRESIZEASGSTAGE } from './pipeline/stages/resizeAsg/awsResizeAsgStage';
 import { AMAZON_PIPELINE_STAGES_ROLLBACKCLUSTER_AWSROLLBACKCLUSTERSTAGE } from './pipeline/stages/rollbackCluster/awsRollbackClusterStage';
 import { AMAZON_PIPELINE_STAGES_SCALEDOWNCLUSTER_AWSSCALEDOWNCLUSTERSTAGE } from './pipeline/stages/scaleDownCluster/awsScaleDownClusterStage';
 import { AMAZON_PIPELINE_STAGES_SHRINKCLUSTER_AWSSHRINKCLUSTERSTAGE } from './pipeline/stages/shrinkCluster/awsShrinkClusterStage';
 import { AMAZON_PIPELINE_STAGES_TAGIMAGE_AWSTAGIMAGESTAGE } from './pipeline/stages/tagImage/awsTagImageStage';
+import { AMAZON_PIPELINE_STAGES_LAMBDA_UPDATE } from './pipeline/stages/updateCodeLambda';
 import { AWS_REACT_MODULE } from './reactShims/aws.react.module';
 import { AMAZON_SEARCH_SEARCHRESULTFORMATTER } from './search/searchResultFormatter';
 import { AWS_SECURITY_GROUP_MODULE } from './securityGroup/securityGroup.module';
@@ -114,6 +118,10 @@ module(AMAZON_MODULE, [
   INSTANCE_SECURITY_GROUPS_COMPONENT,
   INSTANCE_DNS_COMPONENT,
   AMAZON_INSTANCE_INFORMATION_COMPONENT,
+  AMAZON_PIPELINE_STAGES_LAMBDA_DELETE,
+  AMAZON_PIPELINE_STAGES_LAMBDA_DEPLOY,
+  AMAZON_PIPELINE_STAGES_LAMBDA_INVOKE,
+  AMAZON_PIPELINE_STAGES_LAMBDA_UPDATE,
 ]).config(() => {
   CloudProviderRegistry.registerProvider('aws', {
     name: 'Amazon',

package/src/function/configure/FunctionBasicInformation.tsx

@@ -19,22 +19,7 @@ import { s3BucketNameValidator } from '../../aws.validators';
 import type { IAmazonFunction } from '../../domain';
 import type { IAmazonFunctionUpsertCommand } from '../../index';
 
-const availableRuntimes = [
-  'nodejs10.x',
-  'nodejs12.x',
-  'java8',
-  'java11',
-  'python2.7',
-  'python3.6',
-  'python3.7',
-  'python3.8',
-  'dotnetcore2.1',
-  'dotnetcore3.1',
-  'go1.x',
-  'ruby2.5',
-  'ruby2.7',
-  'provided',
-];
+import { availableRuntimes } from '../../pipeline/stages/deployLambda/components/function.constants';
 
 export interface IFunctionProps {
   app: Application;

package/src/pipeline/stages/deleteLambda/index.ts

@@ -1,11 +1,17 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import { module } from 'angular';
+
 import { Registry, SETTINGS } from '@spinnaker/core';
-import { lambdaDeleteStage } from './LambdaDeleteStage';
 
+import { lambdaDeleteStage } from './LambdaDeleteStage';
 export * from './LambdaDeleteStage';
 
-if (SETTINGS.feature.lambdaAdditionalStages) {
-  Registry.pipeline.registerStage(lambdaDeleteStage);
-}
+export const AMAZON_PIPELINE_STAGES_LAMBDA_DELETE = 'spinnaker.amazon.pipeline.stage.Aws.LambdaDeleteStage';
+
+module(AMAZON_PIPELINE_STAGES_LAMBDA_DELETE, []).config(function () {
+  if (SETTINGS.feature.lambdaAdditionalStages) {
+    Registry.pipeline.registerStage(lambdaDeleteStage);
+  }
+});

package/src/pipeline/stages/deployCloudFormation/CloudFormationChangeSetInfo.tsx

@@ -13,7 +13,7 @@ export interface ICloudFormationChangeSetInfoProps {
 export const CloudFormationChangeSetInfo = (props: ICloudFormationChangeSetInfoProps) => {
   const { stage, stageconfig } = props;
   const [changeSetName, setChangeSetName] = useState(
-    (stage as any).changeSetName ? (stage as any).changeSetName : "ChangeSet-${ execution['id']}",
+    (stage as any).changeSetName ? (stage as any).changeSetName : "ChangeSet-${execution['id']}",
   );
   const [executeChangeSet, setExecuteChangeSet] = useState((stage as any).executeChangeSet);
   const [actionOnReplacement, setActionOnReplacement] = useState((stage as any).actionOnReplacement);

package/src/pipeline/stages/deployLambda/components/AwsLambdaFunctionStageForm.tsx

@@ -15,7 +15,6 @@ import {
   TetheredCreatable,
   TextInput,
 } from '@spinnaker/core';
-import { NumberConcurrencyInput } from '@spinnaker/core/dist/presentation/forms/inputs/NumberConcurrencyInput';
 
 import { BasicSettingsForm, ExecutionRoleForm, LambdaAtEdgeForm, NetworkForm, TriggerEventsForm } from './index';
 
@@ -96,7 +95,7 @@ export function AwsLambdaFunctionStageForm(props: IFormikStageConfigInjectedProp
         help={
           <HelpField content="The total number of current executions of your Lambda function that can be instantiated at any time." />
         }
-        input={(props) => <NumberConcurrencyInput {...props} min={0} max={3000} />}
+        input={(props) => <NumberInput {...props} min={0} max={3000} />}
       />
       <FormikFormField
         name="memorySize"

package/src/pipeline/stages/deployLambda/index.ts

@@ -1,11 +1,18 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import { module } from 'angular';
+
 import { Registry, SETTINGS } from '@spinnaker/core';
+
 import { lambdaDeploymentStage } from './config/LambdaDeploymentStage';
 
 export * from './config/LambdaDeploymentStage';
 
-if (SETTINGS.feature.lambdaAdditionalStages) {
-  Registry.pipeline.registerStage(lambdaDeploymentStage);
-}
+export const AMAZON_PIPELINE_STAGES_LAMBDA_DEPLOY = 'spinnaker.amazon.pipeline.stage.Aws.LambdaDeploymentStage';
+
+module(AMAZON_PIPELINE_STAGES_LAMBDA_DEPLOY, []).config(function () {
+  if (SETTINGS.feature.lambdaAdditionalStages) {
+    Registry.pipeline.registerStage(lambdaDeploymentStage);
+  }
+});

package/src/pipeline/stages/invokeLambda/components/InvokeLambdaOperation.tsx

@@ -19,6 +19,7 @@ export function InvokeLambdaOperation(props: IFormikStageConfigInjectedProps) {
     ArtifactTypePatterns.BITBUCKET_FILE,
     ArtifactTypePatterns.CUSTOM_OBJECT,
     ArtifactTypePatterns.EMBEDDED_BASE64,
+    ArtifactTypePatterns.REMOTE_BASE64,
     ArtifactTypePatterns.GCS_OBJECT,
     ArtifactTypePatterns.GITHUB_FILE,
     ArtifactTypePatterns.GITLAB_FILE,

package/src/pipeline/stages/invokeLambda/index.ts

@@ -1,11 +1,18 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import { module } from 'angular';
+
 import { Registry, SETTINGS } from '@spinnaker/core';
+
 import { lambdaInvokeStage } from './LambdaInvokeStage';
 
 export * from './LambdaInvokeStage';
 
-if (SETTINGS.feature.lambdaAdditionalStages) {
-  Registry.pipeline.registerStage(lambdaInvokeStage);
-}
+export const AMAZON_PIPELINE_STAGES_LAMBDA_INVOKE = 'spinnaker.amazon.pipeline.stage.Aws.LambdaInvokeStage';
+
+module(AMAZON_PIPELINE_STAGES_LAMBDA_INVOKE, []).config(function () {
+  if (SETTINGS.feature.lambdaAdditionalStages) {
+    Registry.pipeline.registerStage(lambdaInvokeStage);
+  }
+});

package/src/pipeline/stages/routeLambda/RouteLambdaFunctionStageForm.tsx

@@ -19,7 +19,6 @@ import {
   TextInput,
   useData,
 } from '@spinnaker/core';
-import { NumberConcurrencyInput } from '@spinnaker/core/dist/presentation/forms/inputs/NumberConcurrencyInput';
 
 import { TriggerEventsForm } from './TriggerEventsForm';
 import { DeploymentStrategyForm } from './components';
@@ -123,7 +122,7 @@ export function RouteLambdaFunctionStageForm(props: IFormikStageConfigInjectedPr
           values.deploymentStrategy === '$WEIGHTED' ? (
             <NumberInput {...props} min={0} max={0} />
           ) : (
-            <NumberConcurrencyInput {...props} min={0} max={3000} />
+            <NumberInput {...props} min={0} max={3000} />
           )
         }
         required={false}

package/src/pipeline/stages/routeLambda/index.ts

@@ -1,11 +1,18 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import { module } from 'angular';
+
 import { Registry, SETTINGS } from '@spinnaker/core';
+
 import { lambdaRouteStage } from './LambdaRouteStage';
 
 export * from './LambdaRouteStage';
 
-if (SETTINGS.feature.lambdaAdditionalStages) {
-  Registry.pipeline.registerStage(lambdaRouteStage);
-}
+export const AMAZON_PIPELINE_STAGES_LAMBDA_ROUTE = 'spinnaker.amazon.pipeline.stage.Aws.LambdaTrafficRoutingStage';
+
+module(AMAZON_PIPELINE_STAGES_LAMBDA_ROUTE, []).config(function () {
+  if (SETTINGS.feature.lambdaAdditionalStages) {
+    Registry.pipeline.registerStage(lambdaRouteStage);
+  }
+});

package/src/pipeline/stages/updateCodeLambda/LambdaUpdateCodeStage.less

@@ -0,0 +1,5 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+.LambdaCodeUpdateStageConfig {
+}

package/src/pipeline/stages/updateCodeLambda/index.ts

@@ -1,11 +1,18 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import { module } from 'angular';
+
 import { Registry, SETTINGS } from '@spinnaker/core';
+
 import { lambdaUpdateCodeStage } from './LambdaUpdateCodeStage';
 
 export * from './LambdaUpdateCodeStage';
 
-if (SETTINGS.feature.lambdaAdditionalStages) {
-  Registry.pipeline.registerStage(lambdaUpdateCodeStage);
-}
+export const AMAZON_PIPELINE_STAGES_LAMBDA_UPDATE = 'spinnaker.amazon.pipeline.stage.Aws.LambdaUpdateCodeStage';
+
+module(AMAZON_PIPELINE_STAGES_LAMBDA_UPDATE, []).config(function () {
+  if (SETTINGS.feature.lambdaAdditionalStages) {
+    Registry.pipeline.registerStage(lambdaUpdateCodeStage);
+  }
+});

package/src/serverGroup/details/scalingPolicy/upsert/step/StepPolicyAction.tsx

@@ -106,6 +106,7 @@ export const StepPolicyAction = ({
                 <NumberInput
                   value={step.metricIntervalLowerBound}
                   max={step.metricIntervalUpperBound}
+                  step={0.1}
                   onChange={(e) =>
                     updateStep({ ...step, metricIntervalLowerBound: Number.parseFloat(e.target.value) }, index)
                   }
@@ -121,6 +122,7 @@ export const StepPolicyAction = ({
                 <NumberInput
                   value={step.metricIntervalUpperBound}
                   min={step.metricIntervalLowerBound}
+                  step={0.1}
                   onChange={(e) =>
                     updateStep({ ...step, metricIntervalUpperBound: Number.parseFloat(e.target.value) }, index)
                   }

package/src/serverGroup/serverGroup.transformer.spec.ts

@@ -169,6 +169,17 @@ describe('awsServerGroupTransformer', () => {
           [0, 10, -5],
         );
       });
+
+      it('verify float adjustments work within the range', function () {
+        this.test(
+          [
+            { id: 1, scalingAdjustment: 10, metricIntervalLowerBound: 3.5, metricIntervalUpperBound: 5.5 },
+            { id: 2, scalingAdjustment: 0, metricIntervalLowerBound: 5.5 },
+            { id: 3, scalingAdjustment: -5, metricIntervalLowerBound: 1.2, metricIntervalUpperBound: 3.5 },
+          ],
+          [-5, 10, 0],
+        );
+      });
     });
   });
 });