Skip to content

Commit

Permalink
Merge pull request #134 from aws-solutions/feature/v1.9.5
Browse files Browse the repository at this point in the history 
Update to version v1.9.5
  • Loading branch information
@fhoueto-amz
fhoueto-amz authored Oct 17, 2024
2 parents a1a6718 + 8388d4c commit 5305abd
Show file tree
Hide file tree
Showing 79 changed files with 345 additions and 796 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.9.5] - 2024-10-17

### Security

- Patched commons-io and avro vulnerabilities

## [1.9.4] - 2024-10-03

### Security
Expand Down
4 changes: 4 additions & 0 deletions deployment/get-cdk-version.js
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
/** ************************************************************************************************
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* SPDX-License-Identifier: Apache-2.0 *
************************************************************************************************ */
const cdkPackage = require('../source/node_modules/aws-cdk/package.json');
console.log(cdkPackage.version);
16 changes: 4 additions & 12 deletions source/bin/aws-sdk-aspect.ts
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
/*********************************************************************************************************************
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* *
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance *
* with the License. A copy of the License is located at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES *
* OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions *
* and limitations under the License. *
*********************************************************************************************************************/
/** ************************************************************************************************
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* SPDX-License-Identifier: Apache-2.0 *
************************************************************************************************ */
import {Construct, IConstruct} from 'constructs';
import * as cdk from 'aws-cdk-lib';
import { aws_lambda as lambda } from 'aws-cdk-lib';
Expand Down
16 changes: 4 additions & 12 deletions source/bin/cfn-nag-aspect.ts
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
/*********************************************************************************************************************
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* *
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance *
* with the License. A copy of the License is located at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES *
* OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions *
* and limitations under the License. *
*********************************************************************************************************************/
/** ************************************************************************************************
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* SPDX-License-Identifier: Apache-2.0 *
************************************************************************************************ */

import * as cdk from 'aws-cdk-lib';
import { Construct, IConstruct } from 'constructs';
Expand Down
16 changes: 4 additions & 12 deletions source/bin/solution-props.ts
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
/*********************************************************************************************************************
* Copyright 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* *
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance *
* with the License. A copy of the License is located at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES *
* OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions *
* and limitations under the License. *
*********************************************************************************************************************/
/** ************************************************************************************************
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* SPDX-License-Identifier: Apache-2.0 *
************************************************************************************************ */

import * as cdk from 'aws-cdk-lib';

Expand Down
4 changes: 4 additions & 0 deletions source/bin/streaming-data-solution.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#!/usr/bin/env node
/** ************************************************************************************************
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* SPDX-License-Identifier: Apache-2.0 *
************************************************************************************************ */

import 'source-map-support/register';

Expand Down
14 changes: 13 additions & 1 deletion source/kinesis/kpl-demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>amazon-kinesis-producer</artifactId>
<version>0.15.10</version>
<version>0.15.11</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
Expand Down Expand Up @@ -78,6 +78,18 @@
<artifactId>commons-compress</artifactId>
<version>1.26.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.17.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.avro/avro -->
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.12.0</version>
</dependency>
</dependencies>

<build>
Expand Down
16 changes: 4 additions & 12 deletions source/labs/msk-client-setup.ts
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
/*********************************************************************************************************************
* Copyright 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* *
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance *
* with the License. A copy of the License is located at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES *
* OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions *
* and limitations under the License. *
*********************************************************************************************************************/
/** ************************************************************************************************
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* SPDX-License-Identifier: Apache-2.0 *
************************************************************************************************ */

import * as cdk from 'aws-cdk-lib';
import { Construct} from 'constructs';
Expand Down
16 changes: 4 additions & 12 deletions source/labs/msk-cluster-setup.ts
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
/*********************************************************************************************************************
* Copyright 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* *
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance *
* with the License. A copy of the License is located at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES *
* OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions *
* and limitations under the License. *
*********************************************************************************************************************/
/** ************************************************************************************************
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* SPDX-License-Identifier: Apache-2.0 *
************************************************************************************************ */

import * as cdk from 'aws-cdk-lib';
import { Construct} from 'constructs';
Expand Down
16 changes: 4 additions & 12 deletions source/labs/msk-lambda-role.ts
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
/*********************************************************************************************************************
* Copyright 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* *
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance *
* with the License. A copy of the License is located at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES *
* OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions *
* and limitations under the License. *
*********************************************************************************************************************/
/** ************************************************************************************************
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* SPDX-License-Identifier: Apache-2.0 *
************************************************************************************************ */

import * as cdk from 'aws-cdk-lib';
import { aws_iam as iam, aws_s3 as s3 } from 'aws-cdk-lib';
Expand Down
16 changes: 4 additions & 12 deletions source/lambda/kds-lambda-consumer/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
/*********************************************************************************************************************
* Copyright 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* *
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance *
* with the License. A copy of the License is located at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES *
* OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions *
* and limitations under the License. *
*********************************************************************************************************************/
/** ************************************************************************************************
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* SPDX-License-Identifier: Apache-2.0 *
************************************************************************************************ */

exports.handler = async (event) => {
console.log(`Received event: ${JSON.stringify(event, null, 2)}`);
Expand Down
12 changes: 6 additions & 6 deletions source/lambda/kds-lambda-consumer/package-lock.json
View file

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

2 changes: 1 addition & 1 deletion source/lambda/kds-lambda-consumer/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kds-lambda-consumer",
"version": "1.9.4",
"version": "1.9.5",
"description": "sample lambda consumer for KDS",
"main": "index.js",
"scripts": {
Expand Down
16 changes: 4 additions & 12 deletions source/lambda/kds-lambda-consumer/test/index.spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
/*********************************************************************************************************************
* Copyright 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* *
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance *
* with the License. A copy of the License is located at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES *
* OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions *
* and limitations under the License. *
*********************************************************************************************************************/
/** ************************************************************************************************
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. *
* SPDX-License-Identifier: Apache-2.0 *
************************************************************************************************ */

const expect = require('chai').expect;
const lambdaFn = require('../index.js');
Expand Down
Loading

0 comments on commit 5305abd

Please sign in to comment.