make code v1/v2 aware

Author: Elad Ben-Israel

packages/@aws-cdk/aws-s3-deployment/test/bucket-deployment.test.ts

@@ -1,4 +1,4 @@
-import { readFileSync } from 'fs';
+import { readdirSync, readFileSync, existsSync } from 'fs';
 import * as path from 'path';
 import { Match, Template } from '@aws-cdk/assertions';
 import * as cloudfront from '@aws-cdk/aws-cloudfront';
@@ -1099,7 +1099,7 @@ test('Source.data() can be used to create a file with string contents', () => {
   });
 
   const result = app.synth();
-  const content = readDataFile(result, 'c5b1c01fc092abf1da35f6772e7c507e566aaa69404025c080ba074c69741755', 'my/path.txt');
+  const content = readDataFile(result, 'my/path.txt');
   expect(content).toStrictEqual('hello, world');
 });
 
@@ -1121,7 +1121,7 @@ test('Source.jsonData() can be used to create a file with a JSON object', () =>
   });
 
   const result = app.synth();
-  const obj = JSON.parse(readDataFile(result, '6a9e1763f42401799363d87d16b238c89bf75a56f2a3f67498a3224573062b0c', 'app-config.json'));
+  const obj = JSON.parse(readDataFile(result, 'app-config.json'));
   expect(obj).toStrictEqual({
     foo: 'bar',
     sub: {
@@ -1138,8 +1138,14 @@ test('Source.jsonData() can be used to create a file with a JSON object', () =>
 });
 
 
-function readDataFile(casm: cxapi.CloudAssembly, assetId: string, filePath: string): string {
-  const asset = casm.stacks[0].assets.find(a => a.id === assetId);
-  if (!asset) { throw new Error('Asset not found'); }
-  return readFileSync(path.join(casm.directory, asset.path, filePath), 'utf-8');
+function readDataFile(casm: cxapi.CloudAssembly, relativePath: string): string {
+  const assetDirs = readdirSync(casm.directory).filter(f => f.startsWith('asset.'));
+  for (const dir of assetDirs) {
+    const candidate = path.join(casm.directory, dir, relativePath);
+    if (existsSync(candidate)) {
+      return readFileSync(candidate, 'utf8');
+    }
+  }
+
+  throw new Error(`File ${relativePath} not found in any of the assets of the assembly`);
 }