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.

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

chore: cdk bump 2.165.0 #782

Merged
merged 4 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { Transform } from "projen/lib/javascript";
import { dirname } from 'path';
import { globSync } from 'glob';

const CDK_VERSION = '2.145.0';
const CDK_CONSTRUCTS_VERSION = '10.3.0';
const CDK_VERSION = '2.165.0';
const CDK_CONSTRUCTS_VERSION = '10.4.2';
const JSII_VERSION = '~5.5.0';
const KUBECTL_LAYER_VERSION='v30';

Expand Down
4 changes: 2 additions & 2 deletions examples/datazone-msk-governance/.projen/deps.json

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

2 changes: 1 addition & 1 deletion examples/datazone-msk-governance/.projen/tasks.json

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

4 changes: 2 additions & 2 deletions examples/datazone-msk-governance/requirements.txt

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

2 changes: 1 addition & 1 deletion examples/datazone-msk-governance/tests/test_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def results():
"/my-stack-test/AWS679f53fac002430cb0da5b7982bd2287",
[
{'id':'AwsSolutions-IAM4', 'reason':'Managed Policy for Custom Resource provider framework role is setup by the CDK framework and can\'t be changed' },
{'id':'AwsSolutions-L1', 'reason':'Lambda Function for Custom Resource provider framework is setup by the CDK framework and can\'t be changed' },
{'id':'CdkNagValidationFailure', 'reason':'Lambda Function for Custom Resource provider framework is setup by the CDK framework and can\'t be resolved' },
],
True,
)
Expand Down
4 changes: 2 additions & 2 deletions examples/dsf-quickstart/.projen/deps.json

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

2 changes: 1 addition & 1 deletion examples/dsf-quickstart/.projen/tasks.json

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

4 changes: 2 additions & 2 deletions examples/dsf-quickstart/requirements.txt

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

4 changes: 2 additions & 2 deletions examples/opensearch-quickstart/.projen/deps.json

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

2 changes: 1 addition & 1 deletion examples/opensearch-quickstart/.projen/tasks.json

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

4 changes: 2 additions & 2 deletions examples/opensearch-quickstart/requirements.txt

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

3 changes: 2 additions & 1 deletion examples/opensearch-quickstart/tests/test_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def results():

# We suppress NAGs for the DSF construct because they are already tested in the framework
suppress_nag(stack, 'MyOpenSearchCluster')
suppress_nag(stack, 'OpenSearchApi')

NagSuppressions.add_resource_suppressions_by_path(stack,
"/my-stack-test/MyOpenSearchCluster/Domain/Resource",
Expand All @@ -40,7 +41,7 @@ def results():
"/my-stack-test/AWS679f53fac002430cb0da5b7982bd2287",
[
{'id':'AwsSolutions-IAM4', 'reason':'The Lambda is part of the CDK custom resource framework for SDK calls and can\'t be changed' },
{'id':'AwsSolutions-L1', 'reason': 'The Lambda is part of the CDK custom resource framework for SDK calls and can\'t be changed'}
{'id':'CdkNagValidationFailure', 'reason':'Lambda Function for Custom Resource provider framework is setup by the CDK framework and can\'t be resolved' },
],
True,
)
Expand Down
4 changes: 2 additions & 2 deletions examples/redshift-data-warehouse/.projen/deps.json

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

2 changes: 1 addition & 1 deletion examples/redshift-data-warehouse/.projen/tasks.json

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

4 changes: 2 additions & 2 deletions examples/redshift-data-warehouse/requirements.txt

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

4 changes: 2 additions & 2 deletions examples/spark-data-lake/infra/.projen/deps.json

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

2 changes: 1 addition & 1 deletion examples/spark-data-lake/infra/.projen/tasks.json

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

4 changes: 2 additions & 2 deletions examples/spark-data-lake/infra/requirements.txt

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

6 changes: 3 additions & 3 deletions framework/.projen/deps.json

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

20 changes: 18 additions & 2 deletions framework/API.md

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

10 changes: 5 additions & 5 deletions framework/package.json

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

Original file line number Diff line number Diff line change
Expand Up @@ -319,15 +319,7 @@ describe ('Creating a DataZoneMskCentralAuthorizer with default configuration',
Action: 'sts:AssumeRole',
Effect: 'Allow',
Principal: {
Service: {
'Fn::FindInMap': [
'ServiceprincipalMap',
{
Ref: 'AWS::Region',
},
'states',
],
},
Service: 'states.amazonaws.com',
},
},
],
Expand Down Expand Up @@ -552,15 +544,7 @@ describe ('Creating a DataZoneMskCentralAuthorizer with default configuration',
Action: 'sts:AssumeRole',
Effect: 'Allow',
Principal: {
Service: {
'Fn::FindInMap': [
'ServiceprincipalMap',
{
Ref: 'AWS::Region',
},
'states',
],
},
Service: 'states.amazonaws.com',
},
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,7 @@ describe ('Creating a DataZoneMskEnvironmentAuthorizer with default configuratio
Action: 'sts:AssumeRole',
Effect: 'Allow',
Principal: {
Service: {
'Fn::FindInMap': [
'ServiceprincipalMap',
{
Ref: 'AWS::Region',
},
'states',
],
},
Service: 'states.amazonaws.com',
},
},
{
Expand Down
14 changes: 13 additions & 1 deletion framework/test/unit/nag/consumption/nag-opensearch-api.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Aspects.of(stack).add(new AwsSolutionsChecks({ verbose: true }));
NagSuppressions.addResourceSuppressionsByPath(
stack,
'/Stack/OpenSearch/SecurityGroup/Resource',
[{ id: 'CdkNagValidationFailure', reason: 'VPC can be created or supplied as props, so cidr block is not known in advance' }],
[{ id: 'CdkNagValidationFailure', reason: 'VPC can be created or supplied as props, so CIDR block is not known in advance' }],
);
NagSuppressions.addResourceSuppressionsByPath(
stack,
Expand Down Expand Up @@ -111,6 +111,18 @@ NagSuppressions.addResourceSuppressionsByPath(
],
);

NagSuppressions.addResourceSuppressionsByPath(stack,
[
'/Stack/OpenSearchApi/Provider',
'/Stack/AWS679f53fac002430cb0da5b7982bd2287/Resource',
'/Stack/OpenSearch/CreateSLR/Provider',
],
[
{ id: 'CdkNagValidationFailure', reason: 'CDK custom resource provider framework is using intrinsic function to get latest node runtime per region which makes the NAG validation fails' },
],
true,
);

//recommendaed FGAC https://docs.aws.amazon.com/opensearch-service/latest/developerguide/fgac.html
NagSuppressions.addResourceSuppressionsByPath(
stack,
Expand Down
12 changes: 12 additions & 0 deletions framework/test/unit/nag/consumption/nag-opensearch.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,18 @@ NagSuppressions.addResourceSuppressionsByPath(
true,
);

NagSuppressions.addResourceSuppressionsByPath(stack,
[
'/Stack/OpenSearchApi/Provider',
'/Stack/AWS679f53fac002430cb0da5b7982bd2287',
'/Stack/OpenSearch/CreateSLR/Provider',
],
[
{ id: 'CdkNagValidationFailure', reason: 'CDK custom resource provider framework is using intrinsic function to get latest node runtime per region which makes the NAG validation fails' },
],
true,
);


test('No unsuppressed Warnings', () => {
const warnings = Annotations.fromStack(stack).findWarning('*', Match.stringLikeRegexp('AwsSolutions-.*'));
Expand Down
Loading
Loading