Merge branch 'main' into issue-20854

mergify[bot] · web-flow · commit 4d309937678f · 2022-07-08T08:35:28.000Z
diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/load-balancer.test.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/load-balancer.test.ts
@@ -59,7 +59,7 @@ describe('tests', () => {
     const endpointService = new ec2.VpcEndpointService(stack, 'EndpointService', { vpcEndpointServiceLoadBalancers: [nlb] });
 
     // WHEN
-    const importedPHZ = route53.PublicHostedZone.fromHostedZoneAttributes(stack, 'MyPHZ', {
+    const importedPHZ = route53.PublicHostedZone.fromPublicHostedZoneAttributes(stack, 'MyPHZ', {
       hostedZoneId: 'sampleid',
       zoneName: 'MyZone',
     });
diff --git a/packages/@aws-cdk/aws-route53/lib/hosted-zone.ts b/packages/@aws-cdk/aws-route53/lib/hosted-zone.ts
@@ -250,8 +250,8 @@ export class PublicHostedZone extends HostedZone implements IPublicHostedZone {
    * @param id  the logical name of this Construct
    * @param attrs the PublicHostedZoneAttributes (hosted zone ID and hosted zone name)
    */
-  public static fromPublicHostedZoneAttributes(scope: Construct, id: string, attrs: PublicHostedZoneAttributes): IHostedZone {
-    class Import extends Resource implements IHostedZone {
+  public static fromPublicHostedZoneAttributes(scope: Construct, id: string, attrs: PublicHostedZoneAttributes): IPublicHostedZone {
+    class Import extends Resource implements IPublicHostedZone {
       public readonly hostedZoneId = attrs.hostedZoneId;
       public readonly zoneName = attrs.zoneName;
       public get hostedZoneArn(): string {
