Skip to content

Commit b169227

Browse files
authored
Merge branch 'main' into shikagg/bundling-root-user
2 parents ca51dda + 6c882e0 commit b169227

File tree

35 files changed

+1071
-120
lines changed

35 files changed

+1071
-120
lines changed

.github/workflows/spec-update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
# Pull Request details
155155
title: "feat: update L1 CloudFormation resource definitions"
156156
body-path: ${{ runner.temp }}/PR.md
157-
labels: contribution/core,dependencies,auto-approve,pr-linter/exempt-integ-test,pr-linter/exempt-readme,pr-linter/exempt-test
157+
labels: contribution/core,dependencies,pr-linter/exempt-integ-test,pr-linter/exempt-readme,pr-linter/exempt-test
158158
team-reviewers: aws-cdk-team
159159
# Github prevents further Github actions to be run if the default Github token is used.
160160
# Instead use a privileged token here, so further GH actions can be triggered on this PR.

packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-group.js.snapshot/aws-cdk-log-group-integ.assets.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-group.js.snapshot/aws-cdk-log-group-integ.template.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,14 @@
112112
]
113113
}
114114
},
115+
"FieldIndexPolicies": [
116+
{
117+
"Fields": [
118+
"Operation",
119+
"RequestId"
120+
]
121+
}
122+
],
115123
"RetentionInDays": 731
116124
},
117125
"UpdateReplacePolicy": "Retain",

packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-group.js.snapshot/manifest.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-group.js.snapshot/tree.json

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-group.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Bucket } from 'aws-cdk-lib/aws-s3';
22
import { App, Stack, StackProps } from 'aws-cdk-lib';
33
import { IntegTest } from '@aws-cdk/integ-tests-alpha';
4-
import { LogGroup, DataProtectionPolicy, DataIdentifier, CustomDataIdentifier } from 'aws-cdk-lib/aws-logs';
4+
import { LogGroup, DataProtectionPolicy, DataIdentifier, CustomDataIdentifier, FieldIndexPolicy } from 'aws-cdk-lib/aws-logs';
55

66
class LogGroupIntegStack extends Stack {
77
constructor(scope: App, id: string, props?: StackProps) {
@@ -19,8 +19,13 @@ class LogGroupIntegStack extends Stack {
1919
s3BucketAuditDestination: bucket,
2020
});
2121

22+
const fieldIndexPolicy = new FieldIndexPolicy({
23+
fields: ['Operation', 'RequestId'],
24+
});
25+
2226
new LogGroup(this, 'LogGroupLambda', {
2327
dataProtectionPolicy: dataProtectionPolicy,
28+
fieldIndexPolicies: [fieldIndexPolicy],
2429
});
2530
}
2631
}

packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/lib/types.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,18 @@ export class Runtime {
7575
/** Flink Version 1.20 */
7676
public static readonly FLINK_1_20 = Runtime.of('FLINK-1_20');
7777

78+
/** Zeppelin Flink Version 3.0 */
79+
public static readonly ZEPPELIN_FLINK_3_0 = Runtime.of('ZEPPELIN-FLINK-3_0');
80+
81+
/** Zeppelin Flink Version 2.0 */
82+
public static readonly ZEPPELIN_FLINK_2_0 = Runtime.of('ZEPPELIN-FLINK-2_0');
83+
84+
/** Zeppelin Flink Version 1.0 */
85+
public static readonly ZEPPELIN_FLINK_1_0 = Runtime.of('ZEPPELIN-FLINK-1_0');
86+
87+
/** SQL Version 1.0 */
88+
public static readonly SQL_1_0 = Runtime.of('SQL-1_0');
89+
7890
/** Create a new Runtime with with an arbitrary Flink version string */
7991
public static of(value: string) {
8092
return new Runtime(value);

packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/lib/common.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ export class Compression {
2828
* ZIP
2929
*/
3030
public static readonly ZIP = new Compression('ZIP');
31+
/**
32+
* Uncompressed
33+
*/
34+
public static readonly UNCOMPRESSED = new Compression('UNCOMPRESSED');
3135

3236
/**
3337
* Creates a new Compression instance with a custom value.

packages/@aws-cdk/aws-scheduler-alpha/README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,22 +100,22 @@ const oneTimeSchedule = new Schedule(this, 'Schedule', {
100100
Your AWS account comes with a default scheduler group. You can access the default group in CDK with:
101101

102102
```ts
103-
const defaultGroup = Group.fromDefaultGroup(this, "DefaultGroup");
103+
const defaultScheduleGroup = ScheduleGroup.fromDefaultScheduleGroup(this, "DefaultGroup");
104104
```
105105

106106
You can add a schedule to a custom scheduling group managed by you. If a custom group is not specified, the schedule is added to the default group.
107107

108108
```ts
109109
declare const target: targets.LambdaInvoke;
110110

111-
const group = new Group(this, "Group", {
112-
groupName: "MyGroup",
111+
const scheduleGroup = new ScheduleGroup(this, "ScheduleGroup", {
112+
scheduleGroupName: "MyScheduleGroup",
113113
});
114114

115115
new Schedule(this, 'Schedule', {
116116
schedule: ScheduleExpression.rate(Duration.minutes(10)),
117117
target,
118-
group,
118+
scheduleGroup,
119119
});
120120
```
121121

@@ -300,25 +300,25 @@ new cloudwatch.Alarm(this, 'SchedulesErrorAlarm', {
300300
});
301301
```
302302

303-
### Metrics for a Group
303+
### Metrics for a Schedule Group
304304

305-
To view metrics for a specific group you can use methods on class `Group`:
305+
To view metrics for a specific group you can use methods on class `ScheduleGroup`:
306306

307307
```ts
308-
const group = new Group(this, "Group", {
309-
groupName: "MyGroup",
308+
const scheduleGroup = new ScheduleGroup(this, "ScheduleGroup", {
309+
scheduleGroupName: "MyScheduleGroup",
310310
});
311311

312312
new cloudwatch.Alarm(this, 'MyGroupErrorAlarm', {
313-
metric: group.metricTargetErrors(),
313+
metric: scheduleGroup.metricTargetErrors(),
314314
evaluationPeriods: 1,
315315
threshold: 0
316316
});
317317

318318
// Or use default group
319-
const defaultGroup = Group.fromDefaultGroup(this, "DefaultGroup");
320-
new cloudwatch.Alarm(this, 'DefaultGroupErrorAlarm', {
321-
metric: defaultGroup.metricTargetErrors(),
319+
const defaultScheduleGroup = ScheduleGroup.fromDefaultScheduleGroup(this, "DefaultScheduleGroup");
320+
new cloudwatch.Alarm(this, 'DefaultScheduleGroupErrorAlarm', {
321+
metric: defaultScheduleGroup.metricTargetErrors(),
322322
evaluationPeriods: 1,
323323
threshold: 0
324324
});
Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
11
{
22
"exclude": [
3-
"construct-ctor-props-optional:@aws-cdk/aws-scheduler-alpha.Group",
43
"props-physical-name:@aws-cdk/aws-scheduler-alpha.GroupProps",
5-
"from-method:@aws-cdk/aws-scheduler-alpha.Schedule",
6-
"attribute-tag:@aws-cdk/aws-scheduler-alpha.Schedule.scheduleArn",
7-
"attribute-tag:@aws-cdk/aws-scheduler-alpha.Schedule.scheduleName",
4+
"attribute-tag:@aws-cdk/aws-scheduler-alpha.Schedule.scheduleGroup",
85
"docs-public-apis:@aws-cdk/aws-scheduler-alpha.ContextAttribute.name",
96
"docs-public-apis:@aws-cdk/aws-scheduler-alpha.Group",
107
"docs-public-apis:@aws-cdk/aws-scheduler-alpha.GroupProps",
11-
"docs-public-apis:@aws-cdk/aws-scheduler-alpha.IGroup",
12-
"props-default-doc:@aws-cdk/aws-scheduler-alpha.ScheduleProps.targetOverrides",
13-
"props-default-doc:@aws-cdk/aws-scheduler-alpha.ScheduleTargetConfig.deadLetterConfig",
14-
"props-default-doc:@aws-cdk/aws-scheduler-alpha.ScheduleTargetConfig.ecsParameters",
15-
"props-default-doc:@aws-cdk/aws-scheduler-alpha.ScheduleTargetConfig.eventBridgeParameters",
16-
"props-default-doc:@aws-cdk/aws-scheduler-alpha.ScheduleTargetConfig.input",
17-
"props-default-doc:@aws-cdk/aws-scheduler-alpha.ScheduleTargetConfig.kinesisParameters",
18-
"props-default-doc:@aws-cdk/aws-scheduler-alpha.ScheduleTargetConfig.retryPolicy",
19-
"props-default-doc:@aws-cdk/aws-scheduler-alpha.ScheduleTargetConfig.sageMakerPipelineParameters",
20-
"props-default-doc:@aws-cdk/aws-scheduler-alpha.ScheduleTargetConfig.sqsParameters",
21-
"docs-public-apis:@aws-cdk/aws-scheduler-alpha.ScheduleTargetProps"
8+
"docs-public-apis:@aws-cdk/aws-scheduler-alpha.IGroup"
229
]
2310
}

0 commit comments

Comments
 (0)