fix custom-resources tests

aws · mergify · Jul 6, 2023 · Jun 7, 2023 · Jun 9, 2023 · Jun 9, 2023
commit b3d6654aa355f9e13920e454562e2d31e054db1b
diff --git a/packages/aws-cdk-lib/custom-resources/lib/provider-framework/runtime/framework.ts b/packages/aws-cdk-lib/custom-resources/lib/provider-framework/runtime/framework.ts
@@ -148,7 +148,9 @@ async function invokeUserFunction<A extends { ResponseURL: '...' }>(functionArnE
 
 function parseJsonPayload(payload: any): any {
   if (!payload) { return { }; }
-  const text = payload.toString();
+  // sdk v3 returns payloads in Uint8Array, either it or a string or Buffer
+  // can be cast into a buffer and then decoded.
+  let text = new TextDecoder().decode(Buffer.from(payload));
   try {
     return JSON.parse(text);
   } catch {

diff --git a/packages/aws-cdk-lib/custom-resources/test/provider-framework/mocks.ts b/packages/aws-cdk-lib/custom-resources/test/provider-framework/mocks.ts
@@ -86,7 +86,10 @@ export async function invokeFunctionMock(req: InvokeCommandInput): Promise<Invoc
     }
 
     return {
-      Payload: new TextEncoder().encode(JSON.stringify(ret)),
+      Payload: ret
+        ? new TextEncoder().encode(typeof ret !== 'string' ? JSON.stringify(ret) : ret)
+        // handle undefined explicitly for mocks so we don't encode it
+        : undefined,
     };
   } catch (e: any) {
     return {