Skip to content

Commit

Permalink
Merge branch 'main' into support-cloudwatch-alarm-lambda-action
Browse files Browse the repository at this point in the history
  • Loading branch information
paulhcsun authored Jan 11, 2024
2 parents d876c52 + 10d5a9f commit 7aec9fe
Show file tree
Hide file tree
Showing 15 changed files with 2,205 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/DESIGN_GUIDELINES.md
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,7 @@ the user.
Constructs that represent such resources should conform to the following
guidelines.

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

Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-neptune-alpha/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const cluster = new neptune.DatabaseCluster(this, 'Database', {
});
```

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`.
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`.

## Adding replicas

Expand Down
4 changes: 4 additions & 0 deletions packages/@aws-cdk/aws-neptune-alpha/lib/cluster.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ 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.3.0.0
*/
public static readonly V1_3_0_0 = new EngineVersion('1.3.0.0');

/**
* Constructor for specifying a custom engine version
Expand Down
4 changes: 4 additions & 0 deletions packages/@aws-cdk/aws-neptune-alpha/lib/parameter-group.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ export class ParameterGroupFamily {
* Family used by Neptune engine versions 1.2.0.0 and later
*/
public static readonly NEPTUNE_1_2 = new ParameterGroupFamily('neptune1.2');
/**
* Family used by Neptune engine versions 1.3.0.0 and later
*/
public static readonly NEPTUNE_1_3 = new ParameterGroupFamily('neptune1.3');

/**
* Constructor for specifying a custom parameter group famil
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-neptune-alpha/test/cluster.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ describe('DatabaseCluster', () => {
});

test.each([
['1.1.1.0', EngineVersion.V1_1_1_0], ['1.2.0.0', EngineVersion.V1_2_0_0],
['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],
])('can create a cluster for engine version %s', (expected, version) => {
// GIVEN
const stack = testStack();
Expand Down

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

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

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

Loading

0 comments on commit 7aec9fe

Please sign in to comment.