|
1 | 1 | import { promises as fs, existsSync } from 'fs'; |
2 | 2 | import * as os from 'os'; |
3 | 3 | import * as path from 'path'; |
4 | | -import { AwsClients, TestFixture, integTest, cloneDirectory, shell, withDefaultFixture, retry, sleep, randomInteger, withSamIntegrationFixture, RESOURCES_DIR, withCDKMigrateFixture, withExtendedTimeoutFixture } from '../../lib'; |
| 4 | +import { integTest, cloneDirectory, shell, withDefaultFixture, retry, sleep, randomInteger, withSamIntegrationFixture, RESOURCES_DIR, withCDKMigrateFixture, withExtendedTimeoutFixture } from '../../lib'; |
5 | 5 |
|
6 | 6 | jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime |
7 | 7 |
|
@@ -687,22 +687,15 @@ integTest('cdk migrate --from-scan for resources with Write Only Properties gene |
687 | 687 | ['migrate', '--stack-name', migrateStackName, '--from-stack'], |
688 | 688 | { modEnv: { MIGRATE_INTEG_TEST: '1' }, neverRequireApproval: true, verbose: true, captureStderr: false }, |
689 | 689 | ); |
690 | | - const awsClients = await AwsClients.default(fixture.output); |
691 | | - const fixtureJr = new TestFixture( |
692 | | - path.join(fixture.integTestDir, migrateStackName), |
693 | | - fixture.stackNamePrefix, |
694 | | - fixture.output, |
695 | | - awsClients, |
696 | | - '', |
697 | | - ); |
698 | | - await fixtureJr.cdkDeploy('migrate-stack', { neverRequireApproval: true, verbose: true, captureStderr: false }); |
| 690 | + await fixture.shell(['cd', path.join(fixture.integTestDir, migrateStackName)]); |
| 691 | + await fixture.cdk(['deploy', migrateStackName], { neverRequireApproval: true, verbose: true, captureStderr: false }); |
699 | 692 | const response = await fixture.aws.cloudFormation('describeStacks', { |
700 | 693 | StackName: migrateStackName, |
701 | 694 | }); |
702 | 695 |
|
703 | 696 | expect(response.Stacks?.[0].StackStatus).toEqual('UPDATE_COMPLETE'); |
704 | 697 | } finally { |
705 | | - await fixture.cdkDestroy(migrateStackName); |
| 698 | + await fixture.cdkDestroy('migrate-stack'); |
706 | 699 | } |
707 | 700 | })); |
708 | 701 | }); |
|
0 commit comments