Update unit tests, try/catch errors

aws · Nov 10, 2023 · a6d9357 · a6d9357
1 parent 6e04059
commit a6d9357
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/packages/aws-cdk-lib/core/lib/asset-staging.ts b/packages/aws-cdk-lib/core/lib/asset-staging.ts
@@ -570,11 +570,11 @@ function sanitizeHashValue(key: string, value: any): any {
         url.password = '';
         return url.toString();
       }
-    } catch (e) {
-      if (e instanceof TypeError) {
-        throw new Error(`${key} must be a valid URL, got ${value}.`);
-      }
-      throw e;
+    } catch (e: any) {
+      if (e.name === 'TypeError') {
+        throw new Error(`${key} must be a valid URL, got ${value}.`);      
+         }
+         throw e;
     }
   }
   return value;

diff --git a/packages/aws-cdk-lib/core/test/staging.test.ts b/packages/aws-cdk-lib/core/test/staging.test.ts
@@ -543,6 +543,25 @@ describe('staging', () => {
     ]);
   });
 
+  test('bundler throws n error when the PIP url is not a valid url', () => {
+    // GIVEN
+    const app = new App({ context: { [cxapi.NEW_STYLE_STACK_SYNTHESIS_CONTEXT]: false } });
+    const stack = new Stack(app, 'stack');
+    const directory = path.join(__dirname, 'fs', 'fixtures', 'test1');
+
+    // WHEN
+    expect(() => new AssetStaging(stack, 'Asset', {
+      sourcePath: directory,
+      bundling: {
+        image: DockerImage.fromRegistry('alpine'),
+        command: [DockerStubCommand.SUCCESS],
+        environment: {
+          PIP_INDEX_URL: 'NOT_A_URL',
+        },
+      },
+    })).toThrow('PIP_INDEX_URL must be a valid URL, got NOT_A_URL.');
+  });
+
   test('bundler outputs to intermediate dir and renames to asset', () => {
     // GIVEN
     const app = new App({ context: { [cxapi.NEW_STYLE_STACK_SYNTHESIS_CONTEXT]: false } });