Merge branch 'master' into bump/16.0.0

aws · Jun 30, 2020 · fc9d2cf · fc9d2cf
2 parents 057a1aa + 034bc35
commit fc9d2cf
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/packages/@aws-cdk/aws-batch/lib/compute-environment.ts b/packages/@aws-cdk/aws-batch/lib/compute-environment.ts
@@ -1,6 +1,6 @@
 import * as ec2 from '@aws-cdk/aws-ec2';
 import * as iam from '@aws-cdk/aws-iam';
-import { Aws, Construct, IResource, Resource, Stack, Tag } from '@aws-cdk/core';
+import { Construct, IResource, Resource, Stack, Tag } from '@aws-cdk/core';
 import { CfnComputeEnvironment } from './batch.generated';
 
 /**
@@ -493,7 +493,7 @@ export class ComputeEnvironment extends Resource implements IComputeEnvironment
         return props.computeResources.spotFleetRole;
       } else if (props.computeResources.type === ComputeResourceType.SPOT) {
         return iam.Role.fromRoleArn(this, 'Resource-SpotFleet-Role',
-          `arn${Aws.PARTITION}iam::${this.stack.account}:role/aws-service-role/spotfleet.amazonaws.com/AWSServiceRoleForEC2SpotFleet`);
+          `arn:${this.stack.partition}:iam::${this.stack.account}:role/aws-service-role/spotfleet.amazonaws.com/AWSServiceRoleForEC2SpotFleet`);
       }
     }
 

diff --git a/packages/@aws-cdk/aws-batch/test/compute-environment.test.ts b/packages/@aws-cdk/aws-batch/test/compute-environment.test.ts
@@ -104,11 +104,11 @@ describe('Batch Compute Evironment', () => {
             'Fn::Join': [
               '',
               [
-                'arn',
+                'arn:',
                 {
                   Ref: 'AWS::Partition',
                 },
-                'iam::',
+                ':iam::',
                 {
                   Ref: 'AWS::AccountId',
                 },

diff --git a/packages/@aws-cdk/aws-batch/test/integ.batch.expected.json b/packages/@aws-cdk/aws-batch/test/integ.batch.expected.json
@@ -1173,11 +1173,11 @@
             "Fn::Join": [
               "",
               [
-                "arn",
+                "arn:",
                 {
                   "Ref": "AWS::Partition"
                 },
-                "iam::",
+                ":iam::",
                 {
                   "Ref": "AWS::AccountId"
                 },
@@ -1351,4 +1351,4 @@
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts b/packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts
@@ -51,6 +51,18 @@ export enum ComparisonOperator {
    * Used only for alarms based on anomaly detection models
    */
   LESS_THAN_LOWER_OR_GREATER_THAN_UPPER_THRESHOLD = 'LessThanLowerOrGreaterThanUpperThreshold',
+
+  /**
+   * Specified statistic is greater than the anomaly model band.
+   * Used only for alarms based on anomaly detection models
+   */
+  GREATER_THAN_UPPER_THRESHOLD = 'GreaterThanUpperThreshold',
+
+  /**
+   * Specified statistic is lower than the anomaly model band.
+   * Used only for alarms based on anomaly detection models
+   */
+  LESS_THAN_LOWER_THRESHOLD = 'LessThanLowerThreshold',
 }
 
 const OPERATOR_SYMBOLS: {[key: string]: string} = {