Addressed review comments

Author: Tarun Belani

packages/@aws-cdk/aws-imagebuilder-alpha/README.md

@@ -374,14 +374,14 @@ distributionConfiguration.addAmiDistributions({
   launchTemplates: [
     {
       launchTemplate: ec2.LaunchTemplate.fromLaunchTemplateAttributes(this, 'LaunchTemplate', {
-        launchTemplateName: 'imagebuilder-ami'
+        launchTemplateId: 'lt-1234'
       }),
       setDefaultVersion: true
     },
     {
       accountId: '123456789012',
       launchTemplate: ec2.LaunchTemplate.fromLaunchTemplateAttributes(this, 'CrossAccountLaunchTemplate', {
-        launchTemplateName: 'imagebuilder-cross-account-ami'
+        launchTemplateId: 'lt-5678'
       }),
       setDefaultVersion: true
     }

packages/@aws-cdk/aws-imagebuilder-alpha/lib/distribution-configuration.ts

@@ -596,30 +596,26 @@ export class DistributionConfiguration extends DistributionConfigurationBase {
       throw new cdk.ValidationError('You must specify at least one AMI or container distribution', this);
     }
 
-    const distributionByRegion: { [region: string]: CfnDistributionConfiguration.DistributionProperty } =
-      Object.fromEntries(
-        Object.entries(this.amiDistributionsByRegion).map(
-          ([region, distribution]): [string, CfnDistributionConfiguration.DistributionProperty] => [
-            region,
-            {
-              region,
-              amiDistributionConfiguration: this.buildAmiDistribution(distribution),
-              fastLaunchConfigurations: this.buildFastLaunchConfigurations(distribution),
-              launchTemplateConfigurations: this.buildLaunchTemplateConfigurations(distribution),
-              ssmParameterConfigurations: this.buildSsmParameterConfigurations(distribution),
-              licenseConfigurationArns: this.buildLicenseConfigurationArns(distribution),
-            },
-          ],
-        ),
-      );
-    Object.values(this.containerDistributionsByRegion).forEach((containerDistribution) => {
-      const region = containerDistribution.region ?? cdk.Stack.of(this).region;
+    const distributionByRegion: { [region: string]: CfnDistributionConfiguration.DistributionProperty } = {};
+
+    for (const [region, distribution] of Object.entries(this.amiDistributionsByRegion)) {
+      distributionByRegion[region] = {
+        region,
+        amiDistributionConfiguration: this.buildAmiDistribution(distribution),
+        fastLaunchConfigurations: this.buildFastLaunchConfigurations(distribution),
+        launchTemplateConfigurations: this.buildLaunchTemplateConfigurations(distribution),
+        ssmParameterConfigurations: this.buildSsmParameterConfigurations(distribution),
+        licenseConfigurationArns: this.buildLicenseConfigurationArns(distribution),
+      };
+    }
+
+    for (const [region, containerDistribution] of Object.entries(this.containerDistributionsByRegion)) {
       distributionByRegion[region] = {
         ...(distributionByRegion[region] ?? {}),
         region,
         containerDistributionConfiguration: this.buildContainerDistribution(containerDistribution),
       };
-    });
+    }
 
     return Object.values(distributionByRegion);
   }

packages/@aws-cdk/aws-imagebuilder-alpha/test/integ.all-parameters.distribution-configuration.js.snapshot/aws-cdk-imagebuilder-distribution-configuration-all-parameters.assets.json

@@ -144,6 +144,9 @@
        },
        "Name": "imagebuilder-{{ imagebuilder:buildDate }}",
        "TargetAccountIds": [
+        {
+         "Ref": "AWS::AccountId"
+        },
         "123456789012",
         "098765432109"
        ]
@@ -211,7 +214,9 @@
         ]
        }
       ],
-      "Region": "us-east-1",
+      "Region": {
+       "Ref": "AWS::Region"
+      },
       "SsmParameterConfigurations": [
        {
         "AmiAccountId": "098765432109",
@@ -334,6 +339,9 @@
        },
        "Name": "imagebuilder-{{ imagebuilder:buildDate }}",
        "TargetAccountIds": [
+        {
+         "Ref": "AWS::AccountId"
+        },
         "123456789012",
         "098765432109"
        ]
@@ -388,7 +396,9 @@
         ]
        }
       ],
-      "Region": "us-east-1",
+      "Region": {
+       "Ref": "AWS::Region"
+      },
       "SsmParameterConfigurations": [
        {
         "AmiAccountId": "098765432109",
@@ -425,7 +435,7 @@
   "ContainerDistributionConfiguration18609EDB": {
    "Type": "AWS::ImageBuilder::DistributionConfiguration",
    "Properties": {
-    "Description": "This is an AMI distribution configuration.",
+    "Description": "This is a Container distribution configuration.",
     "Distributions": [
      {
       "ContainerDistributionConfiguration": {
@@ -441,7 +451,9 @@
         "Service": "ECR"
        }
       },
-      "Region": "us-east-1"
+      "Region": {
+       "Ref": "AWS::Region"
+      }
      },
      {
       "ContainerDistributionConfiguration": {