Skip to content

Commit 7aec9fe

Browse files
authored
Merge branch 'main' into support-cloudwatch-alarm-lambda-action
2 parents d876c52 + 10d5a9f commit 7aec9fe

15 files changed

+2205
-5
lines changed

docs/DESIGN_GUIDELINES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ the user.
929929
Constructs that represent such resources should conform to the following
930930
guidelines.
931931

932-
An optional prop called **role** of type **iam.IRole**should be exposed to allow
932+
An optional prop called **role** of type **iam.IRole** should be exposed to allow
933933
users to "bring their own role", and use either an owned or unowned role
934934
_[awslint:role-config-prop]_.
935935

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ const cluster = new neptune.DatabaseCluster(this, 'Database', {
100100
});
101101
```
102102

103-
Note: if you want to use Neptune engine `1.2.0.0` or later, you need to specify the corresponding `engineVersion` prop to `neptune.DatabaseCluster` and `family` prop of `ParameterGroupFamily.NEPTUNE_1_2` to `neptune.ClusterParameterGroup` and `neptune.ParameterGroup`.
103+
Note: To use the Neptune engine versions `1.2.0.0` or later, including the newly added `1.3` series, it's necessary to specify the appropriate `engineVersion` prop in `neptune.DatabaseCluster`. Additionally, for both 1.2 and 1.3 series, the corresponding `family` prop must be set to `ParameterGroupFamily.NEPTUNE_1_2` or `ParameterGroupFamily.NEPTUNE_1_3` respectively in `neptune.ClusterParameterGroup` and `neptune.ParameterGroup`.
104104

105105
## Adding replicas
106106

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ 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.3.0.0
81+
*/
82+
public static readonly V1_3_0_0 = new EngineVersion('1.3.0.0');
7983

8084
/**
8185
* Constructor for specifying a custom engine version

packages/@aws-cdk/aws-neptune-alpha/lib/parameter-group.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ export class ParameterGroupFamily {
1515
* Family used by Neptune engine versions 1.2.0.0 and later
1616
*/
1717
public static readonly NEPTUNE_1_2 = new ParameterGroupFamily('neptune1.2');
18+
/**
19+
* Family used by Neptune engine versions 1.3.0.0 and later
20+
*/
21+
public static readonly NEPTUNE_1_3 = new ParameterGroupFamily('neptune1.3');
1822

1923
/**
2024
* Constructor for specifying a custom parameter group famil

packages/@aws-cdk/aws-neptune-alpha/test/cluster.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ describe('DatabaseCluster', () => {
121121
});
122122

123123
test.each([
124-
['1.1.1.0', EngineVersion.V1_1_1_0], ['1.2.0.0', EngineVersion.V1_2_0_0],
124+
['1.1.1.0', EngineVersion.V1_1_1_0], ['1.2.0.0', EngineVersion.V1_2_0_0], ['1.3.0.0', EngineVersion.V1_3_0_0],
125125
])('can create a cluster for engine version %s', (expected, version) => {
126126
// GIVEN
127127
const stack = testStack();

packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster-ev13.js.snapshot/ClusterTestDefaultTestDeployAssert6A1BBA9D.assets.json

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

packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster-ev13.js.snapshot/ClusterTestDefaultTestDeployAssert6A1BBA9D.template.json

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

packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster-ev13.js.snapshot/aws-cdk-neptune-integ.assets.json

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

0 commit comments

Comments
 (0)