Merge pull request #4 from codyzhao2770/tenant

done distribution tenant, other small changes

Author: codyzhao2770

packages/aws-cdk-lib/aws-cloudfront/lib/connection-group.ts

@@ -22,7 +22,7 @@ export interface IConnectionGroup extends IResource {
   /**
    * The unique identifier for the connection group.
    */
-  readonly groupId: string;
+  readonly id: string;
 
 }
 
@@ -48,7 +48,7 @@ export interface ConnectionGroupAttributes {
   /**
    * The unique identifier for the connection group.
    */
-  readonly groupId: string;
+  readonly id: string;
 }
 
 export interface ConnectionGroupProps {
@@ -65,15 +65,15 @@ export interface ConnectionGroupProps {
 
   /**
    * Whether IPv6 is enabled for the connection group
-   * @default false
+   * @default true
    */
   readonly ipv6Enabled?: boolean;
 
   /**
    * The ID of the Anycast static IP list.
    * @default - none
    */
-  readonly anycastIpListID?: string;
+  readonly anycastIpListId?: string;
 
   /**
    * The ID of the Anycast static IP list.
@@ -91,22 +91,22 @@ export class ConnectionGroup extends Resource implements IConnectionGroup {
       public readonly name: string;
       public readonly routingEndpoint: string;
       public readonly arn: string;
-      public readonly groupId: string;
+      public readonly id: string;
 
       constructor() {
         super(scope, id);
         this.name = attrs.name;
         this.routingEndpoint = attrs.routingEndpoint;
         this.arn = attrs.arn;
-        this.groupId = attrs.groupId;
+        this.id = attrs.id;
       }
     }();
   }
 
   public readonly name: string;
   public readonly routingEndpoint: string;
   public readonly arn: string;
-  public readonly groupId: string;
+  public readonly id: string;
 
   constructor(scope: Construct, id: string, props: ConnectionGroupProps) {
     super(scope, id);
@@ -117,14 +117,14 @@ export class ConnectionGroup extends Resource implements IConnectionGroup {
 
     const connectionGroup = new CfnConnectionGroup(this, 'Resource', {
       name: this.name,
-      anycastIpListId: props.anycastIpListID,
+      anycastIpListId: props.anycastIpListId,
       enabled: props.enabled ?? true,
-      ipv6Enabled: props.ipv6Enabled ?? false,
+      ipv6Enabled: props.ipv6Enabled ?? true,
       tags: props.tags,
     });
 
     this.routingEndpoint = connectionGroup.attrRoutingEndpoint;
     this.arn = connectionGroup.attrArn;
-    this.groupId = connectionGroup.ref;
+    this.id = connectionGroup.ref;
   }
 }

packages/aws-cdk-lib/aws-cloudfront/lib/distribution-tenant.ts

@@ -0,0 +1,125 @@
+import { Construct } from 'constructs';
+import { CfnDistributionTenant } from './cloudfront.generated';
+import { CfnTag, IResource, Resource } from '../../core';
+import { addConstructMetadata } from '../../core/lib/metadata-resource';
+
+export interface IDistributionTenant extends IResource {
+
+  readonly distributionId: string;
+
+  readonly name: string;
+
+  readonly domains: string[];
+
+  readonly connectionGroupId: string | undefined;
+
+}
+
+/**
+ * Attributes for importing an existing distribution tenant
+ */
+export interface DistributionTenantAttributes {
+  /**
+   * The distribution ID for this tenant.
+   */
+  readonly distributionId: string;
+
+  /**
+   * The name of the distribution tenant.
+   */
+  readonly name: string;
+
+  /**
+   * The domains associated with this tenant.
+   */
+  readonly domains: string[];
+
+  /**
+   * The connection group ID associated with this tenant.
+   */
+  readonly connectionGroupId: string;
+}
+
+export interface CustomizationProps extends CfnDistributionTenant.CustomizationsProperty {
+
+}
+
+export interface ManagedCertificateRequestProps extends CfnDistributionTenant.ManagedCertificateRequestProperty{
+
+}
+
+export interface ParameterProps extends CfnDistributionTenant.ParameterProperty{
+
+}
+
+export interface DistributionTenantProps {
+
+  readonly distributionId: string;
+
+  readonly name: string;
+
+  readonly domains: string[];
+
+  readonly connectionGroupId?: string;
+
+  readonly customizations?: CustomizationProps;
+
+  readonly enabled?: boolean;
+
+  readonly managedCertificateRequest?: ManagedCertificateRequestProps;
+
+  readonly parameters?: ParameterProps[];
+
+  readonly tags?: CfnTag [];
+}
+
+export class DistributionTenant extends Resource implements IDistributionTenant {
+  /**
+   * Import an existing distribution tenant
+   */
+  public static fromDistributionTenantAttributes(scope: Construct, id: string, attrs: DistributionTenantAttributes): IDistributionTenant {
+    return new class extends Resource implements IDistributionTenant {
+      public readonly distributionId: string;
+      public readonly name: string;
+      public readonly domains: string[];
+      public readonly connectionGroupId: string;
+
+      constructor() {
+        super(scope, id);
+        this.distributionId = attrs.distributionId;
+        this.name = attrs.name;
+        this.domains = attrs.domains;
+        this.connectionGroupId = attrs.connectionGroupId;
+      }
+    }();
+  }
+
+  public readonly distributionId: string;
+  public readonly name: string;
+  public readonly domains: string[];
+  public readonly connectionGroupId: string | undefined;
+
+  constructor(scope: Construct, id: string, props: DistributionTenantProps) {
+    super(scope, id);
+
+    addConstructMetadata(this, props);
+
+    this.name = props.name;
+    this.domains = props.domains;
+    this.distributionId = props.distributionId;
+
+    const distributionTenant = new CfnDistributionTenant(this, 'Resource', {
+      distributionId: props.distributionId,
+      domains: props.domains,
+      name: props.name,
+      connectionGroupId: props.connectionGroupId,
+      customizations: props.customizations,
+      enabled: props.enabled ?? true,
+      managedCertificateRequest: props.managedCertificateRequest,
+      parameters: props.parameters,
+      tags: props.tags,
+    });
+
+    this.connectionGroupId = distributionTenant.connectionGroupId;
+  }
+}

packages/aws-cdk-lib/aws-cloudfront/lib/distribution.ts

@@ -283,9 +283,9 @@ export interface DistributionProps {
    *
    * @see https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront-readme.html#cloudfront-saas-manager-resources
    *
-   * @default false
+   * @default DIRECT
    */
-  readonly multiTenant?: boolean;
+  readonly connectionMode?: ConnectionMode;
 
   /**
    * Configuration for a distribution tenant.
@@ -294,7 +294,11 @@ export interface DistributionProps {
    *
    * @default - No special tenant configurations (undefined).
    */
-  readonly tenantConfig?: CfnDistribution.TenantConfigProperty;
+  readonly tenantConfig?: TenantConfigProps;
+}
+
+export interface TenantConfigProps extends CfnDistribution.TenantConfigProperty {
+
 }
 
 /**
@@ -413,7 +417,7 @@ export class Distribution extends Resource implements IDistribution {
         viewerCertificate: this.certificate ? this.renderViewerCertificate(this.certificate,
           props.minimumProtocolVersion, props.sslSupportMethod) : undefined,
         webAclId: Lazy.string({ produce: () => this.webAclId }),
-        connectionMode: props.multiTenant ? 'tenant-only' : 'direct',
+        connectionMode: props.connectionMode ?? 'direct',
         tenantConfig: props.tenantConfig ?? undefined,
       },
     });
@@ -870,22 +874,24 @@ export class Distribution extends Resource implements IDistribution {
   }
 
   private validateMultiTenantConfig(props: DistributionProps) {
-    if (!props.multiTenant) {
+    if (props.connectionMode == ConnectionMode.DIRECT) {
       if (props.tenantConfig) {
         throw new ValidationError('tenantConfig is not supported for direct distributions', this);
       }
     } else {
-      if (props.domainNames) {
-        throw new ValidationError('domainNames may not be configured for multi-tenant distributions', this);
-      } if (props.enableIpv6) {
-        throw new ValidationError('enableIpv6 field is not supported for multi-tenant distributions, please use a connection group to configure IPV6 options', this);
-      } if (props.priceClass) {
-        throw new ValidationError('priceClass may not be configured for multi-tenant distributions', this);
-      } if (props.sslSupportMethod && props.sslSupportMethod == SSLMethod.VIP) {
-        throw new ValidationError( 'invalid SSL Method', this);
-      } if (props.defaultBehavior.smoothStreaming) {
-        throw new ValidationError( 'smoothStreaming not supported by multi-tenant distributions', this);
-      }
+      const validations = [
+        { condition: props.domainNames, message: 'domainNames may not be configured for multi-tenant distributions' },
+        { condition: props.enableIpv6, message: 'enableIpv6 field is not supported for multi-tenant distributions, please use a connection group to configure IPV6 options' },
+        { condition: props.priceClass, message: 'priceClass may not be configured for multi-tenant distributions' },
+        { condition: props.sslSupportMethod && props.sslSupportMethod == SSLMethod.VIP, message: 'invalid SSL Method' },
+        { condition: props.defaultBehavior.smoothStreaming, message: 'smoothStreaming not supported by multi-tenant distributions' },
+      ];
+
+      validations.forEach(({ condition, message }) => {
+        if (condition) {
+          throw new ValidationError(message, this);
+        }
+      });
     }
   }
 }
@@ -915,6 +921,11 @@ export enum PriceClass {
   PRICE_CLASS_ALL = 'PriceClass_All',
 }
 
+export enum ConnectionMode {
+  TENANT_ONLY = 'tenant-only',
+  DIRECT = 'direct',
+}
+
 /**
  * How HTTPs should be handled with your distribution.
  */

packages/aws-cdk-lib/aws-cloudfront/lib/index.ts

@@ -1,5 +1,7 @@
 export * from './cache-policy';
+export * from './connection-group';
 export * from './distribution';
+export * from './distribution-tenant';
 export * from './endpoint';
 export * from './function';
 export * from './geo-restriction';

packages/aws-cdk-lib/aws-cloudfront/lib/multi-tenant-distribution.ts

@@ -1,7 +1,7 @@
 import { Construct } from 'constructs';
 import { ICachePolicy } from './cache-policy';
 import { CfnDistribution, CfnMonitoringSubscription } from './cloudfront.generated';
-import { HttpVersion, ViewerProtocolPolicy, SSLMethod, SecurityPolicyProtocol, AllowedMethods, CachedMethods, ErrorResponse, EdgeLambda } from './distribution';
+import { HttpVersion, ViewerProtocolPolicy, SSLMethod, SecurityPolicyProtocol, AllowedMethods, CachedMethods, ErrorResponse, EdgeLambda, TenantConfigProps } from './distribution';
 import { FunctionAssociation } from './function';
 import { GeoRestriction } from './geo-restriction';
 import { IKeyGroup } from './key-group';
@@ -250,7 +250,7 @@ export interface MTDProps {
    *
    * @default - No special tenant configurations (undefined).
    */
-  readonly tenantConfig?: CfnDistribution.TenantConfigProperty;
+  readonly tenantConfig?: TenantConfigProps;
 }
 
 /**