@@ -599,76 +599,76 @@ integTest('cdk migrate generates migrate.json', withCDKMigrateFixture('typescrip
599
599
await fixture . cdkDestroy ( fixture . stackNamePrefix ) ;
600
600
} ) ) ;
601
601
602
- integTest ( 'cdk migrate --from-scan with AND/OR filters correctly filters resources' , withExtendedTimeoutFixture ( async ( fixture ) => {
603
- const stackName = `cdk-migrate-integ-${ fixture . randomString } ` ;
604
-
605
- await fixture . cdkDeploy ( 'migrate-stack' , {
606
- modEnv : { SAMPLE_RESOURCES : '1' } ,
607
- } ) ;
608
- await fixture . cdk (
609
- [ 'migrate' , '--stack-name' , stackName , '--from-scan' , 'new' , '--filter' , 'type=AWS::SNS::Topic,tag-key=tag1' , 'type=AWS::SQS::Queue,tag-key=tag3' ] ,
610
- { modEnv : { MIGRATE_INTEG_TEST : '1' } , neverRequireApproval : true , verbose : true , captureStderr : false } ,
611
- ) ;
612
-
613
- try {
614
- const response = await fixture . aws . cloudFormation ( 'describeGeneratedTemplate' , {
615
- GeneratedTemplateName : stackName ,
616
- } ) ;
617
- const resourceNames = [ ] ;
618
- for ( const resource of response . Resources || [ ] ) {
619
- if ( resource . LogicalResourceId ) {
620
- resourceNames . push ( resource . LogicalResourceId ) ;
621
- }
622
- }
623
- fixture . log ( `Resources: ${ resourceNames } ` ) ;
624
- expect ( resourceNames . some ( ele => ele && ele . includes ( 'migratetopic1' ) ) ) . toBeTruthy ( ) ;
625
- expect ( resourceNames . some ( ele => ele && ele . includes ( 'migratequeue1' ) ) ) . toBeTruthy ( ) ;
626
- } finally {
627
- await fixture . cdkDestroy ( 'migrate-stack' ) ;
628
- await fixture . aws . cloudFormation ( 'deleteGeneratedTemplate' , {
629
- GeneratedTemplateName : stackName ,
630
- } ) ;
631
- }
632
- } ) ) ;
633
-
634
- integTest ( 'cdk migrate --from-scan for resources with Write Only Properties generates warnings' , withExtendedTimeoutFixture ( async ( fixture ) => {
635
- const stackName = `cdk-migrate-integ-${ fixture . randomString } ` ;
636
-
637
- await fixture . cdkDeploy ( 'migrate-stack' , {
638
- modEnv : {
639
- LAMBDA_RESOURCES : '1' ,
640
- } ,
641
- } ) ;
642
- await fixture . cdk (
643
- [ 'migrate' , '--stack-name' , stackName , '--from-scan' , 'new' , '--filter' , 'type=AWS::Lambda::Function,tag-key=lambda-tag' ] ,
644
- { modEnv : { MIGRATE_INTEG_TEST : '1' } , neverRequireApproval : true , verbose : true , captureStderr : false } ,
645
- ) ;
646
-
647
- try {
648
-
649
- const response = await fixture . aws . cloudFormation ( 'describeGeneratedTemplate' , {
650
- GeneratedTemplateName : stackName ,
651
- } ) ;
652
- const resourceNames = [ ] ;
653
- for ( const resource of response . Resources || [ ] ) {
654
- if ( resource . LogicalResourceId && resource . ResourceType === 'AWS::Lambda::Function' ) {
655
- resourceNames . push ( resource . LogicalResourceId ) ;
656
- }
657
- }
658
- fixture . log ( `Resources: ${ resourceNames } ` ) ;
659
- const readmePath = path . join ( fixture . integTestDir , stackName , 'README.md' ) ;
660
- const readme = await fs . readFile ( readmePath , 'utf8' ) ;
661
- expect ( readme ) . toContain ( '## Warnings' ) ;
662
- for ( const resourceName of resourceNames ) {
663
- expect ( readme ) . toContain ( `### ${ resourceName } ` ) ;
664
- }
665
- } finally {
666
- await fixture . cdkDestroy ( 'migrate-stack' ) ;
667
- await fixture . aws . cloudFormation ( 'deleteGeneratedTemplate' , {
668
- GeneratedTemplateName : stackName ,
669
- } ) ;
670
- }
671
- } ) ) ;
602
+ // integTest('cdk migrate --from-scan with AND/OR filters correctly filters resources', withExtendedTimeoutFixture(async (fixture) => {
603
+ // const stackName = `cdk-migrate-integ-${fixture.randomString}`;
604
+
605
+ // await fixture.cdkDeploy('migrate-stack', {
606
+ // modEnv: { SAMPLE_RESOURCES: '1' },
607
+ // });
608
+ // await fixture.cdk(
609
+ // ['migrate', '--stack-name', stackName, '--from-scan', 'new', '--filter', 'type=AWS::SNS::Topic,tag-key=tag1', 'type=AWS::SQS::Queue,tag-key=tag3'],
610
+ // { modEnv: { MIGRATE_INTEG_TEST: '1' }, neverRequireApproval: true, verbose: true, captureStderr: false },
611
+ // );
612
+
613
+ // try {
614
+ // const response = await fixture.aws.cloudFormation('describeGeneratedTemplate', {
615
+ // GeneratedTemplateName: stackName,
616
+ // });
617
+ // const resourceNames = [];
618
+ // for (const resource of response.Resources || []) {
619
+ // if (resource.LogicalResourceId) {
620
+ // resourceNames.push(resource.LogicalResourceId);
621
+ // }
622
+ // }
623
+ // fixture.log(`Resources: ${resourceNames}`);
624
+ // expect(resourceNames.some(ele => ele && ele.includes('migratetopic1'))).toBeTruthy();
625
+ // expect(resourceNames.some(ele => ele && ele.includes('migratequeue1'))).toBeTruthy();
626
+ // } finally {
627
+ // await fixture.cdkDestroy('migrate-stack');
628
+ // await fixture.aws.cloudFormation('deleteGeneratedTemplate', {
629
+ // GeneratedTemplateName: stackName,
630
+ // });
631
+ // }
632
+ // }));
633
+
634
+ // integTest('cdk migrate --from-scan for resources with Write Only Properties generates warnings', withExtendedTimeoutFixture(async (fixture) => {
635
+ // const stackName = `cdk-migrate-integ-${fixture.randomString}`;
636
+
637
+ // await fixture.cdkDeploy('migrate-stack', {
638
+ // modEnv: {
639
+ // LAMBDA_RESOURCES: '1',
640
+ // },
641
+ // });
642
+ // await fixture.cdk(
643
+ // ['migrate', '--stack-name', stackName, '--from-scan', 'new', '--filter', 'type=AWS::Lambda::Function,tag-key=lambda-tag'],
644
+ // { modEnv: { MIGRATE_INTEG_TEST: '1' }, neverRequireApproval: true, verbose: true, captureStderr: false },
645
+ // );
646
+
647
+ // try {
648
+
649
+ // const response = await fixture.aws.cloudFormation('describeGeneratedTemplate', {
650
+ // GeneratedTemplateName: stackName,
651
+ // });
652
+ // const resourceNames = [];
653
+ // for (const resource of response.Resources || []) {
654
+ // if (resource.LogicalResourceId && resource.ResourceType === 'AWS::Lambda::Function') {
655
+ // resourceNames.push(resource.LogicalResourceId);
656
+ // }
657
+ // }
658
+ // fixture.log(`Resources: ${resourceNames}`);
659
+ // const readmePath = path.join(fixture.integTestDir, stackName, 'README.md');
660
+ // const readme = await fs.readFile(readmePath, 'utf8');
661
+ // expect(readme).toContain('## Warnings');
662
+ // for (const resourceName of resourceNames) {
663
+ // expect(readme).toContain(`### ${resourceName}`);
664
+ // }
665
+ // } finally {
666
+ // await fixture.cdkDestroy('migrate-stack');
667
+ // await fixture.aws.cloudFormation('deleteGeneratedTemplate', {
668
+ // GeneratedTemplateName: stackName,
669
+ // });
670
+ // }
671
+ // }));
672
672
673
673
[ 'typescript' , 'python' , 'csharp' , 'java' ] . forEach ( language => {
674
674
integTest ( `cdk migrate --from-stack creates deployable ${ language } app` , withExtendedTimeoutFixture ( async ( fixture ) => {
0 commit comments