fix(s3-deployment): source markers missing when there are multiple so…

…urces (#23364)

Follow up to #23321. There is an interesting edge case where if there is _any_ source that has source markers then _all_ sources have to have source markers. This is due to the way the custom resource logic works

https://github.com/aws/aws-cdk/blob/02d0876bbb196e9fbeb32d977e7cf65229c8559d/packages/%40aws-cdk/aws-s3-deployment/lib/lambda/index.py#L64

https://github.com/aws/aws-cdk/blob/02d0876bbb196e9fbeb32d977e7cf65229c8559d/packages/%40aws-cdk/aws-s3-deployment/lib/lambda/index.py#L137


----

### All Submissions:

* [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md)

### Adding new Construct Runtime Dependencies:

* [ ] This PR adds new construct runtime dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-construct-runtime-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)?
	* [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)?

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

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

@@ -369,6 +369,10 @@ export class BucketDeployment extends Construct {
             return this.sources.reduce((acc, source) => {
               if (source.markers) {
                 acc.push(source.markers);
+                // if there are more than 1 source, then all sources
+                // require markers (custom resource will throw an error otherwise)
+              } else if (this.sources.length > 1) {
+                acc.push({});
               }
               return acc;
             }, [] as Array<Record<string, any>>);

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

@@ -1384,6 +1384,26 @@ test('can add sources with addSource', () => {
   });
 });
 
+test('if any source has markers then all sources have markers', () => {
+  const app = new cdk.App();
+  const stack = new cdk.Stack(app, 'Test');
+  const bucket = new s3.Bucket(stack, 'Bucket');
+  const deployment = new s3deploy.BucketDeployment(stack, 'Deploy', {
+    sources: [s3deploy.Source.data('my/path.txt', 'helloWorld')],
+    destinationBucket: bucket,
+  });
+  deployment.addSource(s3deploy.Source.asset(path.join(__dirname, 'my-website')));
+
+  const result = app.synth();
+  const content = readDataFile(result, 'my/path.txt');
+  expect(content).toStrictEqual('helloWorld');
+  Template.fromStack(stack).hasResourceProperties('Custom::CDKBucketDeployment', {
+    SourceMarkers: [
+      {},
+      {},
+    ],
+  });
+});
 
 function readDataFile(casm: cxapi.CloudAssembly, relativePath: string): string {
   const assetDirs = readdirSync(casm.directory).filter(f => f.startsWith('asset.'));

packages/@aws-cdk/aws-s3-deployment/test/integ.bucket-deployment.js.snapshot/asset.6ddcf10002539818a9256eff3fb2b22aa09298d8f946e26ba121c175a600c44e/index.py → packages/@aws-cdk/aws-s3-deployment/test/integ.bucket-deployment.js.snapshot/asset.2bc265c5e0569aeb24a6349c15bd54e76e845892376515e036627ab0cc70bb64/index.py

@@ -236,7 +236,6 @@ def aws_command(*args):
 def cfn_send(event, context, responseStatus, responseData={}, physicalResourceId=None, noEcho=False, reason=None):
 
     responseUrl = event['ResponseURL']
-    logger.info(responseUrl)
 
     responseBody = {}
     responseBody['Status'] = responseStatus
@@ -306,4 +305,4 @@ def replace_markers(filename, markers):
 
     # # delete the original file and rename the new one to the original
     os.remove(filename)
-    os.rename(outfile, filename)
+    os.rename(outfile, filename)

packages/@aws-cdk/aws-s3-deployment/test/integ.bucket-deployment.js.snapshot/asset.67b455acb1a39b8327b9eece665245f3ecdef054977a27de1155c58054395c54/some-key

@@ -0,0 +1 @@
+helloworld

packages/@aws-cdk/aws-s3-deployment/test/integ.bucket-deployment.js.snapshot/asset.a94977ede0211fd3b45efa33d6d8d1d7bbe0c5a96d977139d8b16abfa96fe9cb/403.html

@@ -0,0 +1,2 @@
+<h1>Hello, S3 bucket deployments!</h1>
+<img src="rabir2v.gif">