linting fixes

aws · Oct 2, 2018 · baf96fa · baf96fa
1 parent 913e718
commit baf96fa
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 31 deletions.
diff --git a/packages/aws-cdk/lib/api/util/sdk.ts b/packages/aws-cdk/lib/api/util/sdk.ts
@@ -108,7 +108,7 @@ export class SDK {
   }
   public async route53(awsAccountId: string | undefined, region: string | undefined, mode: Mode): Promise<AWS.Route53> {
     return new AWS.Route53({
-      region: region,
+      region,
       credentials: await this.credentialsCache.get(awsAccountId, mode),
       ...this.defaultClientArgs
     });

diff --git a/packages/aws-cdk/lib/contextplugins.ts b/packages/aws-cdk/lib/contextplugins.ts
@@ -76,48 +76,51 @@ export class HostedZoneContextProviderPlugin implements ContextProviderPlugin {
     }
     const candidateZones = this.filterZones(r53, response.HostedZones,
       !!props.privateZone, props.vpcId);
-    if(candidateZones.length > 1) {
-      const filter = `dns:${domainName}, privateZone:${privateZone}, vpcId:${vpcId}`;
-      throw new Error(`Found more than one matching HostedZone ${candidateZones} for ${filter}`);
+    if (candidateZones.length > 1) {
+      const filteProps = `dns:${domainName}, privateZone:${privateZone}, vpcId:${vpcId}`;
+      throw new Error(`Found more than one matching HostedZone ${candidateZones} for ${filteProps}`);
     }
     return candidateZones[0];
   }
-  private filterZones(r53: AWS.Route53, zones: AWS.Route53.HostedZone[], privateZone: boolean, vpcId: string | undefined): AWS.Route53.HostedZone[]{
-    let candidates: AWS.Route53.HostedZone[] = [];
-    if(privateZone) {
-      candidates = zones.filter(zone => zone.Config && zone.Config.PrivateZone);
-    } else {
-      candidates = zones.filter(zone => !zone.Config || !zone.Config.PrivateZone);
-    }
-    if(vpcId) {
-      const vpcZones: AWS.Route53.HostedZone[] = [];
-      for(const zone of candidates) {
-        r53.getHostedZone({Id: zone.Id}, (err, data) => {
-          if(err) {
-            throw new Error(err.message);
-          }
-          if(!data.VPCs) {
-            debug(`Expected VPC for private zone but no VPC found ${zone.Id}`)
-            return;
-          }
-          if(data.VPCs.map(vpc => vpc.VPCId).includes(vpcId)) {
-            vpcZones.push(zone);
-          }
-        });
+
+  private filterZones(r53: AWS.Route53, zones: AWS.Route53.HostedZone[], privateZone: boolean, vpcId: string | undefined): AWS.Route53.HostedZone[] {
+
+      let candidates: AWS.Route53.HostedZone[] = [];
+      if (privateZone) {
+        candidates = zones.filter(zone => zone.Config && zone.Config.PrivateZone);
+      } else {
+        candidates = zones.filter(zone => !zone.Config || !zone.Config.PrivateZone);
       }
-      return vpcZones;
+      if (vpcId) {
+        const vpcZones: AWS.Route53.HostedZone[] = [];
+        for (const zone of candidates) {
+          r53.getHostedZone({Id: zone.Id}, (err, data) => {
+            if (err) {
+              throw new Error(err.message);
+            }
+            if (!data.VPCs) {
+              debug(`Expected VPC for private zone but no VPC found ${zone.Id}`);
+              return;
+            }
+            if (data.VPCs.map(vpc => vpc.VPCId).includes(vpcId)) {
+              vpcZones.push(zone);
+            }
+          });
+        }
+        return vpcZones;
+      }
+      return candidates;
     }
-    return candidates;
-  }
 
   private isHostedZoneProps(props: cxapi.HostedZoneProviderProps | any): props is cxapi.HostedZoneProviderProps {
-    return (<cxapi.HostedZoneProviderProps>props).domainName !== undefined;
+    return (props as cxapi.HostedZoneProviderProps).domainName !== undefined;
   }
 }
 /**
  * Iterate over the list of missing context values and invoke the appropriate providers from the map to retrieve them
  */
-export async function provideContextValues(missingValues: { [key: string]: cxapi.ContextProviderProps },
+export async function provideContextValues(
+  missingValues: { [key: string]: cxapi.ContextProviderProps },
   projectConfig: Settings,
   availableContextProviders: ProviderMap) {
   for (const key of Object.keys(missingValues)) {