Skip to content

Commit

Permalink
Merge branch 'main' into cloudfront-empty-domainnames-warning
Browse files Browse the repository at this point in the history
  • Loading branch information
@mergify
mergify[bot] authored Sep 9, 2024
2 parents 9f08c34 + 1132887 commit 0d69703
Show file tree
Hide file tree
Showing 3 changed files with 197 additions and 2 deletions.
20 changes: 20 additions & 0 deletions packages/@aws-cdk/aws-neptune-alpha/lib/cluster.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@ export class EngineVersion {
* Neptune engine version 1.2.1.0
*/
public static readonly V1_2_1_0 = new EngineVersion('1.2.1.0');
/**
* Neptune engine version 1.2.1.1
*/
public static readonly V1_2_1_1 = new EngineVersion('1.2.1.1');
/**
* Neptune engine version 1.2.1.2
*/
public static readonly V1_2_1_2 = new EngineVersion('1.2.1.2');
/**
* Neptune engine version 1.3.0.0
*/
Expand All @@ -84,6 +92,18 @@ export class EngineVersion {
* Neptune engine version 1.3.1.0
*/
public static readonly V1_3_1_0 = new EngineVersion('1.3.1.0');
/**
* Neptune engine version 1.3.2.0
*/
public static readonly V1_3_2_0 = new EngineVersion('1.3.2.0');
/**
* Neptune engine version 1.3.2.1
*/
public static readonly V1_3_2_1 = new EngineVersion('1.3.2.1');
/**
* Neptune engine version 1.3.3.0
*/
public static readonly V1_3_3_0 = new EngineVersion('1.3.3.0');

/**
* Constructor for specifying a custom engine version
Expand Down
163 changes: 161 additions & 2 deletions packages/@aws-cdk/aws-neptune-alpha/lib/instance.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,75 @@ import { IParameterGroup } from './parameter-group';
* used for defining `DatabaseInstanceProps.instanceType`.
*/
export class InstanceType {
/**
* db.x2g.large
*/
public static readonly X2G_LARGE = InstanceType.of('db.x2g.large');

/**
* db.x2g.xlarge
*/
public static readonly X2G_XLARGE = InstanceType.of('db.x2g.xlarge');

/**
* db.x2g.2xlarge
*/
public static readonly X2G_2XLARGE = InstanceType.of('db.x2g.2xlarge');

/**
* db.x2g.4xlarge
*/
public static readonly X2G_4XLARGE = InstanceType.of('db.x2g.4xlarge');

/**
* db.x2g.8xlarge
*/
public static readonly X2G_8XLARGE = InstanceType.of('db.x2g.8xlarge');

/**
* db.x2g.12xlarge
*/
public static readonly X2G_12XLARGE = InstanceType.of('db.x2g.12xlarge');

/**
* db.x2g.16xlarge
*/
public static readonly X2G_16XLARGE = InstanceType.of('db.x2g.16xlarge');

/**
* db.x2iedn.xlarge
*/
public static readonly X2IEDN_XLARGE = InstanceType.of('db.x2iedn.xlarge');

/**
* db.x2iedn.2xlarge
*/
public static readonly X2IEDN_2XLARGE = InstanceType.of('db.x2iedn.2xlarge');

/**
* db.x2iedn.4xlarge
*/
public static readonly X2IEDN_4XLARGE = InstanceType.of('db.x2iedn.4xlarge');

/**
* db.x2iedn.8xlarge
*/
public static readonly X2IEDN_8XLARGE = InstanceType.of('db.x2iedn.8xlarge');

/**
* db.x2iedn.16xlarge
*/
public static readonly X2IEDN_16XLARGE = InstanceType.of('db.x2iedn.16xlarge');

/**
* db.x2iedn.24xlarge
*/
public static readonly X2IEDN_24XLARGE = InstanceType.of('db.x2iedn.24xlarge');

/**
* db.x2iedn.32xlarge
*/
public static readonly X2IEDN_32XLARGE = InstanceType.of('db.x2iedn.32xlarge');

/**
* db.r6g.large
Expand Down Expand Up @@ -49,9 +118,49 @@ export class InstanceType {
public static readonly R6G_16XLARGE = InstanceType.of('db.r6g.16xlarge');

/**
* db.t4g.medium
* db.r6i.large
*/
public static readonly T4G_MEDIUM = InstanceType.of('db.t4g.medium');
public static readonly R6I_LARGE = InstanceType.of('db.r6i.large');

/**
* db.r6i.xlarge
*/
public static readonly R6I_XLARGE = InstanceType.of('db.r6i.xlarge');

/**
* db.r6i.2xlarge
*/
public static readonly R6I_2XLARGE = InstanceType.of('db.r6i.2xlarge');

/**
* db.r6i.4xlarge
*/
public static readonly R6I_4XLARGE = InstanceType.of('db.r6i.4xlarge');

/**
* db.r6i.8xlarge
*/
public static readonly R6I_8XLARGE = InstanceType.of('db.r6i.8xlarge');

/**
* db.r6i.12xlarge
*/
public static readonly R6I_12XLARGE = InstanceType.of('db.r6i.12xlarge');

/**
* db.r6i.16xlarge
*/
public static readonly R6I_16XLARGE = InstanceType.of('db.r6i.16xlarge');

/**
* db.r6i.24xlarge
*/
public static readonly R6I_24XLARGE = InstanceType.of('db.r6i.24xlarge');

/**
* db.r6i.32xlarge
*/
public static readonly R6I_32XLARGE = InstanceType.of('db.r6i.32xlarge');

/**
* db.r5.large
Expand Down Expand Up @@ -83,11 +192,56 @@ export class InstanceType {
*/
public static readonly R5_12XLARGE = InstanceType.of('db.r5.12xlarge');

/**
* db.r5.16xlarge
*/
public static readonly R5_16XLARGE = InstanceType.of('db.r5.16xlarge');

/**
* db.r5.24xlarge
*/
public static readonly R5_24XLARGE = InstanceType.of('db.r5.24xlarge');

/**
* db.r5d.large
*/
public static readonly R5D_LARGE = InstanceType.of('db.r5d.large');

/**
* db.r5d.xlarge
*/
public static readonly R5D_XLARGE = InstanceType.of('db.r5d.xlarge');

/**
* db.r5d.2xlarge
*/
public static readonly R5D_2XLARGE = InstanceType.of('db.r5d.2xlarge');

/**
* db.r5d.4xlarge
*/
public static readonly R5D_4XLARGE = InstanceType.of('db.r5d.4xlarge');

/**
* db.r5d.8xlarge
*/
public static readonly R5D_8XLARGE = InstanceType.of('db.r5d.8xlarge');

/**
* db.r5d.12xlarge
*/
public static readonly R5D_12XLARGE = InstanceType.of('db.r5d.12xlarge');

/**
* db.r5d.16xlarge
*/
public static readonly R5D_16XLARGE = InstanceType.of('db.r5d.16xlarge');

/**
* db.r5d.24xlarge
*/
public static readonly R5D_24XLARGE = InstanceType.of('db.r5d.24xlarge');

/**
* db.r4.large
*/
Expand All @@ -113,6 +267,11 @@ export class InstanceType {
*/
public static readonly R4_8XLARGE = InstanceType.of('db.r4.8xlarge');

/**
* db.t4g.medium
*/
public static readonly T4G_MEDIUM = InstanceType.of('db.t4g.medium');

/**
* db.t3.medium
*/
Expand Down
16 changes: 16 additions & 0 deletions packages/aws-cdk-lib/aws-ec2/lib/vpc-endpoint.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,9 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
public static readonly ACCESS_ANALYZER = new InterfaceVpcEndpointAwsService('access-analyzer');
public static readonly ACCOUNT_MANAGEMENT = new InterfaceVpcEndpointAwsService('account');
public static readonly AIRFLOW_API = new InterfaceVpcEndpointAwsService('airflow.api');
public static readonly AIRFLOW_API_FIPS = new InterfaceVpcEndpointAwsService('airflow.api-fips');
public static readonly AIRFLOW_ENV = new InterfaceVpcEndpointAwsService('airflow.env');
public static readonly AIRFLOW_ENV_FIPS = new InterfaceVpcEndpointAwsService('airflow.env-fips');
public static readonly AIRFLOW_OPS = new InterfaceVpcEndpointAwsService('airflow.ops');
public static readonly APIGATEWAY = new InterfaceVpcEndpointAwsService('execute-api');
/** @deprecated - Use InterfaceVpcEndpointAwsService.APP_MESH_ENVOY_MANAGEMENT instead. */
Expand Down Expand Up @@ -323,6 +325,7 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
public static readonly CODEWHISPERER = new InterfaceVpcEndpointAwsService('codewhisperer');
/** @deprecated - Use InterfaceVpcEndpointAwsService.CLOUDWATCH_MONITORING instead. */
public static readonly CLOUDWATCH = new InterfaceVpcEndpointAwsService('monitoring');
public static readonly CLOUDWATCH_APPLICATION_INSIGHTS = new InterfaceVpcEndpointAwsService('applicationinsights');
public static readonly CLOUDWATCH_APPLICATION_SIGNALS = new InterfaceVpcEndpointAwsService('application-signals');
/** @deprecated - Use InterfaceVpcEndpointAwsService.EVENTBRIDGE instead. */
public static readonly CLOUDWATCH_EVENTS = new InterfaceVpcEndpointAwsService('events');
Expand Down Expand Up @@ -395,6 +398,7 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
public static readonly EMR = new InterfaceVpcEndpointAwsService('elasticmapreduce');
public static readonly EMR_EKS = new InterfaceVpcEndpointAwsService('emr-containers');
public static readonly EMR_SERVERLESS = new InterfaceVpcEndpointAwsService('emr-serverless');
public static readonly EMR_SERVERLESS_LIVY = new InterfaceVpcEndpointAwsService('emr-serverless-services.livy');
public static readonly EMR_WAL = new InterfaceVpcEndpointAwsService('emrwal.prod');
public static readonly ENTITY_RESOLUTION = new InterfaceVpcEndpointAwsService('entityresolution');
public static readonly EVENTBRIDGE = new InterfaceVpcEndpointAwsService('events');
Expand Down Expand Up @@ -446,6 +450,7 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
public static readonly KEYSPACES = new InterfaceVpcEndpointAwsService('cassandra', '', 9142);
public static readonly KEYSPACES_FIPS = new InterfaceVpcEndpointAwsService('cassandra-fips', '', 9142);
public static readonly KINESIS_STREAMS = new InterfaceVpcEndpointAwsService('kinesis-streams');
public static readonly KINESIS_STREAMS_FIPS = new InterfaceVpcEndpointAwsService('kinesis-streams-fips');
public static readonly KINESIS_FIREHOSE = new InterfaceVpcEndpointAwsService('kinesis-firehose');
public static readonly KMS = new InterfaceVpcEndpointAwsService('kms');
public static readonly KMS_FIPS = new InterfaceVpcEndpointAwsService('kms-fips');
Expand Down Expand Up @@ -485,6 +490,8 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
public static readonly OMICS_TAGS = new InterfaceVpcEndpointAwsService('tags-omics');
public static readonly OMICS_WORKFLOWS = new InterfaceVpcEndpointAwsService('workflows-omics');
public static readonly PANORAMA = new InterfaceVpcEndpointAwsService('panorama');
public static readonly PARALLEL_COMPUTING_SERVICE = new InterfaceVpcEndpointAwsService('pcs');
public static readonly PARALLEL_COMPUTING_SERVICE_FIPS = new InterfaceVpcEndpointAwsService('pcs-fips');
public static readonly PAYMENT_CRYPTOGRAPHY_CONTROLPLANE = new InterfaceVpcEndpointAwsService('payment-cryptography.controlplane');
public static readonly PAYMENT_CRYTOGRAPHY_DATAPLANE = new InterfaceVpcEndpointAwsService('payment-cryptography.dataplane');
public static readonly PERSONALIZE = new InterfaceVpcEndpointAwsService('personalize');
Expand All @@ -505,12 +512,16 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
public static readonly PROMETHEUS_WORKSPACES = new InterfaceVpcEndpointAwsService('aps-workspaces');
public static readonly PROTON = new InterfaceVpcEndpointAwsService('proton');
public static readonly Q_BUSSINESS = new InterfaceVpcEndpointAwsService('qbusiness', 'aws.api');
public static readonly Q_DEVELOPER = new InterfaceVpcEndpointAwsService('q');
public static readonly Q_DEVELOPER_CODE_WHISPERER = new InterfaceVpcEndpointAwsService('codewhisperer');
public static readonly Q_DEVELOPER_QAPPS = new InterfaceVpcEndpointAwsService('qapps');
public static readonly Q_USER_SUBSCRIPTIONS = new InterfaceVpcEndpointAwsService('service.user-subscriptions');
public static readonly QLDB = new InterfaceVpcEndpointAwsService('qldb.session');
public static readonly QUICKSIGHT_WEBSITE = new InterfaceVpcEndpointAwsService('quicksight-website');
public static readonly RDS = new InterfaceVpcEndpointAwsService('rds');
public static readonly RDS_DATA = new InterfaceVpcEndpointAwsService('rds-data');
public static readonly RDS_PERFORMANCE_INSIGHTS = new InterfaceVpcEndpointAwsService('pi');
public static readonly RDS_PERFORMANCE_INSIGHTS_FIPS = new InterfaceVpcEndpointAwsService('pi-fips');
public static readonly REDSHIFT = new InterfaceVpcEndpointAwsService('redshift');
public static readonly REDSHIFT_FIPS = new InterfaceVpcEndpointAwsService('redshift-fips');
public static readonly REDSHIFT_DATA = new InterfaceVpcEndpointAwsService('redshift-data');
Expand All @@ -523,6 +534,7 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
public static readonly REKOGNITION_STREAMING_FIPS = new InterfaceVpcEndpointAwsService('streaming-rekognition-fips');
public static readonly REPOST_SPACE = new InterfaceVpcEndpointAwsService('repostspace');
public static readonly ROBOMAKER = new InterfaceVpcEndpointAwsService('robomaker');
public static readonly RECYCLE_BIN = new InterfaceVpcEndpointAwsService('rbin');
public static readonly S3 = new InterfaceVpcEndpointAwsService('s3');
public static readonly S3_OUTPOSTS = new InterfaceVpcEndpointAwsService('s3-outposts');
public static readonly S3_MULTI_REGION_ACCESS_POINTS = new InterfaceVpcEndpointAwsService('s3-global.accesspoint', 'com.amazonaws', undefined, { global: true });
Expand All @@ -548,9 +560,11 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
public static readonly SNS = new InterfaceVpcEndpointAwsService('sns');
public static readonly SQS = new InterfaceVpcEndpointAwsService('sqs');
public static readonly SSM = new InterfaceVpcEndpointAwsService('ssm');
public static readonly SSM_FIPS = new InterfaceVpcEndpointAwsService('ssm-fips');
public static readonly SSM_MESSAGES = new InterfaceVpcEndpointAwsService('ssmmessages');
public static readonly SSM_CONTACTS = new InterfaceVpcEndpointAwsService('ssm-contacts');
public static readonly SSM_INCIDENTS = new InterfaceVpcEndpointAwsService('ssm-incidents');
public static readonly SSM_QUICK_SETUP = new InterfaceVpcEndpointAwsService('ssm-quicksetup');
public static readonly STEP_FUNCTIONS = new InterfaceVpcEndpointAwsService('states');
public static readonly STEP_FUNCTIONS_SYNC = new InterfaceVpcEndpointAwsService('sync-states');
public static readonly STORAGE_GATEWAY = new InterfaceVpcEndpointAwsService('storagegateway');
Expand All @@ -562,12 +576,14 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
public static readonly TEXTRACT = new InterfaceVpcEndpointAwsService('textract');
public static readonly TEXTRACT_FIPS = new InterfaceVpcEndpointAwsService('textract-fips');
public static readonly TIMESTREAM_INFLUXDB = new InterfaceVpcEndpointAwsService('timestream-influxdb');
public static readonly TIMESTREAM_INFLUXDB_FIPS = new InterfaceVpcEndpointAwsService('timestream-influxdb-fips');
public static readonly TRANSCRIBE = new InterfaceVpcEndpointAwsService('transcribe');
public static readonly TRANSCRIBE_STREAMING = new InterfaceVpcEndpointAwsService('transcribestreaming');
public static readonly TRANSFER = new InterfaceVpcEndpointAwsService('transfer');
public static readonly TRANSFER_SERVER = new InterfaceVpcEndpointAwsService('transfer.server');
public static readonly TRANSLATE = new InterfaceVpcEndpointAwsService('translate');
public static readonly TRUSTED_ADVISOR = new InterfaceVpcEndpointAwsService('trustedadvisor');
public static readonly WELL_ARCHITECTED_TOOL = new InterfaceVpcEndpointAwsService('wellarchitected');
public static readonly WORKSPACES = new InterfaceVpcEndpointAwsService('workspaces');
public static readonly WORKSPACES_THIN_CLIENT = new InterfaceVpcEndpointAwsService('thinclient.api');
public static readonly XRAY = new InterfaceVpcEndpointAwsService('xray');
Expand Down

0 comments on commit 0d69703

Please sign in to comment.