chore: break a number of cyclic dependencies

packages/aws-cdk-lib/assertions/lib/capture.ts

@@ -1,4 +1,4 @@
-import { Match } from '.';
+import { Match } from './match';
 import { Matcher, MatchResult } from './matcher';
 import { AssertionError } from './private/error';
 import type { Type } from './private/type';

packages/aws-cdk-lib/assertions/lib/private/resources.ts

@@ -1,4 +1,5 @@
-import { Match, Matcher } from '..';
+import { Match } from '../match';
+import { Matcher } from '../matcher';
 import { AbsentMatch } from './matchers/absent';
 import { formatAllMismatches, matchSection, formatSectionMatchFailure, formatAllMatches } from './section';
 import type { Resource, Template } from './template';

packages/aws-cdk-lib/aws-apigateway/lib/stepfunctions-api.ts

@@ -1,8 +1,8 @@
 import type { Construct } from 'constructs';
-import type { RestApiProps } from '.';
-import { RestApi } from '.';
 import type { RequestContext } from './integrations';
 import { StepFunctionsIntegration } from './integrations/stepfunctions';
+import type { RestApiProps } from './restapi';
+import { RestApi } from './restapi';
 import type * as iam from '../../aws-iam';
 import * as sfn from '../../aws-stepfunctions';
 import { ValidationError } from '../../core/lib/errors';

packages/aws-cdk-lib/aws-apigatewayv2/lib/common/api-mapping.ts

@@ -1,15 +1,15 @@
 import type { Construct } from 'constructs';
 import type { IDomainName } from './domain-name';
 import type { IStage } from './stage';
