Skip to content

Commit be5594c

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into automation/spec-update
2 parents c2940b5 + 01393c4 commit be5594c

5 files changed

Lines changed: 204 additions & 4 deletions

File tree

‎packages/@aws-cdk/aws-neptune-alpha/lib/cluster.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,14 @@ export class EngineVersion {
7676
* Neptune engine version 1.2.1.0
7777
*/
7878
public static readonly V1_2_1_0 = new EngineVersion('1.2.1.0');
79+
/**
80+
* Neptune engine version 1.2.1.1
81+
*/
82+
public static readonly V1_2_1_1 = new EngineVersion('1.2.1.1');
83+
/**
84+
* Neptune engine version 1.2.1.2
85+
*/
86+
public static readonly V1_2_1_2 = new EngineVersion('1.2.1.2');
7987
/**
8088
* Neptune engine version 1.3.0.0
8189
*/
@@ -84,6 +92,18 @@ export class EngineVersion {
8492
* Neptune engine version 1.3.1.0
8593
*/
8694
public static readonly V1_3_1_0 = new EngineVersion('1.3.1.0');
95+
/**
96+
* Neptune engine version 1.3.2.0
97+
*/
98+
public static readonly V1_3_2_0 = new EngineVersion('1.3.2.0');
99+
/**
100+
* Neptune engine version 1.3.2.1
101+
*/
102+
public static readonly V1_3_2_1 = new EngineVersion('1.3.2.1');
103+
/**
104+
* Neptune engine version 1.3.3.0
105+
*/
106+
public static readonly V1_3_3_0 = new EngineVersion('1.3.3.0');
87107

88108
/**
89109
* Constructor for specifying a custom engine version

‎packages/@aws-cdk/aws-neptune-alpha/lib/instance.ts‎

Lines changed: 161 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,75 @@ import { IParameterGroup } from './parameter-group';
1212
* used for defining `DatabaseInstanceProps.instanceType`.
1313
*/
1414
export class InstanceType {
15+
/**
16+
* db.x2g.large
17+
*/
18+
public static readonly X2G_LARGE = InstanceType.of('db.x2g.large');
19+
20+
/**
21+
* db.x2g.xlarge
22+
*/
23+
public static readonly X2G_XLARGE = InstanceType.of('db.x2g.xlarge');
24+
25+
/**
26+
* db.x2g.2xlarge
27+
*/
28+
public static readonly X2G_2XLARGE = InstanceType.of('db.x2g.2xlarge');
29+
30+
/**
31+
* db.x2g.4xlarge
32+
*/
33+
public static readonly X2G_4XLARGE = InstanceType.of('db.x2g.4xlarge');
34+
35+
/**
36+
* db.x2g.8xlarge
37+
*/
38+
public static readonly X2G_8XLARGE = InstanceType.of('db.x2g.8xlarge');
39+
40+
/**
41+
* db.x2g.12xlarge
42+
*/
43+
public static readonly X2G_12XLARGE = InstanceType.of('db.x2g.12xlarge');
44+
45+
/**
46+
* db.x2g.16xlarge
47+
*/
48+
public static readonly X2G_16XLARGE = InstanceType.of('db.x2g.16xlarge');
49+
50+
/**
51+
* db.x2iedn.xlarge
52+
*/
53+
public static readonly X2IEDN_XLARGE = InstanceType.of('db.x2iedn.xlarge');
54+
55+
/**
56+
* db.x2iedn.2xlarge
57+
*/
58+
public static readonly X2IEDN_2XLARGE = InstanceType.of('db.x2iedn.2xlarge');
59+
60+
/**
61+
* db.x2iedn.4xlarge
62+
*/
63+
public static readonly X2IEDN_4XLARGE = InstanceType.of('db.x2iedn.4xlarge');
64+
65+
/**
66+
* db.x2iedn.8xlarge
67+
*/
68+
public static readonly X2IEDN_8XLARGE = InstanceType.of('db.x2iedn.8xlarge');
69+
70+
/**
71+
* db.x2iedn.16xlarge
72+
*/
73+
public static readonly X2IEDN_16XLARGE = InstanceType.of('db.x2iedn.16xlarge');
74+
75+
/**
76+
* db.x2iedn.24xlarge
77+
*/
78+
public static readonly X2IEDN_24XLARGE = InstanceType.of('db.x2iedn.24xlarge');
79+
80+
/**
81+
* db.x2iedn.32xlarge
82+
*/
83+
public static readonly X2IEDN_32XLARGE = InstanceType.of('db.x2iedn.32xlarge');
1584

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

51120
/**
52-
* db.t4g.medium
121+
* db.r6i.large
53122
*/
54-
public static readonly T4G_MEDIUM = InstanceType.of('db.t4g.medium');
123+
public static readonly R6I_LARGE = InstanceType.of('db.r6i.large');
124+
125+
/**
126+
* db.r6i.xlarge
127+
*/
128+
public static readonly R6I_XLARGE = InstanceType.of('db.r6i.xlarge');
129+
130+
/**
131+
* db.r6i.2xlarge
132+
*/
133+
public static readonly R6I_2XLARGE = InstanceType.of('db.r6i.2xlarge');
134+
135+
/**
136+
* db.r6i.4xlarge
137+
*/
138+
public static readonly R6I_4XLARGE = InstanceType.of('db.r6i.4xlarge');
139+
140+
/**
141+
* db.r6i.8xlarge
142+
*/
143+
public static readonly R6I_8XLARGE = InstanceType.of('db.r6i.8xlarge');
144+
145+
/**
146+
* db.r6i.12xlarge
147+
*/
148+
public static readonly R6I_12XLARGE = InstanceType.of('db.r6i.12xlarge');
149+
150+
/**
151+
* db.r6i.16xlarge
152+
*/
153+
public static readonly R6I_16XLARGE = InstanceType.of('db.r6i.16xlarge');
154+
155+
/**
156+
* db.r6i.24xlarge
157+
*/
158+
public static readonly R6I_24XLARGE = InstanceType.of('db.r6i.24xlarge');
159+
160+
/**
161+
* db.r6i.32xlarge
162+
*/
163+
public static readonly R6I_32XLARGE = InstanceType.of('db.r6i.32xlarge');
55164

56165
/**
57166
* db.r5.large
@@ -83,11 +192,56 @@ export class InstanceType {
83192
*/
84193
public static readonly R5_12XLARGE = InstanceType.of('db.r5.12xlarge');
85194

195+
/**
196+
* db.r5.16xlarge
197+
*/
198+
public static readonly R5_16XLARGE = InstanceType.of('db.r5.16xlarge');
199+
86200
/**
87201
* db.r5.24xlarge
88202
*/
89203
public static readonly R5_24XLARGE = InstanceType.of('db.r5.24xlarge');
90204

205+
/**
206+
* db.r5d.large
207+
*/
208+
public static readonly R5D_LARGE = InstanceType.of('db.r5d.large');
209+
210+
/**
211+
* db.r5d.xlarge
212+
*/
213+
public static readonly R5D_XLARGE = InstanceType.of('db.r5d.xlarge');
214+
215+
/**
216+
* db.r5d.2xlarge
217+
*/
218+
public static readonly R5D_2XLARGE = InstanceType.of('db.r5d.2xlarge');
219+
220+
/**
221+
* db.r5d.4xlarge
222+
*/
223+
public static readonly R5D_4XLARGE = InstanceType.of('db.r5d.4xlarge');
224+
225+
/**
226+
* db.r5d.8xlarge
227+
*/
228+
public static readonly R5D_8XLARGE = InstanceType.of('db.r5d.8xlarge');
229+
230+
/**
231+
* db.r5d.12xlarge
232+
*/
233+
public static readonly R5D_12XLARGE = InstanceType.of('db.r5d.12xlarge');
234+
235+
/**
236+
* db.r5d.16xlarge
237+
*/
238+
public static readonly R5D_16XLARGE = InstanceType.of('db.r5d.16xlarge');
239+
240+
/**
241+
* db.r5d.24xlarge
242+
*/
243+
public static readonly R5D_24XLARGE = InstanceType.of('db.r5d.24xlarge');
244+
91245
/**
92246
* db.r4.large
93247
*/
@@ -113,6 +267,11 @@ export class InstanceType {
113267
*/
114268
public static readonly R4_8XLARGE = InstanceType.of('db.r4.8xlarge');
115269

270+
/**
271+
* db.t4g.medium
272+
*/
273+
public static readonly T4G_MEDIUM = InstanceType.of('db.t4g.medium');
274+
116275
/**
117276
* db.t3.medium
118277
*/

‎packages/aws-cdk-lib/aws-cloudfront/lib/distribution.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import * as cloudwatch from '../../aws-cloudwatch';
1515
import * as iam from '../../aws-iam';
1616
import * as lambda from '../../aws-lambda';
1717
import * as s3 from '../../aws-s3';
18-
import { ArnFormat, IResource, Lazy, Resource, Stack, Token, Duration, Names, FeatureFlags } from '../../core';
18+
import { ArnFormat, IResource, Lazy, Resource, Stack, Token, Duration, Names, FeatureFlags, Annotations } from '../../core';
1919
import { CLOUDFRONT_DEFAULT_SECURITY_POLICY_TLS_V1_2_2021 } from '../../cx-api';
2020

2121
/**
@@ -321,6 +321,10 @@ export class Distribution extends Resource implements IDistribution {
321321
if (!Token.isUnresolved(certificateRegion) && certificateRegion !== 'us-east-1') {
322322
throw new Error(`Distribution certificates must be in the us-east-1 region and the certificate you provided is in ${certificateRegion}.`);
323323
}
324+
325+
if ((props.domainNames ?? []).length === 0) {
326+
Annotations.of(this).addWarningV2('@aws-cdk/aws-cloudfront:emptyDomainNames', 'No domain names are specified. You will need to specify it after running associate-alias CLI command manually. See the "Moving an alternate domain name to a different distribution" section of module\'s README for more info.');
327+
}
324328
}
325329

326330
const originId = this.addOrigin(props.defaultBehavior.origin);

‎packages/aws-cdk-lib/aws-cloudfront/test/distribution.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defaultOrigin, defaultOriginGroup } from './test-origin';
2-
import { Match, Template } from '../../assertions';
2+
import { Annotations, Match, Template } from '../../assertions';
33
import * as acm from '../../aws-certificatemanager';
44
import * as cloudwatch from '../../aws-cloudwatch';
55
import * as iam from '../../aws-iam';
@@ -473,6 +473,7 @@ describe('certificates', () => {
473473
},
474474
},
475475
});
476+
Annotations.fromStack(stack).hasWarning('/Stack/Dist1', 'No domain names are specified. You will need to specify it after running associate-alias CLI command manually. See the "Moving an alternate domain name to a different distribution" section of module\'s README for more info. [ack: @aws-cdk/aws-cloudfront:emptyDomainNames]');
476477
});
477478

478479
test('use the TLSv1.2_2021 security policy by default', () => {

‎packages/aws-cdk-lib/aws-ec2/lib/vpc-endpoint.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,9 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
275275
public static readonly ACCESS_ANALYZER = new InterfaceVpcEndpointAwsService('access-analyzer');
276276
public static readonly ACCOUNT_MANAGEMENT = new InterfaceVpcEndpointAwsService('account');
277277
public static readonly AIRFLOW_API = new InterfaceVpcEndpointAwsService('airflow.api');
278+
public static readonly AIRFLOW_API_FIPS = new InterfaceVpcEndpointAwsService('airflow.api-fips');
278279
public static readonly AIRFLOW_ENV = new InterfaceVpcEndpointAwsService('airflow.env');
280+
public static readonly AIRFLOW_ENV_FIPS = new InterfaceVpcEndpointAwsService('airflow.env-fips');
279281
public static readonly AIRFLOW_OPS = new InterfaceVpcEndpointAwsService('airflow.ops');
280282
public static readonly APIGATEWAY = new InterfaceVpcEndpointAwsService('execute-api');
281283
/** @deprecated - Use InterfaceVpcEndpointAwsService.APP_MESH_ENVOY_MANAGEMENT instead. */
@@ -323,6 +325,7 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
323325
public static readonly CODEWHISPERER = new InterfaceVpcEndpointAwsService('codewhisperer');
324326
/** @deprecated - Use InterfaceVpcEndpointAwsService.CLOUDWATCH_MONITORING instead. */
325327
public static readonly CLOUDWATCH = new InterfaceVpcEndpointAwsService('monitoring');
328+
public static readonly CLOUDWATCH_APPLICATION_INSIGHTS = new InterfaceVpcEndpointAwsService('applicationinsights');
326329
public static readonly CLOUDWATCH_APPLICATION_SIGNALS = new InterfaceVpcEndpointAwsService('application-signals');
327330
/** @deprecated - Use InterfaceVpcEndpointAwsService.EVENTBRIDGE instead. */
328331
public static readonly CLOUDWATCH_EVENTS = new InterfaceVpcEndpointAwsService('events');
@@ -395,6 +398,7 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
395398
public static readonly EMR = new InterfaceVpcEndpointAwsService('elasticmapreduce');
396399
public static readonly EMR_EKS = new InterfaceVpcEndpointAwsService('emr-containers');
397400
public static readonly EMR_SERVERLESS = new InterfaceVpcEndpointAwsService('emr-serverless');
401+
public static readonly EMR_SERVERLESS_LIVY = new InterfaceVpcEndpointAwsService('emr-serverless-services.livy');
398402
public static readonly EMR_WAL = new InterfaceVpcEndpointAwsService('emrwal.prod');
399403
public static readonly ENTITY_RESOLUTION = new InterfaceVpcEndpointAwsService('entityresolution');
400404
public static readonly EVENTBRIDGE = new InterfaceVpcEndpointAwsService('events');
@@ -446,6 +450,7 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
446450
public static readonly KEYSPACES = new InterfaceVpcEndpointAwsService('cassandra', '', 9142);
447451
public static readonly KEYSPACES_FIPS = new InterfaceVpcEndpointAwsService('cassandra-fips', '', 9142);
448452
public static readonly KINESIS_STREAMS = new InterfaceVpcEndpointAwsService('kinesis-streams');
453+
public static readonly KINESIS_STREAMS_FIPS = new InterfaceVpcEndpointAwsService('kinesis-streams-fips');
449454
public static readonly KINESIS_FIREHOSE = new InterfaceVpcEndpointAwsService('kinesis-firehose');
450455
public static readonly KMS = new InterfaceVpcEndpointAwsService('kms');
451456
public static readonly KMS_FIPS = new InterfaceVpcEndpointAwsService('kms-fips');
@@ -485,6 +490,8 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
485490
public static readonly OMICS_TAGS = new InterfaceVpcEndpointAwsService('tags-omics');
486491
public static readonly OMICS_WORKFLOWS = new InterfaceVpcEndpointAwsService('workflows-omics');
487492
public static readonly PANORAMA = new InterfaceVpcEndpointAwsService('panorama');
493+
public static readonly PARALLEL_COMPUTING_SERVICE = new InterfaceVpcEndpointAwsService('pcs');
494+
public static readonly PARALLEL_COMPUTING_SERVICE_FIPS = new InterfaceVpcEndpointAwsService('pcs-fips');
488495
public static readonly PAYMENT_CRYPTOGRAPHY_CONTROLPLANE = new InterfaceVpcEndpointAwsService('payment-cryptography.controlplane');
489496
public static readonly PAYMENT_CRYTOGRAPHY_DATAPLANE = new InterfaceVpcEndpointAwsService('payment-cryptography.dataplane');
490497
public static readonly PERSONALIZE = new InterfaceVpcEndpointAwsService('personalize');
@@ -505,12 +512,16 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
505512
public static readonly PROMETHEUS_WORKSPACES = new InterfaceVpcEndpointAwsService('aps-workspaces');
506513
public static readonly PROTON = new InterfaceVpcEndpointAwsService('proton');
507514
public static readonly Q_BUSSINESS = new InterfaceVpcEndpointAwsService('qbusiness', 'aws.api');
515+
public static readonly Q_DEVELOPER = new InterfaceVpcEndpointAwsService('q');
508516
public static readonly Q_DEVELOPER_CODE_WHISPERER = new InterfaceVpcEndpointAwsService('codewhisperer');
509517
public static readonly Q_DEVELOPER_QAPPS = new InterfaceVpcEndpointAwsService('qapps');
518+
public static readonly Q_USER_SUBSCRIPTIONS = new InterfaceVpcEndpointAwsService('service.user-subscriptions');
510519
public static readonly QLDB = new InterfaceVpcEndpointAwsService('qldb.session');
511520
public static readonly QUICKSIGHT_WEBSITE = new InterfaceVpcEndpointAwsService('quicksight-website');
512521
public static readonly RDS = new InterfaceVpcEndpointAwsService('rds');
513522
public static readonly RDS_DATA = new InterfaceVpcEndpointAwsService('rds-data');
523+
public static readonly RDS_PERFORMANCE_INSIGHTS = new InterfaceVpcEndpointAwsService('pi');
524+
public static readonly RDS_PERFORMANCE_INSIGHTS_FIPS = new InterfaceVpcEndpointAwsService('pi-fips');
514525
public static readonly REDSHIFT = new InterfaceVpcEndpointAwsService('redshift');
515526
public static readonly REDSHIFT_FIPS = new InterfaceVpcEndpointAwsService('redshift-fips');
516527
public static readonly REDSHIFT_DATA = new InterfaceVpcEndpointAwsService('redshift-data');
@@ -523,6 +534,7 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
523534
public static readonly REKOGNITION_STREAMING_FIPS = new InterfaceVpcEndpointAwsService('streaming-rekognition-fips');
524535
public static readonly REPOST_SPACE = new InterfaceVpcEndpointAwsService('repostspace');
525536
public static readonly ROBOMAKER = new InterfaceVpcEndpointAwsService('robomaker');
537+
public static readonly RECYCLE_BIN = new InterfaceVpcEndpointAwsService('rbin');
526538
public static readonly S3 = new InterfaceVpcEndpointAwsService('s3');
527539
public static readonly S3_OUTPOSTS = new InterfaceVpcEndpointAwsService('s3-outposts');
528540
public static readonly S3_MULTI_REGION_ACCESS_POINTS = new InterfaceVpcEndpointAwsService('s3-global.accesspoint', 'com.amazonaws', undefined, { global: true });
@@ -548,9 +560,11 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
548560
public static readonly SNS = new InterfaceVpcEndpointAwsService('sns');
549561
public static readonly SQS = new InterfaceVpcEndpointAwsService('sqs');
550562
public static readonly SSM = new InterfaceVpcEndpointAwsService('ssm');
563+
public static readonly SSM_FIPS = new InterfaceVpcEndpointAwsService('ssm-fips');
551564
public static readonly SSM_MESSAGES = new InterfaceVpcEndpointAwsService('ssmmessages');
552565
public static readonly SSM_CONTACTS = new InterfaceVpcEndpointAwsService('ssm-contacts');
553566
public static readonly SSM_INCIDENTS = new InterfaceVpcEndpointAwsService('ssm-incidents');
567+
public static readonly SSM_QUICK_SETUP = new InterfaceVpcEndpointAwsService('ssm-quicksetup');
554568
public static readonly STEP_FUNCTIONS = new InterfaceVpcEndpointAwsService('states');
555569
public static readonly STEP_FUNCTIONS_SYNC = new InterfaceVpcEndpointAwsService('sync-states');
556570
public static readonly STORAGE_GATEWAY = new InterfaceVpcEndpointAwsService('storagegateway');
@@ -562,12 +576,14 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
562576
public static readonly TEXTRACT = new InterfaceVpcEndpointAwsService('textract');
563577
public static readonly TEXTRACT_FIPS = new InterfaceVpcEndpointAwsService('textract-fips');
564578
public static readonly TIMESTREAM_INFLUXDB = new InterfaceVpcEndpointAwsService('timestream-influxdb');
579+
public static readonly TIMESTREAM_INFLUXDB_FIPS = new InterfaceVpcEndpointAwsService('timestream-influxdb-fips');
565580
public static readonly TRANSCRIBE = new InterfaceVpcEndpointAwsService('transcribe');
566581
public static readonly TRANSCRIBE_STREAMING = new InterfaceVpcEndpointAwsService('transcribestreaming');
567582
public static readonly TRANSFER = new InterfaceVpcEndpointAwsService('transfer');
568583
public static readonly TRANSFER_SERVER = new InterfaceVpcEndpointAwsService('transfer.server');
569584
public static readonly TRANSLATE = new InterfaceVpcEndpointAwsService('translate');
570585
public static readonly TRUSTED_ADVISOR = new InterfaceVpcEndpointAwsService('trustedadvisor');
586+
public static readonly WELL_ARCHITECTED_TOOL = new InterfaceVpcEndpointAwsService('wellarchitected');
571587
public static readonly WORKSPACES = new InterfaceVpcEndpointAwsService('workspaces');
572588
public static readonly WORKSPACES_THIN_CLIENT = new InterfaceVpcEndpointAwsService('thinclient.api');
573589
public static readonly XRAY = new InterfaceVpcEndpointAwsService('xray');

0 commit comments

Comments
 (0)