switch

aws · Jun 9, 2020 · 17df113 · 17df113
1 parent 1ff601d
commit 17df113
Showing 1 changed file with 18 additions and 22 deletions.
diff --git a/packages/@aws-cdk/core/lib/asset-staging.ts b/packages/@aws-cdk/core/lib/asset-staging.ts
@@ -70,17 +70,16 @@ export class AssetStaging extends Construct {
   constructor(scope: Construct, id: string, props: AssetStagingProps) {
     super(scope, id);
 
-    if (props.assetHash && props.assetHashType && props.assetHashType !== AssetHashType.CUSTOM) {
-      throw new Error(`Cannot specify \`${props.assetHashType}\` for \`assetHashType\` when \`assetHash\` is specified. Use \`CUSTOM\` or leave \`undefined\`.`);
-    }
-
     this.sourcePath = props.sourcePath;
     this.fingerprintOptions = props;
 
     if (props.bundling) {
       this.bundleDir = this.bundle(props.bundling);
     }
 
+    if (props.assetHash && props.assetHashType && props.assetHashType !== AssetHashType.CUSTOM) {
+      throw new Error(`Cannot specify \`${props.assetHashType}\` for \`assetHashType\` when \`assetHash\` is specified. Use \`CUSTOM\` or leave \`undefined\`.`);
+    }
     const hashType = props.assetHash ? AssetHashType.CUSTOM : props.assetHashType ?? AssetHashType.SOURCE;
     this.assetHash = this.calculateHash(hashType, props.assetHash);
 
@@ -176,24 +175,21 @@ export class AssetStaging extends Construct {
   }
 
   private calculateHash(hashType: AssetHashType, assetHash?: string): string {
-    if (hashType === AssetHashType.SOURCE) {
-      return FileSystem.fingerprint(this.sourcePath, this.fingerprintOptions);
-    }
-
-    if (hashType === AssetHashType.BUNDLE) {
-      if (!this.bundleDir) {
-        throw new Error('Cannot use `AssetHashType.BUNDLE` when `bundling` is not specified.');
-      }
-      return FileSystem.fingerprint(this.bundleDir, this.fingerprintOptions);
-    }
-
-    if (hashType === AssetHashType.CUSTOM) {
-      if (!assetHash) {
-        throw new Error('`assetHash` must be specified when `assetHashType` is set to `AssetHashType.CUSTOM`.');
-      }
-      return assetHash;
+    switch (hashType) {
+      case AssetHashType.SOURCE:
+        return FileSystem.fingerprint(this.sourcePath, this.fingerprintOptions);
+      case AssetHashType.BUNDLE:
+        if (!this.bundleDir) {
+          throw new Error('Cannot use `AssetHashType.BUNDLE` when `bundling` is not specified.');
+        }
+        return FileSystem.fingerprint(this.bundleDir, this.fingerprintOptions);
+      case AssetHashType.CUSTOM:
+        if (!assetHash) {
+          throw new Error('`assetHash` must be specified when `assetHashType` is set to `AssetHashType.CUSTOM`.');
+        }
+        return assetHash;
+      default:
+        throw new Error('Unknown asset hash type.');
     }
-
-    throw new Error('Unknown asset hash type.');
   }
 }