resolve conflicts

Author: rix0rrr

.github/workflows/integ.yml

@@ -676,16 +676,54 @@ const tmpToolkitHelpers = configureProject(
     devDeps: [
       '@types/archiver',
       '@types/semver',
+      'aws-sdk-client-mock',
+      'aws-sdk-client-mock-jest',
       'fast-check',
+      'nock',
+      '@smithy/util-stream',
+      'xml-js',
     ],
     deps: [
       cloudAssemblySchema.name,
       cloudFormationDiff,
       cxApi,
+      `@aws-sdk/client-appsync@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/client-cloudcontrol@${CLI_SDK_V3_RANGE}`,
       `@aws-sdk/client-cloudformation@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/client-cloudwatch-logs@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/client-codebuild@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/client-ec2@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/client-ecr@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/client-ecs@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/client-elastic-load-balancing-v2@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/client-iam@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/client-kms@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/client-lambda@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/client-route-53@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/client-s3@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/client-secrets-manager@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/client-sfn@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/client-ssm@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/client-sts@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/credential-providers@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/lib-storage@${CLI_SDK_V3_RANGE}`,
+      `@aws-sdk/ec2-metadata-service@${CLI_SDK_V3_RANGE}`,
+      '@smithy/middleware-endpoint',
+      '@smithy/node-http-handler',
+      '@smithy/property-provider',
+      '@smithy/shared-ini-file-loader',
+      '@smithy/types',
+      '@smithy/util-retry',
+      '@smithy/util-waiter',
+      cdkAssets,
       'archiver',
       'chalk@4',
+      'fs-extra@^9',
       'glob',
+      'minimatch',
+      'p-limit@^3',
+      'promptly', // @todo remove this should only be in CLI
+      'proxy-agent', // @todo remove this should only be in CLI
       'semver',
       'uuid',
       'wrap-ansi@^7', // Last non-ESM version
@@ -870,9 +908,6 @@ const cli = configureProject(
         // We have many tests here that commonly time out
         testTimeout: 60_000,
         coveragePathIgnorePatterns: [
-          // Mostly wrappers around the SDK, which get mocked in unit tests
-          '<rootDir>/lib/api/aws-auth/sdk.ts',
-
           // Files generated by cli-args-gen
           '<rootDir>/lib/cli/parse-command-line-arguments.ts',
           '<rootDir>/lib/cli/user-input.ts',
@@ -1187,7 +1222,7 @@ const toolkitLib = configureProject(
       tmpToolkitHelpers,
       'aws-cdk-lib',
       'aws-sdk-client-mock',
-      'dts-bundle-generator',
+      'dts-bundle-generator@9.3.1', // use this specific version because newer versions are much slower. This is a temporary arrangement we hope to remove soon anyway.
       'esbuild',
       'typedoc',
     ],
@@ -1522,6 +1557,7 @@ new CdkCliIntegTestsWorkflow(repo, {
   testEnvironment: TEST_ENVIRONMENT,
   buildRunsOn: POWERFUL_RUNNER,
   testRunsOn: POWERFUL_RUNNER,
+  maxWorkers: '80',
 
   localPackages: [
     cloudAssemblySchema.name,