Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(kinesisanalytics-flink): add support for Flink 1.19 #30723

Merged
merged 6 commits into from
Jul 31, 2024
Merged

feat(kinesisanalytics-flink): add support for Flink 1.19 #30723

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4629921
feat(kinesisanalytics-flink): add support for Flink 1.19
clementallen Jul 1, 2024
96acff2
Updated flink integ tests
clementallen Jul 1, 2024
a5533c1
Merge branch 'main' into flink_1_19
clementallen Jul 1, 2024
5ddbb02
Fixed flink version in failing test assertion
clementallen Jul 1, 2024
9d1eb64
Merge branch 'main' into flink_1_19
TheRealAmazonKendra Jul 31, 2024
39ca1ae
Merge branch 'main' into flink_1_19
mergify[bot] Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Kinesis Analytics Flink
# Kinesis Analytics Flink
<!--BEGIN STABILITY BANNER-->

---
Expand Down Expand Up @@ -46,7 +46,7 @@ const flinkApp = new flink.Application(this, 'Application', {
},
},
// ...
runtime: flink.Runtime.FLINK_1_18,
runtime: flink.Runtime.FLINK_1_19,
code: flink.ApplicationCode.fromBucket(bucket, 'my-app.jar'),
});
```
Expand All @@ -59,7 +59,7 @@ snapshotting, monitoring, and parallelism.
declare const bucket: s3.Bucket;
const flinkApp = new flink.Application(this, 'Application', {
code: flink.ApplicationCode.fromBucket(bucket, 'my-app.jar'),
runtime: flink.Runtime.FLINK_1_18,
runtime: flink.Runtime.FLINK_1_19,
checkpointingEnabled: true, // default is true
checkpointInterval: Duration.seconds(30), // default is 1 minute
minPauseBetweenCheckpoints: Duration.seconds(10), // default is 5 seconds
Expand All @@ -80,7 +80,7 @@ declare const bucket: s3.Bucket;
declare const vpc: ec2.Vpc;
const flinkApp = new flink.Application(this, 'Application', {
code: flink.ApplicationCode.fromBucket(bucket, 'my-app.jar'),
runtime: flink.Runtime.FLINK_1_18,
runtime: flink.Runtime.FLINK_1_19,
vpc,
});
```
3 changes: 3 additions & 0 deletions packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/lib/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ export class Runtime {
/** Flink Version 1.18 */
public static readonly FLINK_1_18 = Runtime.of('FLINK-1_18');

/** Flink Version 1.19 */
public static readonly FLINK_1_19 = Runtime.of('FLINK-1_19');

/** Create a new Runtime with with an arbitrary Flink version string */
public static of(value: string) {
return new Runtime(value);
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/application.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@ describe('Application', () => {
stack = new core.Stack();
bucket = new s3.Bucket(stack, 'CodeBucket');
requiredProps = {
runtime: flink.Runtime.FLINK_1_11,
runtime: flink.Runtime.FLINK_1_19,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: For future references, I would prefer to have this as parameterized tests to cover both existing and new runtime.

code: flink.ApplicationCode.fromBucket(bucket, 'my-app.jar'),
};
});

test('default Flink Application', () => {
new flink.Application(stack, 'FlinkApplication', {
runtime: flink.Runtime.FLINK_1_11,
runtime: flink.Runtime.FLINK_1_19,
code: flink.ApplicationCode.fromBucket(bucket, 'my-app.jar'),
applicationName: 'MyFlinkApplication',
});

Template.fromStack(stack).hasResourceProperties('AWS::KinesisAnalyticsV2::Application', {
ApplicationName: 'MyFlinkApplication',
RuntimeEnvironment: 'FLINK-1_11',
RuntimeEnvironment: 'FLINK-1_19',
ServiceExecutionRole: {
'Fn::GetAtt': [
'FlinkApplicationRole2F7BCBF6',
Expand Down
4 changes: 2 additions & 2 deletions ...integ.application-code-from-bucket.lit.js.snapshot/FlinkAppCodeFromBucketTest.assets.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...teg.application-code-from-bucket.lit.js.snapshot/FlinkAppCodeFromBucketTest.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"SnapshotsEnabled": true
}
},
"RuntimeEnvironment": "FLINK-1_18",
"RuntimeEnvironment": "FLINK-1_19",
"ServiceExecutionRole": {
"Fn::GetAtt": [
"AppRole1AF9B530",
Expand Down
2 changes: 1 addition & 1 deletion ...alytics-flink-alpha/test/integ.application-code-from-bucket.lit.js.snapshot/manifest.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...isanalytics-flink-alpha/test/integ.application-code-from-bucket.lit.js.snapshot/tree.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .../@aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.application-code-from-bucket.lit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const fileKey = asset.s3ObjectKey;
///! show
new flink.Application(stack, 'App', {
code: flink.ApplicationCode.fromBucket(bucket, fileKey),
runtime: flink.Runtime.FLINK_1_18,
runtime: flink.Runtime.FLINK_1_19,
});
///! hide

Expand Down
4 changes: 2 additions & 2 deletions ...esisanalytics-flink-alpha/test/integ.application.lit.js.snapshot/FlinkAppTest.assets.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...isanalytics-flink-alpha/test/integ.application.lit.js.snapshot/FlinkAppTest.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"SnapshotsEnabled": true
}
},
"RuntimeEnvironment": "FLINK-1_18",
"RuntimeEnvironment": "FLINK-1_19",
"ServiceExecutionRole": {
"Fn::GetAtt": [
"AppRole1AF9B530",
Expand Down
2 changes: 1 addition & 1 deletion ...cdk/aws-kinesisanalytics-flink-alpha/test/integ.application.lit.js.snapshot/manifest.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.application.lit.js.snapshot/tree.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.application.lit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const stack = new core.Stack(app, 'FlinkAppTest');

const flinkApp = new flink.Application(stack, 'App', {
code: flink.ApplicationCode.fromAsset(path.join(__dirname, 'code-asset')),
runtime: flink.Runtime.FLINK_1_18,
runtime: flink.Runtime.FLINK_1_19,
});

new cloudwatch.Alarm(stack, 'Alarm', {
Expand Down
4 changes: 2 additions & 2 deletions ...esisanalytics-flink-alpha/test/integ.vpc-application.js.snapshot/FlinkAppTest.assets.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...isanalytics-flink-alpha/test/integ.vpc-application.js.snapshot/FlinkAppTest.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@
}
]
},
"RuntimeEnvironment": "FLINK-1_18",
"RuntimeEnvironment": "FLINK-1_19",
"ServiceExecutionRole": {
"Fn::GetAtt": [
"AppRole1AF9B530",
Expand Down
2 changes: 1 addition & 1 deletion ...cdk/aws-kinesisanalytics-flink-alpha/test/integ.vpc-application.js.snapshot/manifest.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.vpc-application.js.snapshot/tree.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.vpc-application.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const vpc = new ec2.Vpc(stack, 'VPC', { restrictDefaultSecurityGroup: false });

new flink.Application(stack, 'App', {
code: flink.ApplicationCode.fromAsset(path.join(__dirname, 'code-asset')),
runtime: flink.Runtime.FLINK_1_18,
runtime: flink.Runtime.FLINK_1_19,
vpc,
});

Expand Down