Merge branch 'main' into mrgrain/refactor/integ-runner/remove-deprecated-cli-engine

Author: mrgrain

packages/@aws-cdk/integ-runner/lib/cli.ts

@@ -79,7 +79,10 @@ export function parseCliArgs(args: string[] = []) {
   }
 
   const requestedTests = fromFile
-    ? (fs.readFileSync(fromFile, { encoding: 'utf8' })).split('\n').filter(x => x)
+    ? (fs.readFileSync(fromFile, { encoding: 'utf8' }))
+      .split('\n')
+      .filter(x => x)
+      .filter(x => !x.startsWith('#'))
     : (tests.length > 0 ? tests : undefined); // 'undefined' means no request
 
   if (argv['disable-update-workflow'] !== undefined && argv['update-workflow'] !== undefined) {

packages/@aws-cdk/integ-runner/test/cli.test.ts

@@ -132,6 +132,84 @@ describe('Test discovery', () => {
   });
 });
 
+describe('--from-file comment filtering', () => {
+  const currentCwd = process.cwd();
+  let tempDir: string;
+
+  beforeEach(() => {
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'integ-runner-test-'));
+    process.chdir(tempDir);
+  });
+
+  afterEach(() => {
+    process.chdir(currentCwd);
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  test('filters out comment lines starting with #', () => {
+    // Create temp file with mix of comments and test names
+    const testFile = path.join(tempDir, 'tests.txt');
+    fs.writeFileSync(testFile, [
+      '# This is a comment',
+      'test1.js',
+      '# Another comment',
+      'test2.js',
+      'test3.js',
+      '# Final comment',
+    ].join('\n'));
+
+    const options = parseCliArgs(['--from-file', testFile]);
+
+    // Verify comments are excluded and test names are included
+    expect(options.tests).toEqual(['test1.js', 'test2.js', 'test3.js']);
+  });
+
+  test('returns empty array for comment-only file', () => {
+    // Create temp file with only # lines
+    const testFile = path.join(tempDir, 'comments-only.txt');
+    fs.writeFileSync(testFile, [
+      '# Comment 1',
+      '# Comment 2',
+      '# Comment 3',
+    ].join('\n'));
+
+    const options = parseCliArgs(['--from-file', testFile]);
+
+    // Verify empty array is returned
+    expect(options.tests).toEqual([]);
+  });
+
+  test('preserves lines with # not at start (inline hash)', () => {
+    // Create temp file with lines like test#1.js
+    const testFile = path.join(tempDir, 'inline-hash.txt');
+    fs.writeFileSync(testFile, [
+      'test#1.js',
+      'my-test#feature.js',
+      'another#test#file.js',
+    ].join('\n'));
+
+    const options = parseCliArgs(['--from-file', testFile]);
+
+    // Verify lines with # not at start are preserved
+    expect(options.tests).toEqual(['test#1.js', 'my-test#feature.js', 'another#test#file.js']);
+  });
+
+  test('preserves lines with whitespace before # as test names', () => {
+    // Create temp file with lines like "  #not-a-comment"
+    const testFile = path.join(tempDir, 'whitespace-hash.txt');
+    fs.writeFileSync(testFile, [
+      '  #not-a-comment',
+      '\t#also-not-a-comment',
+      '   #test-name',
+    ].join('\n'));
+
+    const options = parseCliArgs(['--from-file', testFile]);
+
+    // Verify lines with whitespace before # are preserved as test names
+    expect(options.tests).toEqual(['  #not-a-comment', '\t#also-not-a-comment', '   #test-name']);
+  });
+});
+
 describe('CLI config file', () => {
   const configFile = 'integ.config.json';
   const withConfig = (settings: any, fileName = configFile) => {

packages/aws-cdk/lib/init-templates/.init-version.json

@@ -1 +1 @@
-{"aws-cdk-lib": "^2.236.0", "constructs": "^10.0.0"}
+{"aws-cdk-lib": "^2.237.0", "constructs": "^10.0.0"}

packages/aws-cdk/lib/init-templates/.recommended-feature-flags.json

@@ -49,6 +49,7 @@
   "@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2": true,
   "@aws-cdk/aws-kms:reduceCrossAccountRegionPolicyScope": true,
   "@aws-cdk/aws-eks:nodegroupNameAttribute": true,
+  "@aws-cdk/aws-eks:useNativeOidcProvider": true,
   "@aws-cdk/aws-ec2:ebsDefaultGp3Volume": true,
   "@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm": true,
   "@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": false,