Merge branch 'master' into appmesh/compile

mergify[bot] · web-flow · commit 4a8f502c7637 · 2021-10-13T17:39:35.000Z
diff --git a/build.sh b/build.sh
@@ -94,6 +94,10 @@ if [ "$check_compat" == "true" ]; then
 fi
 
 # Create the release notes for the current version. These are ephemeral and not saved in source.
-node ./scripts/create-release-notes.js
+# Skip this step for a "bump candidate" build, where a new, fake version number has been created
+# without any corresponding changelog entries.
+if ! ${BUMP_CANDIDATE:-false}; then
+    node ./scripts/create-release-notes.js
+fi
 
 touch $BUILD_INDICATOR
diff --git a/packages/@aws-cdk/aws-ssm/lib/parameter.ts b/packages/@aws-cdk/aws-ssm/lib/parameter.ts
@@ -137,6 +137,13 @@ export interface StringParameterProps extends ParameterOptions {
    * @default ParameterType.STRING
    */
   readonly type?: ParameterType;
+
+  /**
+   * The data type of the parameter, such as `text` or `aws:ec2:image`.
+   *
+   * @default - undefined
+   */
+  readonly dataType?: ParameterDataType;
 }
 
 /**
@@ -217,6 +224,20 @@ export enum ParameterType {
   AWS_EC2_IMAGE_ID = 'AWS::EC2::Image::Id',
 }
 
+/**
+ * SSM parameter data type
+ */
+export enum ParameterDataType {
+  /**
+   * Text
+   */
+  TEXT = 'text',
+  /**
+   * Aws Ec2 Image
+   */
+  AWS_EC2_IMAGE = 'aws:ec2:image',
+}
+
 /**
  * SSM parameter tier
  */
@@ -436,12 +457,17 @@ export class StringParameter extends ParameterBase implements IStringParameter {
       throw new Error('Description cannot be longer than 1024 characters.');
     }
 
+    if (props.type && props.type === ParameterType.AWS_EC2_IMAGE_ID) {
+      throw new Error('The type must either be ParameterType.STRING or ParameterType.STRING_LIST. Did you mean to set dataType: ParameterDataType.AWS_EC2_IMAGE instead?');
+    }
+
     const resource = new ssm.CfnParameter(this, 'Resource', {
       allowedPattern: props.allowedPattern,
       description: props.description,
       name: this.physicalName,
       tier: props.tier,
       type: props.type || ParameterType.STRING,
+      dataType: props.dataType,
       value: props.stringValue,
     });
 
diff --git a/packages/@aws-cdk/aws-ssm/test/parameter.test.ts b/packages/@aws-cdk/aws-ssm/test/parameter.test.ts
@@ -28,6 +28,34 @@ test('creating a String SSM Parameter', () => {
   });
 });
 
+test('type cannot be specified as AWS_EC2_IMAGE_ID', () => {
+  // GIVEN
+  const stack = new cdk.Stack();
+
+  // THEN
+  expect(() => new ssm.StringParameter(stack, 'myParam', {
+    stringValue: 'myValue',
+    type: ssm.ParameterType.AWS_EC2_IMAGE_ID,
+  })).toThrow('The type must either be ParameterType.STRING or ParameterType.STRING_LIST. Did you mean to set dataType: ParameterDataType.AWS_EC2_IMAGE instead?');
+});
+
+test('dataType can be specified', () => {
+  // GIVEN
+  const stack = new cdk.Stack();
+
+  // WHEN
+  new ssm.StringParameter(stack, 'myParam', {
+    stringValue: 'myValue',
+    dataType: ssm.ParameterDataType.AWS_EC2_IMAGE,
+  });
+
+  // THEN
+  expect(stack).toHaveResource('AWS::SSM::Parameter', {
+    Value: 'myValue',
+    DataType: 'aws:ec2:image',
+  });
+});
+
 test('expect String SSM Parameter to have tier properly set', () => {
   // GIVEN
   const stack = new cdk.Stack();
diff --git a/yarn.lock b/yarn.lock
@@ -1583,7 +1583,7 @@
   dependencies:
     "@types/glob" "*"
 
-"@types/aws-lambda@^8.10.83", "@types/aws-lambda@^8.10.84":
+"@types/aws-lambda@^8.10.84":
   version "8.10.84"
   resolved "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.84.tgz#b1f391ceeb6908b28d8416d93f27afe8d1348d4e"
   integrity sha512-5V78eLtmN0d4RA14hKDwcsMQRl3JotQJlhGFDBo/jdE2TyDFRaYwB/UmMUC4SzhSvRGn+YMkh7jGPnXi8COAng==
@@ -9027,7 +9027,7 @@ symbol-tree@^3.2.4:
   resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-table@*, table@^6.0.9, table@^6.7.1, table@^6.7.2:
+table@*, table@^6.0.9, table@^6.7.2:
   version "6.7.2"
   resolved "https://registry.npmjs.org/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0"
   integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==