-import type { CfnApiMappingProps } from '.././index';
-import { CfnApiMapping } from '.././index';
 import type { IResource } from '../../../core';
 import { Resource } from '../../../core';
 import { ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
 import type { ApiMappingReference, IApiMappingRef, IApiRef, IDomainNameRef } from '../../../interfaces/generated/aws-apigatewayv2-interfaces.generated';
+import { CfnApiMapping } from '../apigatewayv2.generated';
+import type { CfnApiMappingProps } from '../apigatewayv2.generated';
 
 /**
  * Represents an ApiGatewayV2 ApiMapping resource

packages/aws-cdk-lib/aws-apigatewayv2/lib/common/domain-name.ts

@@ -1,7 +1,5 @@
 import type { Construct } from 'constructs';
 import type { IpAddressType } from './api';
-import type { CfnDomainNameProps } from '.././index';
-import { CfnDomainName } from '.././index';
 import type { IBucket } from '../../../aws-s3';
 import type { IResource } from '../../../core';
 import { ArnFormat, Lazy, Resource, Stack, Token } from '../../../core';
@@ -11,7 +9,8 @@ import { addConstructMetadata, MethodMetadata } from '../../../core/lib/metadata
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
 import type { ICertificateRef } from '../../../interfaces/generated/aws-certificatemanager-interfaces.generated';
-import type { DomainNameReference, IDomainNameRef } from '../apigatewayv2.generated';
+import { CfnDomainName } from '../apigatewayv2.generated';
+import type { CfnDomainNameProps, DomainNameReference, IDomainNameRef } from '../apigatewayv2.generated';
 
 /**
  * The minimum version of the SSL protocol that you want API Gateway to use for HTTPS connections.

packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts

@@ -7,15 +7,15 @@ import type { IHttpStage, HttpStageOptions } from './stage';
 import { HttpStage } from './stage';
 import type { VpcLinkProps } from './vpc-link';
 import { VpcLink } from './vpc-link';
-import type { CfnApiProps } from '.././index';
-import { CfnApi, HttpApiHelper } from '.././index';
+import { CfnApi } from '../apigatewayv2.generated';
+import { HttpApiHelper } from './api-helper';
 import type { Metric, MetricOptions } from '../../../aws-cloudwatch';
 import type { Duration } from '../../../core';
 import { UnscopedValidationError, ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata, MethodMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
-import type { ApiReference, IApiRef } from '../apigatewayv2.generated';
+import type { CfnApiProps, ApiReference, IApiRef } from '../apigatewayv2.generated';
 import type { IApi, IpAddressType } from '../common/api';
 import { ApiBase } from '../common/base';
 import type { DomainMappingOptions } from '../common/stage';

packages/aws-cdk-lib/aws-apigatewayv2/lib/http/authorizer.ts

@@ -7,9 +7,9 @@ import { ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import type { AuthorizerReference } from '../apigatewayv2.generated';
+import { CfnAuthorizer } from '../apigatewayv2.generated';
 import type { IAuthorizer } from '../common';
-import type { AuthorizerReference } from '../index';
-import { CfnAuthorizer } from '../index';
 
 /**
  * Supported Authorizer types

packages/aws-cdk-lib/aws-apigatewayv2/lib/http/integration.ts

@@ -2,15 +2,15 @@ import type { Construct } from 'constructs';
 import type { IHttpApi, IHttpApiRef } from './api';
 import { toIHttpApi } from './api';
 import type { HttpMethod, IHttpRoute } from './route';
-import type { IntegrationReference } from '.././index';
-import { CfnIntegration } from '.././index';
 import type { IRoleRef } from '../../../aws-iam';
 import type { Duration } from '../../../core';
 import { Aws, Resource } from '../../../core';
 import { ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import { CfnIntegration } from '../apigatewayv2.generated';
+import type { IntegrationReference } from '../apigatewayv2.generated';
 import type { IIntegration } from '../common';
 import type { ParameterMapping } from '../parameter-mapping';
 

packages/aws-cdk-lib/aws-apigatewayv2/lib/http/route.ts

@@ -3,14 +3,14 @@ import type { IHttpApi, IHttpApiRef } from './api';
 import { toIHttpApi } from './api';
 import type { HttpRouteAuthorizerConfig, IHttpRouteAuthorizer } from './authorizer';
 import type { HttpRouteIntegration } from './integration';
-import type { CfnRouteProps, RouteReference } from '.././index';
-import { CfnRoute } from '.././index';
 import * as iam from '../../../aws-iam';
 import { Aws, Resource } from '../../../core';
 import { UnscopedValidationError, ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata, MethodMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import { CfnRoute } from '../apigatewayv2.generated';
+import type { CfnRouteProps, RouteReference } from '../apigatewayv2.generated';
 import type { IRoute } from '../common';
 
 /**

packages/aws-cdk-lib/aws-apigatewayv2/lib/http/stage.ts

@@ -8,11 +8,11 @@ import { ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import type { IStageRef } from '../apigatewayv2.generated';
+import { CfnStage } from '../apigatewayv2.generated';
 import type { StageOptions, IStage, StageAttributes } from '../common';
 import type { IApi } from '../common/api';
 import { StageBase } from '../common/base';
-import type { IStageRef } from '../index';
-import { CfnStage } from '../index';
 
 const DEFAULT_STAGE_NAME = '$default';
 

packages/aws-cdk-lib/aws-apigatewayv2/lib/http/vpc-link.ts

@@ -4,8 +4,8 @@ import type { IResource } from '../../../core';
 import { Lazy, Names, Resource } from '../../../core';
 import { addConstructMetadata, MethodMetadata } from '../../../core/lib/metadata-resource';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
-import type { IVpcLinkRef, VpcLinkReference } from '../index';
-import { CfnVpcLink } from '../index';
+import type { IVpcLinkRef, VpcLinkReference } from '../apigatewayv2.generated';
+import { CfnVpcLink } from '../apigatewayv2.generated';
 
 /**
  * Represents an API Gateway VpcLink

packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/api.ts

@@ -1,14 +1,14 @@
 import type { Construct } from 'constructs';
 import type { WebSocketRouteOptions } from './route';
 import { WebSocketRoute } from './route';
-import { CfnApi } from '.././index';
 import type { IGrantable } from '../../../aws-iam';
 import { Grant } from '../../../aws-iam';
 import { ArnFormat, Stack, Token } from '../../../core';
 import { UnscopedValidationError, ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata, MethodMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import { CfnApi } from '../apigatewayv2.generated';
 import type { ApiReference, IApiRef } from '../apigatewayv2.generated';
 import type { IApi, IpAddressType } from '../common/api';
 import { ApiBase } from '../common/base';

packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/authorizer.ts

@@ -6,9 +6,9 @@ import { ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import type { AuthorizerReference } from '../apigatewayv2.generated';
+import { CfnAuthorizer } from '../apigatewayv2.generated';
 import type { IAuthorizer } from '../common';
-import type { AuthorizerReference } from '../index';
-import { CfnAuthorizer } from '../index';
 
 /**
  * Supported Authorizer types

packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/integration.ts

@@ -1,15 +1,15 @@
 import type { Construct } from 'constructs';
 import type { IWebSocketApi, IWebSocketApiRef } from './api';
 import type { IWebSocketRoute } from './route';
-import type { IntegrationReference } from '.././index';
-import { CfnIntegration } from '.././index';
 import type { IRole } from '../../../aws-iam';
 import type { Duration } from '../../../core';
 import { Resource } from '../../../core';
 import { ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import { CfnIntegration } from '../apigatewayv2.generated';
+import type { IntegrationReference } from '../apigatewayv2.generated';
 import type { IIntegration } from '../common';
 
 /**

packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/route.ts

@@ -3,13 +3,13 @@ import type { IWebSocketApi } from './api';
 import type { IWebSocketRouteAuthorizer } from './authorizer';
 import { WebSocketNoneAuthorizer } from './authorizer';
 import type { WebSocketRouteIntegration } from './integration';
-import type { RouteReference } from '.././index';
-import { CfnRoute, CfnRouteResponse } from '.././index';
 import { Resource } from '../../../core';
 import { ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import { CfnRoute, CfnRouteResponse } from '../apigatewayv2.generated';
+import type { RouteReference } from '../apigatewayv2.generated';
 import type { IRoute } from '../common';
 
 /**

packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/stage.ts

@@ -1,6 +1,5 @@
 import type { Construct } from 'constructs';
 import type { IWebSocketApi } from './api';
-import { CfnStage } from '.././index';
 import { AccessLogField, AccessLogFormat } from '../../../aws-apigateway';
 import type { IGrantable } from '../../../aws-iam';
 import { Grant } from '../../../aws-iam';
@@ -9,6 +8,7 @@ import { ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata, MethodMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import { CfnStage } from '../apigatewayv2.generated';
 import type { StageOptions, IApi, IStage, StageAttributes } from '../common';
 import { StageBase } from '../common/base';
 

packages/aws-cdk-lib/aws-autoscaling/lib/auto-scaling-group.ts

@@ -1,5 +1,5 @@
 import type { Construct } from 'constructs';
-import { AutoScalingGroupRequireImdsv2Aspect } from './aspects';
+import { AutoScalingGroupRequireImdsv2Aspect } from './aspects/require-imdsv2-aspect';
 import type { CfnAutoScalingGroupProps } from './autoscaling.generated';
 import { CfnAutoScalingGroup, CfnLaunchConfiguration } from './autoscaling.generated';
 import type { BasicLifecycleHookProps } from './lifecycle-hook';

packages/aws-cdk-lib/aws-cloudfront/lib/vpc-origin.ts

@@ -1,8 +1,8 @@
 import type { Construct } from 'constructs';
 import type { IVpcOriginRef, VpcOriginReference } from './cloudfront.generated';
 import { CfnVpcOrigin } from './cloudfront.generated';
-import type { OriginProtocolPolicy } from '../';
-import { OriginSslPolicy } from '../';
+import type { OriginProtocolPolicy } from './distribution';
+import { OriginSslPolicy } from './web-distribution';
 import type { IInstance } from '../../aws-ec2';
 import type { IApplicationLoadBalancer, INetworkLoadBalancer } from '../../aws-elasticloadbalancingv2';
 import type {

packages/aws-cdk-lib/aws-codepipeline-actions/lib/codebuild/build-action.ts

@@ -1,12 +1,12 @@
 import type { Construct } from 'constructs';
-import { CodeStarConnectionsSourceAction } from '..';
 import * as codebuild from '../../../aws-codebuild';
 import * as codepipeline from '../../../aws-codepipeline';
 import * as iam from '../../../aws-iam';
 import * as cdk from '../../../core';
 import { lit } from '../../../core/lib/private/literal-string';
 import { Action } from '../action';
 import { CodeCommitSourceAction } from '../codecommit/source-action';
+import { CodeStarConnectionsSourceAction } from '../codestar-connections/source-action';
 
 /**
  * The type of the CodeBuild action that determines its CodePipeline Category -

packages/aws-cdk-lib/aws-ec2/lib/bastion-host.ts

@@ -1,10 +1,10 @@
 import type { Construct } from 'constructs';
-import type { InstanceReference } from '.';
-import { InstanceArchitecture, InstanceClass, InstanceSize, InstanceType } from '.';
 import type { CloudFormationInit } from './cfn-init';
 import type { Connections } from './connections';
+import type { InstanceReference } from './ec2.generated';
 import type { ApplyCloudFormationInitOptions, IInstance } from './instance';
 import { Instance } from './instance';
+import { InstanceArchitecture, InstanceClass, InstanceSize, InstanceType } from './instance-types';
 import type { IMachineImage } from './machine-image';
 import { AmazonLinuxCpuType, MachineImage } from './machine-image';
 import type { IPeer } from './peer';

packages/aws-cdk-lib/aws-ec2/lib/instance.ts

@@ -1,5 +1,5 @@
 import type { Construct } from 'constructs';
-import { InstanceRequireImdsv2Aspect } from './aspects';
+import { InstanceRequireImdsv2Aspect } from './aspects/require-imdsv2-aspect';
 import type { CloudFormationInit } from './cfn-init';
 import type { IConnectable } from './connections';
 import { Connections } from './connections';

packages/aws-cdk-lib/aws-ec2/lib/machine-image/common.ts

@@ -1,6 +1,7 @@
 import type { Construct } from 'constructs';
 import { lookupImage } from './utils';
 import { UserData } from '../user-data';
+import { OperatingSystemType } from './os-type';
 
 /**
  * Common options across all generations.
@@ -144,19 +145,6 @@ export interface MachineImageConfig {
   readonly userData: UserData;
 }
 
-/**
- * The OS type of a particular image
- */
-export enum OperatingSystemType {
-  LINUX,
-  WINDOWS,
-  /**
-   * Used when the type of the operating system is not known
-   * (for example, for imported Auto-Scaling Groups).
-   */
-  UNKNOWN,
-}
-
 /**
  * CPU type
  */

packages/aws-cdk-lib/aws-ec2/lib/machine-image/index.ts

@@ -3,3 +3,4 @@ export * from './amazon-linux2';
 export * from './machine-image';
 export * from './amazon-linux-2022';
 export * from './amazon-linux-2023';
+export * from './os-type';

packages/aws-cdk-lib/aws-ec2/lib/machine-image/machine-image.ts

@@ -6,7 +6,7 @@ import { AmazonLinux2023ImageSsmParameter, AmazonLinux2023Kernel } from './amazo
 import type { AmazonLinux2ImageSsmParameterProps } from './amazon-linux2';
 import { AmazonLinux2ImageSsmParameter, AmazonLinux2Kernel } from './amazon-linux2';
 import type { IMachineImage, MachineImageConfig } from './common';
-import { AmazonLinuxCpuType, AmazonLinuxEdition, AmazonLinuxGeneration, AmazonLinuxStorage, AmazonLinuxVirt, OperatingSystemType } from './common';
+import { AmazonLinuxCpuType, AmazonLinuxEdition, AmazonLinuxGeneration, AmazonLinuxStorage, AmazonLinuxVirt } from './common';
 import { lookupImage } from './utils';
 import * as ssm from '../../../aws-ssm';
 import * as cxschema from '../../../cloud-assembly-schema';
@@ -15,6 +15,7 @@ import { lit } from '../../../core/lib/private/literal-string';
 import type * as cxapi from '../../../cx-api';
 import { UserData } from '../user-data';
 import { WindowsVersion } from '../windows-versions';
+import { OperatingSystemType } from './os-type';
 
 /**
  * Factory functions for standard Amazon Machine Image objects.

packages/aws-cdk-lib/aws-ec2/lib/machine-image/os-type.ts

@@ -0,0 +1,12 @@
+/**
+ * The OS type of a particular image
+ */
+export enum OperatingSystemType {
+  LINUX,
+  WINDOWS,
+  /**
+   * Used when the type of the operating system is not known
+   * (for example, for imported Auto-Scaling Groups).
+   */
+  UNKNOWN,
+}

packages/aws-cdk-lib/aws-ec2/lib/user-data.ts

@@ -1,4 +1,4 @@
-import { OperatingSystemType } from './machine-image';
+import { OperatingSystemType } from './machine-image/os-type';
 import type { IBucketRef } from '../../aws-s3';
 import type { Resource, CfnResource } from '../../core';
 import { Fn, Stack, UnscopedValidationError } from '../../core';

packages/aws-cdk-lib/aws-lambda/lib/alias.ts

@@ -340,3 +340,14 @@ export interface VersionWeight {
    */
   readonly weight: number;
 }
+
+/**
+ * @internal
+ */
+export function addAlias(scope: Construct, version: IVersion, aliasName: string, options: AliasOptions = {}) {
+  return new Alias(scope, `Alias${aliasName}`, {
+    aliasName,
+    version,
+    ...options,
+  });
+}

packages/aws-cdk-lib/aws-lambda/lib/function-base.ts

@@ -1,6 +1,7 @@
 import { createHash } from 'crypto';
 import type { Construct, Node } from 'constructs';
 import type { AliasOptions } from './alias';
+import { addAlias } from './alias';
 import type { Architecture } from './architecture';
 import type { EventInvokeConfigOptions } from './event-invoke-config';
 import { EventInvokeConfig } from './event-invoke-config';
@@ -14,7 +15,7 @@ import type { FunctionReference, IFunctionRef, VersionReference } from './lambda
 import { CfnPermission } from './lambda.generated';
 import type { Permission } from './permission';
 import type { TenancyConfig } from './tenancy-config';
-import { addAlias, flatMap } from './util';
+import { flatMap } from './util';
 import type * as cloudwatch from '../../aws-cloudwatch';
 import type * as ec2 from '../../aws-ec2';
 import * as iam from '../../aws-iam';

packages/aws-cdk-lib/aws-lambda/lib/function.ts

@@ -2,6 +2,7 @@ import type { Construct, IConstruct } from 'constructs';
 import type { AdotInstrumentationConfig } from './adot-layers';
 import { AdotLambdaExecWrapper } from './adot-layers';
 import type { AliasOptions, Alias } from './alias';
+import { addAlias } from './alias';
 import { Architecture } from './architecture';
 import type { Code, CodeConfig } from './code';
 import type { DurableConfig } from './durable-config';
@@ -25,7 +26,6 @@ import { determineLatestNodeRuntime, Runtime, RuntimeFamily } from './runtime';
 import type { RuntimeManagementMode } from './runtime-management';
 import type { SnapStartConf } from './snapstart-config';
 import type { TenancyConfig } from './tenancy-config';
-import { addAlias } from './util';
 import * as cloudwatch from '../../aws-cloudwatch';
 import type { IProfilingGroup } from '../../aws-codeguruprofiler';
 import { ProfilingGroup, ComputePlatform } from '../../aws-codeguruprofiler';