Change physicalNameGenerator in (I)Resource to be a property instead …

…of a function.
aws · May 3, 2019 · b7c6f7c · b7c6f7c
1 parent 3d88a09
commit b7c6f7c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/packages/@aws-cdk/aws-s3/lib/bucket.ts b/packages/@aws-cdk/aws-s3/lib/bucket.ts
@@ -890,8 +890,8 @@ export class Bucket extends BucketBase {
     return this.onEvent(EventType.ObjectRemoved, dest, ...filters);
   }
 
-  public physicalNameGenerator(): PhysicalNameGenerator {
-    return super.physicalNameGenerator().toLowerCase();
+  public get physicalNameGenerator(): PhysicalNameGenerator {
+    return super.physicalNameGenerator.toLowerCase();
   }
 
   private validateBucketName(bucketName: string) {

diff --git a/packages/@aws-cdk/cdk/lib/physical-name.ts b/packages/@aws-cdk/cdk/lib/physical-name.ts
@@ -111,7 +111,7 @@ export class DeployTimeOrAssignedPhysicalName extends PhysicalName {
   /** @internal */
   public _resolveForCrossEnv(resource: IResource): void {
     if (!this.name) {
-      this.name = resource.physicalNameGenerator().generate();
+      this.name = resource.physicalNameGenerator.generate();
     }
   }
 }
diff --git a/packages/@aws-cdk/cdk/lib/resource.ts b/packages/@aws-cdk/cdk/lib/resource.ts
@@ -16,7 +16,7 @@ export interface IResource extends IConstruct {
    * possibly by calling `super` and changing the resulting generator,
    * to fit their needs.
    */
-  physicalNameGenerator(): PhysicalNameGenerator;
+  readonly physicalNameGenerator: PhysicalNameGenerator;
 
   /** @internal */
   _resolvePhysicalNameForCrossEnv(): void;
@@ -41,7 +41,7 @@ export abstract class Resource extends Construct implements IResource {
     this.physicalName = props.physicalName || PhysicalName.deployTime();
   }
 
-  public physicalNameGenerator(): PhysicalNameGenerator {
+  public get physicalNameGenerator(): PhysicalNameGenerator {
     return PhysicalNameGenerator.from(this);
   }