diff --git a/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/app-staging-synthesizer.ts b/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/app-staging-synthesizer.ts index 21f7290d19f4b..d422e182bcb97 100644 --- a/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/app-staging-synthesizer.ts +++ b/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/app-staging-synthesizer.ts @@ -11,7 +11,7 @@ import { Stack, StackSynthesizer, Token, -} from 'aws-cdk-lib'; +} from 'aws-cdk-lib/core'; import { StringSpecializer, translateCfnTokenToAssetToken } from 'aws-cdk-lib/core/lib/helpers-internal'; import { BootstrapRole, BootstrapRoles, DeploymentIdentities } from './bootstrap-roles'; import { DefaultStagingStack, DefaultStagingStackOptions } from './default-staging-stack'; diff --git a/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/default-staging-stack.ts b/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/default-staging-stack.ts index d3db964441f44..9e75755f344c6 100644 --- a/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/default-staging-stack.ts +++ b/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/default-staging-stack.ts @@ -1,5 +1,9 @@ import * as fs from 'fs'; import * as path from 'path'; +import * as ecr from 'aws-cdk-lib/aws-ecr'; +import * as iam from 'aws-cdk-lib/aws-iam'; +import * as kms from 'aws-cdk-lib/aws-kms'; +import * as s3 from 'aws-cdk-lib/aws-s3'; import { App, ArnFormat, @@ -11,11 +15,7 @@ import { RemovalPolicy, Stack, StackProps, -} from 'aws-cdk-lib'; -import * as ecr from 'aws-cdk-lib/aws-ecr'; -import * as iam from 'aws-cdk-lib/aws-iam'; -import * as kms from 'aws-cdk-lib/aws-kms'; -import * as s3 from 'aws-cdk-lib/aws-s3'; +} from 'aws-cdk-lib/core'; import { StringSpecializer } from 'aws-cdk-lib/core/lib/helpers-internal'; import { BootstrapRole } from './bootstrap-roles'; import { FileStagingLocation, IStagingResources, IStagingResourcesFactory, ImageStagingLocation } from './staging-stack'; diff --git a/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/per-env-staging-factory.ts b/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/per-env-staging-factory.ts index 3d3c8fd5c50b2..e510dbf7dfc2c 100644 --- a/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/per-env-staging-factory.ts +++ b/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/per-env-staging-factory.ts @@ -1,4 +1,4 @@ -import { Stack } from 'aws-cdk-lib'; +import { Stack } from 'aws-cdk-lib/core'; import { AppScopedGlobal } from './private/app-global'; import { IStagingResources, IStagingResourcesFactory, ObtainStagingResourcesContext } from './staging-stack'; diff --git a/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/private/app-global.ts b/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/private/app-global.ts index 2cd36d0264a5b..d68c9bced38f3 100644 --- a/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/private/app-global.ts +++ b/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/private/app-global.ts @@ -1,4 +1,4 @@ -import { App } from 'aws-cdk-lib'; +import { App } from 'aws-cdk-lib/core'; import { IConstruct } from 'constructs'; /** diff --git a/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/staging-stack.ts b/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/staging-stack.ts index 9cc24dbb3bce5..f7cf19d278720 100644 --- a/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/staging-stack.ts +++ b/packages/@aws-cdk/app-staging-synthesizer-alpha/lib/staging-stack.ts @@ -1,4 +1,4 @@ -import { DockerImageAssetSource, FileAssetSource, Stack } from 'aws-cdk-lib'; +import { DockerImageAssetSource, FileAssetSource, Stack } from 'aws-cdk-lib/core'; import { IConstruct } from 'constructs'; /** diff --git a/packages/@aws-cdk/aws-amplify-alpha/lib/app.ts b/packages/@aws-cdk/aws-amplify-alpha/lib/app.ts index e4d2df3fcb657..f0aaa7a7176f7 100644 --- a/packages/@aws-cdk/aws-amplify-alpha/lib/app.ts +++ b/packages/@aws-cdk/aws-amplify-alpha/lib/app.ts @@ -1,6 +1,6 @@ import * as codebuild from 'aws-cdk-lib/aws-codebuild'; import * as iam from 'aws-cdk-lib/aws-iam'; -import { IResource, Lazy, Resource, SecretValue } from 'aws-cdk-lib'; +import { IResource, Lazy, Resource, SecretValue } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnApp } from 'aws-cdk-lib/aws-amplify'; import { BasicAuth } from './basic-auth'; diff --git a/packages/@aws-cdk/aws-amplify-alpha/lib/basic-auth.ts b/packages/@aws-cdk/aws-amplify-alpha/lib/basic-auth.ts index 17b0104e6bfec..85762d3bf9c6d 100644 --- a/packages/@aws-cdk/aws-amplify-alpha/lib/basic-auth.ts +++ b/packages/@aws-cdk/aws-amplify-alpha/lib/basic-auth.ts @@ -1,6 +1,6 @@ import * as kms from 'aws-cdk-lib/aws-kms'; import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'; -import { SecretValue } from 'aws-cdk-lib'; +import { SecretValue } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; /** diff --git a/packages/@aws-cdk/aws-amplify-alpha/lib/branch.ts b/packages/@aws-cdk/aws-amplify-alpha/lib/branch.ts index 1960df82ac02d..712455dcd980b 100644 --- a/packages/@aws-cdk/aws-amplify-alpha/lib/branch.ts +++ b/packages/@aws-cdk/aws-amplify-alpha/lib/branch.ts @@ -11,7 +11,7 @@ import { Duration, NestedStack, Stack, -} from 'aws-cdk-lib'; +} from 'aws-cdk-lib/core'; import { Provider } from 'aws-cdk-lib/custom-resources'; import { Construct } from 'constructs'; import { CfnBranch } from 'aws-cdk-lib/aws-amplify'; diff --git a/packages/@aws-cdk/aws-amplify-alpha/lib/domain.ts b/packages/@aws-cdk/aws-amplify-alpha/lib/domain.ts index e7b5800842886..6075d2b2a1a52 100644 --- a/packages/@aws-cdk/aws-amplify-alpha/lib/domain.ts +++ b/packages/@aws-cdk/aws-amplify-alpha/lib/domain.ts @@ -1,5 +1,5 @@ import * as iam from 'aws-cdk-lib/aws-iam'; -import { Lazy, Resource, IResolvable } from 'aws-cdk-lib'; +import { Lazy, Resource, IResolvable } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnDomain } from 'aws-cdk-lib/aws-amplify'; import { IApp } from './app'; diff --git a/packages/@aws-cdk/aws-amplify-alpha/lib/source-code-providers.ts b/packages/@aws-cdk/aws-amplify-alpha/lib/source-code-providers.ts index 5f43bbe0df650..640417c52404a 100644 --- a/packages/@aws-cdk/aws-amplify-alpha/lib/source-code-providers.ts +++ b/packages/@aws-cdk/aws-amplify-alpha/lib/source-code-providers.ts @@ -1,5 +1,5 @@ import * as codecommit from 'aws-cdk-lib/aws-codecommit'; -import { SecretValue } from 'aws-cdk-lib'; +import { SecretValue } from 'aws-cdk-lib/core'; import { App, ISourceCodeProvider, SourceCodeProviderConfig } from './app'; /** diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/api-mapping.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/api-mapping.ts index 98aae8b741dd9..4d83ece564651 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/api-mapping.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/api-mapping.ts @@ -1,4 +1,4 @@ -import { IResource, Resource } from 'aws-cdk-lib'; +import { IResource, Resource } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IApi } from './api'; import { IDomainName } from './domain-name'; diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/api.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/api.ts index 8c5fb2e991946..0375653007f49 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/api.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/api.ts @@ -1,5 +1,5 @@ import * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch'; -import { IResource } from 'aws-cdk-lib'; +import { IResource } from 'aws-cdk-lib/core'; /** * Represents a API Gateway HTTP/WebSocket API diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/authorizer.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/authorizer.ts index 3b404d1e76037..376baac1dc1e8 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/authorizer.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/authorizer.ts @@ -1,4 +1,4 @@ -import { IResource } from 'aws-cdk-lib'; +import { IResource } from 'aws-cdk-lib/core'; /** * Represents an Authorizer. diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/base.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/base.ts index 6d2924568d2bc..bb4804e13e370 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/base.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/base.ts @@ -1,5 +1,5 @@ import * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch'; -import { Resource } from 'aws-cdk-lib'; +import { Resource } from 'aws-cdk-lib/core'; import { IApi } from './api'; import { ApiMapping } from './api-mapping'; import { DomainMappingOptions, IStage } from './stage'; diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/domain-name.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/domain-name.ts index ffab9059fc113..5d22be1b35e43 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/domain-name.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/domain-name.ts @@ -1,6 +1,6 @@ import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager'; import { IBucket } from 'aws-cdk-lib/aws-s3'; -import { IResource, Lazy, Resource, Token } from 'aws-cdk-lib'; +import { IResource, Lazy, Resource, Token } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnDomainName, CfnDomainNameProps } from 'aws-cdk-lib/aws-apigatewayv2'; diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/integration.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/integration.ts index 4beab4ce21ab7..023ddacaeea8e 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/integration.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/integration.ts @@ -1,4 +1,4 @@ -import { IResource } from 'aws-cdk-lib'; +import { IResource } from 'aws-cdk-lib/core'; /** * Represents an integration to an API Route. diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/route.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/route.ts index d73481295fc31..4920772ff1877 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/route.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/route.ts @@ -1,4 +1,4 @@ -import { IResource } from 'aws-cdk-lib'; +import { IResource } from 'aws-cdk-lib/core'; /** * Represents a route. diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/stage.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/stage.ts index 6ad27320e3e91..e9fb36b76084c 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/stage.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/common/stage.ts @@ -1,5 +1,5 @@ import { Metric, MetricOptions } from 'aws-cdk-lib/aws-cloudwatch'; -import { IResource } from 'aws-cdk-lib'; +import { IResource } from 'aws-cdk-lib/core'; import { IDomainName } from './domain-name'; /** diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/api.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/api.ts index 15deefaa44fcd..8f052e80c993a 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/api.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/api.ts @@ -1,5 +1,5 @@ import { Metric, MetricOptions } from 'aws-cdk-lib/aws-cloudwatch'; -import { Duration } from 'aws-cdk-lib'; +import { Duration } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IHttpRouteAuthorizer } from './authorizer'; import { HttpRouteIntegration } from './integration'; diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/authorizer.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/authorizer.ts index 097691aab0426..ba6fafb3a6e7f 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/authorizer.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/authorizer.ts @@ -1,4 +1,4 @@ -import { Duration, Resource } from 'aws-cdk-lib'; +import { Duration, Resource } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IHttpApi } from './api'; import { IHttpRoute } from './route'; diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/integration.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/integration.ts index bea01b943ffae..d9e630557f3ad 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/integration.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/integration.ts @@ -1,5 +1,5 @@ import { IRole } from 'aws-cdk-lib/aws-iam'; -import { Aws, Resource } from 'aws-cdk-lib'; +import { Aws, Resource } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IHttpApi } from './api'; import { HttpMethod, IHttpRoute } from './route'; diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/route.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/route.ts index 040704a99113b..b7aab0663a2a3 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/route.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/route.ts @@ -1,5 +1,5 @@ import * as iam from 'aws-cdk-lib/aws-iam'; -import { Aws, Resource } from 'aws-cdk-lib'; +import { Aws, Resource } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IHttpApi } from './api'; import { HttpRouteAuthorizerConfig, IHttpRouteAuthorizer } from './authorizer'; diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/stage.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/stage.ts index 3f90e07f55d4b..d93967d66a82a 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/stage.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/stage.ts @@ -1,5 +1,5 @@ import { Metric, MetricOptions } from 'aws-cdk-lib/aws-cloudwatch'; -import { Stack } from 'aws-cdk-lib'; +import { Stack } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IHttpApi } from './api'; import { CfnStage } from 'aws-cdk-lib/aws-apigatewayv2'; diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/vpc-link.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/vpc-link.ts index 74929a4e4b3a0..5756cdb455922 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/vpc-link.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/http/vpc-link.ts @@ -1,5 +1,5 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; -import { IResource, Lazy, Names, Resource } from 'aws-cdk-lib'; +import { IResource, Lazy, Names, Resource } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnVpcLink } from 'aws-cdk-lib/aws-apigatewayv2'; diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/api.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/api.ts index c015cee597e1f..94fd95e95508c 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/api.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/api.ts @@ -1,5 +1,5 @@ import { Grant, IGrantable } from 'aws-cdk-lib/aws-iam'; -import { Stack } from 'aws-cdk-lib'; +import { Stack } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { WebSocketRoute, WebSocketRouteOptions } from './route'; import { CfnApi } from 'aws-cdk-lib/aws-apigatewayv2'; diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/authorizer.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/authorizer.ts index 6ddf1bdc18163..33c5859f6a951 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/authorizer.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/authorizer.ts @@ -1,4 +1,4 @@ -import { Resource } from 'aws-cdk-lib'; +import { Resource } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IWebSocketApi } from './api'; import { IWebSocketRoute } from './route'; diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/integration.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/integration.ts index d4c37b73a9a52..43b9c7dc5024a 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/integration.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/integration.ts @@ -1,4 +1,4 @@ -import { Resource } from 'aws-cdk-lib'; +import { Resource } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IWebSocketApi } from './api'; import { IWebSocketRoute } from './route'; diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/route.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/route.ts index 7f6c8ed24e40d..e119e5fa63839 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/route.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/route.ts @@ -1,4 +1,4 @@ -import { Resource } from 'aws-cdk-lib'; +import { Resource } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IWebSocketApi } from './api'; import { IWebSocketRouteAuthorizer, WebSocketNoneAuthorizer } from './authorizer'; diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/stage.ts b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/stage.ts index ae94d8a0a100f..e294a42946ec9 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/stage.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-alpha/lib/websocket/stage.ts @@ -1,5 +1,5 @@ import { Grant, IGrantable } from 'aws-cdk-lib/aws-iam'; -import { Stack } from 'aws-cdk-lib'; +import { Stack } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IWebSocketApi } from './api'; import { CfnStage } from 'aws-cdk-lib/aws-apigatewayv2'; diff --git a/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/lib/http/lambda.ts b/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/lib/http/lambda.ts index 803432e0df0b4..26ba4f1743499 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/lib/http/lambda.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/lib/http/lambda.ts @@ -9,7 +9,7 @@ import { } from '@aws-cdk/aws-apigatewayv2-alpha'; import { ServicePrincipal } from 'aws-cdk-lib/aws-iam'; import { IFunction } from 'aws-cdk-lib/aws-lambda'; -import { Stack, Duration, Names } from 'aws-cdk-lib'; +import { Stack, Duration, Names } from 'aws-cdk-lib/core'; /** * Specifies the type responses the lambda returns diff --git a/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/lib/http/user-pool.ts b/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/lib/http/user-pool.ts index de271ff2cbfa6..7cf9a894ac542 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/lib/http/user-pool.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/lib/http/user-pool.ts @@ -1,6 +1,6 @@ import { HttpAuthorizer, HttpAuthorizerType, HttpRouteAuthorizerBindOptions, HttpRouteAuthorizerConfig, IHttpRouteAuthorizer } from '@aws-cdk/aws-apigatewayv2-alpha'; import { IUserPool, IUserPoolClient } from 'aws-cdk-lib/aws-cognito'; -import { Stack } from 'aws-cdk-lib'; +import { Stack } from 'aws-cdk-lib/core'; /** * Properties to initialize HttpUserPoolAuthorizer. diff --git a/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/lib/websocket/lambda.ts b/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/lib/websocket/lambda.ts index 26b63e355214c..b02769d2a40c6 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/lib/websocket/lambda.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/lib/websocket/lambda.ts @@ -8,7 +8,7 @@ import { } from '@aws-cdk/aws-apigatewayv2-alpha'; import { ServicePrincipal } from 'aws-cdk-lib/aws-iam'; import { IFunction } from 'aws-cdk-lib/aws-lambda'; -import { Stack, Names } from 'aws-cdk-lib'; +import { Stack, Names } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; /** diff --git a/packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/lib/http/lambda.ts b/packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/lib/http/lambda.ts index a35d9494c7ab9..1dd1e53e3c1da 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/lib/http/lambda.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/lib/http/lambda.ts @@ -8,7 +8,7 @@ import { } from '@aws-cdk/aws-apigatewayv2-alpha'; import { ServicePrincipal } from 'aws-cdk-lib/aws-iam'; import { IFunction } from 'aws-cdk-lib/aws-lambda'; -import { Stack } from 'aws-cdk-lib'; +import { Stack } from 'aws-cdk-lib/core'; /** * Lambda Proxy integration properties diff --git a/packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/lib/websocket/lambda.ts b/packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/lib/websocket/lambda.ts index 4b77351c5a64f..9306ef7dc0e7a 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/lib/websocket/lambda.ts +++ b/packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/lib/websocket/lambda.ts @@ -6,7 +6,7 @@ import { } from '@aws-cdk/aws-apigatewayv2-alpha'; import { ServicePrincipal } from 'aws-cdk-lib/aws-iam'; import { IFunction } from 'aws-cdk-lib/aws-lambda'; -import { Stack } from 'aws-cdk-lib'; +import { Stack } from 'aws-cdk-lib/core'; /** * Lambda WebSocket Integration diff --git a/packages/@aws-cdk/aws-apprunner-alpha/lib/service.ts b/packages/@aws-cdk/aws-apprunner-alpha/lib/service.ts index a6c4f918d5c01..3a2a8e8de57c6 100644 --- a/packages/@aws-cdk/aws-apprunner-alpha/lib/service.ts +++ b/packages/@aws-cdk/aws-apprunner-alpha/lib/service.ts @@ -3,8 +3,8 @@ import * as assets from 'aws-cdk-lib/aws-ecr-assets'; import * as iam from 'aws-cdk-lib/aws-iam'; import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'; import * as ssm from 'aws-cdk-lib/aws-ssm'; -import * as cdk from 'aws-cdk-lib'; -import { Lazy } from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; +import { Lazy } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnService } from 'aws-cdk-lib/aws-apprunner'; import { IVpcConnector } from './vpc-connector'; diff --git a/packages/@aws-cdk/aws-apprunner-alpha/lib/vpc-connector.ts b/packages/@aws-cdk/aws-apprunner-alpha/lib/vpc-connector.ts index ab9e03d846065..a6371eacd86f7 100644 --- a/packages/@aws-cdk/aws-apprunner-alpha/lib/vpc-connector.ts +++ b/packages/@aws-cdk/aws-apprunner-alpha/lib/vpc-connector.ts @@ -1,6 +1,6 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; import { Connections } from 'aws-cdk-lib/aws-ec2'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnVpcConnector } from 'aws-cdk-lib/aws-apprunner'; diff --git a/packages/@aws-cdk/aws-batch-alpha/lib/compute-environment-base.ts b/packages/@aws-cdk/aws-batch-alpha/lib/compute-environment-base.ts index 1a308ef8cd442..c0e82a6f1c5c5 100644 --- a/packages/@aws-cdk/aws-batch-alpha/lib/compute-environment-base.ts +++ b/packages/@aws-cdk/aws-batch-alpha/lib/compute-environment-base.ts @@ -1,5 +1,5 @@ import * as iam from 'aws-cdk-lib/aws-iam'; -import { IResource, Resource } from 'aws-cdk-lib'; +import { IResource, Resource } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; /** diff --git a/packages/@aws-cdk/aws-batch-alpha/lib/ecs-container-definition.ts b/packages/@aws-cdk/aws-batch-alpha/lib/ecs-container-definition.ts index 959058f709338..0f09ef8d30497 100644 --- a/packages/@aws-cdk/aws-batch-alpha/lib/ecs-container-definition.ts +++ b/packages/@aws-cdk/aws-batch-alpha/lib/ecs-container-definition.ts @@ -2,7 +2,7 @@ import * as ecs from 'aws-cdk-lib/aws-ecs'; import { IFileSystem } from 'aws-cdk-lib/aws-efs'; import * as iam from 'aws-cdk-lib/aws-iam'; import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'; -import { Lazy, PhysicalName, Size } from 'aws-cdk-lib'; +import { Lazy, PhysicalName, Size } from 'aws-cdk-lib/core'; import { Construct, IConstruct } from 'constructs'; import { CfnJobDefinition } from 'aws-cdk-lib/aws-batch'; import { LinuxParameters } from './linux-parameters'; diff --git a/packages/@aws-cdk/aws-batch-alpha/lib/ecs-job-definition.ts b/packages/@aws-cdk/aws-batch-alpha/lib/ecs-job-definition.ts index 1e26e46392650..e92cd58b9e914 100644 --- a/packages/@aws-cdk/aws-batch-alpha/lib/ecs-job-definition.ts +++ b/packages/@aws-cdk/aws-batch-alpha/lib/ecs-job-definition.ts @@ -1,4 +1,4 @@ -import { ArnFormat, Stack } from 'aws-cdk-lib'; +import { ArnFormat, Stack } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnJobDefinition } from 'aws-cdk-lib/aws-batch'; import { EcsEc2ContainerDefinition, IEcsContainerDefinition } from './ecs-container-definition'; diff --git a/packages/@aws-cdk/aws-batch-alpha/lib/eks-container-definition.ts b/packages/@aws-cdk/aws-batch-alpha/lib/eks-container-definition.ts index d37905d78650a..446e85d416f3f 100644 --- a/packages/@aws-cdk/aws-batch-alpha/lib/eks-container-definition.ts +++ b/packages/@aws-cdk/aws-batch-alpha/lib/eks-container-definition.ts @@ -1,5 +1,5 @@ import * as ecs from 'aws-cdk-lib/aws-ecs'; -import { Lazy, Size } from 'aws-cdk-lib'; +import { Lazy, Size } from 'aws-cdk-lib/core'; import { Construct, IConstruct } from 'constructs'; import { CfnJobDefinition } from 'aws-cdk-lib/aws-batch'; diff --git a/packages/@aws-cdk/aws-batch-alpha/lib/eks-job-definition.ts b/packages/@aws-cdk/aws-batch-alpha/lib/eks-job-definition.ts index fb2fbe15b1c45..f5a58b482bf9c 100644 --- a/packages/@aws-cdk/aws-batch-alpha/lib/eks-job-definition.ts +++ b/packages/@aws-cdk/aws-batch-alpha/lib/eks-job-definition.ts @@ -1,4 +1,4 @@ -import { ArnFormat, Lazy, Stack } from 'aws-cdk-lib'; +import { ArnFormat, Lazy, Stack } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnJobDefinition } from 'aws-cdk-lib/aws-batch'; import { EksContainerDefinition, EmptyDirVolume, HostPathVolume, SecretPathVolume } from './eks-container-definition'; diff --git a/packages/@aws-cdk/aws-batch-alpha/lib/job-definition-base.ts b/packages/@aws-cdk/aws-batch-alpha/lib/job-definition-base.ts index 4361db9377810..9265e126ded89 100644 --- a/packages/@aws-cdk/aws-batch-alpha/lib/job-definition-base.ts +++ b/packages/@aws-cdk/aws-batch-alpha/lib/job-definition-base.ts @@ -1,4 +1,4 @@ -import { Duration, IResource, Lazy, Resource } from 'aws-cdk-lib'; +import { Duration, IResource, Lazy, Resource } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnJobDefinitionProps } from 'aws-cdk-lib/aws-batch'; diff --git a/packages/@aws-cdk/aws-batch-alpha/lib/job-queue.ts b/packages/@aws-cdk/aws-batch-alpha/lib/job-queue.ts index 44197e7bc75cf..c6ce04cedd748 100644 --- a/packages/@aws-cdk/aws-batch-alpha/lib/job-queue.ts +++ b/packages/@aws-cdk/aws-batch-alpha/lib/job-queue.ts @@ -1,4 +1,4 @@ -import { ArnFormat, IResource, Lazy, Resource, Stack } from 'aws-cdk-lib'; +import { ArnFormat, IResource, Lazy, Resource, Stack } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnJobQueue } from 'aws-cdk-lib/aws-batch'; import { IComputeEnvironment } from './compute-environment-base'; diff --git a/packages/@aws-cdk/aws-batch-alpha/lib/linux-parameters.ts b/packages/@aws-cdk/aws-batch-alpha/lib/linux-parameters.ts index fd176526e8942..c1fd120a8e6b6 100644 --- a/packages/@aws-cdk/aws-batch-alpha/lib/linux-parameters.ts +++ b/packages/@aws-cdk/aws-batch-alpha/lib/linux-parameters.ts @@ -1,4 +1,4 @@ -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnJobDefinition } from 'aws-cdk-lib/aws-batch'; diff --git a/packages/@aws-cdk/aws-batch-alpha/lib/managed-compute-environment.ts b/packages/@aws-cdk/aws-batch-alpha/lib/managed-compute-environment.ts index e532089cbeb4c..f7ffec746178c 100644 --- a/packages/@aws-cdk/aws-batch-alpha/lib/managed-compute-environment.ts +++ b/packages/@aws-cdk/aws-batch-alpha/lib/managed-compute-environment.ts @@ -2,7 +2,7 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as eks from 'aws-cdk-lib/aws-eks'; import * as iam from 'aws-cdk-lib/aws-iam'; import { IRole } from 'aws-cdk-lib/aws-iam'; -import { ArnFormat, Duration, ITaggable, Lazy, Resource, Stack, TagManager, TagType } from 'aws-cdk-lib'; +import { ArnFormat, Duration, ITaggable, Lazy, Resource, Stack, TagManager, TagType } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnComputeEnvironment } from 'aws-cdk-lib/aws-batch'; import { IComputeEnvironment, ComputeEnvironmentBase, ComputeEnvironmentProps } from './compute-environment-base'; diff --git a/packages/@aws-cdk/aws-batch-alpha/lib/multinode-job-definition.ts b/packages/@aws-cdk/aws-batch-alpha/lib/multinode-job-definition.ts index 449ba68922918..ec72e6d5d14b8 100644 --- a/packages/@aws-cdk/aws-batch-alpha/lib/multinode-job-definition.ts +++ b/packages/@aws-cdk/aws-batch-alpha/lib/multinode-job-definition.ts @@ -1,5 +1,5 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; -import { ArnFormat, Lazy, Stack } from 'aws-cdk-lib'; +import { ArnFormat, Lazy, Stack } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnJobDefinition } from 'aws-cdk-lib/aws-batch'; import { IEcsContainerDefinition } from './ecs-container-definition'; diff --git a/packages/@aws-cdk/aws-batch-alpha/lib/scheduling-policy.ts b/packages/@aws-cdk/aws-batch-alpha/lib/scheduling-policy.ts index 49475e1950344..31478d5cbbd48 100644 --- a/packages/@aws-cdk/aws-batch-alpha/lib/scheduling-policy.ts +++ b/packages/@aws-cdk/aws-batch-alpha/lib/scheduling-policy.ts @@ -1,4 +1,4 @@ -import { ArnFormat, Duration, IResource, Lazy, Resource, Stack } from 'aws-cdk-lib'; +import { ArnFormat, Duration, IResource, Lazy, Resource, Stack } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnSchedulingPolicy } from 'aws-cdk-lib/aws-batch'; diff --git a/packages/@aws-cdk/aws-batch-alpha/lib/unmanaged-compute-environment.ts b/packages/@aws-cdk/aws-batch-alpha/lib/unmanaged-compute-environment.ts index 877215d2a34a6..69076d78cedc2 100644 --- a/packages/@aws-cdk/aws-batch-alpha/lib/unmanaged-compute-environment.ts +++ b/packages/@aws-cdk/aws-batch-alpha/lib/unmanaged-compute-environment.ts @@ -1,5 +1,5 @@ import { ManagedPolicy, Role, ServicePrincipal } from 'aws-cdk-lib/aws-iam'; -import { ArnFormat, Stack } from 'aws-cdk-lib'; +import { ArnFormat, Stack } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnComputeEnvironment } from 'aws-cdk-lib/aws-batch'; import { IComputeEnvironment, ComputeEnvironmentBase, ComputeEnvironmentProps } from './compute-environment-base'; diff --git a/packages/@aws-cdk/aws-cloud9-alpha/lib/environment.ts b/packages/@aws-cdk/aws-cloud9-alpha/lib/environment.ts index 325dd2374102e..1894499e4da5f 100644 --- a/packages/@aws-cdk/aws-cloud9-alpha/lib/environment.ts +++ b/packages/@aws-cdk/aws-cloud9-alpha/lib/environment.ts @@ -1,7 +1,7 @@ import * as codecommit from 'aws-cdk-lib/aws-codecommit'; import * as ec2 from 'aws-cdk-lib/aws-ec2'; import { IUser } from 'aws-cdk-lib/aws-iam'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnEnvironmentEC2 } from 'aws-cdk-lib/aws-cloud9'; diff --git a/packages/@aws-cdk/aws-codestar-alpha/lib/github-repository.ts b/packages/@aws-cdk/aws-codestar-alpha/lib/github-repository.ts index 38db0c0d4fce6..ff2a5bf8dd230 100644 --- a/packages/@aws-cdk/aws-codestar-alpha/lib/github-repository.ts +++ b/packages/@aws-cdk/aws-codestar-alpha/lib/github-repository.ts @@ -1,5 +1,5 @@ import * as s3 from 'aws-cdk-lib/aws-s3'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import * as codestar from 'aws-cdk-lib/aws-codestar'; diff --git a/packages/@aws-cdk/aws-cognito-identitypool-alpha/lib/identitypool-role-attachment.ts b/packages/@aws-cdk/aws-cognito-identitypool-alpha/lib/identitypool-role-attachment.ts index 0d719a7bd4dc7..d555e816408ed 100644 --- a/packages/@aws-cdk/aws-cognito-identitypool-alpha/lib/identitypool-role-attachment.ts +++ b/packages/@aws-cdk/aws-cognito-identitypool-alpha/lib/identitypool-role-attachment.ts @@ -8,7 +8,7 @@ import { Resource, IResource, Token, -} from 'aws-cdk-lib'; +} from 'aws-cdk-lib/core'; import { Construct, } from 'constructs'; diff --git a/packages/@aws-cdk/aws-cognito-identitypool-alpha/lib/identitypool-user-pool-authentication-provider.ts b/packages/@aws-cdk/aws-cognito-identitypool-alpha/lib/identitypool-user-pool-authentication-provider.ts index cad1a858e8454..bcf5a2cc075bf 100644 --- a/packages/@aws-cdk/aws-cognito-identitypool-alpha/lib/identitypool-user-pool-authentication-provider.ts +++ b/packages/@aws-cdk/aws-cognito-identitypool-alpha/lib/identitypool-user-pool-authentication-provider.ts @@ -2,7 +2,7 @@ import { IUserPool, IUserPoolClient, } from 'aws-cdk-lib/aws-cognito'; -import { Stack } from 'aws-cdk-lib'; +import { Stack } from 'aws-cdk-lib/core'; import { Construct, Node, } from 'constructs'; diff --git a/packages/@aws-cdk/aws-cognito-identitypool-alpha/lib/identitypool.ts b/packages/@aws-cdk/aws-cognito-identitypool-alpha/lib/identitypool.ts index 7dd469a745a1c..589ab8d285428 100644 --- a/packages/@aws-cdk/aws-cognito-identitypool-alpha/lib/identitypool.ts +++ b/packages/@aws-cdk/aws-cognito-identitypool-alpha/lib/identitypool.ts @@ -14,7 +14,7 @@ import { Stack, ArnFormat, Lazy, -} from 'aws-cdk-lib'; +} from 'aws-cdk-lib/core'; import { Construct, } from 'constructs'; diff --git a/packages/@aws-cdk/aws-gamelift-alpha/lib/alias.ts b/packages/@aws-cdk/aws-gamelift-alpha/lib/alias.ts index 904886b5a3bff..cc3640d0fa9f3 100644 --- a/packages/@aws-cdk/aws-gamelift-alpha/lib/alias.ts +++ b/packages/@aws-cdk/aws-gamelift-alpha/lib/alias.ts @@ -1,4 +1,4 @@ -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IFleet } from './fleet-base'; import { IGameSessionQueueDestination } from './game-session-queue'; diff --git a/packages/@aws-cdk/aws-gamelift-alpha/lib/build-fleet.ts b/packages/@aws-cdk/aws-gamelift-alpha/lib/build-fleet.ts index 66ac42c2799e2..67b0ff03e78b9 100644 --- a/packages/@aws-cdk/aws-gamelift-alpha/lib/build-fleet.ts +++ b/packages/@aws-cdk/aws-gamelift-alpha/lib/build-fleet.ts @@ -1,5 +1,5 @@ import * as iam from 'aws-cdk-lib/aws-iam'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IBuild } from './build'; import { FleetBase, FleetProps, IFleet } from './fleet-base'; diff --git a/packages/@aws-cdk/aws-gamelift-alpha/lib/build.ts b/packages/@aws-cdk/aws-gamelift-alpha/lib/build.ts index 6ef687da25e6f..364fab7ef112e 100644 --- a/packages/@aws-cdk/aws-gamelift-alpha/lib/build.ts +++ b/packages/@aws-cdk/aws-gamelift-alpha/lib/build.ts @@ -1,7 +1,7 @@ import * as iam from 'aws-cdk-lib/aws-iam'; import * as s3 from 'aws-cdk-lib/aws-s3'; import * as s3_assets from 'aws-cdk-lib/aws-s3-assets'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { Content } from './content'; import { CfnBuild } from 'aws-cdk-lib/aws-gamelift'; diff --git a/packages/@aws-cdk/aws-gamelift-alpha/lib/content.ts b/packages/@aws-cdk/aws-gamelift-alpha/lib/content.ts index de3dd80773691..fb57ea0feb520 100644 --- a/packages/@aws-cdk/aws-gamelift-alpha/lib/content.ts +++ b/packages/@aws-cdk/aws-gamelift-alpha/lib/content.ts @@ -1,7 +1,7 @@ import * as iam from 'aws-cdk-lib/aws-iam'; import * as s3 from 'aws-cdk-lib/aws-s3'; import * as s3_assets from 'aws-cdk-lib/aws-s3-assets'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; /** diff --git a/packages/@aws-cdk/aws-gamelift-alpha/lib/fleet-base.ts b/packages/@aws-cdk/aws-gamelift-alpha/lib/fleet-base.ts index b97b3fe26121c..68d907c899fe6 100644 --- a/packages/@aws-cdk/aws-gamelift-alpha/lib/fleet-base.ts +++ b/packages/@aws-cdk/aws-gamelift-alpha/lib/fleet-base.ts @@ -1,7 +1,7 @@ import * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch'; import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as iam from 'aws-cdk-lib/aws-iam'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { Alias, AliasOptions } from './alias'; import { IGameSessionQueueDestination } from './game-session-queue'; diff --git a/packages/@aws-cdk/aws-gamelift-alpha/lib/game-server-group.ts b/packages/@aws-cdk/aws-gamelift-alpha/lib/game-server-group.ts index f6990156105fc..26952d36583f5 100644 --- a/packages/@aws-cdk/aws-gamelift-alpha/lib/game-server-group.ts +++ b/packages/@aws-cdk/aws-gamelift-alpha/lib/game-server-group.ts @@ -1,7 +1,7 @@ import * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch'; import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as iam from 'aws-cdk-lib/aws-iam'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnGameServerGroup } from 'aws-cdk-lib/aws-gamelift'; diff --git a/packages/@aws-cdk/aws-gamelift-alpha/lib/game-session-queue.ts b/packages/@aws-cdk/aws-gamelift-alpha/lib/game-session-queue.ts index 715d9a0f51a41..93af69be6d2b8 100644 --- a/packages/@aws-cdk/aws-gamelift-alpha/lib/game-session-queue.ts +++ b/packages/@aws-cdk/aws-gamelift-alpha/lib/game-session-queue.ts @@ -1,6 +1,6 @@ import * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch'; import * as sns from 'aws-cdk-lib/aws-sns'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnGameSessionQueue } from 'aws-cdk-lib/aws-gamelift'; diff --git a/packages/@aws-cdk/aws-gamelift-alpha/lib/ingress-rule.ts b/packages/@aws-cdk/aws-gamelift-alpha/lib/ingress-rule.ts index 37813eb2917ca..63914e41a876c 100644 --- a/packages/@aws-cdk/aws-gamelift-alpha/lib/ingress-rule.ts +++ b/packages/@aws-cdk/aws-gamelift-alpha/lib/ingress-rule.ts @@ -1,4 +1,4 @@ -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; /** * Protocol for use in Connection Rules diff --git a/packages/@aws-cdk/aws-gamelift-alpha/lib/matchmaking-configuration.ts b/packages/@aws-cdk/aws-gamelift-alpha/lib/matchmaking-configuration.ts index 5ffa172aa259c..bcb2b0425b813 100644 --- a/packages/@aws-cdk/aws-gamelift-alpha/lib/matchmaking-configuration.ts +++ b/packages/@aws-cdk/aws-gamelift-alpha/lib/matchmaking-configuration.ts @@ -1,6 +1,6 @@ import * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch'; import * as sns from 'aws-cdk-lib/aws-sns'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IMatchmakingRuleSet } from '.'; diff --git a/packages/@aws-cdk/aws-gamelift-alpha/lib/matchmaking-ruleset.ts b/packages/@aws-cdk/aws-gamelift-alpha/lib/matchmaking-ruleset.ts index f54fa01783c5d..0061e314dbded 100644 --- a/packages/@aws-cdk/aws-gamelift-alpha/lib/matchmaking-ruleset.ts +++ b/packages/@aws-cdk/aws-gamelift-alpha/lib/matchmaking-ruleset.ts @@ -1,5 +1,5 @@ import * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnMatchmakingRuleSet } from 'aws-cdk-lib/aws-gamelift'; import { RuleSetContent } from './matchmaking-ruleset-body'; diff --git a/packages/@aws-cdk/aws-gamelift-alpha/lib/queued-matchmaking-configuration.ts b/packages/@aws-cdk/aws-gamelift-alpha/lib/queued-matchmaking-configuration.ts index 2aeff56674547..1e32e265dfc50 100644 --- a/packages/@aws-cdk/aws-gamelift-alpha/lib/queued-matchmaking-configuration.ts +++ b/packages/@aws-cdk/aws-gamelift-alpha/lib/queued-matchmaking-configuration.ts @@ -1,6 +1,6 @@ import * as iam from 'aws-cdk-lib/aws-iam'; import * as sns from 'aws-cdk-lib/aws-sns'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IGameSessionQueue } from './game-session-queue'; import * as gamelift from 'aws-cdk-lib/aws-gamelift'; diff --git a/packages/@aws-cdk/aws-gamelift-alpha/lib/script.ts b/packages/@aws-cdk/aws-gamelift-alpha/lib/script.ts index 1b625c9c3a7a7..6f1dba1f267c6 100644 --- a/packages/@aws-cdk/aws-gamelift-alpha/lib/script.ts +++ b/packages/@aws-cdk/aws-gamelift-alpha/lib/script.ts @@ -1,7 +1,7 @@ import * as iam from 'aws-cdk-lib/aws-iam'; import * as s3 from 'aws-cdk-lib/aws-s3'; import * as s3_assets from 'aws-cdk-lib/aws-s3-assets'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { Content } from './content'; import { CfnScript } from 'aws-cdk-lib/aws-gamelift'; diff --git a/packages/@aws-cdk/aws-gamelift-alpha/lib/standalone-matchmaking-configuration.ts b/packages/@aws-cdk/aws-gamelift-alpha/lib/standalone-matchmaking-configuration.ts index 87639683b1827..68af2935629b5 100644 --- a/packages/@aws-cdk/aws-gamelift-alpha/lib/standalone-matchmaking-configuration.ts +++ b/packages/@aws-cdk/aws-gamelift-alpha/lib/standalone-matchmaking-configuration.ts @@ -1,6 +1,6 @@ import * as iam from 'aws-cdk-lib/aws-iam'; import * as sns from 'aws-cdk-lib/aws-sns'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import * as gamelift from 'aws-cdk-lib/aws-gamelift'; import { MatchmakingConfigurationProps, MatchmakingConfigurationBase, IMatchmakingConfiguration } from './matchmaking-configuration'; diff --git a/packages/@aws-cdk/aws-glue-alpha/lib/code.ts b/packages/@aws-cdk/aws-glue-alpha/lib/code.ts index dc53ab1d1797a..ed5c3c58e3510 100644 --- a/packages/@aws-cdk/aws-glue-alpha/lib/code.ts +++ b/packages/@aws-cdk/aws-glue-alpha/lib/code.ts @@ -2,7 +2,7 @@ import * as fs from 'fs'; import * as iam from 'aws-cdk-lib/aws-iam'; import * as s3 from 'aws-cdk-lib/aws-s3'; import * as s3assets from 'aws-cdk-lib/aws-s3-assets'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { md5hash } from 'aws-cdk-lib/core/lib/helpers-internal'; import * as constructs from 'constructs'; diff --git a/packages/@aws-cdk/aws-glue-alpha/lib/connection.ts b/packages/@aws-cdk/aws-glue-alpha/lib/connection.ts index 31d109dd60274..3d8b4738f3d57 100644 --- a/packages/@aws-cdk/aws-glue-alpha/lib/connection.ts +++ b/packages/@aws-cdk/aws-glue-alpha/lib/connection.ts @@ -1,5 +1,5 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import * as constructs from 'constructs'; import { CfnConnection } from 'aws-cdk-lib/aws-glue'; diff --git a/packages/@aws-cdk/aws-glue-alpha/lib/database.ts b/packages/@aws-cdk/aws-glue-alpha/lib/database.ts index 2ab0d7c088993..8368caa0c89a5 100644 --- a/packages/@aws-cdk/aws-glue-alpha/lib/database.ts +++ b/packages/@aws-cdk/aws-glue-alpha/lib/database.ts @@ -1,4 +1,4 @@ -import { ArnFormat, IResource, Lazy, Names, Resource, Stack } from 'aws-cdk-lib'; +import { ArnFormat, IResource, Lazy, Names, Resource, Stack } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnDatabase } from 'aws-cdk-lib/aws-glue'; diff --git a/packages/@aws-cdk/aws-glue-alpha/lib/job.ts b/packages/@aws-cdk/aws-glue-alpha/lib/job.ts index 4f7c87344749b..76487882e3758 100644 --- a/packages/@aws-cdk/aws-glue-alpha/lib/job.ts +++ b/packages/@aws-cdk/aws-glue-alpha/lib/job.ts @@ -3,7 +3,7 @@ import * as events from 'aws-cdk-lib/aws-events'; import * as iam from 'aws-cdk-lib/aws-iam'; import * as logs from 'aws-cdk-lib/aws-logs'; import * as s3 from 'aws-cdk-lib/aws-s3'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import * as constructs from 'constructs'; import { Code, JobExecutable, JobExecutableConfig, JobType } from '.'; import { IConnection } from './connection'; diff --git a/packages/@aws-cdk/aws-glue-alpha/lib/security-configuration.ts b/packages/@aws-cdk/aws-glue-alpha/lib/security-configuration.ts index 6f9d770463c37..f628ac46e6b63 100644 --- a/packages/@aws-cdk/aws-glue-alpha/lib/security-configuration.ts +++ b/packages/@aws-cdk/aws-glue-alpha/lib/security-configuration.ts @@ -1,6 +1,6 @@ import * as kms from 'aws-cdk-lib/aws-kms'; -import * as cdk from 'aws-cdk-lib'; -import { Lazy, Names } from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; +import { Lazy, Names } from 'aws-cdk-lib/core'; import * as constructs from 'constructs'; import { CfnSecurityConfiguration } from 'aws-cdk-lib/aws-glue'; diff --git a/packages/@aws-cdk/aws-glue-alpha/lib/table.ts b/packages/@aws-cdk/aws-glue-alpha/lib/table.ts index 1439fc4f2b90d..ff36dce8a0f90 100644 --- a/packages/@aws-cdk/aws-glue-alpha/lib/table.ts +++ b/packages/@aws-cdk/aws-glue-alpha/lib/table.ts @@ -1,7 +1,7 @@ import * as iam from 'aws-cdk-lib/aws-iam'; import * as kms from 'aws-cdk-lib/aws-kms'; import * as s3 from 'aws-cdk-lib/aws-s3'; -import { ArnFormat, Fn, IResource, Lazy, Names, Resource, Stack } from 'aws-cdk-lib'; +import { ArnFormat, Fn, IResource, Lazy, Names, Resource, Stack } from 'aws-cdk-lib/core'; import * as cr from 'aws-cdk-lib/custom-resources'; import { AwsCustomResource } from 'aws-cdk-lib/custom-resources'; import { Construct } from 'constructs'; diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/lib/lambda-function-action.ts b/packages/@aws-cdk/aws-iot-actions-alpha/lib/lambda-function-action.ts index 724cc81005a13..ea2701ba5c73a 100644 --- a/packages/@aws-cdk/aws-iot-actions-alpha/lib/lambda-function-action.ts +++ b/packages/@aws-cdk/aws-iot-actions-alpha/lib/lambda-function-action.ts @@ -1,7 +1,7 @@ import * as iam from 'aws-cdk-lib/aws-iam'; import * as iot from '@aws-cdk/aws-iot-alpha'; import * as lambda from 'aws-cdk-lib/aws-lambda'; -import { Names } from 'aws-cdk-lib'; +import { Names } from 'aws-cdk-lib/core'; /** * The action to invoke an AWS Lambda function, passing in an MQTT message. diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/lib/private/role.ts b/packages/@aws-cdk/aws-iot-actions-alpha/lib/private/role.ts index bf697605a3e6b..28c734b840762 100644 --- a/packages/@aws-cdk/aws-iot-actions-alpha/lib/private/role.ts +++ b/packages/@aws-cdk/aws-iot-actions-alpha/lib/private/role.ts @@ -1,5 +1,5 @@ import * as iam from 'aws-cdk-lib/aws-iam'; -import { PhysicalName } from 'aws-cdk-lib'; +import { PhysicalName } from 'aws-cdk-lib/core'; import { Construct, IConstruct } from 'constructs'; /** diff --git a/packages/@aws-cdk/aws-iot-alpha/lib/topic-rule.ts b/packages/@aws-cdk/aws-iot-alpha/lib/topic-rule.ts index d99575a5140ea..6f4e8cd92ab1a 100644 --- a/packages/@aws-cdk/aws-iot-alpha/lib/topic-rule.ts +++ b/packages/@aws-cdk/aws-iot-alpha/lib/topic-rule.ts @@ -1,4 +1,4 @@ -import { ArnFormat, Resource, Stack, IResource, Lazy } from 'aws-cdk-lib'; +import { ArnFormat, Resource, Stack, IResource, Lazy } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IAction } from './action'; import { IotSql } from './iot-sql'; diff --git a/packages/@aws-cdk/aws-iotevents-actions-alpha/lib/timer-duration.ts b/packages/@aws-cdk/aws-iotevents-actions-alpha/lib/timer-duration.ts index 7ab203ead3f18..4d83e948e2b8b 100644 --- a/packages/@aws-cdk/aws-iotevents-actions-alpha/lib/timer-duration.ts +++ b/packages/@aws-cdk/aws-iotevents-actions-alpha/lib/timer-duration.ts @@ -1,5 +1,5 @@ import * as iotevents from '@aws-cdk/aws-iotevents-alpha'; -import { Duration } from 'aws-cdk-lib'; +import { Duration } from 'aws-cdk-lib/core'; /** * The duration of the timer. diff --git a/packages/@aws-cdk/aws-iotevents-alpha/lib/detector-model.ts b/packages/@aws-cdk/aws-iotevents-alpha/lib/detector-model.ts index 6f0fd1151b998..4eb4e6d216d0e 100644 --- a/packages/@aws-cdk/aws-iotevents-alpha/lib/detector-model.ts +++ b/packages/@aws-cdk/aws-iotevents-alpha/lib/detector-model.ts @@ -1,5 +1,5 @@ import * as iam from 'aws-cdk-lib/aws-iam'; -import { Resource, IResource } from 'aws-cdk-lib'; +import { Resource, IResource } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnDetectorModel } from 'aws-cdk-lib/aws-iotevents'; import { State } from './state'; diff --git a/packages/@aws-cdk/aws-iotevents-alpha/lib/input.ts b/packages/@aws-cdk/aws-iotevents-alpha/lib/input.ts index 7aa257b26ca24..7471dfba761e1 100644 --- a/packages/@aws-cdk/aws-iotevents-alpha/lib/input.ts +++ b/packages/@aws-cdk/aws-iotevents-alpha/lib/input.ts @@ -1,5 +1,5 @@ import * as iam from 'aws-cdk-lib/aws-iam'; -import { Resource, IResource, Aws } from 'aws-cdk-lib'; +import { Resource, IResource, Aws } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnInput } from 'aws-cdk-lib/aws-iotevents'; diff --git a/packages/@aws-cdk/aws-ivs-alpha/lib/channel.ts b/packages/@aws-cdk/aws-ivs-alpha/lib/channel.ts index 373da1eee3ea3..124dd6118db1c 100644 --- a/packages/@aws-cdk/aws-ivs-alpha/lib/channel.ts +++ b/packages/@aws-cdk/aws-ivs-alpha/lib/channel.ts @@ -1,5 +1,5 @@ -import * as core from 'aws-cdk-lib'; -import { Lazy, Names } from 'aws-cdk-lib'; +import * as core from 'aws-cdk-lib/core'; +import { Lazy, Names } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnChannel } from 'aws-cdk-lib/aws-ivs'; import { StreamKey } from './stream-key'; diff --git a/packages/@aws-cdk/aws-ivs-alpha/lib/playback-key-pair.ts b/packages/@aws-cdk/aws-ivs-alpha/lib/playback-key-pair.ts index 3316a34f10a58..38114e46050e4 100644 --- a/packages/@aws-cdk/aws-ivs-alpha/lib/playback-key-pair.ts +++ b/packages/@aws-cdk/aws-ivs-alpha/lib/playback-key-pair.ts @@ -1,5 +1,5 @@ -import * as core from 'aws-cdk-lib'; -import { Lazy, Names } from 'aws-cdk-lib'; +import * as core from 'aws-cdk-lib/core'; +import { Lazy, Names } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnPlaybackKeyPair } from 'aws-cdk-lib/aws-ivs'; diff --git a/packages/@aws-cdk/aws-ivs-alpha/lib/stream-key.ts b/packages/@aws-cdk/aws-ivs-alpha/lib/stream-key.ts index 154855bc257cf..1f7fdd4c7c92a 100644 --- a/packages/@aws-cdk/aws-ivs-alpha/lib/stream-key.ts +++ b/packages/@aws-cdk/aws-ivs-alpha/lib/stream-key.ts @@ -1,4 +1,4 @@ -import * as core from 'aws-cdk-lib'; +import * as core from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IChannel } from './channel'; import { CfnStreamKey } from 'aws-cdk-lib/aws-ivs'; diff --git a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/lib/application.ts b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/lib/application.ts index fb45ce19661f1..462e8615c8afc 100644 --- a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/lib/application.ts +++ b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/lib/application.ts @@ -3,7 +3,7 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as iam from 'aws-cdk-lib/aws-iam'; import { CfnApplicationCloudWatchLoggingOptionV2, CfnApplicationV2 } from 'aws-cdk-lib/aws-kinesisanalytics'; import * as logs from 'aws-cdk-lib/aws-logs'; -import * as core from 'aws-cdk-lib'; +import * as core from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { ApplicationCode } from './application-code'; import { environmentProperties } from './private/environment-properties'; diff --git a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/lib/private/flink-application-configuration.ts b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/lib/private/flink-application-configuration.ts index 4b89f5b58d321..534a3a91d4b4c 100644 --- a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/lib/private/flink-application-configuration.ts +++ b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/lib/private/flink-application-configuration.ts @@ -1,4 +1,4 @@ -import * as core from 'aws-cdk-lib'; +import * as core from 'aws-cdk-lib/core'; import { LogLevel, MetricsLevel } from '../types'; interface FlinkApplicationConfiguration extends diff --git a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/lib/private/validation.ts b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/lib/private/validation.ts index 2cdd614f90b74..17080bf8a5676 100644 --- a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/lib/private/validation.ts +++ b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/lib/private/validation.ts @@ -1,5 +1,5 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; -import * as core from 'aws-cdk-lib'; +import * as core from 'aws-cdk-lib/core'; interface ValidatedProps { applicationName?: string; diff --git a/packages/@aws-cdk/aws-kinesisfirehose-alpha/lib/delivery-stream.ts b/packages/@aws-cdk/aws-kinesisfirehose-alpha/lib/delivery-stream.ts index 29943a3cadb16..7704c9f594199 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose-alpha/lib/delivery-stream.ts +++ b/packages/@aws-cdk/aws-kinesisfirehose-alpha/lib/delivery-stream.ts @@ -3,7 +3,7 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as iam from 'aws-cdk-lib/aws-iam'; import * as kinesis from 'aws-cdk-lib/aws-kinesis'; import * as kms from 'aws-cdk-lib/aws-kms'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { RegionInfo } from 'aws-cdk-lib/region-info'; import { Construct, Node } from 'constructs'; import { IDestination } from './destination'; diff --git a/packages/@aws-cdk/aws-kinesisfirehose-alpha/lib/processor.ts b/packages/@aws-cdk/aws-kinesisfirehose-alpha/lib/processor.ts index 65a3dd9860bd7..b5157f5872e01 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose-alpha/lib/processor.ts +++ b/packages/@aws-cdk/aws-kinesisfirehose-alpha/lib/processor.ts @@ -1,5 +1,5 @@ import * as iam from 'aws-cdk-lib/aws-iam'; -import { Duration, Size } from 'aws-cdk-lib'; +import { Duration, Size } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; diff --git a/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/lib/common.ts b/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/lib/common.ts index 3eede7b2dfb8b..ab7de15a28517 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/lib/common.ts +++ b/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/lib/common.ts @@ -3,7 +3,7 @@ import * as firehose from '@aws-cdk/aws-kinesisfirehose-alpha'; import * as kms from 'aws-cdk-lib/aws-kms'; import * as logs from 'aws-cdk-lib/aws-logs'; import * as s3 from 'aws-cdk-lib/aws-s3'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; /** * Possible compression options Kinesis Data Firehose can use to compress data on delivery. diff --git a/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/lib/private/helpers.ts b/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/lib/private/helpers.ts index 800299c09b322..8a3cddc65d1ca 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/lib/private/helpers.ts +++ b/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/lib/private/helpers.ts @@ -4,7 +4,7 @@ import { CfnDeliveryStream } from 'aws-cdk-lib/aws-kinesisfirehose'; import * as kms from 'aws-cdk-lib/aws-kms'; import * as logs from 'aws-cdk-lib/aws-logs'; import * as s3 from 'aws-cdk-lib/aws-s3'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct, IDependable, Node } from 'constructs'; import { DestinationS3BackupProps } from '../common'; diff --git a/packages/@aws-cdk/aws-lambda-go-alpha/lib/bundling.ts b/packages/@aws-cdk/aws-lambda-go-alpha/lib/bundling.ts index fdeab4ca3435e..f219915c068f3 100644 --- a/packages/@aws-cdk/aws-lambda-go-alpha/lib/bundling.ts +++ b/packages/@aws-cdk/aws-lambda-go-alpha/lib/bundling.ts @@ -1,7 +1,7 @@ import * as os from 'os'; import * as path from 'path'; import { Architecture, AssetCode, Code, Runtime } from 'aws-cdk-lib/aws-lambda'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { BundlingOptions } from './types'; import { exec, findUp, getGoBuildVersion } from './util'; diff --git a/packages/@aws-cdk/aws-lambda-go-alpha/lib/types.ts b/packages/@aws-cdk/aws-lambda-go-alpha/lib/types.ts index b9e4266b5e7fb..33b999215e6fe 100644 --- a/packages/@aws-cdk/aws-lambda-go-alpha/lib/types.ts +++ b/packages/@aws-cdk/aws-lambda-go-alpha/lib/types.ts @@ -1,4 +1,4 @@ -import { AssetHashType, BundlingFileAccess, DockerImage, DockerRunOptions } from 'aws-cdk-lib'; +import { AssetHashType, BundlingFileAccess, DockerImage, DockerRunOptions } from 'aws-cdk-lib/core'; /** * Bundling options diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/lib/bundling.ts b/packages/@aws-cdk/aws-lambda-python-alpha/lib/bundling.ts index ab1251cb6e65d..2590299ca66c4 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/lib/bundling.ts +++ b/packages/@aws-cdk/aws-lambda-python-alpha/lib/bundling.ts @@ -1,6 +1,6 @@ import * as path from 'path'; import { Architecture, AssetCode, Code, Runtime } from 'aws-cdk-lib/aws-lambda'; -import { AssetStaging, BundlingFileAccess, BundlingOptions as CdkBundlingOptions, DockerImage, DockerVolume } from 'aws-cdk-lib'; +import { AssetStaging, BundlingFileAccess, BundlingOptions as CdkBundlingOptions, DockerImage, DockerVolume } from 'aws-cdk-lib/core'; import { Packaging, DependenciesFile } from './packaging'; import { BundlingOptions, ICommandHooks } from './types'; diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/lib/function.ts b/packages/@aws-cdk/aws-lambda-python-alpha/lib/function.ts index 0b67d86c6e3e1..7105c088be82a 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/lib/function.ts +++ b/packages/@aws-cdk/aws-lambda-python-alpha/lib/function.ts @@ -1,7 +1,7 @@ import * as fs from 'fs'; import * as path from 'path'; import { Function, FunctionOptions, Runtime, RuntimeFamily } from 'aws-cdk-lib/aws-lambda'; -import { Stack } from 'aws-cdk-lib'; +import { Stack } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { Bundling } from './bundling'; import { BundlingOptions } from './types'; diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/lib/layer.ts b/packages/@aws-cdk/aws-lambda-python-alpha/lib/layer.ts index a35bbca4ca470..7b7820acf8d2e 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/lib/layer.ts +++ b/packages/@aws-cdk/aws-lambda-python-alpha/lib/layer.ts @@ -1,6 +1,6 @@ import * as path from 'path'; import * as lambda from 'aws-cdk-lib/aws-lambda'; -import { Stack } from 'aws-cdk-lib'; +import { Stack } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { Bundling } from './bundling'; import { BundlingOptions } from './types'; diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/lib/types.ts b/packages/@aws-cdk/aws-lambda-python-alpha/lib/types.ts index d5f92006df1eb..3c26bd54ab72c 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/lib/types.ts +++ b/packages/@aws-cdk/aws-lambda-python-alpha/lib/types.ts @@ -1,4 +1,4 @@ -import { AssetHashType, BundlingFileAccess, DockerImage, DockerRunOptions } from 'aws-cdk-lib'; +import { AssetHashType, BundlingFileAccess, DockerImage, DockerRunOptions } from 'aws-cdk-lib/core'; /** * Options for bundling diff --git a/packages/@aws-cdk/aws-location-alpha/lib/place-index.ts b/packages/@aws-cdk/aws-location-alpha/lib/place-index.ts index 681a8726d2f96..c9df3f77a2ff6 100644 --- a/packages/@aws-cdk/aws-location-alpha/lib/place-index.ts +++ b/packages/@aws-cdk/aws-location-alpha/lib/place-index.ts @@ -1,5 +1,5 @@ import * as iam from 'aws-cdk-lib/aws-iam'; -import { ArnFormat, IResource, Lazy, Names, Resource, Stack, Token } from 'aws-cdk-lib'; +import { ArnFormat, IResource, Lazy, Names, Resource, Stack, Token } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnPlaceIndex } from 'aws-cdk-lib/aws-location'; diff --git a/packages/@aws-cdk/aws-msk-alpha/lib/cluster.ts b/packages/@aws-cdk/aws-msk-alpha/lib/cluster.ts index 18f90da02ae82..392b78cc014a0 100644 --- a/packages/@aws-cdk/aws-msk-alpha/lib/cluster.ts +++ b/packages/@aws-cdk/aws-msk-alpha/lib/cluster.ts @@ -5,8 +5,8 @@ import * as kms from 'aws-cdk-lib/aws-kms'; import * as logs from 'aws-cdk-lib/aws-logs'; import * as s3 from 'aws-cdk-lib/aws-s3'; import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'; -import * as core from 'aws-cdk-lib'; -import { FeatureFlags } from 'aws-cdk-lib'; +import * as core from 'aws-cdk-lib/core'; +import { FeatureFlags } from 'aws-cdk-lib/core'; import * as cr from 'aws-cdk-lib/custom-resources'; import { S3_CREATE_DEFAULT_LOGGING_POLICY } from 'aws-cdk-lib/cx-api'; import * as constructs from 'constructs'; diff --git a/packages/@aws-cdk/aws-neptune-alpha/lib/cluster.ts b/packages/@aws-cdk/aws-neptune-alpha/lib/cluster.ts index f52d4e3832a5d..cf22688d1e890 100644 --- a/packages/@aws-cdk/aws-neptune-alpha/lib/cluster.ts +++ b/packages/@aws-cdk/aws-neptune-alpha/lib/cluster.ts @@ -3,7 +3,7 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as iam from 'aws-cdk-lib/aws-iam'; import * as kms from 'aws-cdk-lib/aws-kms'; import * as logs from 'aws-cdk-lib/aws-logs'; -import { Aws, Duration, IResource, Lazy, RemovalPolicy, Resource, Token } from 'aws-cdk-lib'; +import { Aws, Duration, IResource, Lazy, RemovalPolicy, Resource, Token } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { Endpoint } from './endpoint'; import { InstanceType } from './instance'; diff --git a/packages/@aws-cdk/aws-neptune-alpha/lib/endpoint.ts b/packages/@aws-cdk/aws-neptune-alpha/lib/endpoint.ts index 3d20dbdd42445..cc881922740fb 100644 --- a/packages/@aws-cdk/aws-neptune-alpha/lib/endpoint.ts +++ b/packages/@aws-cdk/aws-neptune-alpha/lib/endpoint.ts @@ -1,4 +1,4 @@ -import { Token } from 'aws-cdk-lib'; +import { Token } from 'aws-cdk-lib/core'; /** * Connection endpoint of a neptune cluster or instance diff --git a/packages/@aws-cdk/aws-neptune-alpha/lib/instance.ts b/packages/@aws-cdk/aws-neptune-alpha/lib/instance.ts index 0270c1f2243ab..e9d68312d6811 100644 --- a/packages/@aws-cdk/aws-neptune-alpha/lib/instance.ts +++ b/packages/@aws-cdk/aws-neptune-alpha/lib/instance.ts @@ -1,6 +1,6 @@ import * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch'; import * as ec2 from 'aws-cdk-lib/aws-ec2'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IDatabaseCluster } from './cluster'; import { Endpoint } from './endpoint'; diff --git a/packages/@aws-cdk/aws-neptune-alpha/lib/parameter-group.ts b/packages/@aws-cdk/aws-neptune-alpha/lib/parameter-group.ts index 28f878173c5dd..dc1d4969283bb 100644 --- a/packages/@aws-cdk/aws-neptune-alpha/lib/parameter-group.ts +++ b/packages/@aws-cdk/aws-neptune-alpha/lib/parameter-group.ts @@ -1,4 +1,4 @@ -import { IResource, Resource } from 'aws-cdk-lib'; +import { IResource, Resource } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnDBClusterParameterGroup, CfnDBParameterGroup } from 'aws-cdk-lib/aws-neptune'; diff --git a/packages/@aws-cdk/aws-neptune-alpha/lib/subnet-group.ts b/packages/@aws-cdk/aws-neptune-alpha/lib/subnet-group.ts index 9cafd87feafc7..386b7f2ba37b7 100644 --- a/packages/@aws-cdk/aws-neptune-alpha/lib/subnet-group.ts +++ b/packages/@aws-cdk/aws-neptune-alpha/lib/subnet-group.ts @@ -1,5 +1,5 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; -import { IResource, RemovalPolicy, Resource } from 'aws-cdk-lib'; +import { IResource, RemovalPolicy, Resource } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnDBSubnetGroup } from 'aws-cdk-lib/aws-neptune'; diff --git a/packages/@aws-cdk/aws-redshift-alpha/lib/cluster.ts b/packages/@aws-cdk/aws-redshift-alpha/lib/cluster.ts index e4da33d1b58fd..70fab88697fb1 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/lib/cluster.ts +++ b/packages/@aws-cdk/aws-redshift-alpha/lib/cluster.ts @@ -5,7 +5,7 @@ import * as kms from 'aws-cdk-lib/aws-kms'; import * as lambda from 'aws-cdk-lib/aws-lambda'; import * as s3 from 'aws-cdk-lib/aws-s3'; import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'; -import { ArnFormat, CustomResource, Duration, IResource, Lazy, RemovalPolicy, Resource, SecretValue, Stack, Token } from 'aws-cdk-lib'; +import { ArnFormat, CustomResource, Duration, IResource, Lazy, RemovalPolicy, Resource, SecretValue, Stack, Token } from 'aws-cdk-lib/core'; import { AwsCustomResource, AwsCustomResourcePolicy, PhysicalResourceId, Provider } from 'aws-cdk-lib/custom-resources'; import { Construct } from 'constructs'; import { DatabaseSecret } from './database-secret'; diff --git a/packages/@aws-cdk/aws-redshift-alpha/lib/endpoint.ts b/packages/@aws-cdk/aws-redshift-alpha/lib/endpoint.ts index 23f59080a584d..ee632cb2682b5 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/lib/endpoint.ts +++ b/packages/@aws-cdk/aws-redshift-alpha/lib/endpoint.ts @@ -1,4 +1,4 @@ -import { Token } from 'aws-cdk-lib'; +import { Token } from 'aws-cdk-lib/core'; /** * Connection endpoint of a redshift cluster diff --git a/packages/@aws-cdk/aws-redshift-alpha/lib/parameter-group.ts b/packages/@aws-cdk/aws-redshift-alpha/lib/parameter-group.ts index 2b466453c0597..5b2125df029c2 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/lib/parameter-group.ts +++ b/packages/@aws-cdk/aws-redshift-alpha/lib/parameter-group.ts @@ -1,4 +1,4 @@ -import { IResource, Resource } from 'aws-cdk-lib'; +import { IResource, Resource } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnClusterParameterGroup } from 'aws-cdk-lib/aws-redshift'; diff --git a/packages/@aws-cdk/aws-redshift-alpha/lib/private/database-query.ts b/packages/@aws-cdk/aws-redshift-alpha/lib/private/database-query.ts index eb74aa06b4b71..2e90c8883ae78 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/lib/private/database-query.ts +++ b/packages/@aws-cdk/aws-redshift-alpha/lib/private/database-query.ts @@ -2,7 +2,7 @@ import * as path from 'path'; import * as iam from 'aws-cdk-lib/aws-iam'; import * as lambda from 'aws-cdk-lib/aws-lambda'; import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import * as customresources from 'aws-cdk-lib/custom-resources'; import { Construct } from 'constructs'; import { DatabaseQueryHandlerProps } from './handler-props'; diff --git a/packages/@aws-cdk/aws-redshift-alpha/lib/private/privileges.ts b/packages/@aws-cdk/aws-redshift-alpha/lib/private/privileges.ts index 201778776d5f8..cb3f7367f8786 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/lib/private/privileges.ts +++ b/packages/@aws-cdk/aws-redshift-alpha/lib/private/privileges.ts @@ -1,4 +1,4 @@ -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { DatabaseQuery } from './database-query'; import { HandlerName } from './database-query-provider/handler-name'; diff --git a/packages/@aws-cdk/aws-redshift-alpha/lib/subnet-group.ts b/packages/@aws-cdk/aws-redshift-alpha/lib/subnet-group.ts index bc0f49aa7ce55..1986bc027b226 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/lib/subnet-group.ts +++ b/packages/@aws-cdk/aws-redshift-alpha/lib/subnet-group.ts @@ -1,5 +1,5 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; -import { IResource, RemovalPolicy, Resource } from 'aws-cdk-lib'; +import { IResource, RemovalPolicy, Resource } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnClusterSubnetGroup } from 'aws-cdk-lib/aws-redshift'; diff --git a/packages/@aws-cdk/aws-redshift-alpha/lib/table.ts b/packages/@aws-cdk/aws-redshift-alpha/lib/table.ts index 0a1504b4bfe68..1e432936ef4e3 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/lib/table.ts +++ b/packages/@aws-cdk/aws-redshift-alpha/lib/table.ts @@ -1,5 +1,5 @@ /* eslint-disable import/no-extraneous-dependencies */ -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { REDSHIFT_COLUMN_ID } from 'aws-cdk-lib/cx-api'; import { Construct, IConstruct } from 'constructs'; import { ICluster } from './cluster'; diff --git a/packages/@aws-cdk/aws-redshift-alpha/lib/user.ts b/packages/@aws-cdk/aws-redshift-alpha/lib/user.ts index fcdfee37637af..add3d1b071bfd 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/lib/user.ts +++ b/packages/@aws-cdk/aws-redshift-alpha/lib/user.ts @@ -1,6 +1,6 @@ import * as kms from 'aws-cdk-lib/aws-kms'; import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct, IConstruct } from 'constructs'; import { ICluster } from './cluster'; import { DatabaseOptions } from './database-options'; diff --git a/packages/@aws-cdk/aws-route53resolver-alpha/lib/firewall-domain-list.ts b/packages/@aws-cdk/aws-route53resolver-alpha/lib/firewall-domain-list.ts index 7ee514343f621..cad3a21ffc7ef 100644 --- a/packages/@aws-cdk/aws-route53resolver-alpha/lib/firewall-domain-list.ts +++ b/packages/@aws-cdk/aws-route53resolver-alpha/lib/firewall-domain-list.ts @@ -1,7 +1,7 @@ import * as path from 'path'; import { IBucket } from 'aws-cdk-lib/aws-s3'; import { Asset } from 'aws-cdk-lib/aws-s3-assets'; -import { IResource, Resource, Token } from 'aws-cdk-lib'; +import { IResource, Resource, Token } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnFirewallDomainList } from 'aws-cdk-lib/aws-route53resolver'; diff --git a/packages/@aws-cdk/aws-route53resolver-alpha/lib/firewall-rule-group-association.ts b/packages/@aws-cdk/aws-route53resolver-alpha/lib/firewall-rule-group-association.ts index 62dbf3192bdcf..2197762b32da6 100644 --- a/packages/@aws-cdk/aws-route53resolver-alpha/lib/firewall-rule-group-association.ts +++ b/packages/@aws-cdk/aws-route53resolver-alpha/lib/firewall-rule-group-association.ts @@ -1,5 +1,5 @@ import { IVpc } from 'aws-cdk-lib/aws-ec2'; -import { Resource, Token } from 'aws-cdk-lib'; +import { Resource, Token } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IFirewallRuleGroup } from './firewall-rule-group'; import { CfnFirewallRuleGroupAssociation } from 'aws-cdk-lib/aws-route53resolver'; diff --git a/packages/@aws-cdk/aws-route53resolver-alpha/lib/firewall-rule-group.ts b/packages/@aws-cdk/aws-route53resolver-alpha/lib/firewall-rule-group.ts index 85b7245888a4d..6d9e7869b0015 100644 --- a/packages/@aws-cdk/aws-route53resolver-alpha/lib/firewall-rule-group.ts +++ b/packages/@aws-cdk/aws-route53resolver-alpha/lib/firewall-rule-group.ts @@ -1,4 +1,4 @@ -import { Duration, IResource, Lazy, Resource } from 'aws-cdk-lib'; +import { Duration, IResource, Lazy, Resource } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IFirewallDomainList } from './firewall-domain-list'; import { FirewallRuleGroupAssociation, FirewallRuleGroupAssociationOptions } from './firewall-rule-group-association'; diff --git a/packages/@aws-cdk/aws-s3objectlambda-alpha/lib/access-point.ts b/packages/@aws-cdk/aws-s3objectlambda-alpha/lib/access-point.ts index 7ece7df575980..e24566d6e98ed 100644 --- a/packages/@aws-cdk/aws-s3objectlambda-alpha/lib/access-point.ts +++ b/packages/@aws-cdk/aws-s3objectlambda-alpha/lib/access-point.ts @@ -1,7 +1,7 @@ import * as iam from 'aws-cdk-lib/aws-iam'; import * as lambda from 'aws-cdk-lib/aws-lambda'; import * as s3 from 'aws-cdk-lib/aws-s3'; -import * as core from 'aws-cdk-lib'; +import * as core from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { CfnAccessPoint } from 'aws-cdk-lib/aws-s3objectlambda'; diff --git a/packages/@aws-cdk/aws-sagemaker-alpha/lib/accelerator-type.ts b/packages/@aws-cdk/aws-sagemaker-alpha/lib/accelerator-type.ts index 3c013782c3734..be3fb40d2054a 100644 --- a/packages/@aws-cdk/aws-sagemaker-alpha/lib/accelerator-type.ts +++ b/packages/@aws-cdk/aws-sagemaker-alpha/lib/accelerator-type.ts @@ -1,4 +1,4 @@ -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; /** * Supported Elastic Inference (EI) instance types for SageMaker instance-based production variants. diff --git a/packages/@aws-cdk/aws-sagemaker-alpha/lib/endpoint-config.ts b/packages/@aws-cdk/aws-sagemaker-alpha/lib/endpoint-config.ts index 40585f2f0e615..e7824a124bd67 100644 --- a/packages/@aws-cdk/aws-sagemaker-alpha/lib/endpoint-config.ts +++ b/packages/@aws-cdk/aws-sagemaker-alpha/lib/endpoint-config.ts @@ -1,6 +1,6 @@ import { EOL } from 'os'; import * as kms from 'aws-cdk-lib/aws-kms'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { AcceleratorType } from './accelerator-type'; import { InstanceType } from './instance-type'; diff --git a/packages/@aws-cdk/aws-sagemaker-alpha/lib/endpoint.ts b/packages/@aws-cdk/aws-sagemaker-alpha/lib/endpoint.ts index 9ccbf039890f9..3f716347e0ca7 100644 --- a/packages/@aws-cdk/aws-sagemaker-alpha/lib/endpoint.ts +++ b/packages/@aws-cdk/aws-sagemaker-alpha/lib/endpoint.ts @@ -3,7 +3,7 @@ import * as appscaling from 'aws-cdk-lib/aws-applicationautoscaling'; import * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch'; import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as iam from 'aws-cdk-lib/aws-iam'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { EndpointConfig, IEndpointConfig, InstanceProductionVariant } from './endpoint-config'; import { InstanceType } from './instance-type'; diff --git a/packages/@aws-cdk/aws-sagemaker-alpha/lib/instance-type.ts b/packages/@aws-cdk/aws-sagemaker-alpha/lib/instance-type.ts index bb8351de4bb8b..6323212dc6f15 100644 --- a/packages/@aws-cdk/aws-sagemaker-alpha/lib/instance-type.ts +++ b/packages/@aws-cdk/aws-sagemaker-alpha/lib/instance-type.ts @@ -1,4 +1,4 @@ -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; /** * Supported instance types for SageMaker instance-based production variants. diff --git a/packages/@aws-cdk/aws-sagemaker-alpha/lib/model.ts b/packages/@aws-cdk/aws-sagemaker-alpha/lib/model.ts index ab04c28ca11ca..589caed2e9556 100644 --- a/packages/@aws-cdk/aws-sagemaker-alpha/lib/model.ts +++ b/packages/@aws-cdk/aws-sagemaker-alpha/lib/model.ts @@ -1,6 +1,6 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as iam from 'aws-cdk-lib/aws-iam'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { ContainerImage } from './container-image'; import { ModelData } from './model-data'; diff --git a/packages/@aws-cdk/aws-sagemaker-alpha/lib/private/util.ts b/packages/@aws-cdk/aws-sagemaker-alpha/lib/private/util.ts index eab1ad1dbf6d2..c1121fc426fb1 100644 --- a/packages/@aws-cdk/aws-sagemaker-alpha/lib/private/util.ts +++ b/packages/@aws-cdk/aws-sagemaker-alpha/lib/private/util.ts @@ -1,4 +1,4 @@ -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { md5hash } from 'aws-cdk-lib/core/lib/helpers-internal'; /** diff --git a/packages/@aws-cdk/aws-scheduler-alpha/lib/schedule-expression.ts b/packages/@aws-cdk/aws-scheduler-alpha/lib/schedule-expression.ts index 89aa1f9205dae..477eee7b20659 100644 --- a/packages/@aws-cdk/aws-scheduler-alpha/lib/schedule-expression.ts +++ b/packages/@aws-cdk/aws-scheduler-alpha/lib/schedule-expression.ts @@ -1,5 +1,5 @@ -import { Duration, TimeZone } from 'aws-cdk-lib'; import * as events from 'aws-cdk-lib/aws-events'; +import { Duration, TimeZone } from 'aws-cdk-lib/core'; /** * ScheduleExpression for EventBridge Schedule diff --git a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/application-associator.ts b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/application-associator.ts index 8bbb614e805f0..8542f21fd74e7 100644 --- a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/application-associator.ts +++ b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/application-associator.ts @@ -1,4 +1,4 @@ -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IApplication } from './application'; import { CheckedStageStackAssociator } from './aspects/stack-associator'; diff --git a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/application.ts b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/application.ts index 1adbea95e543d..40d5479148fdf 100644 --- a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/application.ts +++ b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/application.ts @@ -1,5 +1,5 @@ import { CfnResourceShare } from 'aws-cdk-lib/aws-ram'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { StageStackAssociator } from './aspects/stack-associator'; import { AttributeGroup, IAttributeGroup } from './attribute-group'; diff --git a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/aspects/stack-associator.ts b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/aspects/stack-associator.ts index 79a608a44e176..c3f5692ea22e2 100644 --- a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/aspects/stack-associator.ts +++ b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/aspects/stack-associator.ts @@ -1,4 +1,4 @@ -import { IAspect, Stack, Stage, Annotations, Names } from 'aws-cdk-lib'; +import { IAspect, Stack, Stage, Annotations, Names } from 'aws-cdk-lib/core'; import { IConstruct } from 'constructs'; import { IApplication } from '../application'; import { ApplicationAssociator } from '../application-associator'; diff --git a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/attribute-group.ts b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/attribute-group.ts index 818c6f477533d..f71c6cce8c365 100644 --- a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/attribute-group.ts +++ b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/attribute-group.ts @@ -1,5 +1,5 @@ import { CfnResourceShare } from 'aws-cdk-lib/aws-ram'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IApplication } from './application'; import { getPrincipalsforSharing, hashValues, ShareOptions, SharePermission } from './common'; diff --git a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/private/utils.ts b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/private/utils.ts index 395bcae4dd55c..ee6e4ae6bb0b3 100644 --- a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/private/utils.ts +++ b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/private/utils.ts @@ -1,4 +1,4 @@ -import { Token } from 'aws-cdk-lib'; +import { Token } from 'aws-cdk-lib/core'; /** * Verifies if application or the visited node is region agnostic. diff --git a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/private/validation.ts b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/private/validation.ts index 7ad7d8b6d0bfd..c3d84e3718f9f 100644 --- a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/private/validation.ts +++ b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/private/validation.ts @@ -1,4 +1,4 @@ -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; /** * Class to validate that inputs match requirements. diff --git a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/target-application.ts b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/target-application.ts index 6d5b8ce9dfcbf..6c1dd508fc16a 100644 --- a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/target-application.ts +++ b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/lib/target-application.ts @@ -1,4 +1,4 @@ -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IApplication, Application } from './application'; import { hashValues } from './common'; diff --git a/packages/@aws-cdk/aws-synthetics-alpha/lib/canary.ts b/packages/@aws-cdk/aws-synthetics-alpha/lib/canary.ts index 83664f03f6c57..a5503b61708ef 100644 --- a/packages/@aws-cdk/aws-synthetics-alpha/lib/canary.ts +++ b/packages/@aws-cdk/aws-synthetics-alpha/lib/canary.ts @@ -3,7 +3,7 @@ import { Metric, MetricOptions, MetricProps } from 'aws-cdk-lib/aws-cloudwatch'; import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as iam from 'aws-cdk-lib/aws-iam'; import * as s3 from 'aws-cdk-lib/aws-s3'; -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { Code } from './code'; import { Runtime } from './runtime'; diff --git a/packages/@aws-cdk/aws-synthetics-alpha/lib/schedule.ts b/packages/@aws-cdk/aws-synthetics-alpha/lib/schedule.ts index 9b8df232d0490..7be04de89fab3 100644 --- a/packages/@aws-cdk/aws-synthetics-alpha/lib/schedule.ts +++ b/packages/@aws-cdk/aws-synthetics-alpha/lib/schedule.ts @@ -1,4 +1,4 @@ -import { Duration } from 'aws-cdk-lib'; +import { Duration } from 'aws-cdk-lib/core'; /** * Schedule for canary runs diff --git a/packages/@aws-cdk/cli-lib-alpha/rosetta/default.ts-fixture b/packages/@aws-cdk/cli-lib-alpha/rosetta/default.ts-fixture index e714a8e55535d..a7cc8422a5203 100644 --- a/packages/@aws-cdk/cli-lib-alpha/rosetta/default.ts-fixture +++ b/packages/@aws-cdk/cli-lib-alpha/rosetta/default.ts-fixture @@ -1,5 +1,5 @@ // Fixture with an AwsCdkCli set up -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { AwsCdkCli } from '@aws-cdk/cli-lib-alpha'; const cli = AwsCdkCli.fromCloudAssemblyDirectoryProducer({ diff --git a/packages/@aws-cdk/cli-lib-alpha/rosetta/imports.ts-fixture b/packages/@aws-cdk/cli-lib-alpha/rosetta/imports.ts-fixture index 8824253afe9f4..5028764e138f9 100644 --- a/packages/@aws-cdk/cli-lib-alpha/rosetta/imports.ts-fixture +++ b/packages/@aws-cdk/cli-lib-alpha/rosetta/imports.ts-fixture @@ -1,5 +1,5 @@ // Fixture with imports, but nothing else -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { AwsCdkCli, ICloudAssemblyDirectoryProducer } from '@aws-cdk/cli-lib-alpha'; /// here diff --git a/packages/@aws-cdk/cli-lib-alpha/rosetta/producer.ts-fixture b/packages/@aws-cdk/cli-lib-alpha/rosetta/producer.ts-fixture index 093665648f5b7..50292193a57f1 100644 --- a/packages/@aws-cdk/cli-lib-alpha/rosetta/producer.ts-fixture +++ b/packages/@aws-cdk/cli-lib-alpha/rosetta/producer.ts-fixture @@ -1,5 +1,5 @@ // Fixture with imports, but nothing else -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; import { AwsCdkCli, ICloudAssemblyDirectoryProducer } from '@aws-cdk/cli-lib-alpha'; class MyProducer implements ICloudAssemblyDirectoryProducer { diff --git a/packages/@aws-cdk/cli-lib-alpha/test/cli.test.ts b/packages/@aws-cdk/cli-lib-alpha/test/cli.test.ts index 803d92fb7655c..d3a2e6d661442 100644 --- a/packages/@aws-cdk/cli-lib-alpha/test/cli.test.ts +++ b/packages/@aws-cdk/cli-lib-alpha/test/cli.test.ts @@ -1,5 +1,5 @@ import { join } from 'path'; -import * as core from 'aws-cdk-lib'; +import * as core from 'aws-cdk-lib/core'; import * as cli from 'aws-cdk/lib'; import { AwsCdkCli } from '../lib'; diff --git a/packages/@aws-cdk/cli-lib-alpha/test/commands.test.ts b/packages/@aws-cdk/cli-lib-alpha/test/commands.test.ts index 4bcb558323628..d2433139d68a1 100644 --- a/packages/@aws-cdk/cli-lib-alpha/test/commands.test.ts +++ b/packages/@aws-cdk/cli-lib-alpha/test/commands.test.ts @@ -1,4 +1,4 @@ -import * as core from 'aws-cdk-lib'; +import * as core from 'aws-cdk-lib/core'; import * as cli from 'aws-cdk/lib'; import { AwsCdkCli } from '../lib'; import { RequireApproval, StackActivityProgress } from '../lib/commands'; diff --git a/packages/@aws-cdk/cli-lib-alpha/test/test-app/app.ts b/packages/@aws-cdk/cli-lib-alpha/test/test-app/app.ts index 5e57c0b34c932..303299ec8b1cf 100644 --- a/packages/@aws-cdk/cli-lib-alpha/test/test-app/app.ts +++ b/packages/@aws-cdk/cli-lib-alpha/test/test-app/app.ts @@ -1,4 +1,4 @@ -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; const app = new cdk.App(); new cdk.Stack(app, 'AppStack1'); diff --git a/packages/@aws-cdk/example-construct-library/lib/example-resource.ts b/packages/@aws-cdk/example-construct-library/lib/example-resource.ts index f55c98f495fe1..8308bb0a340f5 100644 --- a/packages/@aws-cdk/example-construct-library/lib/example-resource.ts +++ b/packages/@aws-cdk/example-construct-library/lib/example-resource.ts @@ -11,7 +11,7 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as events from 'aws-cdk-lib/aws-events'; import * as iam from 'aws-cdk-lib/aws-iam'; import * as s3 from 'aws-cdk-lib/aws-s3'; -import * as core from 'aws-cdk-lib'; +import * as core from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; // for files that are part of this package, we do import individual classes or functions import { exampleResourceArnComponents } from './private/example-resource-common'; diff --git a/packages/@aws-cdk/example-construct-library/lib/private/example-resource-common.ts b/packages/@aws-cdk/example-construct-library/lib/private/example-resource-common.ts index a0d9f86091322..76eac6dc78a11 100644 --- a/packages/@aws-cdk/example-construct-library/lib/private/example-resource-common.ts +++ b/packages/@aws-cdk/example-construct-library/lib/private/example-resource-common.ts @@ -1,4 +1,4 @@ -import * as cdk from 'aws-cdk-lib'; +import * as cdk from 'aws-cdk-lib/core'; // This file contains utility functions used in the implementation of ExampleResource // which we don't want to make part of the public API of this module diff --git a/packages/@aws-cdk/example-construct-library/test/example-resource.test.ts b/packages/@aws-cdk/example-construct-library/test/example-resource.test.ts index fa9ea68fe0179..736b9750c4f11 100644 --- a/packages/@aws-cdk/example-construct-library/test/example-resource.test.ts +++ b/packages/@aws-cdk/example-construct-library/test/example-resource.test.ts @@ -9,7 +9,7 @@ import { Match, Template } from 'aws-cdk-lib/assertions'; import * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch'; import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as iam from 'aws-cdk-lib/aws-iam'; -import * as core from 'aws-cdk-lib'; +import * as core from 'aws-cdk-lib/core'; // Always import the module you're testing qualified - // don't import individual classes from it! diff --git a/packages/@aws-cdk/example-construct-library/test/integ.example-resource.ts b/packages/@aws-cdk/example-construct-library/test/integ.example-resource.ts index 59bfe78e4c4a5..275e12ab2adfb 100644 --- a/packages/@aws-cdk/example-construct-library/test/integ.example-resource.ts +++ b/packages/@aws-cdk/example-construct-library/test/integ.example-resource.ts @@ -8,7 +8,7 @@ * see the main CONTRIBUTING.md file. */ -import * as core from 'aws-cdk-lib'; +import * as core from 'aws-cdk-lib/core'; // as in unit tests, we use a qualified import, // not bring in individual classes import * as er from '../lib'; diff --git a/packages/@aws-cdk/integ-tests-alpha/lib/assertions/api-call-base.ts b/packages/@aws-cdk/integ-tests-alpha/lib/assertions/api-call-base.ts index 6904a75e3fdb8..67aa8156f9be4 100644 --- a/packages/@aws-cdk/integ-tests-alpha/lib/assertions/api-call-base.ts +++ b/packages/@aws-cdk/integ-tests-alpha/lib/assertions/api-call-base.ts @@ -1,4 +1,4 @@ -import { CustomResource, Reference } from 'aws-cdk-lib'; +import { CustomResource, Reference } from 'aws-cdk-lib/core'; import { Construct, IConstruct } from 'constructs'; import { ExpectedResult } from './common'; import { AssertionsProvider } from './providers'; diff --git a/packages/@aws-cdk/integ-tests-alpha/lib/assertions/assertions.ts b/packages/@aws-cdk/integ-tests-alpha/lib/assertions/assertions.ts index f6db29e52ac79..69ff247f8b829 100644 --- a/packages/@aws-cdk/integ-tests-alpha/lib/assertions/assertions.ts +++ b/packages/@aws-cdk/integ-tests-alpha/lib/assertions/assertions.ts @@ -1,4 +1,4 @@ -import { CustomResource, CfnOutput } from 'aws-cdk-lib'; +import { CustomResource, CfnOutput } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { ExpectedResult, ActualResult } from './common'; import { md5hash } from './private/hash'; diff --git a/packages/@aws-cdk/integ-tests-alpha/lib/assertions/common.ts b/packages/@aws-cdk/integ-tests-alpha/lib/assertions/common.ts index c967754b299a5..57eba2d41e52c 100644 --- a/packages/@aws-cdk/integ-tests-alpha/lib/assertions/common.ts +++ b/packages/@aws-cdk/integ-tests-alpha/lib/assertions/common.ts @@ -1,4 +1,4 @@ -import { CustomResource } from 'aws-cdk-lib'; +import { CustomResource } from 'aws-cdk-lib/core'; import { IApiCall } from './api-call-base'; /** diff --git a/packages/@aws-cdk/integ-tests-alpha/lib/assertions/private/deploy-assert.ts b/packages/@aws-cdk/integ-tests-alpha/lib/assertions/private/deploy-assert.ts index 55342380f7b0e..4610a6c0a03a0 100644 --- a/packages/@aws-cdk/integ-tests-alpha/lib/assertions/private/deploy-assert.ts +++ b/packages/@aws-cdk/integ-tests-alpha/lib/assertions/private/deploy-assert.ts @@ -1,4 +1,4 @@ -import { Stack } from 'aws-cdk-lib'; +import { Stack } from 'aws-cdk-lib/core'; import { Construct, IConstruct, Node } from 'constructs'; import { IApiCall } from '../api-call-base'; import { EqualsAssertion } from '../assertions'; diff --git a/packages/@aws-cdk/integ-tests-alpha/lib/assertions/providers/provider.ts b/packages/@aws-cdk/integ-tests-alpha/lib/assertions/providers/provider.ts index 7b495d69213a7..661f7b47f3ff1 100644 --- a/packages/@aws-cdk/integ-tests-alpha/lib/assertions/providers/provider.ts +++ b/packages/@aws-cdk/integ-tests-alpha/lib/assertions/providers/provider.ts @@ -1,5 +1,5 @@ import * as path from 'path'; -import { Duration, CfnResource, AssetStaging, Stack, FileAssetPackaging, Token, Lazy, Reference } from 'aws-cdk-lib'; +import { Duration, CfnResource, AssetStaging, Stack, FileAssetPackaging, Token, Lazy, Reference } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; let SDK_METADATA: any = undefined; diff --git a/packages/@aws-cdk/integ-tests-alpha/lib/assertions/sdk.ts b/packages/@aws-cdk/integ-tests-alpha/lib/assertions/sdk.ts index bfc1dfa4674be..b65e0f5bec2e4 100644 --- a/packages/@aws-cdk/integ-tests-alpha/lib/assertions/sdk.ts +++ b/packages/@aws-cdk/integ-tests-alpha/lib/assertions/sdk.ts @@ -1,4 +1,4 @@ -import { ArnFormat, CfnResource, CustomResource, Lazy, Stack, Aspects, CfnOutput } from 'aws-cdk-lib'; +import { ArnFormat, CfnResource, CustomResource, Lazy, Stack, Aspects, CfnOutput } from 'aws-cdk-lib/core'; import { Construct, IConstruct } from 'constructs'; import { ApiCallBase, IApiCall } from './api-call-base'; import { ExpectedResult } from './common'; diff --git a/packages/@aws-cdk/integ-tests-alpha/lib/assertions/waiter-state-machine.ts b/packages/@aws-cdk/integ-tests-alpha/lib/assertions/waiter-state-machine.ts index 63bbfe7779fe1..7739e6ceb8b1d 100644 --- a/packages/@aws-cdk/integ-tests-alpha/lib/assertions/waiter-state-machine.ts +++ b/packages/@aws-cdk/integ-tests-alpha/lib/assertions/waiter-state-machine.ts @@ -1,4 +1,4 @@ -import { CfnResource, Duration, Stack } from 'aws-cdk-lib'; +import { CfnResource, Duration, Stack } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { AssertionsProvider } from './providers'; diff --git a/packages/@aws-cdk/integ-tests-alpha/lib/manifest-synthesizer.ts b/packages/@aws-cdk/integ-tests-alpha/lib/manifest-synthesizer.ts index ff3e400fa04a1..a92c7a6cec350 100644 --- a/packages/@aws-cdk/integ-tests-alpha/lib/manifest-synthesizer.ts +++ b/packages/@aws-cdk/integ-tests-alpha/lib/manifest-synthesizer.ts @@ -1,5 +1,5 @@ import { IntegManifest, Manifest } from 'aws-cdk-lib/cloud-assembly-schema'; -import { ISynthesisSession } from 'aws-cdk-lib'; +import { ISynthesisSession } from 'aws-cdk-lib/core'; import { IntegManifestWriter } from './manifest-writer'; import { IntegTestCase } from './test-case'; diff --git a/packages/@aws-cdk/integ-tests-alpha/lib/test-case.ts b/packages/@aws-cdk/integ-tests-alpha/lib/test-case.ts index dcbd0d3cb209e..6bcac0c08693b 100644 --- a/packages/@aws-cdk/integ-tests-alpha/lib/test-case.ts +++ b/packages/@aws-cdk/integ-tests-alpha/lib/test-case.ts @@ -1,5 +1,5 @@ import { IntegManifest, Manifest, TestCase, TestOptions } from 'aws-cdk-lib/cloud-assembly-schema'; -import { attachCustomSynthesis, ISynthesisSession, Stack, StackProps } from 'aws-cdk-lib'; +import { attachCustomSynthesis, ISynthesisSession, Stack, StackProps } from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; import { IDeployAssert } from './assertions'; import { DeployAssert } from './assertions/private/deploy-assert';