unit and integ tests

Author: iankhou

packages/@aws-cdk/app-staging-synthesizer-alpha/lib/default-staging-stack.ts

@@ -257,8 +257,6 @@ export class DefaultStagingStack extends Stack implements IStagingResources {
   private readonly deployRoleArn?: string;
 
   constructor(scope: App, id: string, private readonly props: DefaultStagingStackProps) {
-    // eslint-disable-next-line no-console
-    console.log('hello');
     super(scope, id, {
       ...props,
       synthesizer: new BootstraplessSynthesizer({

packages/@aws-cdk/app-staging-synthesizer-alpha/test/app-staging-synthesizer.test.ts

@@ -26,6 +26,35 @@ describe(AppStagingSynthesizer, () => {
     });
   });
 
+  test('uses qualifier in deployment roles and staging context', () => {
+    // GIVEN
+    const qualifier = 'custom-qualifier';
+    const customApp = new App({
+      defaultStackSynthesizer: AppStagingSynthesizer.defaultResources({
+        appId: APP_ID,
+        bootstrapQualifier: qualifier,
+        stagingBucketEncryption: BucketEncryption.S3_MANAGED,
+      }),
+    });
+    new Stack(customApp, 'CustomStack', {
+      env: {
+        account: '111111111111',
+        region: 'us-east-1',
+      },
+    });
+
+    // WHEN
+    const assembly = customApp.synth();
+    const artifact = assembly.getStackArtifact('CustomStack');
+
+    // THEN
+    // The deployment role should contain the custom qualifier
+    expect(artifact.assumeRoleArn).toBe(`arn:\${AWS::Partition}:iam::111111111111:role/cdk-${qualifier}-deploy-role-111111111111-us-east-1`);
+
+    // The CloudFormation execution role should contain the custom qualifier
+    expect(artifact.cloudFormationExecutionRoleArn).toBe(`arn:\${AWS::Partition}:iam::111111111111:role/cdk-${qualifier}-cfn-exec-role-111111111111-us-east-1`);
+  });
+
   test('stack template is in asset manifest', () => {
     // GIVEN
     new CfnResource(stack, 'Resource', {

packages/@aws-cdk/app-staging-synthesizer-alpha/test/integ.synth-default-resources.ts

@@ -1,6 +1,7 @@
 import * as path from 'path';
 import * as integ from '@aws-cdk/integ-tests-alpha';
 import { App, Stack } from 'aws-cdk-lib';
+import { Template } from 'aws-cdk-lib/assertions';
 import * as lambda from 'aws-cdk-lib/aws-lambda';
 import { BucketEncryption } from 'aws-cdk-lib/aws-s3';
 import { APP_ID_MAX } from './util';
@@ -9,13 +10,34 @@ import { AppStagingSynthesizer } from '../lib';
 // IMAGE_COPIES env variable is used to test maximum number of ECR repositories allowed.
 const IMAGE_COPIES = Number(process.env.IMAGE_COPIES) ?? 1;
 
+// Test with custom qualifier
+const CUSTOM_QUALIFIER = 'custom-qualifier';
+
 const app = new App({
   context: {
     '@aws-cdk/aws-iam:minimizePolicies': true,
     '@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
   },
 });
 
+// Stack with custom qualifier
+const stackWithQualifier = new Stack(app, 'synthesize-with-qualifier', {
+  synthesizer: AppStagingSynthesizer.defaultResources({
+    appId: APP_ID_MAX,
+    bootstrapQualifier: CUSTOM_QUALIFIER,
+    stagingBucketEncryption: BucketEncryption.KMS,
+  }),
+});
+
+// Add a lambda to trigger asset creation
+new lambda.Function(stackWithQualifier, 'lambda-with-qualifier', {
+  code: lambda.AssetCode.fromAsset(path.join(__dirname, 'assets')),
+  handler: 'index.handler',
+  runtime: lambda.Runtime.PYTHON_3_10,
+});
+
+// Default stack without qualifier
+
 const stack = new Stack(app, 'synthesize-default-resources', {
   synthesizer: AppStagingSynthesizer.defaultResources({
     appId: APP_ID_MAX, // this has implications on the overall template size
@@ -57,13 +79,27 @@ new lambda.Function(stack, 'lambda-ecr-two', {
   runtime: lambda.Runtime.FROM_IMAGE,
 });
 
+// Get both staging stacks
 const defaultStagingStack = app.node.tryFindChild(`StagingStack-${APP_ID_MAX}-ACCOUNT-REGION`) as Stack;
-if (!defaultStagingStack) {
-  throw new Error('Default Staging Stack not found');
+const qualifierStagingStack = app.node.tryFindChild(`StagingStack-${CUSTOM_QUALIFIER}-ACCOUNT-REGION`) as Stack;
+
+if (!defaultStagingStack || !qualifierStagingStack) {
+  throw new Error('One or more staging stacks not found');
 }
 
+// Add assertions to verify qualifier usage
 new integ.IntegTest(app, 'integ-tests', {
-  testCases: [stack, defaultStagingStack],
+  testCases: [stack, stackWithQualifier, defaultStagingStack, qualifierStagingStack],
+  diffAssets: true,
+});
+
+// Verify qualifier is used in role names
+Template.fromStack(qualifierStagingStack).hasResourceProperties('AWS::IAM::Role', {
+  RoleName: `cdk-${CUSTOM_QUALIFIER}-deploy-role-ACCOUNT-REGION`,
+});
+
+Template.fromStack(qualifierStagingStack).hasResourceProperties('AWS::IAM::Role', {
+  RoleName: `cdk-${CUSTOM_QUALIFIER}-file-role-REGION`,
 });
 
 app.synth();

packages/aws-cdk-lib/core/test/stack-synthesizers/bootstrapless-synthesizer.test.ts

@@ -2,8 +2,6 @@ import { FileAssetPackaging } from '@aws-cdk/cloud-assembly-schema';
 import { App } from '../../lib/app';
 import { Stack } from '../../lib/stack';
 import { BootstraplessSynthesizer } from '../../lib/stack-synthesizers/bootstrapless-synthesizer';
-import { DefaultStackSynthesizer } from '../../lib/stack-synthesizers/default-synthesizer';
-import { getAssetManifest, readAssetManifest } from './_helpers';
 
 describe('BootstraplessSynthesizer', () => {
   test('differs from DefaultStackSynthesizer in bootstrap requirements', () => {