From e3b73269b7660b85ea4c4a14778157fbac4f5830 Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Wed, 21 May 2025 12:54:48 +0100 Subject: [PATCH 01/33] chore(integ-testing): re-org test cases into folders (#515) I got annoyed at trying to find a certain test case. This will help a little. Just file moves + import changes. --- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license --- ...r-will-not-overwrite-the-default-template.integtest.ts | 2 +- .../{ => bootstrap}/cdk-bootstrap-add-tags.integtest.ts | 2 +- ...tags-then-update-tags-during-re-bootstrap.integtest.ts | 2 +- ...and-deploy-if-omitting-execution-policies.integtest.ts | 2 +- ...bootstrap-can-bootstrap-without-execution.integtest.ts | 2 +- ...--public-access-block-configuration-false.integtest.ts | 2 +- ...n-create-multiple-legacy-bootstrap-stacks.integtest.ts | 2 +- ...k-even-if-bootstrap-stack-name-is-unknown.integtest.ts | 2 +- ...an-deploy-with-session-tags-on-the-deploy.integtest.ts | 4 ++-- ...role-and-with-session-tags-on-deploy-role.integtest.ts | 4 ++-- .../cdk-bootstrap-can-dump-the-template.integtest.ts | 2 +- ...trap-can-remove-custompermissionsboundary.integtest.ts | 4 ++-- .../cdk-bootstrap-can-remove-trusted-account.integtest.ts | 2 +- ...ions-boundary-(with-slashes)-to-bootstrap.integtest.ts | 2 +- ...-custom-permissions-boundary-to-bootstrap.integtest.ts | 2 +- ...default-permissions-boundary-to-bootstrap.integtest.ts | 2 +- ...reate-ecr-with-tag-immutability-to-set-on.integtest.ts | 2 +- ...o-new-style-bootstrap-(with-docker-image).integtest.ts | 2 +- ...ew-style-synthesis-to-new-style-bootstrap.integtest.ts | 2 +- ...ld-style-synthesis-to-new-style-bootstrap.integtest.ts | 2 +- ...ootstrap-switch-on-termination-protection.integtest.ts | 2 +- ...stack-to-new-bootstrap-stack-while-in-use.integtest.ts | 2 +- .../{ => ci-output}/cdk-ci-output-to-stderr.integtest.ts | 2 +- .../cdk-ci-true-output-to-stdout.integtest.ts | 4 ++-- .../cdk-lib-cli-lib-deploy.integtest.ts | 2 +- .../{ => cli-lib-alpha}/cdk-lib-cli-lib-list.integtest.ts | 2 +- .../cdk-lib-cli-lib-synth.integtest.ts | 2 +- ...xpected-to-fail-when-approval-is-required.integtest.ts | 2 +- .../cdk-context-in-stage-propagates-to-top.integtest.ts | 2 +- .../{ => context}/cdk-context-setting.integtest.ts | 2 +- ...--exclusively-selects-only-selected-stack.integtest.ts | 2 +- .../cdk-automatic-ordering-with-concurrency.integtest.ts | 2 +- .../{ => deploy}/cdk-automatic-ordering.integtest.ts | 2 +- ...d-and---no-rollback-is-removed-from-flags.integtest.ts | 2 +- ...-paused-and-change-contains-a-replacement.integtest.ts | 2 +- ...t-and---no-rollback-is-removed-from-flags.integtest.ts | 2 +- ...dk-construct-with-builtin-lambda-function.integtest.ts | 2 +- .../{ => deploy}/cdk-deploy---method-direct.integtest.ts | 2 +- .../{ => deploy}/cdk-deploy-all-concurrently.integtest.ts | 2 +- .../{ => deploy}/cdk-deploy-all.integtest.ts | 2 +- ...k-deploy-and-test-stack-with-lambda-asset.integtest.ts | 2 +- ...ification-arns-when-empty-array-is-passed.integtest.ts | 2 +- .../{ => deploy}/cdk-deploy-no-stacks-error.integtest.ts | 2 +- ...-deploy-no-stacks-with---ignore-no-stacks.integtest.ts | 2 +- ...ting-notification-arns-when-not-specified.integtest.ts | 2 +- .../cdk-deploy-stack-with-docker-asset.integtest.ts | 2 +- ...asset-to-object-lock-enabled-asset-bucket.integtest.ts | 2 +- .../cdk-deploy-stack-without-resource.integtest.ts | 2 +- .../cdk-deploy-wildcard-with-outputs.integtest.ts | 2 +- ...eploy-with-import-existing-resources-true.integtest.ts | 2 +- ...irect-and-import-existing-resources-fails.integtest.ts | 2 +- .../cdk-deploy-with-notification-arn-as-flag.integtest.ts | 2 +- ...oy-with-notification-arn-as-prop-and-flag.integtest.ts | 2 +- .../cdk-deploy-with-notification-arn-as-prop.integtest.ts | 2 +- .../cdk-deploy-with-parameters-multi.integtest.ts | 2 +- .../{ => deploy}/cdk-deploy-with-parameters.integtest.ts | 2 +- .../cdk-deploy-with-wildcard-and-parameters.integtest.ts | 2 +- ...deploy-without-execute-a-named-change-set.integtest.ts | 2 +- ...-deploy-without-import-existing-resources.integtest.ts | 2 +- .../cli-integ-tests/{ => deploy}/cdk-deploy.integtest.ts | 2 +- .../{ => deploy}/cdk-doubly-nested-stack.integtest.ts | 2 +- .../cdk-failed-deploy-does-not-hang.integtest.ts | 2 +- .../{ => deploy}/cdk-fast-deploy.integtest.ts | 2 +- .../cdk-generating-and-loading-assembly.integtest.ts | 2 +- .../cdk-nested-stack-with-parameters.integtest.ts | 2 +- ...hanges-without-a-cli-are-expected-to-fail.integtest.ts | 2 +- .../cdk-stage-with-bundled-lambda-function.integtest.ts | 2 +- .../{ => deploy}/cdk-termination-protection.integtest.ts | 2 +- .../{ => destroy}/cdk-destroy-interactive.integtest.ts | 2 +- ...rror-if-any-of-the-stacks-contains-a-diff.integtest.ts | 2 +- ...with-if-any-of-the-stacks-contains-a-diff.integtest.ts | 2 +- ...sage-for-stacks-which-have-no-differences.integtest.ts | 2 +- ...l-exits-when-security-changes-are-present.integtest.ts | 2 +- ...curity-diff-for-sso-access-control-config.integtest.ts | 2 +- ...its-when-security-diff-for-sso-assignment.integtest.ts | 2 +- ...diff-for-sso-perm-set-with-managed-policy.integtest.ts | 2 +- ...f-for-sso-perm-set-without-managed-policy.integtest.ts | 2 +- ...ly-outputs-sso-access-control-information.integtest.ts | 2 +- ...sfully-outputs-sso-assignment-information.integtest.ts | 2 +- ...ssion-set-with-managed-policy-information.integtest.ts | 2 +- ...on-set-without-managed-policy-information.integtest.ts | 2 +- ...f--import-existing-resources-shows-import.integtest.ts | 2 +- ...iff-doesnt-show-resource-metadata-changes.integtest.ts | 2 +- ...rce-metadata-changes-with---no-change-set.integtest.ts | 2 +- ...it-stack-name-and-qualifier-does-not-fail.integtest.ts | 2 +- ...k-diff-with-large-changeset-does-not-fail.integtest.ts | 2 +- .../cli-integ-tests/{ => diff}/cdk-cdk-diff.integtest.ts | 2 +- .../{ => diff}/cdk-enablediffnofail.integtest.ts | 2 +- .../cli-integ-tests/{ => diff}/cdk-iam-diff.integtest.ts | 2 +- ...cdk-gc-deletes-unused-s3-objects-rollback.integtest.ts | 2 +- ...bage-collection-deletes-unused-ecr-images.integtest.ts | 2 +- ...bage-collection-deletes-unused-s3-objects.integtest.ts | 2 +- ...arbage-collection-keeps-in-use-ecr-images.integtest.ts | 2 +- ...arbage-collection-keeps-in-use-s3-objects.integtest.ts | 2 +- ...garbage-collection-tags-unused-ecr-images.integtest.ts | 2 +- ...garbage-collection-tags-unused-s3-objects.integtest.ts | 2 +- ...rbage-collection-untags-in-use-ecr-images.integtest.ts | 2 +- ...rbage-collection-untags-in-use-s3-objects.integtest.ts | 2 +- ...vice-detects-failed-deployment-and-errors.integtest.ts | 2 +- ...-service-waits-for-deployment-to-complete.integtest.ts | 2 +- ...supports-appsync-apis-with-many-functions.integtest.ts | 2 +- ...k-hotswap-deployment-supports-ecs-service.integtest.ts | 2 +- ...oyment-supports-fn::importvalue-intrinsic.integtest.ts | 2 +- ...ons-description-and-environment-variables.integtest.ts | 2 +- ...s-deployment-respects-properties-override.integtest.ts | 2 +- .../{ => import}/cdk-import-interactive.integtest.ts | 2 +- ...ort-with-construct-that-requires-bundling.integtest.ts | 2 +- .../{ => import}/cdk-test-resource-import.integtest.ts | 2 +- ...-cdk-ls---show-dependencies---json---long.integtest.ts | 2 +- .../cdk-cdk-ls---show-dependencies---json.integtest.ts | 2 +- .../cli-integ-tests/{ => list}/cdk-cdk-ls.integtest.ts | 2 +- .../cdk-ssm-parameter-provider-error.integtest.ts | 2 +- .../{ => lookup}/cdk-vpc-lookup.integtest.ts | 2 +- ...-from-stack-creates-deployable-app-csharp.integtest.ts | 0 ...e--from-stack-creates-deployable-app-java.integtest.ts | 0 ...-from-stack-creates-deployable-app-python.integtest.ts | 0 ...m-stack-creates-deployable-app-typescript.integtest.ts | 0 .../cdk-migrate-deploys-successfully-csharp.integtest.ts | 0 .../cdk-migrate-deploys-successfully-java.integtest.ts | 0 .../cdk-migrate-deploys-successfully-python.integtest.ts | 0 ...k-migrate-deploys-successfully-typescript.integtest.ts | 0 .../cdk-migrate-generates-migrate.json.integtest.ts | 0 ...app-with-localfile-source-in-migrate.json.integtest.ts | 2 +- .../cli-integ-tests/{cdk-migrate => migrate}/testcase.ts | 0 .../cdk-cdk-notices-are-displayed-correctly.integtest.ts | 2 +- .../cdk-cdk-notices-with---unacknowledged.integtest.ts | 2 +- .../{ => notices}/cdk-skips-notice-refresh.integtest.ts | 2 +- ...quests-go-through-a-proxy-when-configured.integtest.ts | 4 ++-- .../tests/cli-integ-tests/{ => proxy}/proxy.integtest.ts | 8 ++++---- .../{ => refactor}/cdk-refactor-dry-run.integtest.ts | 2 +- ...te_rollback_complete-state-can-be-updated.integtest.ts | 2 +- .../cdk-test-cdk-rollback---force.integtest.ts | 2 +- .../{ => rollback}/cdk-test-cdk-rollback.integtest.ts | 2 +- ...te-will-delete-stack-and-create-a-new-one.integtest.ts | 2 +- ...ally-test-the-synthesized-cdk-application.integtest.ts | 2 +- .../cdk-can-still-load-old-assemblies.integtest.ts | 2 +- ...d-the-metadata-properties-expected-by-sam.integtest.ts | 2 +- ...k-cdk-synth-bundled-functions-as-expected.integtest.ts | 2 +- .../{ => synth}/cdk-cdk-synth.integtest.ts | 2 +- ...ynth---quiet-can-be-specified-in-cdk.json.integtest.ts | 2 +- ...ing-a-stage-with-errors-can-be-suppressed.integtest.ts | 2 +- ...hing-a-stage-with-errors-leads-to-failure.integtest.ts | 2 +- ...mplates-on-disk-contain-metadata-resource.integtest.ts | 2 +- .../cdk-two-ways-of-showing-the-version.integtest.ts | 2 +- 144 files changed, 142 insertions(+), 142 deletions(-) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-a-customized-template-vendor-will-not-overwrite-the-default-template.integtest.ts (96%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-add-tags.integtest.ts (93%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-can-add-tags-then-update-tags-during-re-bootstrap.integtest.ts (94%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-can-and-deploy-if-omitting-execution-policies.integtest.ts (91%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-can-bootstrap-without-execution.integtest.ts (91%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-can-create-a-legacy-bootstrap-stack-with---public-access-block-configuration-false.integtest.ts (92%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-can-create-multiple-legacy-bootstrap-stacks.integtest.ts (94%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-can-deploy-modern-synthesized-stack-even-if-bootstrap-stack-name-is-unknown.integtest.ts (93%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-can-deploy-with-session-tags-on-the-deploy.integtest.ts (79%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-can-deploy-without-execution-role-and-with-session-tags-on-deploy-role.integtest.ts (77%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-can-dump-the-template.integtest.ts (94%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-can-remove-custompermissionsboundary.integtest.ts (96%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-can-remove-trusted-account.integtest.ts (94%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-can-use-the-custom-permissions-boundary-(with-slashes)-to-bootstrap.integtest.ts (90%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-can-use-the-custom-permissions-boundary-to-bootstrap.integtest.ts (90%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-can-use-the-default-permissions-boundary-to-bootstrap.integtest.ts (89%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-create-ecr-with-tag-immutability-to-set-on.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-deploy-new-style-synthesis-to-new-style-bootstrap-(with-docker-image).integtest.ts (92%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-deploy-new-style-synthesis-to-new-style-bootstrap.integtest.ts (92%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-deploy-old-style-synthesis-to-new-style-bootstrap.integtest.ts (91%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-switch-on-termination-protection.integtest.ts (93%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => bootstrap}/cdk-bootstrap-upgrade-legacy-bootstrap-stack-to-new-bootstrap-stack-while-in-use.integtest.ts (99%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => ci-output}/cdk-ci-output-to-stderr.integtest.ts (91%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => ci-output}/cdk-ci-true-output-to-stdout.integtest.ts (89%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => cli-lib-alpha}/cdk-lib-cli-lib-deploy.integtest.ts (93%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => cli-lib-alpha}/cdk-lib-cli-lib-list.integtest.ts (84%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => cli-lib-alpha}/cdk-lib-cli-lib-synth.integtest.ts (92%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => cli-lib-alpha}/cdk-lib-security-related-changes-without-a-cli-are-expected-to-fail-when-approval-is-required.integtest.ts (93%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => context}/cdk-context-in-stage-propagates-to-top.integtest.ts (90%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => context}/cdk-context-setting.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk---exclusively-selects-only-selected-stack.integtest.ts (94%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-automatic-ordering-with-concurrency.integtest.ts (88%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-automatic-ordering.integtest.ts (87%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-automatic-rollback-if-paused-and---no-rollback-is-removed-from-flags.integtest.ts (94%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-automatic-rollback-if-paused-and-change-contains-a-replacement.integtest.ts (94%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-automatic-rollback-if-replacement-and---no-rollback-is-removed-from-flags.integtest.ts (92%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-construct-with-builtin-lambda-function.integtest.ts (87%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy---method-direct.integtest.ts (91%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-all-concurrently.integtest.ts (88%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-all.integtest.ts (86%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-and-test-stack-with-lambda-asset.integtest.ts (93%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-deletes-all-notification-arns-when-empty-array-is-passed.integtest.ts (96%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-no-stacks-error.integtest.ts (87%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-no-stacks-with---ignore-no-stacks.integtest.ts (86%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-preserves-existing-notification-arns-when-not-specified.integtest.ts (96%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-stack-with-docker-asset.integtest.ts (80%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-stack-with-lambda-asset-to-object-lock-enabled-asset-bucket.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-stack-without-resource.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-wildcard-with-outputs.integtest.ts (93%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-with-import-existing-resources-true.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-with-method-direct-and-import-existing-resources-fails.integtest.ts (91%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-with-notification-arn-as-flag.integtest.ts (94%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-with-notification-arn-as-prop-and-flag.integtest.ts (96%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-with-notification-arn-as-prop.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-with-parameters-multi.integtest.ts (94%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-with-parameters.integtest.ts (92%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-with-wildcard-and-parameters.integtest.ts (92%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-without-execute-a-named-change-set.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy-without-import-existing-resources.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-deploy.integtest.ts (90%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-doubly-nested-stack.integtest.ts (82%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-failed-deploy-does-not-hang.integtest.ts (85%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-fast-deploy.integtest.ts (96%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-generating-and-loading-assembly.integtest.ts (97%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-nested-stack-with-parameters.integtest.ts (94%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-security-related-changes-without-a-cli-are-expected-to-fail.integtest.ts (94%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-stage-with-bundled-lambda-function.integtest.ts (85%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => deploy}/cdk-termination-protection.integtest.ts (91%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => destroy}/cdk-destroy-interactive.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff---fail-on-multiple-stacks-exits-with-error-if-any-of-the-stacks-contains-a-diff.integtest.ts (92%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff---fail-with-multiple-stack-exits-with-if-any-of-the-stacks-contains-a-diff.integtest.ts (92%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff---quiet-does-not-print-there-were-no-differences-message-for-stacks-which-have-no-differences.integtest.ts (90%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff---security-only---fail-exits-when-security-changes-are-present.integtest.ts (87%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-access-control-config.integtest.ts (87%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-assignment.integtest.ts (87%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-perm-set-with-managed-policy.integtest.ts (87%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-perm-set-without-managed-policy.integtest.ts (88%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff---security-only-successfully-outputs-sso-access-control-information.integtest.ts (97%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff---security-only-successfully-outputs-sso-assignment-information.integtest.ts (97%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff---security-only-successfully-outputs-sso-permission-set-with-managed-policy-information.integtest.ts (97%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff---security-only-successfully-outputs-sso-permission-set-without-managed-policy-information.integtest.ts (97%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff--import-existing-resources-shows-import.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff-doesnt-show-resource-metadata-changes.integtest.ts (91%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff-shows-resource-metadata-changes-with---no-change-set.integtest.ts (91%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff-with-large-changeset-and-custom-toolkit-stack-name-and-qualifier-does-not-fail.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff-with-large-changeset-does-not-fail.integtest.ts (92%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-cdk-diff.integtest.ts (90%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-enablediffnofail.integtest.ts (96%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => diff}/cdk-iam-diff.integtest.ts (96%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => gc}/cdk-gc-deletes-unused-s3-objects-rollback.integtest.ts (99%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => gc}/cdk-gc-garbage-collection-deletes-unused-ecr-images.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => gc}/cdk-gc-garbage-collection-deletes-unused-s3-objects.integtest.ts (99%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => gc}/cdk-gc-garbage-collection-keeps-in-use-ecr-images.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => gc}/cdk-gc-garbage-collection-keeps-in-use-s3-objects.integtest.ts (99%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => gc}/cdk-gc-garbage-collection-tags-unused-ecr-images.integtest.ts (96%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => gc}/cdk-gc-garbage-collection-tags-unused-s3-objects.integtest.ts (99%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => gc}/cdk-gc-garbage-collection-untags-in-use-ecr-images.integtest.ts (97%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => gc}/cdk-gc-garbage-collection-untags-in-use-s3-objects.integtest.ts (99%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => hotswap}/cdk-hotswap-deployment-for-ecs-service-detects-failed-deployment-and-errors.integtest.ts (93%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => hotswap}/cdk-hotswap-deployment-for-ecs-service-waits-for-deployment-to-complete.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => hotswap}/cdk-hotswap-deployment-supports-appsync-apis-with-many-functions.integtest.ts (94%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => hotswap}/cdk-hotswap-deployment-supports-ecs-service.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => hotswap}/cdk-hotswap-deployment-supports-fn::importvalue-intrinsic.integtest.ts (96%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => hotswap}/cdk-hotswap-deployment-supports-lambda-functions-description-and-environment-variables.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => hotswap}/cdk-hotswap-ecs-deployment-respects-properties-override.integtest.ts (97%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => import}/cdk-import-interactive.integtest.ts (97%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => import}/cdk-test-resource-import-with-construct-that-requires-bundling.integtest.ts (98%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => import}/cdk-test-resource-import.integtest.ts (99%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => list}/cdk-cdk-ls---show-dependencies---json---long.integtest.ts (96%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => list}/cdk-cdk-ls---show-dependencies---json.integtest.ts (97%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => list}/cdk-cdk-ls.integtest.ts (93%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => lookup}/cdk-ssm-parameter-provider-error.integtest.ts (88%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => lookup}/cdk-vpc-lookup.integtest.ts (94%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{cdk-migrate => migrate}/cdk-migrate--from-stack-creates-deployable-app-csharp.integtest.ts (100%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{cdk-migrate => migrate}/cdk-migrate--from-stack-creates-deployable-app-java.integtest.ts (100%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{cdk-migrate => migrate}/cdk-migrate--from-stack-creates-deployable-app-python.integtest.ts (100%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{cdk-migrate => migrate}/cdk-migrate--from-stack-creates-deployable-app-typescript.integtest.ts (100%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{cdk-migrate => migrate}/cdk-migrate-deploys-successfully-csharp.integtest.ts (100%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{cdk-migrate => migrate}/cdk-migrate-deploys-successfully-java.integtest.ts (100%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{cdk-migrate => migrate}/cdk-migrate-deploys-successfully-python.integtest.ts (100%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{cdk-migrate => migrate}/cdk-migrate-deploys-successfully-typescript.integtest.ts (100%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{cdk-migrate => migrate}/cdk-migrate-generates-migrate.json.integtest.ts (100%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => migrate}/cdk-test-migrate-deployment-for-app-with-localfile-source-in-migrate.json.integtest.ts (96%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{cdk-migrate => migrate}/testcase.ts (100%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => notices}/cdk-cdk-notices-are-displayed-correctly.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => notices}/cdk-cdk-notices-with---unacknowledged.integtest.ts (90%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => notices}/cdk-skips-notice-refresh.integtest.ts (92%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => proxy}/cdk-requests-go-through-a-proxy-when-configured.integtest.ts (94%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => proxy}/proxy.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => refactor}/cdk-refactor-dry-run.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => rollback}/cdk-stack-in-update_rollback_complete-state-can-be-updated.integtest.ts (96%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => rollback}/cdk-test-cdk-rollback---force.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => rollback}/cdk-test-cdk-rollback.integtest.ts (93%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => rollback}/cdk-update-to-stack-in-rollback_complete-state-will-delete-stack-and-create-a-new-one.integtest.ts (96%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => sam}/cdk-sam-can-locally-test-the-synthesized-cdk-application.integtest.ts (97%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => synth}/cdk-can-still-load-old-assemblies.integtest.ts (98%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => synth}/cdk-cdk-synth-add-the-metadata-properties-expected-by-sam.integtest.ts (98%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => synth}/cdk-cdk-synth-bundled-functions-as-expected.integtest.ts (97%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => synth}/cdk-cdk-synth.integtest.ts (95%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => synth}/cdk-synth---quiet-can-be-specified-in-cdk.json.integtest.ts (91%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => synth}/cdk-synthing-a-stage-with-errors-can-be-suppressed.integtest.ts (85%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => synth}/cdk-synthing-a-stage-with-errors-leads-to-failure.integtest.ts (87%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => synth}/cdk-templates-on-disk-contain-metadata-resource.integtest.ts (93%) rename packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/{ => version}/cdk-two-ways-of-showing-the-version.integtest.ts (86%) diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-a-customized-template-vendor-will-not-overwrite-the-default-template.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-a-customized-template-vendor-will-not-overwrite-the-default-template.integtest.ts similarity index 96% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-a-customized-template-vendor-will-not-overwrite-the-default-template.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-a-customized-template-vendor-will-not-overwrite-the-default-template.integtest.ts index 408f55d09..e48fc5cf4 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-a-customized-template-vendor-will-not-overwrite-the-default-template.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-a-customized-template-vendor-will-not-overwrite-the-default-template.integtest.ts @@ -1,7 +1,7 @@ import * as fs from 'fs'; import * as path from 'path'; import * as yaml from 'yaml'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-add-tags.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-add-tags.integtest.ts similarity index 93% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-add-tags.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-add-tags.integtest.ts index c15508fb5..267f80f47 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-add-tags.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-add-tags.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-add-tags-then-update-tags-during-re-bootstrap.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-add-tags-then-update-tags-during-re-bootstrap.integtest.ts similarity index 94% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-add-tags-then-update-tags-during-re-bootstrap.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-add-tags-then-update-tags-during-re-bootstrap.integtest.ts index a5f944f8c..09a8547d6 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-add-tags-then-update-tags-during-re-bootstrap.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-add-tags-then-update-tags-during-re-bootstrap.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-and-deploy-if-omitting-execution-policies.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-and-deploy-if-omitting-execution-policies.integtest.ts similarity index 91% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-and-deploy-if-omitting-execution-policies.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-and-deploy-if-omitting-execution-policies.integtest.ts index ec6ef0837..bb1eb507f 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-and-deploy-if-omitting-execution-policies.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-and-deploy-if-omitting-execution-policies.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-bootstrap-without-execution.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-bootstrap-without-execution.integtest.ts similarity index 91% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-bootstrap-without-execution.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-bootstrap-without-execution.integtest.ts index 7cb20c941..c9e3ab108 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-bootstrap-without-execution.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-bootstrap-without-execution.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-create-a-legacy-bootstrap-stack-with---public-access-block-configuration-false.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-create-a-legacy-bootstrap-stack-with---public-access-block-configuration-false.integtest.ts similarity index 92% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-create-a-legacy-bootstrap-stack-with---public-access-block-configuration-false.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-create-a-legacy-bootstrap-stack-with---public-access-block-configuration-false.integtest.ts index e115f3825..b18f6bebb 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-create-a-legacy-bootstrap-stack-with---public-access-block-configuration-false.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-create-a-legacy-bootstrap-stack-with---public-access-block-configuration-false.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-create-multiple-legacy-bootstrap-stacks.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-create-multiple-legacy-bootstrap-stacks.integtest.ts similarity index 94% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-create-multiple-legacy-bootstrap-stacks.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-create-multiple-legacy-bootstrap-stacks.integtest.ts index ecafa88eb..935962fd4 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-create-multiple-legacy-bootstrap-stacks.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-create-multiple-legacy-bootstrap-stacks.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-deploy-modern-synthesized-stack-even-if-bootstrap-stack-name-is-unknown.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-deploy-modern-synthesized-stack-even-if-bootstrap-stack-name-is-unknown.integtest.ts similarity index 93% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-deploy-modern-synthesized-stack-even-if-bootstrap-stack-name-is-unknown.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-deploy-modern-synthesized-stack-even-if-bootstrap-stack-name-is-unknown.integtest.ts index 777f6c801..4bda73eca 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-deploy-modern-synthesized-stack-even-if-bootstrap-stack-name-is-unknown.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-deploy-modern-synthesized-stack-even-if-bootstrap-stack-name-is-unknown.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-deploy-with-session-tags-on-the-deploy.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-deploy-with-session-tags-on-the-deploy.integtest.ts similarity index 79% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-deploy-with-session-tags-on-the-deploy.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-deploy-with-session-tags-on-the-deploy.integtest.ts index 26527fe10..8b99b6900 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-deploy-with-session-tags-on-the-deploy.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-deploy-with-session-tags-on-the-deploy.integtest.ts @@ -1,5 +1,5 @@ import * as path from 'path'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime @@ -8,7 +8,7 @@ integTest('can deploy with session tags on the deploy, lookup, file asset, and i await fixture.cdkBootstrapModern({ toolkitStackName: bootstrapStackName, - bootstrapTemplate: path.join(__dirname, '..', '..', 'resources', 'bootstrap-templates', 'session-tags.all-roles-deny-all.yaml'), + bootstrapTemplate: path.join(__dirname, '..', '..', '..', 'resources', 'bootstrap-templates', 'session-tags.all-roles-deny-all.yaml'), }); await fixture.cdkDeploy('session-tags', { diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-deploy-without-execution-role-and-with-session-tags-on-deploy-role.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-deploy-without-execution-role-and-with-session-tags-on-deploy-role.integtest.ts similarity index 77% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-deploy-without-execution-role-and-with-session-tags-on-deploy-role.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-deploy-without-execution-role-and-with-session-tags-on-deploy-role.integtest.ts index f94f7b59c..315e57117 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-deploy-without-execution-role-and-with-session-tags-on-deploy-role.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-deploy-without-execution-role-and-with-session-tags-on-deploy-role.integtest.ts @@ -1,5 +1,5 @@ import * as path from 'path'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime @@ -8,7 +8,7 @@ integTest('can deploy without execution role and with session tags on deploy rol await fixture.cdkBootstrapModern({ toolkitStackName: bootstrapStackName, - bootstrapTemplate: path.join(__dirname, '..', '..', 'resources', 'bootstrap-templates', 'session-tags.deploy-role-deny-sqs.yaml'), + bootstrapTemplate: path.join(__dirname, '..', '..', '..', 'resources', 'bootstrap-templates', 'session-tags.deploy-role-deny-sqs.yaml'), }); await fixture.cdkDeploy('session-tags-with-custom-synthesizer', { diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-dump-the-template.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-dump-the-template.integtest.ts similarity index 94% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-dump-the-template.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-dump-the-template.integtest.ts index 5ed36b1be..71e3fb010 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-dump-the-template.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-dump-the-template.integtest.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import * as path from 'path'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-remove-custompermissionsboundary.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-remove-custompermissionsboundary.integtest.ts similarity index 96% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-remove-custompermissionsboundary.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-remove-custompermissionsboundary.integtest.ts index d2c41efeb..d9495f8ea 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-remove-custompermissionsboundary.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-remove-custompermissionsboundary.integtest.ts @@ -1,7 +1,7 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; import { CreatePolicyCommand, DeletePolicyCommand, GetRoleCommand } from '@aws-sdk/client-iam'; -import { integTest, withoutBootstrap } from '../../lib'; -import eventually from '../../lib/eventually'; +import { integTest, withoutBootstrap } from '../../../lib'; +import eventually from '../../../lib/eventually'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-remove-trusted-account.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-remove-trusted-account.integtest.ts similarity index 94% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-remove-trusted-account.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-remove-trusted-account.integtest.ts index b9c7dc25a..a7e5048e5 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-remove-trusted-account.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-remove-trusted-account.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-use-the-custom-permissions-boundary-(with-slashes)-to-bootstrap.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-use-the-custom-permissions-boundary-(with-slashes)-to-bootstrap.integtest.ts similarity index 90% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-use-the-custom-permissions-boundary-(with-slashes)-to-bootstrap.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-use-the-custom-permissions-boundary-(with-slashes)-to-bootstrap.integtest.ts index be636269e..458ad17cc 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-use-the-custom-permissions-boundary-(with-slashes)-to-bootstrap.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-use-the-custom-permissions-boundary-(with-slashes)-to-bootstrap.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-use-the-custom-permissions-boundary-to-bootstrap.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-use-the-custom-permissions-boundary-to-bootstrap.integtest.ts similarity index 90% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-use-the-custom-permissions-boundary-to-bootstrap.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-use-the-custom-permissions-boundary-to-bootstrap.integtest.ts index 17f88bd37..3d7d50118 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-use-the-custom-permissions-boundary-to-bootstrap.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-use-the-custom-permissions-boundary-to-bootstrap.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-use-the-default-permissions-boundary-to-bootstrap.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-use-the-default-permissions-boundary-to-bootstrap.integtest.ts similarity index 89% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-use-the-default-permissions-boundary-to-bootstrap.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-use-the-default-permissions-boundary-to-bootstrap.integtest.ts index 6a1eff070..d897de2a5 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-can-use-the-default-permissions-boundary-to-bootstrap.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-can-use-the-default-permissions-boundary-to-bootstrap.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-create-ecr-with-tag-immutability-to-set-on.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-create-ecr-with-tag-immutability-to-set-on.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-create-ecr-with-tag-immutability-to-set-on.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-create-ecr-with-tag-immutability-to-set-on.integtest.ts index 0036f0825..2263cebe1 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-create-ecr-with-tag-immutability-to-set-on.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-create-ecr-with-tag-immutability-to-set-on.integtest.ts @@ -1,6 +1,6 @@ import { DescribeStackResourcesCommand } from '@aws-sdk/client-cloudformation'; import { DescribeRepositoriesCommand } from '@aws-sdk/client-ecr'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-deploy-new-style-synthesis-to-new-style-bootstrap-(with-docker-image).integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-deploy-new-style-synthesis-to-new-style-bootstrap-(with-docker-image).integtest.ts similarity index 92% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-deploy-new-style-synthesis-to-new-style-bootstrap-(with-docker-image).integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-deploy-new-style-synthesis-to-new-style-bootstrap-(with-docker-image).integtest.ts index 036879e23..e099b6bd8 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-deploy-new-style-synthesis-to-new-style-bootstrap-(with-docker-image).integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-deploy-new-style-synthesis-to-new-style-bootstrap-(with-docker-image).integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-deploy-new-style-synthesis-to-new-style-bootstrap.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-deploy-new-style-synthesis-to-new-style-bootstrap.integtest.ts similarity index 92% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-deploy-new-style-synthesis-to-new-style-bootstrap.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-deploy-new-style-synthesis-to-new-style-bootstrap.integtest.ts index 2b8c137f6..56f0a04af 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-deploy-new-style-synthesis-to-new-style-bootstrap.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-deploy-new-style-synthesis-to-new-style-bootstrap.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-deploy-old-style-synthesis-to-new-style-bootstrap.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-deploy-old-style-synthesis-to-new-style-bootstrap.integtest.ts similarity index 91% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-deploy-old-style-synthesis-to-new-style-bootstrap.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-deploy-old-style-synthesis-to-new-style-bootstrap.integtest.ts index e961f9c53..ea63414e9 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-deploy-old-style-synthesis-to-new-style-bootstrap.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-deploy-old-style-synthesis-to-new-style-bootstrap.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-switch-on-termination-protection.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-switch-on-termination-protection.integtest.ts similarity index 93% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-switch-on-termination-protection.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-switch-on-termination-protection.integtest.ts index f148b9059..c372b376d 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-switch-on-termination-protection.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-switch-on-termination-protection.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-upgrade-legacy-bootstrap-stack-to-new-bootstrap-stack-while-in-use.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-upgrade-legacy-bootstrap-stack-to-new-bootstrap-stack-while-in-use.integtest.ts similarity index 99% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-upgrade-legacy-bootstrap-stack-to-new-bootstrap-stack-while-in-use.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-upgrade-legacy-bootstrap-stack-to-new-bootstrap-stack-while-in-use.integtest.ts index a5a482d32..924e0dd6e 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-bootstrap-upgrade-legacy-bootstrap-stack-to-new-bootstrap-stack-while-in-use.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrap/cdk-bootstrap-upgrade-legacy-bootstrap-stack-to-new-bootstrap-stack-while-in-use.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withoutBootstrap, randomString } from '../../lib'; +import { integTest, withoutBootstrap, randomString } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-ci-output-to-stderr.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/ci-output/cdk-ci-output-to-stderr.integtest.ts similarity index 91% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-ci-output-to-stderr.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/ci-output/cdk-ci-output-to-stderr.integtest.ts index 7632ebe2f..4231ba02d 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-ci-output-to-stderr.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/ci-output/cdk-ci-output-to-stderr.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-ci-true-output-to-stdout.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/ci-output/cdk-ci-true-output-to-stdout.integtest.ts similarity index 89% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-ci-true-output-to-stdout.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/ci-output/cdk-ci-true-output-to-stdout.integtest.ts index 532caea70..c292cb97f 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-ci-true-output-to-stdout.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/ci-output/cdk-ci-true-output-to-stdout.integtest.ts @@ -1,5 +1,5 @@ -import type { CdkCliOptions } from '../../lib'; -import { integTest, withDefaultFixture } from '../../lib'; +import type { CdkCliOptions } from '../../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-lib-cli-lib-deploy.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-lib-alpha/cdk-lib-cli-lib-deploy.integtest.ts similarity index 93% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-lib-cli-lib-deploy.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-lib-alpha/cdk-lib-cli-lib-deploy.integtest.ts index 6c03e19b6..f73081673 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-lib-cli-lib-deploy.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-lib-alpha/cdk-lib-cli-lib-deploy.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStackResourcesCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withCliLibFixture } from '../../lib'; +import { integTest, withCliLibFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-lib-cli-lib-list.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-lib-alpha/cdk-lib-cli-lib-list.integtest.ts similarity index 84% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-lib-cli-lib-list.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-lib-alpha/cdk-lib-cli-lib-list.integtest.ts index 1b7a12d37..561889fa4 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-lib-cli-lib-list.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-lib-alpha/cdk-lib-cli-lib-list.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withCliLibFixture } from '../../lib'; +import { integTest, withCliLibFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-lib-cli-lib-synth.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-lib-alpha/cdk-lib-cli-lib-synth.integtest.ts similarity index 92% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-lib-cli-lib-synth.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-lib-alpha/cdk-lib-cli-lib-synth.integtest.ts index 5acb70a4f..2abff1d2a 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-lib-cli-lib-synth.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-lib-alpha/cdk-lib-cli-lib-synth.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withCliLibFixture } from '../../lib'; +import { integTest, withCliLibFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-lib-security-related-changes-without-a-cli-are-expected-to-fail-when-approval-is-required.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-lib-alpha/cdk-lib-security-related-changes-without-a-cli-are-expected-to-fail-when-approval-is-required.integtest.ts similarity index 93% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-lib-security-related-changes-without-a-cli-are-expected-to-fail-when-approval-is-required.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-lib-alpha/cdk-lib-security-related-changes-without-a-cli-are-expected-to-fail-when-approval-is-required.integtest.ts index 0e140855f..a7bed6211 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-lib-security-related-changes-without-a-cli-are-expected-to-fail-when-approval-is-required.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-lib-alpha/cdk-lib-security-related-changes-without-a-cli-are-expected-to-fail-when-approval-is-required.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withCliLibFixture } from '../../lib'; +import { integTest, withCliLibFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-context-in-stage-propagates-to-top.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/context/cdk-context-in-stage-propagates-to-top.integtest.ts similarity index 90% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-context-in-stage-propagates-to-top.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/context/cdk-context-in-stage-propagates-to-top.integtest.ts index 99a90910a..0d86e40e4 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-context-in-stage-propagates-to-top.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/context/cdk-context-in-stage-propagates-to-top.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-context-setting.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/context/cdk-context-setting.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-context-setting.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/context/cdk-context-setting.integtest.ts index 97c61aeb7..ee1d9016a 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-context-setting.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/context/cdk-context-setting.integtest.ts @@ -1,6 +1,6 @@ import { promises as fs } from 'fs'; import * as path from 'path'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk---exclusively-selects-only-selected-stack.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk---exclusively-selects-only-selected-stack.integtest.ts similarity index 94% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk---exclusively-selects-only-selected-stack.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk---exclusively-selects-only-selected-stack.integtest.ts index 6ab31a612..bda2f9bcb 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk---exclusively-selects-only-selected-stack.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk---exclusively-selects-only-selected-stack.integtest.ts @@ -1,6 +1,6 @@ import { promises as fs } from 'fs'; import * as path from 'path'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-automatic-ordering-with-concurrency.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-automatic-ordering-with-concurrency.integtest.ts similarity index 88% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-automatic-ordering-with-concurrency.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-automatic-ordering-with-concurrency.integtest.ts index b1e73611b..b25b28028 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-automatic-ordering-with-concurrency.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-automatic-ordering-with-concurrency.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-automatic-ordering.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-automatic-ordering.integtest.ts similarity index 87% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-automatic-ordering.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-automatic-ordering.integtest.ts index 065f9cd0e..d1c9a9601 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-automatic-ordering.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-automatic-ordering.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-automatic-rollback-if-paused-and---no-rollback-is-removed-from-flags.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-automatic-rollback-if-paused-and---no-rollback-is-removed-from-flags.integtest.ts similarity index 94% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-automatic-rollback-if-paused-and---no-rollback-is-removed-from-flags.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-automatic-rollback-if-paused-and---no-rollback-is-removed-from-flags.integtest.ts index 8b7acc2a7..011afa5b0 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-automatic-rollback-if-paused-and---no-rollback-is-removed-from-flags.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-automatic-rollback-if-paused-and---no-rollback-is-removed-from-flags.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withSpecificFixture } from '../../lib'; +import { integTest, withSpecificFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-automatic-rollback-if-paused-and-change-contains-a-replacement.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-automatic-rollback-if-paused-and-change-contains-a-replacement.integtest.ts similarity index 94% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-automatic-rollback-if-paused-and-change-contains-a-replacement.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-automatic-rollback-if-paused-and-change-contains-a-replacement.integtest.ts index 12b839132..a31fc035a 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-automatic-rollback-if-paused-and-change-contains-a-replacement.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-automatic-rollback-if-paused-and-change-contains-a-replacement.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withSpecificFixture } from '../../lib'; +import { integTest, withSpecificFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-automatic-rollback-if-replacement-and---no-rollback-is-removed-from-flags.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-automatic-rollback-if-replacement-and---no-rollback-is-removed-from-flags.integtest.ts similarity index 92% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-automatic-rollback-if-replacement-and---no-rollback-is-removed-from-flags.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-automatic-rollback-if-replacement-and---no-rollback-is-removed-from-flags.integtest.ts index 4e546e475..ef437ff8e 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-automatic-rollback-if-replacement-and---no-rollback-is-removed-from-flags.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-automatic-rollback-if-replacement-and---no-rollback-is-removed-from-flags.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withSpecificFixture } from '../../lib'; +import { integTest, withSpecificFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-construct-with-builtin-lambda-function.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-construct-with-builtin-lambda-function.integtest.ts similarity index 87% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-construct-with-builtin-lambda-function.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-construct-with-builtin-lambda-function.integtest.ts index dc69b6846..75a2d2414 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-construct-with-builtin-lambda-function.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-construct-with-builtin-lambda-function.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy---method-direct.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy---method-direct.integtest.ts similarity index 91% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy---method-direct.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy---method-direct.integtest.ts index eaf10e3c2..b18fe0df1 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy---method-direct.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy---method-direct.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStackResourcesCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-all-concurrently.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-all-concurrently.integtest.ts similarity index 88% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-all-concurrently.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-all-concurrently.integtest.ts index c1d8841f7..4d44e2b86 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-all-concurrently.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-all-concurrently.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-all.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-all.integtest.ts similarity index 86% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-all.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-all.integtest.ts index 66346bc21..c74211754 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-all.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-all.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-and-test-stack-with-lambda-asset.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-and-test-stack-with-lambda-asset.integtest.ts similarity index 93% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-and-test-stack-with-lambda-asset.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-and-test-stack-with-lambda-asset.integtest.ts index 0cb22aa7f..07a6ad5dc 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-and-test-stack-with-lambda-asset.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-and-test-stack-with-lambda-asset.integtest.ts @@ -1,6 +1,6 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; import { InvokeCommand } from '@aws-sdk/client-lambda'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-deletes-all-notification-arns-when-empty-array-is-passed.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-deletes-all-notification-arns-when-empty-array-is-passed.integtest.ts similarity index 96% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-deletes-all-notification-arns-when-empty-array-is-passed.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-deletes-all-notification-arns-when-empty-array-is-passed.integtest.ts index eec8493f1..442dc8854 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-deletes-all-notification-arns-when-empty-array-is-passed.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-deletes-all-notification-arns-when-empty-array-is-passed.integtest.ts @@ -1,6 +1,6 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; import { CreateTopicCommand, DeleteTopicCommand } from '@aws-sdk/client-sns'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-no-stacks-error.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-no-stacks-error.integtest.ts similarity index 87% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-no-stacks-error.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-no-stacks-error.integtest.ts index 217f54dd2..69fa11d08 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-no-stacks-error.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-no-stacks-error.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-no-stacks-with---ignore-no-stacks.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-no-stacks-with---ignore-no-stacks.integtest.ts similarity index 86% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-no-stacks-with---ignore-no-stacks.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-no-stacks-with---ignore-no-stacks.integtest.ts index 29ead570d..e743007bb 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-no-stacks-with---ignore-no-stacks.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-no-stacks-with---ignore-no-stacks.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-preserves-existing-notification-arns-when-not-specified.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-preserves-existing-notification-arns-when-not-specified.integtest.ts similarity index 96% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-preserves-existing-notification-arns-when-not-specified.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-preserves-existing-notification-arns-when-not-specified.integtest.ts index 5331514eb..35147caec 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-preserves-existing-notification-arns-when-not-specified.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-preserves-existing-notification-arns-when-not-specified.integtest.ts @@ -1,6 +1,6 @@ import { DescribeStacksCommand, UpdateStackCommand, waitUntilStackUpdateComplete } from '@aws-sdk/client-cloudformation'; import { CreateTopicCommand, DeleteTopicCommand } from '@aws-sdk/client-sns'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-stack-with-docker-asset.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-stack-with-docker-asset.integtest.ts similarity index 80% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-stack-with-docker-asset.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-stack-with-docker-asset.integtest.ts index 0e4053b7e..d29493ca5 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-stack-with-docker-asset.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-stack-with-docker-asset.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-stack-with-lambda-asset-to-object-lock-enabled-asset-bucket.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-stack-with-lambda-asset-to-object-lock-enabled-asset-bucket.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-stack-with-lambda-asset-to-object-lock-enabled-asset-bucket.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-stack-with-lambda-asset-to-object-lock-enabled-asset-bucket.integtest.ts index 5886846c9..3083a97b7 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-stack-with-lambda-asset-to-object-lock-enabled-asset-bucket.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-stack-with-lambda-asset-to-object-lock-enabled-asset-bucket.integtest.ts @@ -1,5 +1,5 @@ import { PutObjectLockConfigurationCommand } from '@aws-sdk/client-s3'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-stack-without-resource.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-stack-without-resource.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-stack-without-resource.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-stack-without-resource.integtest.ts index cc3a4da7a..7e4eca474 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-stack-without-resource.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-stack-without-resource.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-wildcard-with-outputs.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-wildcard-with-outputs.integtest.ts similarity index 93% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-wildcard-with-outputs.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-wildcard-with-outputs.integtest.ts index bed7237df..8b06281b2 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-wildcard-with-outputs.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-wildcard-with-outputs.integtest.ts @@ -1,6 +1,6 @@ import { promises as fs } from 'fs'; import * as path from 'path'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-import-existing-resources-true.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-import-existing-resources-true.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-import-existing-resources-true.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-import-existing-resources-true.integtest.ts index a6932b6cf..ddb9b07eb 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-import-existing-resources-true.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-import-existing-resources-true.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand, ListChangeSetsCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-method-direct-and-import-existing-resources-fails.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-method-direct-and-import-existing-resources-fails.integtest.ts similarity index 91% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-method-direct-and-import-existing-resources-fails.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-method-direct-and-import-existing-resources-fails.integtest.ts index 284904dc5..60ca3941f 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-method-direct-and-import-existing-resources-fails.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-method-direct-and-import-existing-resources-fails.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-notification-arn-as-flag.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-notification-arn-as-flag.integtest.ts similarity index 94% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-notification-arn-as-flag.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-notification-arn-as-flag.integtest.ts index bb80db98f..6700a7087 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-notification-arn-as-flag.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-notification-arn-as-flag.integtest.ts @@ -1,6 +1,6 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; import { CreateTopicCommand, DeleteTopicCommand } from '@aws-sdk/client-sns'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-notification-arn-as-prop-and-flag.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-notification-arn-as-prop-and-flag.integtest.ts similarity index 96% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-notification-arn-as-prop-and-flag.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-notification-arn-as-prop-and-flag.integtest.ts index a92d6599a..5d45485bb 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-notification-arn-as-prop-and-flag.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-notification-arn-as-prop-and-flag.integtest.ts @@ -1,6 +1,6 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; import { CreateTopicCommand, DeleteTopicCommand } from '@aws-sdk/client-sns'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-notification-arn-as-prop.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-notification-arn-as-prop.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-notification-arn-as-prop.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-notification-arn-as-prop.integtest.ts index ce12b700c..d69780e0d 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-notification-arn-as-prop.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-notification-arn-as-prop.integtest.ts @@ -1,6 +1,6 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; import { CreateTopicCommand, DeleteTopicCommand } from '@aws-sdk/client-sns'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-parameters-multi.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-parameters-multi.integtest.ts similarity index 94% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-parameters-multi.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-parameters-multi.integtest.ts index bd6efd412..ff0ad067b 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-parameters-multi.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-parameters-multi.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-parameters.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-parameters.integtest.ts similarity index 92% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-parameters.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-parameters.integtest.ts index 85f989185..3f671ec46 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-parameters.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-parameters.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-wildcard-and-parameters.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-wildcard-and-parameters.integtest.ts similarity index 92% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-wildcard-and-parameters.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-wildcard-and-parameters.integtest.ts index fce74a2ff..f4902fd29 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-with-wildcard-and-parameters.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-with-wildcard-and-parameters.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-without-execute-a-named-change-set.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-without-execute-a-named-change-set.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-without-execute-a-named-change-set.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-without-execute-a-named-change-set.integtest.ts index 8dbc00919..3824b5c1a 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-without-execute-a-named-change-set.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-without-execute-a-named-change-set.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand, ListChangeSetsCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-without-import-existing-resources.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-without-import-existing-resources.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-without-import-existing-resources.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-without-import-existing-resources.integtest.ts index e49531bbd..dce2e3529 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy-without-import-existing-resources.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy-without-import-existing-resources.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand, ListChangeSetsCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy.integtest.ts similarity index 90% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy.integtest.ts index 1c15539c4..28c0b17d0 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-deploy.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-deploy.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStackResourcesCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-doubly-nested-stack.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-doubly-nested-stack.integtest.ts similarity index 82% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-doubly-nested-stack.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-doubly-nested-stack.integtest.ts index a404fc920..f1c96076e 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-doubly-nested-stack.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-doubly-nested-stack.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-failed-deploy-does-not-hang.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-failed-deploy-does-not-hang.integtest.ts similarity index 85% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-failed-deploy-does-not-hang.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-failed-deploy-does-not-hang.integtest.ts index 88d872b48..b5fdff93e 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-failed-deploy-does-not-hang.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-failed-deploy-does-not-hang.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-fast-deploy.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-fast-deploy.integtest.ts similarity index 96% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-fast-deploy.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-fast-deploy.integtest.ts index bd469d753..33c1d2726 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-fast-deploy.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-fast-deploy.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-generating-and-loading-assembly.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-generating-and-loading-assembly.integtest.ts similarity index 97% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-generating-and-loading-assembly.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-generating-and-loading-assembly.integtest.ts index 59b92da2e..6d791e5b2 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-generating-and-loading-assembly.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-generating-and-loading-assembly.integtest.ts @@ -1,7 +1,7 @@ import { promises as fs } from 'fs'; import * as os from 'os'; import * as path from 'path'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-nested-stack-with-parameters.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-nested-stack-with-parameters.integtest.ts similarity index 94% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-nested-stack-with-parameters.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-nested-stack-with-parameters.integtest.ts index b7ae5242b..9ee8f957c 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-nested-stack-with-parameters.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-nested-stack-with-parameters.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStackResourcesCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-security-related-changes-without-a-cli-are-expected-to-fail.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-security-related-changes-without-a-cli-are-expected-to-fail.integtest.ts similarity index 94% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-security-related-changes-without-a-cli-are-expected-to-fail.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-security-related-changes-without-a-cli-are-expected-to-fail.integtest.ts index 28811c3c6..66e253ef8 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-security-related-changes-without-a-cli-are-expected-to-fail.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-security-related-changes-without-a-cli-are-expected-to-fail.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-stage-with-bundled-lambda-function.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-stage-with-bundled-lambda-function.integtest.ts similarity index 85% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-stage-with-bundled-lambda-function.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-stage-with-bundled-lambda-function.integtest.ts index a496538d4..594ea3c82 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-stage-with-bundled-lambda-function.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-stage-with-bundled-lambda-function.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-termination-protection.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-termination-protection.integtest.ts similarity index 91% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-termination-protection.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-termination-protection.integtest.ts index 18fcb887e..0ed06edf5 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-termination-protection.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/deploy/cdk-termination-protection.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-destroy-interactive.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/destroy/cdk-destroy-interactive.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-destroy-interactive.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/destroy/cdk-destroy-interactive.integtest.ts index 97eb1f981..3f319f113 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-destroy-interactive.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/destroy/cdk-destroy-interactive.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; integTest('cdk destroy prompts the user for confirmation', withDefaultFixture(async (fixture) => { const stackName = 'test-2'; diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---fail-on-multiple-stacks-exits-with-error-if-any-of-the-stacks-contains-a-diff.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---fail-on-multiple-stacks-exits-with-error-if-any-of-the-stacks-contains-a-diff.integtest.ts similarity index 92% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---fail-on-multiple-stacks-exits-with-error-if-any-of-the-stacks-contains-a-diff.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---fail-on-multiple-stacks-exits-with-error-if-any-of-the-stacks-contains-a-diff.integtest.ts index f32267db2..5c2d283e4 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---fail-on-multiple-stacks-exits-with-error-if-any-of-the-stacks-contains-a-diff.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---fail-on-multiple-stacks-exits-with-error-if-any-of-the-stacks-contains-a-diff.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---fail-with-multiple-stack-exits-with-if-any-of-the-stacks-contains-a-diff.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---fail-with-multiple-stack-exits-with-if-any-of-the-stacks-contains-a-diff.integtest.ts similarity index 92% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---fail-with-multiple-stack-exits-with-if-any-of-the-stacks-contains-a-diff.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---fail-with-multiple-stack-exits-with-if-any-of-the-stacks-contains-a-diff.integtest.ts index c439e9761..7704fa4e4 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---fail-with-multiple-stack-exits-with-if-any-of-the-stacks-contains-a-diff.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---fail-with-multiple-stack-exits-with-if-any-of-the-stacks-contains-a-diff.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---quiet-does-not-print-there-were-no-differences-message-for-stacks-which-have-no-differences.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---quiet-does-not-print-there-were-no-differences-message-for-stacks-which-have-no-differences.integtest.ts similarity index 90% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---quiet-does-not-print-there-were-no-differences-message-for-stacks-which-have-no-differences.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---quiet-does-not-print-there-were-no-differences-message-for-stacks-which-have-no-differences.integtest.ts index 485397586..27c56f0f7 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---quiet-does-not-print-there-were-no-differences-message-for-stacks-which-have-no-differences.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---quiet-does-not-print-there-were-no-differences-message-for-stacks-which-have-no-differences.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only---fail-exits-when-security-changes-are-present.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only---fail-exits-when-security-changes-are-present.integtest.ts similarity index 87% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only---fail-exits-when-security-changes-are-present.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only---fail-exits-when-security-changes-are-present.integtest.ts index 9d044ed8d..e81507507 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only---fail-exits-when-security-changes-are-present.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only---fail-exits-when-security-changes-are-present.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-access-control-config.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-access-control-config.integtest.ts similarity index 87% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-access-control-config.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-access-control-config.integtest.ts index 795de12f0..b5ee42068 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-access-control-config.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-access-control-config.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-assignment.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-assignment.integtest.ts similarity index 87% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-assignment.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-assignment.integtest.ts index 3ae31b42f..52024e7a5 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-assignment.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-assignment.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-perm-set-with-managed-policy.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-perm-set-with-managed-policy.integtest.ts similarity index 87% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-perm-set-with-managed-policy.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-perm-set-with-managed-policy.integtest.ts index c103f3bfe..7498dde42 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-perm-set-with-managed-policy.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-perm-set-with-managed-policy.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-perm-set-without-managed-policy.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-perm-set-without-managed-policy.integtest.ts similarity index 88% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-perm-set-without-managed-policy.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-perm-set-without-managed-policy.integtest.ts index b3c13911f..ff2a6c40b 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-perm-set-without-managed-policy.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only---fail-exits-when-security-diff-for-sso-perm-set-without-managed-policy.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only-successfully-outputs-sso-access-control-information.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only-successfully-outputs-sso-access-control-information.integtest.ts similarity index 97% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only-successfully-outputs-sso-access-control-information.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only-successfully-outputs-sso-access-control-information.integtest.ts index 2621e2bde..feb79ac28 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only-successfully-outputs-sso-access-control-information.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only-successfully-outputs-sso-access-control-information.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only-successfully-outputs-sso-assignment-information.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only-successfully-outputs-sso-assignment-information.integtest.ts similarity index 97% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only-successfully-outputs-sso-assignment-information.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only-successfully-outputs-sso-assignment-information.integtest.ts index 247ed171a..ecde7a066 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only-successfully-outputs-sso-assignment-information.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only-successfully-outputs-sso-assignment-information.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only-successfully-outputs-sso-permission-set-with-managed-policy-information.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only-successfully-outputs-sso-permission-set-with-managed-policy-information.integtest.ts similarity index 97% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only-successfully-outputs-sso-permission-set-with-managed-policy-information.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only-successfully-outputs-sso-permission-set-with-managed-policy-information.integtest.ts index 3b070a565..9e2388738 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only-successfully-outputs-sso-permission-set-with-managed-policy-information.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only-successfully-outputs-sso-permission-set-with-managed-policy-information.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only-successfully-outputs-sso-permission-set-without-managed-policy-information.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only-successfully-outputs-sso-permission-set-without-managed-policy-information.integtest.ts similarity index 97% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only-successfully-outputs-sso-permission-set-without-managed-policy-information.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only-successfully-outputs-sso-permission-set-without-managed-policy-information.integtest.ts index 53485e28f..7bbebe08e 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff---security-only-successfully-outputs-sso-permission-set-without-managed-policy-information.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff---security-only-successfully-outputs-sso-permission-set-without-managed-policy-information.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff--import-existing-resources-shows-import.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff--import-existing-resources-shows-import.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff--import-existing-resources-shows-import.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff--import-existing-resources-shows-import.integtest.ts index 1832b71bb..e2627eedc 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff--import-existing-resources-shows-import.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff--import-existing-resources-shows-import.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withSpecificFixture } from '../../lib'; +import { integTest, withSpecificFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff-doesnt-show-resource-metadata-changes.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff-doesnt-show-resource-metadata-changes.integtest.ts similarity index 91% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff-doesnt-show-resource-metadata-changes.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff-doesnt-show-resource-metadata-changes.integtest.ts index bb1d980fc..d1c8f9e4e 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff-doesnt-show-resource-metadata-changes.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff-doesnt-show-resource-metadata-changes.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff-shows-resource-metadata-changes-with---no-change-set.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff-shows-resource-metadata-changes-with---no-change-set.integtest.ts similarity index 91% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff-shows-resource-metadata-changes-with---no-change-set.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff-shows-resource-metadata-changes-with---no-change-set.integtest.ts index e7c82314b..4a0142352 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff-shows-resource-metadata-changes-with---no-change-set.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff-shows-resource-metadata-changes-with---no-change-set.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff-with-large-changeset-and-custom-toolkit-stack-name-and-qualifier-does-not-fail.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff-with-large-changeset-and-custom-toolkit-stack-name-and-qualifier-does-not-fail.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff-with-large-changeset-and-custom-toolkit-stack-name-and-qualifier-does-not-fail.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff-with-large-changeset-and-custom-toolkit-stack-name-and-qualifier-does-not-fail.integtest.ts index ff5c8c3ba..720971e1b 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff-with-large-changeset-and-custom-toolkit-stack-name-and-qualifier-does-not-fail.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff-with-large-changeset-and-custom-toolkit-stack-name-and-qualifier-does-not-fail.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff-with-large-changeset-does-not-fail.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff-with-large-changeset-does-not-fail.integtest.ts similarity index 92% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff-with-large-changeset-does-not-fail.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff-with-large-changeset-does-not-fail.integtest.ts index 5be396009..d563ea0b9 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff-with-large-changeset-does-not-fail.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff-with-large-changeset-does-not-fail.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff.integtest.ts similarity index 90% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff.integtest.ts index eb5bb6a71..a7f8a201a 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-diff.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-cdk-diff.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-enablediffnofail.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-enablediffnofail.integtest.ts similarity index 96% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-enablediffnofail.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-enablediffnofail.integtest.ts index 68f10133c..860dedb6c 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-enablediffnofail.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-enablediffnofail.integtest.ts @@ -1,6 +1,6 @@ import { promises as fs } from 'fs'; import * as path from 'path'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-iam-diff.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-iam-diff.integtest.ts similarity index 96% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-iam-diff.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-iam-diff.integtest.ts index 5c32a46e6..9ed1a7089 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-iam-diff.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/diff/cdk-iam-diff.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-deletes-unused-s3-objects-rollback.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-deletes-unused-s3-objects-rollback.integtest.ts similarity index 99% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-deletes-unused-s3-objects-rollback.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-deletes-unused-s3-objects-rollback.integtest.ts index 6fea1e082..be61e2887 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-deletes-unused-s3-objects-rollback.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-deletes-unused-s3-objects-rollback.integtest.ts @@ -1,5 +1,5 @@ import { ListObjectsV2Command, PutObjectTaggingCommand } from '@aws-sdk/client-s3'; -import { integTest, withoutBootstrap, randomString } from '../../lib'; +import { integTest, withoutBootstrap, randomString } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-deletes-unused-ecr-images.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-deletes-unused-ecr-images.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-deletes-unused-ecr-images.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-deletes-unused-ecr-images.integtest.ts index 6e9636254..4fd5a169d 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-deletes-unused-ecr-images.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-deletes-unused-ecr-images.integtest.ts @@ -1,5 +1,5 @@ import { ListImagesCommand } from '@aws-sdk/client-ecr'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-deletes-unused-s3-objects.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-deletes-unused-s3-objects.integtest.ts similarity index 99% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-deletes-unused-s3-objects.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-deletes-unused-s3-objects.integtest.ts index fb43ac6f2..ecf491455 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-deletes-unused-s3-objects.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-deletes-unused-s3-objects.integtest.ts @@ -1,5 +1,5 @@ import { ListObjectsV2Command } from '@aws-sdk/client-s3'; -import { integTest, withoutBootstrap, randomString } from '../../lib'; +import { integTest, withoutBootstrap, randomString } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-keeps-in-use-ecr-images.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-keeps-in-use-ecr-images.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-keeps-in-use-ecr-images.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-keeps-in-use-ecr-images.integtest.ts index 31482ee5c..788bc0590 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-keeps-in-use-ecr-images.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-keeps-in-use-ecr-images.integtest.ts @@ -1,5 +1,5 @@ import { ListImagesCommand } from '@aws-sdk/client-ecr'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-keeps-in-use-s3-objects.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-keeps-in-use-s3-objects.integtest.ts similarity index 99% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-keeps-in-use-s3-objects.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-keeps-in-use-s3-objects.integtest.ts index d630d268e..c37b3f11f 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-keeps-in-use-s3-objects.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-keeps-in-use-s3-objects.integtest.ts @@ -1,5 +1,5 @@ import { ListObjectsV2Command } from '@aws-sdk/client-s3'; -import { integTest, withoutBootstrap, randomString } from '../../lib'; +import { integTest, withoutBootstrap, randomString } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-tags-unused-ecr-images.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-tags-unused-ecr-images.integtest.ts similarity index 96% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-tags-unused-ecr-images.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-tags-unused-ecr-images.integtest.ts index 5e164bc36..22fb600d2 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-tags-unused-ecr-images.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-tags-unused-ecr-images.integtest.ts @@ -1,5 +1,5 @@ import { ListImagesCommand } from '@aws-sdk/client-ecr'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-tags-unused-s3-objects.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-tags-unused-s3-objects.integtest.ts similarity index 99% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-tags-unused-s3-objects.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-tags-unused-s3-objects.integtest.ts index a971c5564..350b0fa37 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-tags-unused-s3-objects.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-tags-unused-s3-objects.integtest.ts @@ -1,5 +1,5 @@ import { GetObjectTaggingCommand, ListObjectsV2Command } from '@aws-sdk/client-s3'; -import { integTest, withoutBootstrap, randomString } from '../../lib'; +import { integTest, withoutBootstrap, randomString } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-untags-in-use-ecr-images.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-untags-in-use-ecr-images.integtest.ts similarity index 97% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-untags-in-use-ecr-images.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-untags-in-use-ecr-images.integtest.ts index 49248d986..16a603735 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-untags-in-use-ecr-images.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-untags-in-use-ecr-images.integtest.ts @@ -1,5 +1,5 @@ import { BatchGetImageCommand, ListImagesCommand, PutImageCommand } from '@aws-sdk/client-ecr'; -import { integTest, withoutBootstrap } from '../../lib'; +import { integTest, withoutBootstrap } from '../../../lib'; const ECR_ISOLATED_TAG = 'aws-cdk.isolated'; diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-untags-in-use-s3-objects.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-untags-in-use-s3-objects.integtest.ts similarity index 99% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-untags-in-use-s3-objects.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-untags-in-use-s3-objects.integtest.ts index 2e055f689..ac011c537 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-gc-garbage-collection-untags-in-use-s3-objects.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/gc/cdk-gc-garbage-collection-untags-in-use-s3-objects.integtest.ts @@ -1,5 +1,5 @@ import { GetObjectTaggingCommand, ListObjectsV2Command, PutObjectTaggingCommand } from '@aws-sdk/client-s3'; -import { integTest, withoutBootstrap, randomString } from '../../lib'; +import { integTest, withoutBootstrap, randomString } from '../../../lib'; const S3_ISOLATED_TAG = 'aws-cdk:isolated'; diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-for-ecs-service-detects-failed-deployment-and-errors.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-for-ecs-service-detects-failed-deployment-and-errors.integtest.ts similarity index 93% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-for-ecs-service-detects-failed-deployment-and-errors.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-for-ecs-service-detects-failed-deployment-and-errors.integtest.ts index 3220770d3..4624a6cee 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-for-ecs-service-detects-failed-deployment-and-errors.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-for-ecs-service-detects-failed-deployment-and-errors.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withExtendedTimeoutFixture } from '../../lib'; +import { integTest, withExtendedTimeoutFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-for-ecs-service-waits-for-deployment-to-complete.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-for-ecs-service-waits-for-deployment-to-complete.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-for-ecs-service-waits-for-deployment-to-complete.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-for-ecs-service-waits-for-deployment-to-complete.integtest.ts index 235d054ad..e3e398247 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-for-ecs-service-waits-for-deployment-to-complete.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-for-ecs-service-waits-for-deployment-to-complete.integtest.ts @@ -1,6 +1,6 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; import { DescribeServicesCommand } from '@aws-sdk/client-ecs'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-supports-appsync-apis-with-many-functions.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-supports-appsync-apis-with-many-functions.integtest.ts similarity index 94% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-supports-appsync-apis-with-many-functions.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-supports-appsync-apis-with-many-functions.integtest.ts index fd7f8bbe5..d68127fd3 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-supports-appsync-apis-with-many-functions.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-supports-appsync-apis-with-many-functions.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-supports-ecs-service.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-supports-ecs-service.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-supports-ecs-service.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-supports-ecs-service.integtest.ts index 069dc5a40..8f7f0bf99 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-supports-ecs-service.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-supports-ecs-service.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-supports-fn::importvalue-intrinsic.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-supports-fn::importvalue-intrinsic.integtest.ts similarity index 96% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-supports-fn::importvalue-intrinsic.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-supports-fn::importvalue-intrinsic.integtest.ts index 67eaff16a..06ec63b18 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-supports-fn::importvalue-intrinsic.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-supports-fn::importvalue-intrinsic.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-supports-lambda-functions-description-and-environment-variables.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-supports-lambda-functions-description-and-environment-variables.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-supports-lambda-functions-description-and-environment-variables.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-supports-lambda-functions-description-and-environment-variables.integtest.ts index 48992f868..0cb7f05eb 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-deployment-supports-lambda-functions-description-and-environment-variables.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-deployment-supports-lambda-functions-description-and-environment-variables.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-ecs-deployment-respects-properties-override.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-ecs-deployment-respects-properties-override.integtest.ts similarity index 97% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-ecs-deployment-respects-properties-override.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-ecs-deployment-respects-properties-override.integtest.ts index 4665d917d..5ad5a73ae 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-hotswap-ecs-deployment-respects-properties-override.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/hotswap/cdk-hotswap-ecs-deployment-respects-properties-override.integtest.ts @@ -2,7 +2,7 @@ import { promises as fs } from 'fs'; import * as path from 'path'; import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; import { DescribeServicesCommand } from '@aws-sdk/client-ecs'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-import-interactive.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/import/cdk-import-interactive.integtest.ts similarity index 97% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-import-interactive.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/import/cdk-import-interactive.integtest.ts index cf0bdb5cf..bcf5e6f98 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-import-interactive.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/import/cdk-import-interactive.integtest.ts @@ -1,6 +1,6 @@ import { DescribeStackResourcesCommand } from '@aws-sdk/client-cloudformation'; import { CreateTopicCommand, DeleteTopicCommand } from '@aws-sdk/client-sns'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; integTest('cdk import prompts the user for sns topic arns', withDefaultFixture(async (fixture) => { const topicName = (logicalId: string) => `${logicalId}-${fixture.randomString}`; diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-test-resource-import-with-construct-that-requires-bundling.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/import/cdk-test-resource-import-with-construct-that-requires-bundling.integtest.ts similarity index 98% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-test-resource-import-with-construct-that-requires-bundling.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/import/cdk-test-resource-import-with-construct-that-requires-bundling.integtest.ts index f20e6952e..0d28f7661 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-test-resource-import-with-construct-that-requires-bundling.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/import/cdk-test-resource-import-with-construct-that-requires-bundling.integtest.ts @@ -1,7 +1,7 @@ import { promises as fs } from 'fs'; import * as path from 'path'; import { DescribeStacksCommand, GetTemplateCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-test-resource-import.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/import/cdk-test-resource-import.integtest.ts similarity index 99% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-test-resource-import.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/import/cdk-test-resource-import.integtest.ts index 97e1ad735..0a4cd34ae 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-test-resource-import.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/import/cdk-test-resource-import.integtest.ts @@ -1,7 +1,7 @@ import { promises as fs } from 'fs'; import * as path from 'path'; import { DescribeStacksCommand, GetTemplateCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture, randomString } from '../../lib'; +import { integTest, withDefaultFixture, randomString } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-ls---show-dependencies---json---long.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/list/cdk-cdk-ls---show-dependencies---json---long.integtest.ts similarity index 96% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-ls---show-dependencies---json---long.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/list/cdk-cdk-ls---show-dependencies---json---long.integtest.ts index 2df460434..b32b27943 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-ls---show-dependencies---json---long.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/list/cdk-cdk-ls---show-dependencies---json---long.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-ls---show-dependencies---json.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/list/cdk-cdk-ls---show-dependencies---json.integtest.ts similarity index 97% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-ls---show-dependencies---json.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/list/cdk-cdk-ls---show-dependencies---json.integtest.ts index 9ceedb445..ee40eacd1 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-ls---show-dependencies---json.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/list/cdk-cdk-ls---show-dependencies---json.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-ls.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/list/cdk-cdk-ls.integtest.ts similarity index 93% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-ls.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/list/cdk-cdk-ls.integtest.ts index 29f4702b8..d4a563922 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-ls.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/list/cdk-cdk-ls.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-ssm-parameter-provider-error.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/lookup/cdk-ssm-parameter-provider-error.integtest.ts similarity index 88% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-ssm-parameter-provider-error.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/lookup/cdk-ssm-parameter-provider-error.integtest.ts index 083dd26fa..33b1e65a0 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-ssm-parameter-provider-error.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/lookup/cdk-ssm-parameter-provider-error.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-vpc-lookup.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/lookup/cdk-vpc-lookup.integtest.ts similarity index 94% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-vpc-lookup.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/lookup/cdk-vpc-lookup.integtest.ts index 176647d94..1a3c70a49 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-vpc-lookup.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/lookup/cdk-vpc-lookup.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-csharp.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate--from-stack-creates-deployable-app-csharp.integtest.ts similarity index 100% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-csharp.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate--from-stack-creates-deployable-app-csharp.integtest.ts diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-java.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate--from-stack-creates-deployable-app-java.integtest.ts similarity index 100% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-java.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate--from-stack-creates-deployable-app-java.integtest.ts diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-python.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate--from-stack-creates-deployable-app-python.integtest.ts similarity index 100% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-python.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate--from-stack-creates-deployable-app-python.integtest.ts diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-typescript.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate--from-stack-creates-deployable-app-typescript.integtest.ts similarity index 100% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-typescript.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate--from-stack-creates-deployable-app-typescript.integtest.ts diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-csharp.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate-deploys-successfully-csharp.integtest.ts similarity index 100% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-csharp.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate-deploys-successfully-csharp.integtest.ts diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-java.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate-deploys-successfully-java.integtest.ts similarity index 100% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-java.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate-deploys-successfully-java.integtest.ts diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-python.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate-deploys-successfully-python.integtest.ts similarity index 100% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-python.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate-deploys-successfully-python.integtest.ts diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-typescript.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate-deploys-successfully-typescript.integtest.ts similarity index 100% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-typescript.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate-deploys-successfully-typescript.integtest.ts diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-generates-migrate.json.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate-generates-migrate.json.integtest.ts similarity index 100% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-generates-migrate.json.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate-generates-migrate.json.integtest.ts diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-test-migrate-deployment-for-app-with-localfile-source-in-migrate.json.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-test-migrate-deployment-for-app-with-localfile-source-in-migrate.json.integtest.ts similarity index 96% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-test-migrate-deployment-for-app-with-localfile-source-in-migrate.json.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-test-migrate-deployment-for-app-with-localfile-source-in-migrate.json.integtest.ts index ea241cba9..c4c35b351 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-test-migrate-deployment-for-app-with-localfile-source-in-migrate.json.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-test-migrate-deployment-for-app-with-localfile-source-in-migrate.json.integtest.ts @@ -1,6 +1,6 @@ import { promises as fs } from 'fs'; import * as path from 'path'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/testcase.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/testcase.ts similarity index 100% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/testcase.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/testcase.ts diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-notices-are-displayed-correctly.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/notices/cdk-cdk-notices-are-displayed-correctly.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-notices-are-displayed-correctly.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/notices/cdk-cdk-notices-are-displayed-correctly.integtest.ts index a9aa10308..99c314f07 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-notices-are-displayed-correctly.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/notices/cdk-cdk-notices-are-displayed-correctly.integtest.ts @@ -1,6 +1,6 @@ import { promises as fs } from 'fs'; import * as path from 'path'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-notices-with---unacknowledged.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/notices/cdk-cdk-notices-with---unacknowledged.integtest.ts similarity index 90% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-notices-with---unacknowledged.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/notices/cdk-cdk-notices-with---unacknowledged.integtest.ts index 61c1bac81..6c3398d6a 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-notices-with---unacknowledged.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/notices/cdk-cdk-notices-with---unacknowledged.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-skips-notice-refresh.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/notices/cdk-skips-notice-refresh.integtest.ts similarity index 92% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-skips-notice-refresh.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/notices/cdk-skips-notice-refresh.integtest.ts index 13e80eddd..eaf289ee2 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-skips-notice-refresh.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/notices/cdk-skips-notice-refresh.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-requests-go-through-a-proxy-when-configured.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/proxy/cdk-requests-go-through-a-proxy-when-configured.integtest.ts similarity index 94% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-requests-go-through-a-proxy-when-configured.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/proxy/cdk-requests-go-through-a-proxy-when-configured.integtest.ts index 4c005cef3..be42f755a 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-requests-go-through-a-proxy-when-configured.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/proxy/cdk-requests-go-through-a-proxy-when-configured.integtest.ts @@ -1,8 +1,8 @@ import { promises as fs } from 'fs'; import * as os from 'os'; import * as path from 'path'; -import { integTest, withDefaultFixture } from '../../lib'; -import { awsActionsFromRequests, startProxyServer } from '../../lib/proxy'; +import { integTest, withDefaultFixture } from '../../../lib'; +import { awsActionsFromRequests, startProxyServer } from '../../../lib/proxy'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/proxy.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/proxy/proxy.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/proxy.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/proxy/proxy.integtest.ts index 69c3d6703..c82819ac7 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/proxy.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/proxy/proxy.integtest.ts @@ -1,10 +1,10 @@ import { promises as fs } from 'fs'; import * as os from 'os'; import * as path from 'path'; -import { integTest } from '../../lib/integ-test'; -import { startProxyServer } from '../../lib/proxy'; -import type { TestFixture } from '../../lib/with-cdk-app'; -import { withDefaultFixture } from '../../lib/with-cdk-app'; +import { integTest } from '../../../lib/integ-test'; +import { startProxyServer } from '../../../lib/proxy'; +import type { TestFixture } from '../../../lib/with-cdk-app'; +import { withDefaultFixture } from '../../../lib/with-cdk-app'; const docker = process.env.CDK_DOCKER ?? 'docker'; diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-refactor-dry-run.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/refactor/cdk-refactor-dry-run.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-refactor-dry-run.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/refactor/cdk-refactor-dry-run.integtest.ts index 9aed8e2e1..1a44833b8 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-refactor-dry-run.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/refactor/cdk-refactor-dry-run.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withSpecificFixture } from '../../lib'; +import { integTest, withSpecificFixture } from '../../../lib'; integTest( 'detects refactoring changes and prints the result', diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-stack-in-update_rollback_complete-state-can-be-updated.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/rollback/cdk-stack-in-update_rollback_complete-state-can-be-updated.integtest.ts similarity index 96% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-stack-in-update_rollback_complete-state-can-be-updated.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/rollback/cdk-stack-in-update_rollback_complete-state-can-be-updated.integtest.ts index e715bb476..7cebef58a 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-stack-in-update_rollback_complete-state-can-be-updated.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/rollback/cdk-stack-in-update_rollback_complete-state-can-be-updated.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-test-cdk-rollback---force.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/rollback/cdk-test-cdk-rollback---force.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-test-cdk-rollback---force.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/rollback/cdk-test-cdk-rollback---force.integtest.ts index b38e06245..620568957 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-test-cdk-rollback---force.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/rollback/cdk-test-cdk-rollback---force.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withSpecificFixture } from '../../lib'; +import { integTest, withSpecificFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-test-cdk-rollback.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/rollback/cdk-test-cdk-rollback.integtest.ts similarity index 93% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-test-cdk-rollback.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/rollback/cdk-test-cdk-rollback.integtest.ts index c0ef0c264..a84dca0f4 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-test-cdk-rollback.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/rollback/cdk-test-cdk-rollback.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withSpecificFixture } from '../../lib'; +import { integTest, withSpecificFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-update-to-stack-in-rollback_complete-state-will-delete-stack-and-create-a-new-one.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/rollback/cdk-update-to-stack-in-rollback_complete-state-will-delete-stack-and-create-a-new-one.integtest.ts similarity index 96% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-update-to-stack-in-rollback_complete-state-will-delete-stack-and-create-a-new-one.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/rollback/cdk-update-to-stack-in-rollback_complete-state-will-delete-stack-and-create-a-new-one.integtest.ts index d1e7fca6b..190a78335 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-update-to-stack-in-rollback_complete-state-will-delete-stack-and-create-a-new-one.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/rollback/cdk-update-to-stack-in-rollback_complete-state-will-delete-stack-and-create-a-new-one.integtest.ts @@ -1,5 +1,5 @@ import { DescribeStacksCommand } from '@aws-sdk/client-cloudformation'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-sam-can-locally-test-the-synthesized-cdk-application.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/sam/cdk-sam-can-locally-test-the-synthesized-cdk-application.integtest.ts similarity index 97% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-sam-can-locally-test-the-synthesized-cdk-application.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/sam/cdk-sam-can-locally-test-the-synthesized-cdk-application.integtest.ts index 197642da1..258456baf 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-sam-can-locally-test-the-synthesized-cdk-application.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/sam/cdk-sam-can-locally-test-the-synthesized-cdk-application.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withSamIntegrationFixture, randomInteger } from '../../lib'; +import { integTest, withSamIntegrationFixture, randomInteger } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-can-still-load-old-assemblies.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-can-still-load-old-assemblies.integtest.ts similarity index 98% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-can-still-load-old-assemblies.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-can-still-load-old-assemblies.integtest.ts index 24bd0553d..744f31353 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-can-still-load-old-assemblies.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-can-still-load-old-assemblies.integtest.ts @@ -1,7 +1,7 @@ import { promises as fs } from 'fs'; import * as os from 'os'; import * as path from 'path'; -import { integTest, RESOURCES_DIR, shell, withDefaultFixture, cloneDirectory } from '../../lib'; +import { integTest, RESOURCES_DIR, shell, withDefaultFixture, cloneDirectory } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-synth-add-the-metadata-properties-expected-by-sam.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-cdk-synth-add-the-metadata-properties-expected-by-sam.integtest.ts similarity index 98% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-synth-add-the-metadata-properties-expected-by-sam.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-cdk-synth-add-the-metadata-properties-expected-by-sam.integtest.ts index 985117552..e2ccc220a 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-synth-add-the-metadata-properties-expected-by-sam.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-cdk-synth-add-the-metadata-properties-expected-by-sam.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withSamIntegrationFixture } from '../../lib'; +import { integTest, withSamIntegrationFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-synth-bundled-functions-as-expected.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-cdk-synth-bundled-functions-as-expected.integtest.ts similarity index 97% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-synth-bundled-functions-as-expected.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-cdk-synth-bundled-functions-as-expected.integtest.ts index b177bfcab..6917945be 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-synth-bundled-functions-as-expected.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-cdk-synth-bundled-functions-as-expected.integtest.ts @@ -1,6 +1,6 @@ import { existsSync } from 'fs'; import * as path from 'path'; -import { integTest, withSamIntegrationFixture } from '../../lib'; +import { integTest, withSamIntegrationFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-synth.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-cdk-synth.integtest.ts similarity index 95% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-synth.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-cdk-synth.integtest.ts index 66d4630b0..a846dd9af 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-cdk-synth.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-cdk-synth.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-synth---quiet-can-be-specified-in-cdk.json.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-synth---quiet-can-be-specified-in-cdk.json.integtest.ts similarity index 91% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-synth---quiet-can-be-specified-in-cdk.json.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-synth---quiet-can-be-specified-in-cdk.json.integtest.ts index 3bdedf0a3..ba968d1e1 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-synth---quiet-can-be-specified-in-cdk.json.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-synth---quiet-can-be-specified-in-cdk.json.integtest.ts @@ -1,6 +1,6 @@ import { promises as fs } from 'fs'; import * as path from 'path'; -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-synthing-a-stage-with-errors-can-be-suppressed.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-synthing-a-stage-with-errors-can-be-suppressed.integtest.ts similarity index 85% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-synthing-a-stage-with-errors-can-be-suppressed.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-synthing-a-stage-with-errors-can-be-suppressed.integtest.ts index 2d3e00d9d..d0ff582fc 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-synthing-a-stage-with-errors-can-be-suppressed.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-synthing-a-stage-with-errors-can-be-suppressed.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-synthing-a-stage-with-errors-leads-to-failure.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-synthing-a-stage-with-errors-leads-to-failure.integtest.ts similarity index 87% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-synthing-a-stage-with-errors-leads-to-failure.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-synthing-a-stage-with-errors-leads-to-failure.integtest.ts index 990e65b99..edcf033af 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-synthing-a-stage-with-errors-leads-to-failure.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-synthing-a-stage-with-errors-leads-to-failure.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-templates-on-disk-contain-metadata-resource.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-templates-on-disk-contain-metadata-resource.integtest.ts similarity index 93% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-templates-on-disk-contain-metadata-resource.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-templates-on-disk-contain-metadata-resource.integtest.ts index 9f37cdf9b..d7544bf9c 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-templates-on-disk-contain-metadata-resource.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/synth/cdk-templates-on-disk-contain-metadata-resource.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-two-ways-of-showing-the-version.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/version/cdk-two-ways-of-showing-the-version.integtest.ts similarity index 86% rename from packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-two-ways-of-showing-the-version.integtest.ts rename to packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/version/cdk-two-ways-of-showing-the-version.integtest.ts index d604c1e60..819710c10 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-two-ways-of-showing-the-version.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/version/cdk-two-ways-of-showing-the-version.integtest.ts @@ -1,4 +1,4 @@ -import { integTest, withDefaultFixture } from '../../lib'; +import { integTest, withDefaultFixture } from '../../../lib'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime From d0232114c8f2bed05ca2111de2af6643db66e7a6 Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Wed, 21 May 2025 13:47:45 +0100 Subject: [PATCH 02/33] fix(cli): allow [a] to confirm garbage collection of all asset batches (#509) Relates to https://github.com/aws/aws-cdk-cli/issues/396 Mainly a refactor to use the IoHost instead of `promptly` library. However it also slightly improves the user experience on the CLI. This code path is not currently accessible by any public `toolkit-lib` API, hence it's not scoped for it. Before: image After: image --- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license --- .../toolkit-lib/docs/message-registry.md | 1 + .../garbage-collection/garbage-collector.ts | 27 ++++++++++++------- .../lib/api/io/private/messages.ts | 10 ++++++- .../@aws-cdk/toolkit-lib/lib/payloads/gc.ts | 13 +++++++++ .../toolkit-lib/lib/payloads/index.ts | 1 + 5 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 packages/@aws-cdk/toolkit-lib/lib/payloads/gc.ts diff --git a/packages/@aws-cdk/toolkit-lib/docs/message-registry.md b/packages/@aws-cdk/toolkit-lib/docs/message-registry.md index c674fda05..fe812d8ff 100644 --- a/packages/@aws-cdk/toolkit-lib/docs/message-registry.md +++ b/packages/@aws-cdk/toolkit-lib/docs/message-registry.md @@ -72,6 +72,7 @@ group: Documents | `CDK_TOOLKIT_W8010` | Refactor execution not yet supported | `warn` | n/a | | `CDK_TOOLKIT_I9000` | Provides bootstrap times | `info` | {@link Duration} | | `CDK_TOOLKIT_I9100` | Bootstrap progress | `info` | {@link BootstrapEnvironmentProgress} | +| `CDK_TOOLKIT_I9210` | Confirm the deletion of a batch of assets | `info` | {@link AssetBatchDeletionRequest} | | `CDK_TOOLKIT_I9900` | Bootstrap results on success | `result` | [cxapi.Environment](https://docs.aws.amazon.com/cdk/api/v2/docs/@aws-cdk_cx-api.Environment.html) | | `CDK_TOOLKIT_E9900` | Bootstrap failed | `error` | {@link ErrorPayload} | | `CDK_TOOLKIT_I0100` | Notices decoration (the header or footer of a list of notices) | `info` | n/a | diff --git a/packages/@aws-cdk/toolkit-lib/lib/api/garbage-collection/garbage-collector.ts b/packages/@aws-cdk/toolkit-lib/lib/api/garbage-collection/garbage-collector.ts index 338d94ecb..a37fa6d18 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/api/garbage-collection/garbage-collector.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/api/garbage-collection/garbage-collector.ts @@ -2,7 +2,6 @@ import type * as cxapi from '@aws-cdk/cx-api'; import type { ImageIdentifier } from '@aws-sdk/client-ecr'; import type { Tag } from '@aws-sdk/client-s3'; import * as chalk from 'chalk'; -import * as promptly from 'promptly'; import type { IECRClient, IS3Client, SDK, SdkProvider } from '../aws-auth/private'; import { DEFAULT_TOOLKIT_STACK_NAME, ToolkitInfo } from '../toolkit-info'; import { ProgressPrinter } from './progress-printer'; @@ -728,7 +727,7 @@ export class GarbageCollector { } while (continuationToken); } - private async confirmationPrompt(printer: ProgressPrinter, deletables: GcAsset[], type: string) { + private async confirmationPrompt(printer: ProgressPrinter, deletables: GcAsset[], type: 'image' | 'object') { const pluralize = (name: string, count: number): string => { return count === 1 ? name : `${name}s`; }; @@ -739,17 +738,25 @@ export class GarbageCollector { `- ${type}s have been isolated for > ${this.props.rollbackBufferDays} days`, `- ${type}s were created > ${this.props.createdBufferDays} days ago`, '', - 'Delete this batch (yes/no/delete-all)?', + 'Delete this batch?', ].join('\n'); printer.pause(); - const response = await promptly.prompt(message, - { trim: true }, - ); - - // Anything other than yes/y/delete-all is treated as no - if (!response || !['yes', 'y', 'delete-all'].includes(response.toLowerCase())) { + const response = await this.ioHelper.requestResponse(IO.CDK_TOOLKIT_I9210.req(message, { + batch: { + type, + count: deletables.length, + rollbackBufferDays: this.props.rollbackBufferDays, + createdBufferDays: this.props.createdBufferDays, + }, + responseDescription: '[y]es/[n]o/[a]ll', + }, 'y')); + + // Anything other than yes/all is treated as no + const yes = ['y', 'yes']; + const all = ['a', 'all', 'delete-all']; + if (!response || ![...yes, ...all].includes(response.toLowerCase())) { throw new ToolkitError('Deletion aborted by user'); - } else if (response.toLowerCase() == 'delete-all') { + } else if (all.includes(response.toLowerCase())) { this.confirm = false; } } diff --git a/packages/@aws-cdk/toolkit-lib/lib/api/io/private/messages.ts b/packages/@aws-cdk/toolkit-lib/lib/api/io/private/messages.ts index ca6844637..c36028446 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/api/io/private/messages.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/api/io/private/messages.ts @@ -6,6 +6,7 @@ import type { BootstrapEnvironmentProgress } from '../../../payloads/bootstrap-e import type { MissingContext, UpdatedContext } from '../../../payloads/context'; import type { BuildAsset, DeployConfirmationRequest, PublishAsset, StackDeployProgress, SuccessfulDeployStackResult } from '../../../payloads/deploy'; import type { StackDestroy, StackDestroyProgress } from '../../../payloads/destroy'; +import type { AssetBatchDeletionRequest } from '../../../payloads/gc'; import type { HotswapDeploymentDetails, HotswapDeploymentAttempt, HotswappableChange, HotswapResult } from '../../../payloads/hotswap'; import type { StackDetailsPayload } from '../../../payloads/list'; import type { CloudWatchLogEvent, CloudWatchLogMonitorControlEvent } from '../../../payloads/logs-monitor'; @@ -362,7 +363,7 @@ export const IO = { description: 'Refactor execution not yet supported', }), - // 9: Bootstrap (9xxx) + // 9: Bootstrap & gc (9xxx) CDK_TOOLKIT_I9000: make.info({ code: 'CDK_TOOLKIT_I9000', description: 'Provides bootstrap times', @@ -374,6 +375,13 @@ export const IO = { interface: 'BootstrapEnvironmentProgress', }), + // gc (92xx) + CDK_TOOLKIT_I9210: make.question({ + code: 'CDK_TOOLKIT_I9210', + description: 'Confirm the deletion of a batch of assets', + interface: 'AssetBatchDeletionRequest', + }), + CDK_TOOLKIT_I9900: make.result<{ environment: cxapi.Environment }>({ code: 'CDK_TOOLKIT_I9900', description: 'Bootstrap results on success', diff --git a/packages/@aws-cdk/toolkit-lib/lib/payloads/gc.ts b/packages/@aws-cdk/toolkit-lib/lib/payloads/gc.ts new file mode 100644 index 000000000..b807745ff --- /dev/null +++ b/packages/@aws-cdk/toolkit-lib/lib/payloads/gc.ts @@ -0,0 +1,13 @@ +import type { DataRequest } from './types'; + +/** + * Request to confirm or deny the deletion of an assets batch marked for garbage collection. + */ +export interface AssetBatchDeletionRequest extends DataRequest { + readonly batch: { + readonly type: 'image' | 'object'; + readonly count: number; + readonly rollbackBufferDays: number; + readonly createdBufferDays: number; + }; +} diff --git a/packages/@aws-cdk/toolkit-lib/lib/payloads/index.ts b/packages/@aws-cdk/toolkit-lib/lib/payloads/index.ts index 3897b8a6c..c08e5136f 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/payloads/index.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/payloads/index.ts @@ -15,3 +15,4 @@ export * from './stack-details'; export * from './diff'; export * from './logs-monitor'; export * from './hotswap'; +export * from './gc'; From 1ea69f773812f8b3c5d03f6cf29e3de88e526e00 Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Wed, 21 May 2025 16:51:48 +0100 Subject: [PATCH 03/33] refactor(toolkit-lib): all default messages go through the IoHelper (#518) Follow-up from #513, this PR removes the `DEFAULT_TOOLKIT_*` message codes and changes all usage to go through the `IoHelper` instead. Needed to make some additional changes to message spans and the asset logging mechanism. Next step will be the same treatment for SDK and ASSEMBLY messages. --- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license --- .../toolkit-lib/docs/message-registry.md | 6 -- .../lib/actions/diff/private/helpers.ts | 11 +-- .../lib/api/aws-auth/credential-plugins.ts | 4 +- .../api/bootstrap/bootstrap-environment.ts | 28 +++--- .../lib/api/bootstrap/deploy-bootstrap.ts | 14 +-- .../cloudformation/template-body-parameter.ts | 10 +-- .../lib/api/deployments/asset-publishing.ts | 32 +++---- .../toolkit-lib/lib/api/deployments/assets.ts | 8 +- .../lib/api/deployments/cfn-api.ts | 32 +++---- .../toolkit-lib/lib/api/deployments/checks.ts | 6 +- .../lib/api/deployments/deploy-stack.ts | 86 +++++++++---------- .../lib/api/deployments/deployments.ts | 18 ++-- .../lib/api/environment/environment-access.ts | 6 +- .../api/environment/environment-resources.ts | 12 +-- .../garbage-collection/garbage-collector.ts | 56 ++++++------ .../garbage-collection/progress-printer.ts | 6 +- .../api/garbage-collection/stack-refresh.ts | 6 +- .../lib/api/hotswap/hotswap-deployments.ts | 4 +- .../lib/api/io/private/io-default-messages.ts | 57 ++++++++---- .../lib/api/io/private/messages.ts | 26 ------ .../toolkit-lib/lib/api/io/private/span.ts | 19 ++-- .../api/logs-monitor/find-cloudwatch-logs.ts | 3 +- .../lib/api/notices/web-data-source.ts | 3 +- .../lib/api/resource-import/importer.ts | 18 ++-- .../lib/api/resource-import/migrator.ts | 6 +- .../toolkit-lib/lib/api/toolkit-info.ts | 10 +-- .../lib/api/work-graph/work-graph.ts | 8 +- .../toolkit-lib/lib/toolkit/toolkit.ts | 8 +- packages/aws-cdk/lib/cli/cli.ts | 4 +- 29 files changed, 251 insertions(+), 256 deletions(-) diff --git a/packages/@aws-cdk/toolkit-lib/docs/message-registry.md b/packages/@aws-cdk/toolkit-lib/docs/message-registry.md index fe812d8ff..1473ff9a3 100644 --- a/packages/@aws-cdk/toolkit-lib/docs/message-registry.md +++ b/packages/@aws-cdk/toolkit-lib/docs/message-registry.md @@ -6,11 +6,6 @@ group: Documents | Code | Description | Level | Data Interface | |------|-------------|-------|----------------| -| `CDK_TOOLKIT_I0000` | Default info messages emitted from the Toolkit | `info` | n/a | -| `CDK_TOOLKIT_I0000` | Default debug messages emitted from the Toolkit | `debug` | n/a | -| `CDK_TOOLKIT_W0000` | Default warning messages emitted from the Toolkit | `warn` | n/a | -| `CDK_TOOLKIT_E0000` | Default error messages emitted from the Toolkit | `error` | n/a | -| `CDK_TOOLKIT_I0000` | Default trace messages emitted from the Toolkit | `trace` | n/a | | `CDK_TOOLKIT_W0100` | Credential plugin warnings | `warn` | n/a | | `CDK_TOOLKIT_I1000` | Provides synthesis times. | `info` | {@link Duration} | | `CDK_TOOLKIT_I1001` | Cloud Assembly synthesis is starting | `trace` | {@link StackSelectionDetails} | @@ -99,7 +94,6 @@ group: Documents | `CDK_ASSEMBLY_I9999` | Annotations emitted by the cloud assembly | `info` | [cxapi.SynthesisMessage](https://docs.aws.amazon.com/cdk/api/v2/docs/@aws-cdk_cx-api.SynthesisMessage.html) | | `CDK_ASSEMBLY_W9999` | Warnings emitted by the cloud assembly | `warn` | [cxapi.SynthesisMessage](https://docs.aws.amazon.com/cdk/api/v2/docs/@aws-cdk_cx-api.SynthesisMessage.html) | | `CDK_ASSEMBLY_E9999` | Errors emitted by the cloud assembly | `error` | [cxapi.SynthesisMessage](https://docs.aws.amazon.com/cdk/api/v2/docs/@aws-cdk_cx-api.SynthesisMessage.html) | -| `CDK_SDK_I0000` | An SDK trace message. | `trace` | n/a | | `CDK_SDK_I0000` | An SDK debug message. | `debug` | n/a | | `CDK_SDK_W0000` | An SDK warning message. | `warn` | n/a | | `CDK_SDK_I0100` | An SDK trace. SDK traces are emitted as traces to the IoHost, but contain the original SDK logging level. | `trace` | {@link SdkTrace} | diff --git a/packages/@aws-cdk/toolkit-lib/lib/actions/diff/private/helpers.ts b/packages/@aws-cdk/toolkit-lib/lib/actions/diff/private/helpers.ts index 42acf69e9..9239c1d80 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/actions/diff/private/helpers.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/actions/diff/private/helpers.ts @@ -3,13 +3,14 @@ import * as fs from 'fs-extra'; import * as uuid from 'uuid'; import type { ChangeSetDiffOptions, DiffOptions, LocalFileDiffOptions } from '..'; import { DiffMethod } from '..'; +import type { SdkProvider } from '../../../api/aws-auth/private'; import type { StackCollection } from '../../../api/cloud-assembly/stack-collection'; import type { Deployments } from '../../../api/deployments'; +import * as cfnApi from '../../../api/deployments/cfn-api'; import type { TemplateInfo } from '../../../api/diff'; +import type { IoHelper } from '../../../api/io/private'; import type { ResourcesToImport } from '../../../api/resource-import'; import { removeNonImportResources, ResourceMigrator } from '../../../api/resource-import'; -import type { IoHelper, SdkProvider } from '../../../api/shared-private'; -import { IO, cfnApi } from '../../../api/shared-private'; import { ToolkitError } from '../../../toolkit/toolkit-error'; import { deserializeStructure, formatErrorMessage } from '../../../util'; @@ -126,8 +127,8 @@ async function changeSetDiff( throw new ToolkitError(`describeStacks call failed with ${e} for ${stack.stackName}, set fallBackToTemplate to true or use DiffMethod.templateOnly to base the diff on template differences.`); } - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`Checking if the stack ${stack.stackName} exists before creating the changeset has failed, will base the diff on template differences.\n`)); - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(formatErrorMessage(e))); + await ioHelper.defaults.debug(`Checking if the stack ${stack.stackName} exists before creating the changeset has failed, will base the diff on template differences.\n`); + await ioHelper.defaults.debug(formatErrorMessage(e)); stackExists = false; } @@ -148,7 +149,7 @@ async function changeSetDiff( throw new ToolkitError(`the stack '${stack.stackName}' has not been deployed to CloudFormation, set fallBackToTemplate to true or use DiffMethod.templateOnly to base the diff on template differences.`); } - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`the stack '${stack.stackName}' has not been deployed to CloudFormation, skipping changeset creation.`)); + await ioHelper.defaults.debug(`the stack '${stack.stackName}' has not been deployed to CloudFormation, skipping changeset creation.`); return; } } diff --git a/packages/@aws-cdk/toolkit-lib/lib/api/aws-auth/credential-plugins.ts b/packages/@aws-cdk/toolkit-lib/lib/api/aws-auth/credential-plugins.ts index aacefaa9c..fae1c547e 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/api/aws-auth/credential-plugins.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/api/aws-auth/credential-plugins.ts @@ -51,7 +51,7 @@ export class CredentialPlugins { } if (!available) { - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`Credentials source ${source.name} is not available, ignoring it.`)); + await this.ioHelper.defaults.debug(`Credentials source ${source.name} is not available, ignoring it.`); continue; } triedSources.push(source); @@ -66,7 +66,7 @@ export class CredentialPlugins { if (!canProvide) { continue; } - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`Using ${source.name} credentials for account ${awsAccountId}`)); + await this.ioHelper.defaults.debug(`Using ${source.name} credentials for account ${awsAccountId}`); return { credentials: await v3ProviderFromPlugin(() => source.getProvider(awsAccountId, mode as ForReading | ForWriting, { diff --git a/packages/@aws-cdk/toolkit-lib/lib/api/bootstrap/bootstrap-environment.ts b/packages/@aws-cdk/toolkit-lib/lib/api/bootstrap/bootstrap-environment.ts index a1712a728..4fa62fbbf 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/api/bootstrap/bootstrap-environment.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/api/bootstrap/bootstrap-environment.ts @@ -7,7 +7,7 @@ import { ToolkitError } from '../../toolkit/toolkit-error'; import { bundledPackageRootDir, loadStructuredFile, serializeStructure } from '../../util'; import type { SDK, SdkProvider } from '../aws-auth/private'; import type { SuccessfulDeployStackResult } from '../deployments'; -import { IO, type IoHelper } from '../io/private'; +import { type IoHelper } from '../io/private'; import { Mode } from '../plugin'; import { DEFAULT_TOOLKIT_STACK_NAME } from '../toolkit-info'; @@ -123,16 +123,16 @@ export class Bootstrapper { accounts.filter(acc => !params.untrustedAccounts?.map(String).includes(String(acc))); const trustedAccounts = removeUntrusted(params.trustedAccounts ?? splitCfnArray(current.parameters.TrustedAccounts)); - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg( + await this.ioHelper.defaults.info( `Trusted accounts for deployment: ${trustedAccounts.length > 0 ? trustedAccounts.join(', ') : '(none)'}`, - )); + ); const trustedAccountsForLookup = removeUntrusted( params.trustedAccountsForLookup ?? splitCfnArray(current.parameters.TrustedAccountsForLookup), ); - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg( + await this.ioHelper.defaults.info( `Trusted accounts for lookup: ${trustedAccountsForLookup.length > 0 ? trustedAccountsForLookup.join(', ') : '(none)'}`, - )); + ); const cloudFormationExecutionPolicies = params.cloudFormationExecutionPolicies ?? splitCfnArray(current.parameters.CloudFormationExecutionPolicies); @@ -151,16 +151,16 @@ export class Bootstrapper { // Would leave AdministratorAccess policies with a trust relationship, without the user explicitly // approving the trust policy. const implicitPolicy = `arn:${partition}:iam::aws:policy/AdministratorAccess`; - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_WARN.msg( + await this.ioHelper.defaults.warn( `Using default execution policy of '${implicitPolicy}'. Pass '--cloudformation-execution-policies' to customize.`, - )); + ); } else if (cloudFormationExecutionPolicies.length === 0) { throw new ToolkitError( `Please pass \'--cloudformation-execution-policies\' when using \'--trust\' to specify deployment permissions. Try a managed policy of the form \'arn:${partition}:iam::aws:policy/\'.`, ); } else { // Remind people what the current settings are - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(`Execution policies: ${cloudFormationExecutionPolicies.join(', ')}`)); + await this.ioHelper.defaults.info(`Execution policies: ${cloudFormationExecutionPolicies.join(', ')}`); } // * If an ARN is given, that ARN. Otherwise: @@ -199,17 +199,17 @@ export class Bootstrapper { } if (currentPermissionsBoundary !== policyName) { if (!currentPermissionsBoundary) { - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_WARN.msg( + await this.ioHelper.defaults.warn( `Adding new permissions boundary ${policyName}`, - )); + ); } else if (!policyName) { - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_WARN.msg( + await this.ioHelper.defaults.warn( `Removing existing permissions boundary ${currentPermissionsBoundary}`, - )); + ); } else { - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_WARN.msg( + await this.ioHelper.defaults.warn( `Changing permissions boundary from ${currentPermissionsBoundary} to ${policyName}`, - )); + ); } } diff --git a/packages/@aws-cdk/toolkit-lib/lib/api/bootstrap/deploy-bootstrap.ts b/packages/@aws-cdk/toolkit-lib/lib/api/bootstrap/deploy-bootstrap.ts index 0c3e1ef6e..9d16f2c26 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/api/bootstrap/deploy-bootstrap.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/api/bootstrap/deploy-bootstrap.ts @@ -16,7 +16,7 @@ import type { SuccessfulDeployStackResult } from '../deployments'; import { assertIsSuccessfulDeployStackResult } from '../deployments'; import { deployStack } from '../deployments/deploy-stack'; import { NoBootstrapStackEnvironmentResources } from '../environment'; -import { IO, type IoHelper } from '../io/private'; +import { type IoHelper } from '../io/private'; import { Mode } from '../plugin'; import { DEFAULT_TOOLKIT_STACK_NAME, ToolkitInfo } from '../toolkit-info'; @@ -89,9 +89,9 @@ export class BootstrapStack { const currentVariant = this.currentToolkitInfo.variant; const newVariant = bootstrapVariantFromTemplate(template); if (currentVariant !== newVariant) { - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_WARN.msg( + await this.ioHelper.defaults.warn( `Bootstrap stack already exists, containing '${currentVariant}'. Not overwriting it with a template containing '${newVariant}' (use --force if you intend to overwrite)`, - )); + ); return abortResponse; } @@ -99,15 +99,15 @@ export class BootstrapStack { const newVersion = bootstrapVersionFromTemplate(template); const currentVersion = this.currentToolkitInfo.version; if (newVersion < currentVersion) { - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_WARN.msg( + await this.ioHelper.defaults.warn( `Bootstrap stack already at version ${currentVersion}. Not downgrading it to version ${newVersion} (use --force if you intend to downgrade)`, - )); + ); if (newVersion === 0) { // A downgrade with 0 as target version means we probably have a new-style bootstrap in the account, // and an old-style bootstrap as current target, which means the user probably forgot to put this flag in. - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_WARN.msg( + await this.ioHelper.defaults.warn( "(Did you set the '@aws-cdk/core:newStyleStackSynthesis' feature flag in cdk.json?)", - )); + ); } return abortResponse; } diff --git a/packages/@aws-cdk/toolkit-lib/lib/api/cloudformation/template-body-parameter.ts b/packages/@aws-cdk/toolkit-lib/lib/api/cloudformation/template-body-parameter.ts index 69c7f93d1..1986822f1 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/api/cloudformation/template-body-parameter.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/api/cloudformation/template-body-parameter.ts @@ -9,7 +9,7 @@ import { ToolkitError } from '../../toolkit/toolkit-error'; import { contentHash, toYAML } from '../../util'; import type { AssetManifestBuilder } from '../deployments'; import type { EnvironmentResources } from '../environment'; -import { IO, type IoHelper } from '../io/private'; +import { type IoHelper } from '../io/private'; export type TemplateBodyParameter = { TemplateBody?: string; @@ -55,13 +55,13 @@ export async function makeBodyParameter( const toolkitInfo = await resources.lookupToolkit(); if (!toolkitInfo.found) { - await ioHelper.notify( - IO.DEFAULT_TOOLKIT_ERROR.msg(util.format( + await ioHelper.defaults.error( + util.format( `The template for stack "${stack.displayName}" is ${Math.round(templateJson.length / 1024)}KiB. ` + `Templates larger than ${LARGE_TEMPLATE_SIZE_KB}KiB must be uploaded to S3.\n` + 'Run the following command in order to setup an S3 bucket in this environment, and then re-deploy:\n\n', chalk.blue(`\t$ cdk bootstrap ${resolvedEnvironment.name}\n`), - )), + ), ); throw new ToolkitError('Template too large to deploy ("cdk bootstrap" is required)'); @@ -90,7 +90,7 @@ export async function makeBodyParameter( ); const templateURL = `${toolkitInfo.bucketUrl}/${key}`; - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`Storing template in S3 at: ${templateURL}`)); + await ioHelper.defaults.debug(`Storing template in S3 at: ${templateURL}`); return { TemplateURL: templateURL }; } diff --git a/packages/@aws-cdk/toolkit-lib/lib/api/deployments/asset-publishing.ts b/packages/@aws-cdk/toolkit-lib/lib/api/deployments/asset-publishing.ts index 8d9cf6c34..6aa2b6b47 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/api/deployments/asset-publishing.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/api/deployments/asset-publishing.ts @@ -16,8 +16,8 @@ import { } from 'cdk-assets'; import { ToolkitError } from '../../toolkit/toolkit-error'; import type { SDK, SdkProvider } from '../aws-auth/private'; -import type { IoMessageMaker, IoHelper } from '../io/private'; -import { IO } from '../io/private'; +import type { IoMessageLevel } from '../io'; +import type { IoHelper } from '../io/private'; import { Mode } from '../plugin'; interface PublishAssetsOptions { @@ -167,17 +167,17 @@ export class PublishingAws implements IAws { } } -const EVENT_TO_MSG_MAKER: Record | false> = { - build: IO.DEFAULT_TOOLKIT_DEBUG, - cached: IO.DEFAULT_TOOLKIT_DEBUG, - check: IO.DEFAULT_TOOLKIT_DEBUG, - debug: IO.DEFAULT_TOOLKIT_DEBUG, - fail: IO.DEFAULT_TOOLKIT_ERROR, - found: IO.DEFAULT_TOOLKIT_DEBUG, - start: IO.DEFAULT_TOOLKIT_INFO, - success: IO.DEFAULT_TOOLKIT_INFO, - upload: IO.DEFAULT_TOOLKIT_DEBUG, - shell_open: IO.DEFAULT_TOOLKIT_DEBUG, +const EVENT_TO_MSG_LEVEL: Record = { + build: 'debug', + cached: 'debug', + check: 'debug', + debug: 'debug', + fail: 'error', + found: 'debug', + start: 'info', + success: 'info', + upload: 'debug', + shell_open: 'debug', shell_stderr: false, shell_stdout: false, shell_close: false, @@ -193,9 +193,9 @@ export abstract class BasePublishProgressListener implements IPublishProgressLis protected abstract getMessage(type: EventType, event: IPublishProgress): string; public onPublishEvent(type: EventType, event: IPublishProgress): void { - const maker = EVENT_TO_MSG_MAKER[type]; - if (maker) { - void this.ioHelper.notify(maker.msg(this.getMessage(type, event))); + const level = EVENT_TO_MSG_LEVEL[type]; + if (level) { + void this.ioHelper.defaults[level](this.getMessage(type, event)); } } } diff --git a/packages/@aws-cdk/toolkit-lib/lib/api/deployments/assets.ts b/packages/@aws-cdk/toolkit-lib/lib/api/deployments/assets.ts index 727a0f078..a61f79703 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/api/deployments/assets.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/api/deployments/assets.ts @@ -5,7 +5,7 @@ import * as chalk from 'chalk'; import type { AssetManifestBuilder } from './asset-manifest-builder'; import { ToolkitError } from '../../toolkit/toolkit-error'; import type { EnvironmentResources } from '../environment'; -import { IO, type IoHelper } from '../io/private'; +import { type IoHelper } from '../io/private'; import type { ToolkitInfo } from '../toolkit-info'; /** @@ -42,11 +42,11 @@ export async function addMetadataAssetsToManifest( const reuseAsset = reuse.indexOf(asset.id) > -1; if (reuseAsset) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`Reusing asset ${asset.id}: ${JSON.stringify(asset)}`)); + await ioHelper.defaults.debug(`Reusing asset ${asset.id}: ${JSON.stringify(asset)}`); continue; } - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`Preparing asset ${asset.id}: ${JSON.stringify(asset)}`)); + await ioHelper.defaults.debug(`Preparing asset ${asset.id}: ${JSON.stringify(asset)}`); if (!stack.assembly) { throw new ToolkitError('Unexpected: stack assembly is required in order to find assets in assembly directory'); } @@ -96,7 +96,7 @@ async function prepareFileAsset( const key = `${s3Prefix}${baseName}`; const s3url = `s3://${toolkitInfo.bucketName}/${key}`; - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`Storing asset ${asset.path} at ${s3url}`)); + await ioHelper.defaults.debug(`Storing asset ${asset.path} at ${s3url}`); assetManifest.addFileAsset(asset.sourceHash, { path: asset.path, diff --git a/packages/@aws-cdk/toolkit-lib/lib/api/deployments/cfn-api.ts b/packages/@aws-cdk/toolkit-lib/lib/api/deployments/cfn-api.ts index 2bb5f6325..36360a6d1 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/api/deployments/cfn-api.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/api/deployments/cfn-api.ts @@ -18,7 +18,7 @@ import { ToolkitError } from '../../toolkit/toolkit-error'; import type { ICloudFormationClient, SdkProvider } from '../aws-auth/private'; import type { Template, TemplateBodyParameter, TemplateParameter } from '../cloudformation'; import { CloudFormationStack, makeBodyParameter } from '../cloudformation'; -import { IO, type IoHelper } from '../io/private'; +import { type IoHelper } from '../io/private'; import type { ResourcesToImport } from '../resource-import'; /** @@ -105,7 +105,7 @@ export async function waitForChangeSet( changeSetName: string, { fetchAll }: { fetchAll: boolean }, ): Promise { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(format('Waiting for changeset %s on stack %s to finish creating...', changeSetName, stackName))); + await ioHelper.defaults.debug(format('Waiting for changeset %s on stack %s to finish creating...', changeSetName, stackName)); const ret = await waitFor(async () => { const description = await describeChangeSet(cfn, stackName, changeSetName, { fetchAll, @@ -113,7 +113,7 @@ export async function waitForChangeSet( // The following doesn't use a switch because tsc will not allow fall-through, UNLESS it is allows // EVERYWHERE that uses this library directly or indirectly, which is undesirable. if (description.Status === 'CREATE_PENDING' || description.Status === 'CREATE_IN_PROGRESS') { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(format('Changeset %s on stack %s is still creating', changeSetName, stackName))); + await ioHelper.defaults.debug(format('Changeset %s on stack %s is still creating', changeSetName, stackName)); return undefined; } @@ -178,7 +178,7 @@ export async function createDiffChangeSet( // This causes CreateChangeSet to fail with `Template Error: Fn::Equals cannot be partially collapsed`. for (const resource of Object.values(options.stack.template.Resources ?? {})) { if ((resource as any).Type === 'AWS::CloudFormation::Stack') { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg('This stack contains one or more nested stacks, falling back to template-only diff...')); + await ioHelper.defaults.debug('This stack contains one or more nested stacks, falling back to template-only diff...'); return undefined; } @@ -232,9 +232,9 @@ async function uploadBodyParameterAndCreateChangeSet( const exists = (await CloudFormationStack.lookup(cfn, options.stack.stackName, false)).exists; const executionRoleArn = await env.replacePlaceholders(options.stack.cloudFormationExecutionRoleArn); - await ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg( + await ioHelper.defaults.info( 'Hold on while we create a read-only change set to get a diff with accurate replacement information (use --no-change-set to use a less accurate but faster template-only diff)\n', - )); + ); return await createChangeSet(ioHelper, { cfn, @@ -252,10 +252,10 @@ async function uploadBodyParameterAndCreateChangeSet( } catch (e: any) { // This function is currently only used by diff so these messages are diff-specific if (!options.failOnError) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(String(e))); - await ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg( + await ioHelper.defaults.debug(String(e)); + await ioHelper.defaults.info( 'Could not create a change set, will base the diff on template differences (run again with -v to see the reason)\n', - )); + ); return undefined; } @@ -297,7 +297,7 @@ export async function createChangeSet( ): Promise { await cleanupOldChangeset(options.cfn, ioHelper, options.changeSetName, options.stack.stackName); - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`Attempting to create ChangeSet with name ${options.changeSetName} for stack ${options.stack.stackName}`)); + await ioHelper.defaults.debug(`Attempting to create ChangeSet with name ${options.changeSetName} for stack ${options.stack.stackName}`); const templateParams = TemplateParameters.fromTemplate(options.stack.template); const stackParams = templateParams.supplyAll(options.parameters); @@ -318,7 +318,7 @@ export async function createChangeSet( Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM', 'CAPABILITY_AUTO_EXPAND'], }); - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(format('Initiated creation of changeset: %s; waiting for it to finish creating...', changeSet.Id))); + await ioHelper.defaults.debug(format('Initiated creation of changeset: %s; waiting for it to finish creating...', changeSet.Id)); // Fetching all pages if we'll execute, so we can have the correct change count when monitoring. const createdChangeSet = await waitForChangeSet(options.cfn, ioHelper, options.stack.stackName, options.changeSetName, { fetchAll: options.willExecute, @@ -343,7 +343,7 @@ async function cleanupOldChangeset( ) { // Delete any existing change sets generated by CDK since change set names must be unique. // The delete request is successful as long as the stack exists (even if the change set does not exist). - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`Removing existing change set with name ${changeSetName} if it exists`)); + await ioHelper.defaults.debug(`Removing existing change set with name ${changeSetName} if it exists`); await cfn.deleteChangeSet({ StackName: stackName, ChangeSetName: changeSetName, @@ -445,16 +445,16 @@ export async function stabilizeStack( ioHelper: IoHelper, stackName: string, ) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(format('Waiting for stack %s to finish creating or updating...', stackName))); + await ioHelper.defaults.debug(format('Waiting for stack %s to finish creating or updating...', stackName)); return waitFor(async () => { const stack = await CloudFormationStack.lookup(cfn, stackName); if (!stack.exists) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(format('Stack %s does not exist', stackName))); + await ioHelper.defaults.debug(format('Stack %s does not exist', stackName)); return null; } const status = stack.stackStatus; if (status.isInProgress) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(format('Stack %s has an ongoing operation in progress and is not stable (%s)', stackName, status))); + await ioHelper.defaults.debug(format('Stack %s has an ongoing operation in progress and is not stable (%s)', stackName, status)); return undefined; } else if (status.isReviewInProgress) { // This may happen if a stack creation operation is interrupted before the ChangeSet execution starts. Recovering @@ -463,7 +463,7 @@ export async function stabilizeStack( // "forever" we proceed as if the stack was existing and stable. If there is a concurrent operation that just // hasn't finished proceeding just yet, either this operation or the concurrent one may fail due to the other one // having made progress. Which is fine. I guess. - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(format('Stack %s is in REVIEW_IN_PROGRESS state. Considering this is a stable status (%s)', stackName, status))); + await ioHelper.defaults.debug(format('Stack %s is in REVIEW_IN_PROGRESS state. Considering this is a stable status (%s)', stackName, status)); } return stack; diff --git a/packages/@aws-cdk/toolkit-lib/lib/api/deployments/checks.ts b/packages/@aws-cdk/toolkit-lib/lib/api/deployments/checks.ts index f9959e05f..a86f99f29 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/api/deployments/checks.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/api/deployments/checks.ts @@ -1,6 +1,6 @@ import { ToolkitError } from '../../toolkit/toolkit-error'; import type { SDK } from '../aws-auth/private'; -import { IO, type IoHelper } from '../io/private'; +import { type IoHelper } from '../io/private'; export async function determineAllowCrossAccountAssetPublishing( sdk: SDK, @@ -33,8 +33,8 @@ export async function determineAllowCrossAccountAssetPublishing( // of creating bootstrap resources. If they do, there's nothing for us to validate, // but we can't use that as a reason to disallow cross-account publishing. We'll just // have to trust they did their due diligence. So we fail open. - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`Error determining cross account asset publishing: ${e}`)); - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg('Defaulting to allowing cross account asset publishing')); + await ioHelper.defaults.debug(`Error determining cross account asset publishing: ${e}`); + await ioHelper.defaults.debug('Defaulting to allowing cross account asset publishing'); return true; } } diff --git a/packages/@aws-cdk/toolkit-lib/lib/api/deployments/deploy-stack.ts b/packages/@aws-cdk/toolkit-lib/lib/api/deployments/deploy-stack.ts index 9a4e3bd83..faa258366 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/api/deployments/deploy-stack.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/api/deployments/deploy-stack.ts @@ -35,7 +35,7 @@ import { makeBodyParameter, CfnEvaluationException, CloudFormationStack } from ' import type { EnvironmentResources, StringWithoutPlaceholders } from '../environment'; import { HotswapMode, HotswapPropertyOverrides, ICON } from '../hotswap/common'; import { tryHotswapDeployment } from '../hotswap/hotswap-deployments'; -import { IO, type IoHelper } from '../io/private'; +import { type IoHelper } from '../io/private'; import type { ResourcesToImport } from '../resource-import'; import { StackActivityMonitor } from '../stack-events'; @@ -211,9 +211,9 @@ export async function deployStack(options: DeployStackOptions, ioHelper: IoHelpe let cloudFormationStack = await CloudFormationStack.lookup(cfn, deployName); if (cloudFormationStack.stackStatus.isCreationFailure) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg( + await ioHelper.defaults.debug( `Found existing stack ${deployName} that had previously failed creation. Deleting it before attempting to re-create it.`, - )); + ); await cfn.deleteStack({ StackName: deployName }); const deletedStack = await waitForStackDelete(cfn, ioHelper, deployName); if (deletedStack && deletedStack.stackStatus.name !== 'DELETE_COMPLETE') { @@ -250,16 +250,16 @@ export async function deployStack(options: DeployStackOptions, ioHelper: IoHelpe const hotswapPropertyOverrides = options.hotswapPropertyOverrides ?? new HotswapPropertyOverrides(); if (await canSkipDeploy(options, cloudFormationStack, stackParams.hasChanges(cloudFormationStack.parameters), ioHelper)) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`${deployName}: skipping deployment (use --force to override)`)); + await ioHelper.defaults.debug(`${deployName}: skipping deployment (use --force to override)`); // if we can skip deployment and we are performing a hotswap, let the user know // that no hotswap deployment happened if (hotswapMode !== HotswapMode.FULL_DEPLOYMENT) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg( + await ioHelper.defaults.info( format( `\n ${ICON} %s\n`, chalk.bold('hotswap deployment skipped - no changes were detected (use --force to override)'), ), - )); + ); } return { type: 'did-deploy-stack', @@ -268,7 +268,7 @@ export async function deployStack(options: DeployStackOptions, ioHelper: IoHelpe stackArn: cloudFormationStack.stackId, }; } else { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`${deployName}: deploying...`)); + await ioHelper.defaults.debug(`${deployName}: deploying...`); } const bodyParameter = await makeBodyParameter( @@ -283,7 +283,7 @@ export async function deployStack(options: DeployStackOptions, ioHelper: IoHelpe try { bootstrapStackName = (await options.envResources.lookupToolkit()).stackName; } catch (e) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`Could not determine the bootstrap stack name: ${e}`)); + await ioHelper.defaults.debug(`Could not determine the bootstrap stack name: ${e}`); } await publishAssets(legacyAssets.toManifest(stackArtifact.assembly.directory), options.sdkProvider, stackEnv, { parallel: options.assetParallelism, @@ -307,22 +307,22 @@ export async function deployStack(options: DeployStackOptions, ioHelper: IoHelpe return hotswapDeploymentResult; } - await ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(format( + await ioHelper.defaults.info(format( 'Could not perform a hotswap deployment, as the stack %s contains non-Asset changes', stackArtifact.displayName, - ))); + )); } catch (e) { if (!(e instanceof CfnEvaluationException)) { throw e; } - await ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(format( + await ioHelper.defaults.info(format( 'Could not perform a hotswap deployment, because the CloudFormation template could not be resolved: %s', formatErrorMessage(e), - ))); + )); } if (hotswapMode === HotswapMode.FALL_BACK) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg('Falling back to doing a full deployment')); + await ioHelper.defaults.info('Falling back to doing a full deployment'); options.sdk.appendCustomUserAgent('cdk-hotswap/fallback'); } else { return { @@ -405,9 +405,9 @@ class FullCloudFormationDeployment { await this.updateTerminationProtection(); if (changeSetHasNoChanges(changeSetDescription)) { - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(format('No changes are to be performed on %s.', this.stackName))); + await this.ioHelper.defaults.debug(format('No changes are to be performed on %s.', this.stackName)); if (execute) { - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(format('Deleting empty change set %s', changeSetDescription.ChangeSetId))); + await this.ioHelper.defaults.debug(format('Deleting empty change set %s', changeSetDescription.ChangeSetId)); await this.cfn.deleteChangeSet({ StackName: this.stackName, ChangeSetName: changeSetName, @@ -415,7 +415,7 @@ class FullCloudFormationDeployment { } if (this.options.forceDeployment) { - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_WARN.msg( + await this.ioHelper.defaults.warn( [ 'You used the --force flag, but CloudFormation reported that the deployment would not make any changes.', 'According to CloudFormation, all resources are already up-to-date with the state in your CDK app.', @@ -423,7 +423,7 @@ class FullCloudFormationDeployment { 'You cannot use the --force flag to get rid of changes you made in the console. Try using', 'CloudFormation drift detection instead: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-stack-drift.html', ].join('\n'), - )); + ); } return { @@ -435,10 +435,10 @@ class FullCloudFormationDeployment { } if (!execute) { - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(format( + await this.ioHelper.defaults.info(format( 'Changeset %s created and waiting in review for manual execution (--no-execute)', changeSetDescription.ChangeSetId, - ))); + )); return { type: 'did-deploy-stack', noOp: false, @@ -467,8 +467,8 @@ class FullCloudFormationDeployment { private async createChangeSet(changeSetName: string, willExecute: boolean, importExistingResources: boolean) { await this.cleanupOldChangeset(changeSetName); - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`Attempting to create ChangeSet with name ${changeSetName} to ${this.verb} stack ${this.stackName}`)); - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(format('%s: creating CloudFormation changeset...', chalk.bold(this.stackName)))); + await this.ioHelper.defaults.debug(`Attempting to create ChangeSet with name ${changeSetName} to ${this.verb} stack ${this.stackName}`); + await this.ioHelper.defaults.info(format('%s: creating CloudFormation changeset...', chalk.bold(this.stackName))); const changeSet = await this.cfn.createChangeSet({ StackName: this.stackName, ChangeSetName: changeSetName, @@ -480,7 +480,7 @@ class FullCloudFormationDeployment { ...this.commonPrepareOptions(), }); - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(format('Initiated creation of changeset: %s; waiting for it to finish creating...', changeSet.Id))); + await this.ioHelper.defaults.debug(format('Initiated creation of changeset: %s; waiting for it to finish creating...', changeSet.Id)); // Fetching all pages if we'll execute, so we can have the correct change count when monitoring. return waitForChangeSet(this.cfn, this.ioHelper, this.stackName, changeSetName, { fetchAll: willExecute, @@ -488,7 +488,7 @@ class FullCloudFormationDeployment { } private async executeChangeSet(changeSet: DescribeChangeSetCommandOutput): Promise { - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(format('Initiating execution of changeset %s on stack %s', changeSet.ChangeSetId, this.stackName))); + await this.ioHelper.defaults.debug(format('Initiating execution of changeset %s on stack %s', changeSet.ChangeSetId, this.stackName)); await this.cfn.executeChangeSet({ StackName: this.stackName, @@ -497,13 +497,13 @@ class FullCloudFormationDeployment { ...this.commonExecuteOptions(), }); - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg( + await this.ioHelper.defaults.debug( format( 'Execution of changeset %s on stack %s has started; waiting for the update to complete...', changeSet.ChangeSetId, this.stackName, ), - )); + ); // +1 for the extra event emitted from updates. const changeSetLength: number = (changeSet.Changes ?? []).length + (this.update ? 1 : 0); @@ -514,7 +514,7 @@ class FullCloudFormationDeployment { if (this.cloudFormationStack.exists) { // Delete any existing change sets generated by CDK since change set names must be unique. // The delete request is successful as long as the stack exists (even if the change set does not exist). - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`Removing existing change set with name ${changeSetName} if it exists`)); + await this.ioHelper.defaults.debug(`Removing existing change set with name ${changeSetName} if it exists`); await this.cfn.deleteChangeSet({ StackName: this.stackName, ChangeSetName: changeSetName, @@ -526,24 +526,24 @@ class FullCloudFormationDeployment { // Update termination protection only if it has changed. const terminationProtection = this.stackArtifact.terminationProtection ?? false; if (!!this.cloudFormationStack.terminationProtection !== terminationProtection) { - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg( + await this.ioHelper.defaults.debug( format ( 'Updating termination protection from %s to %s for stack %s', this.cloudFormationStack.terminationProtection, terminationProtection, this.stackName, ), - )); + ); await this.cfn.updateTerminationProtection({ StackName: this.stackName, EnableTerminationProtection: terminationProtection, }); - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(format('Termination protection updated to %s for stack %s', terminationProtection, this.stackName))); + await this.ioHelper.defaults.debug(format('Termination protection updated to %s for stack %s', terminationProtection, this.stackName)); } } private async directDeployment(): Promise { - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(format('%s: %s stack...', chalk.bold(this.stackName), this.update ? 'updating' : 'creating'))); + await this.ioHelper.defaults.info(format('%s: %s stack...', chalk.bold(this.stackName), this.update ? 'updating' : 'creating')); const startTime = new Date(); @@ -559,7 +559,7 @@ class FullCloudFormationDeployment { }); } catch (err: any) { if (err.message === 'No updates are to be performed.') { - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(format('No updates are to be performed for stack %s', this.stackName))); + await this.ioHelper.defaults.debug(format('No updates are to be performed for stack %s', this.stackName)); return { type: 'did-deploy-stack', noOp: true, @@ -612,7 +612,7 @@ class FullCloudFormationDeployment { } finally { await monitor.stop(); } - await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(format('Stack %s has completed updating', this.stackName))); + await this.ioHelper.defaults.debug(format('Stack %s has completed updating', this.stackName)); return { type: 'did-deploy-stack', noOp: false, @@ -722,11 +722,11 @@ async function canSkipDeploy( ioHelper: IoHelper, ): Promise { const deployName = deployStackOptions.deployName || deployStackOptions.stack.stackName; - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`${deployName}: checking if we can skip deploy`)); + await ioHelper.defaults.debug(`${deployName}: checking if we can skip deploy`); // Forced deploy if (deployStackOptions.forceDeployment) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`${deployName}: forced deployment`)); + await ioHelper.defaults.debug(`${deployName}: forced deployment`); return false; } @@ -735,53 +735,53 @@ async function canSkipDeploy( deployStackOptions.deploymentMethod?.method === 'change-set' && deployStackOptions.deploymentMethod.execute === false ) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`${deployName}: --no-execute, always creating change set`)); + await ioHelper.defaults.debug(`${deployName}: --no-execute, always creating change set`); return false; } // No existing stack if (!cloudFormationStack.exists) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`${deployName}: no existing stack`)); + await ioHelper.defaults.debug(`${deployName}: no existing stack`); return false; } // Template has changed (assets taken into account here) if (JSON.stringify(deployStackOptions.stack.template) !== JSON.stringify(await cloudFormationStack.template())) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`${deployName}: template has changed`)); + await ioHelper.defaults.debug(`${deployName}: template has changed`); return false; } // Tags have changed if (!compareTags(cloudFormationStack.tags, deployStackOptions.tags ?? [])) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`${deployName}: tags have changed`)); + await ioHelper.defaults.debug(`${deployName}: tags have changed`); return false; } // Notification arns have changed if (!arrayEquals(cloudFormationStack.notificationArns, deployStackOptions.notificationArns ?? [])) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`${deployName}: notification arns have changed`)); + await ioHelper.defaults.debug(`${deployName}: notification arns have changed`); return false; } // Termination protection has been updated if (!!deployStackOptions.stack.terminationProtection !== !!cloudFormationStack.terminationProtection) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`${deployName}: termination protection has been updated`)); + await ioHelper.defaults.debug(`${deployName}: termination protection has been updated`); return false; } // Parameters have changed if (parameterChanges) { if (parameterChanges === 'ssm') { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`${deployName}: some parameters come from SSM so we have to assume they may have changed`)); + await ioHelper.defaults.debug(`${deployName}: some parameters come from SSM so we have to assume they may have changed`); } else { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`${deployName}: parameters have changed`)); + await ioHelper.defaults.debug(`${deployName}: parameters have changed`); } return false; } // Existing stack is in a failed state if (cloudFormationStack.stackStatus.isFailure) { - await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`${deployName}: stack is in a failure state`)); + await ioHelper.defaults.debug(`${deployName}: stack is in a failure state`); return false; } diff --git a/packages/@aws-cdk/toolkit-lib/lib/api/deployments/deployments.ts b/packages/@aws-cdk/toolkit-lib/lib/api/deployments/deployments.ts index 525b4b0f4..1e93c1e7a 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/api/deployments/deployments.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/api/deployments/deployments.ts @@ -31,7 +31,7 @@ import { } from '../cloudformation'; import { type EnvironmentResources, EnvironmentAccess } from '../environment'; import type { HotswapMode, HotswapPropertyOverrides } from '../hotswap/common'; -import { IO, type IoHelper } from '../io/private'; +import { type IoHelper } from '../io/private'; import type { ResourceIdentifierSummaries, ResourcesToImport } from '../resource-import'; import { StackActivityMonitor, StackEventPoller, RollbackChoice } from '../stack-events'; import type { Tag } from '../tags'; @@ -348,7 +348,7 @@ export class Deployments { } public async readCurrentTemplate(stackArtifact: cxapi.CloudFormationStackArtifact): Promise