chore: Sync develop to main post release

CHANGELOG.md

@@ -7,6 +7,46 @@ All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 
+<a name="1.8.0"></a>
+## [1.8.0] - 2023-09-20
+## Documentation
+
+* add kinesis and dynamodb
+
+## Pull Requests
+
+* Merge pull request [#489](https://github.com/aws-powertools/powertools-lambda-dotnet/issues/489) from amirkaws/release-version-1.8.0
+* Merge pull request [#337](https://github.com/aws-powertools/powertools-lambda-dotnet/issues/337) from lachriz-aws/feature/batch-processing
+
+
+<a name="1.7.1"></a>
+## [1.7.1] - 2023-09-19
+## Pull Requests
+
+* Merge pull request [#486](https://github.com/aws-powertools/powertools-lambda-dotnet/issues/486) from amirkaws/update-examples-nuget-versions
+* Merge pull request [#484](https://github.com/aws-powertools/powertools-lambda-dotnet/issues/484) from aws-powertools/hjgraca-release-1.7.1
+* Merge pull request [#482](https://github.com/aws-powertools/powertools-lambda-dotnet/issues/482) from aws-powertools/hjgraca-release-1.7.1
+* Merge pull request [#480](https://github.com/aws-powertools/powertools-lambda-dotnet/issues/480) from hjgraca/bug-revert-aspectinjector
+* Merge pull request [#479](https://github.com/aws-powertools/powertools-lambda-dotnet/issues/479) from aws-powertools/hjgraca-update-examples-1.7.0
+* Merge pull request [#477](https://github.com/aws-powertools/powertools-lambda-dotnet/issues/477) from aws-powertools/hjgraca-delete-dependabot
+
+
+<a name="1.7.0"></a>
+## [1.7.0] - 2023-09-14
+## Maintenance
+
+* **deps:** bump gitpython from 3.1.30 to 3.1.35
+
+## Pull Requests
+
+* Merge pull request [#475](https://github.com/aws-powertools/powertools-lambda-dotnet/issues/475) from aws-powertools/hjgraca-disable-dependabot
+* Merge pull request [#464](https://github.com/aws-powertools/powertools-lambda-dotnet/issues/464) from aws-powertools/hjgraca-release-1.7.0
+* Merge pull request [#451](https://github.com/aws-powertools/powertools-lambda-dotnet/issues/451) from aws-powertools/dependabot/pip/gitpython-3.1.35
+* Merge pull request [#340](https://github.com/aws-powertools/powertools-lambda-dotnet/issues/340) from hjgraca/fix-common-dependency
+* Merge pull request [#437](https://github.com/aws-powertools/powertools-lambda-dotnet/issues/437) from aws-powertools/update-changelog-6143683791
+* Merge pull request [#435](https://github.com/aws-powertools/powertools-lambda-dotnet/issues/435) from amirkaws/release-version-1.6.0-update-examples
+
+
 <a name="1.6.0"></a>
 ## [1.6.0] - 2023-09-07
 ## Pull Requests
@@ -452,7 +492,10 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * Merge pull request [#1](https://github.com/aws-powertools/powertools-lambda-dotnet/issues/1) from sliedig/develop
 
 
-[Unreleased]: https://github.com/aws-powertools/powertools-lambda-dotnet/compare/1.6.0...HEAD
+[Unreleased]: https://github.com/aws-powertools/powertools-lambda-dotnet/compare/1.8.0...HEAD
+[1.8.0]: https://github.com/aws-powertools/powertools-lambda-dotnet/compare/1.7.1...1.8.0
+[1.7.1]: https://github.com/aws-powertools/powertools-lambda-dotnet/compare/1.7.0...1.7.1
+[1.7.0]: https://github.com/aws-powertools/powertools-lambda-dotnet/compare/1.6.0...1.7.0
 [1.6.0]: https://github.com/aws-powertools/powertools-lambda-dotnet/compare/1.5.0...1.6.0
 [1.5.0]: https://github.com/aws-powertools/powertools-lambda-dotnet/compare/1.4.2...1.5.0
 [1.4.2]: https://github.com/aws-powertools/powertools-lambda-dotnet/compare/1.4.1...1.4.2

examples/BatchProcessing/README.md

@@ -33,7 +33,6 @@ You will need the following for local testing.
 To build and deploy your application for the first time, run the following in your shell. Make sure the `template.yaml` file is in your current directory:
 
 ```bash
-cd deploy/sqs
 sam build
 sam deploy --guided
 ```

examples/BatchProcessing/src/HelloWorld/HelloWorld.csproj

@@ -7,10 +7,8 @@
     <ItemGroup>
         <PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.3.1" />
-    </ItemGroup>
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.BatchProcessing\AWS.Lambda.Powertools.BatchProcessing.csproj" />
-      <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" />
-      <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
+        <PackageReference Include="AWS.Lambda.Powertools.BatchProcessing" Version="0.0.1-preview" />
+        <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.3.2" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     </ItemGroup>
 </Project>

examples/BatchProcessing/template.yaml

@@ -111,6 +111,9 @@ Resources:
             FunctionResponseTypes: 
               - ReportBatchItemFailures
 
+  # --------------
+  # Batch Processing for DynamoDb
+
   SampleDynamoDBTable:
     Type: AWS::DynamoDB::Table
     Properties:
@@ -125,8 +128,41 @@ Resources:
       StreamSpecification:
         StreamViewType: NEW_AND_OLD_IMAGES
 
+  DemoDynamoDBStreamProcessorFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      FunctionName: powertools-dotnet-sample-batch-processor-dynamodb
+      CodeUri: ./src/HelloWorld/
+      Handler: HelloWorld::HelloWorld.Function::DynamoDbStreamHandlerUsingAttribute
+      Policies: AWSLambdaDynamoDBExecutionRole
+      Events:
+        Stream:
+          Type: DynamoDB
+          Properties:
+            Stream: !GetAtt SampleDynamoDBTable.StreamArn
+            BatchSize: 100
+            StartingPosition: TRIM_HORIZON
+            FunctionResponseTypes:
+              - ReportBatchItemFailures
+
   # --------------
   # Batch Processing for Kinesis Data Streams
+
+  DemoKinesisStream:
+    Type: AWS::Kinesis::Stream
+    Properties:
+      ShardCount: 1
+      StreamEncryption:
+        EncryptionType: KMS
+        KeyId: !Ref CustomerKey
+
+  StreamConsumer:
+    Type: "AWS::Kinesis::StreamConsumer"
+    Properties:
+      StreamARN: !GetAtt DemoKinesisStream.Arn
+      ConsumerName: KinesisBatchHandlerConsumer
+
+
   SampleKinesisEventBatchProcessorFunction:
     Type: AWS::Serverless::Function
     Properties:
@@ -135,15 +171,13 @@ Resources:
       CodeUri: ./src/HelloWorld/
       Handler: HelloWorld::HelloWorld.Function::KinesisEventHandlerUsingAttribute
       MemorySize: 256
-      # ReservedConcurrentExecutions: 1
-      Policies:
-        - AWSLambdaBasicExecutionRole
-        - KinesisStreamReadPolicy:
-            StreamName: !Ref SampleKinesisDataStream
-      Environment:
-        Variables:
-          POWERTOOLS_BATCH_PROCESSING_ERROR_HANDLING_POLICY: DeriveFromEvent
-          POWERTOOLS_BATCH_PROCESSING_MAX_DEGREE_OF_PARALLELISM: 1
+      Events:
+        Kinesis:
+          Type: Kinesis
+          Properties:
+            Stream: !GetAtt StreamConsumer.ConsumerARN
+            StartingPosition: LATEST
+            BatchSize: 2
 
 Outputs:
   DemoSqsQueue:
@@ -155,6 +189,9 @@ Outputs:
   SampleSqsBatchProcessorFunction:
     Description: "SQS Batch Handler - Lambda Function ARN"
     Value: !GetAtt SampleSqsBatchProcessorFunction.Arn
-  SampleSqsBatchProcessorFunctionRole:
-    Description: "Implicit IAM Role created for SQS Lambda Function ARN"
-    Value: !GetAtt SampleSqsBatchProcessorFunctionRole.Arn
+  DemoKinesisQueue:
+    Description: "ARN for Kinesis Stream"
+    Value: !GetAtt DemoKinesisStream.Arn
+  DemoSQSConsumerFunction:
+    Description: "SQS Batch Handler - Lambda Function ARN"
+    Value: !GetAtt SampleKinesisEventBatchProcessorFunction.Arn

examples/BatchProcessing/test/HelloWorld.Test/HelloWorld.Tests.csproj

@@ -6,10 +6,9 @@
 		<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
 		<PackageReference Include="Amazon.Lambda.TestUtilities" Version="2.0.0" />
 		<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.3.1" />
-		<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.105" />
-		<PackageReference Include="AWSSDK.SQS" Version="3.7.200.25" />
+		<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.201.13" />
+		<PackageReference Include="AWSSDK.SQS" Version="3.7.200.43" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-		<PackageReference Include="Moq" Version="4.18.4" />
 		<PackageReference Include="xunit" Version="2.4.2" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
 		  <PrivateAssets>all</PrivateAssets>

examples/Logging/src/HelloWorld/HelloWorld.csproj

@@ -9,6 +9,6 @@
         <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.6.0" />
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.3.1" />
         <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.3.2" />
-        <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.201.12" />
+        <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.201.13" />
     </ItemGroup>
 </Project>

examples/Logging/test/HelloWorld.Test/HelloWorld.Tests.csproj

@@ -6,7 +6,7 @@
 		<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
 		<PackageReference Include="Amazon.Lambda.TestUtilities" Version="2.0.0" />
 		<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.3.1" />
-		<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.201.12" />
+		<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.201.13" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
 		<PackageReference Include="NSubstitute" Version="5.1.0" />
 		<PackageReference Include="xunit" Version="2.5.1" />

examples/Metrics/src/HelloWorld/HelloWorld.csproj

@@ -10,6 +10,6 @@
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.3.1" />
         <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.3.2" />
         <PackageReference Include="AWS.Lambda.Powertools.Metrics" Version="1.4.2" />
-        <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.201.12" />
+        <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.201.13" />
     </ItemGroup>
 </Project>

examples/Metrics/test/HelloWorld.Test/HelloWorld.Tests.csproj

@@ -6,7 +6,7 @@
 		<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
 		<PackageReference Include="Amazon.Lambda.TestUtilities" Version="2.0.0" />
 		<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.3.1" />
-		<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.201.12" />
+		<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.201.13" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
 		<PackageReference Include="NSubstitute" Version="5.1.0" />
 		<PackageReference Include="xunit" Version="2.5.1" />

examples/Tracing/src/HelloWorld/HelloWorld.csproj

@@ -10,6 +10,6 @@
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.3.1" />
         <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.3.2" />
         <PackageReference Include="AWS.Lambda.Powertools.Tracing" Version="1.3.2" />
-        <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.201.12" />
+        <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.201.13" />
     </ItemGroup>
 </Project>

examples/Tracing/test/HelloWorld.Test/HelloWorld.Tests.csproj

@@ -6,7 +6,7 @@
 		<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
 		<PackageReference Include="Amazon.Lambda.TestUtilities" Version="2.0.0" />
 		<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.3.1" />
-		<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.201.12" />
+		<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.201.13" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
 		<PackageReference Include="NSubstitute" Version="5.1.0" />
 		<PackageReference Include="xunit" Version="2.5.1" />

examples/examples.sln

@@ -67,6 +67,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E25EAD9C-E
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld.Tests", "Tracing\test\HelloWorld.Test\HelloWorld.Tests.csproj", "{A1E1C702-77D3-4279-9E42-2A18783A0586}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BatchProcessing", "BatchProcessing", "{2B5E8DE7-8DA4-47B8-81B7-9E269CC77619}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B95EAACA-FBE4-4CC0-B155-D0AD9BCDEE24}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "BatchProcessing\src\HelloWorld\HelloWorld.csproj", "{F33D0918-452F-4AB0-B842-E43AFE6F948D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CE5C821F-5610-490F-B096-EE91F0E34C10}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld.Tests", "BatchProcessing\test\HelloWorld.Test\HelloWorld.Tests.csproj", "{AAE50681-1FEF-4D9E-9FEA-5406320BDB88}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -128,6 +138,14 @@ Global
 		{A1E1C702-77D3-4279-9E42-2A18783A0586}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A1E1C702-77D3-4279-9E42-2A18783A0586}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A1E1C702-77D3-4279-9E42-2A18783A0586}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F33D0918-452F-4AB0-B842-E43AFE6F948D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F33D0918-452F-4AB0-B842-E43AFE6F948D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F33D0918-452F-4AB0-B842-E43AFE6F948D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F33D0918-452F-4AB0-B842-E43AFE6F948D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AAE50681-1FEF-4D9E-9FEA-5406320BDB88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAE50681-1FEF-4D9E-9FEA-5406320BDB88}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAE50681-1FEF-4D9E-9FEA-5406320BDB88}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AAE50681-1FEF-4D9E-9FEA-5406320BDB88}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{0CC66DBC-C1DF-4AF6-8EEB-FFED6C578BF4} = {526F1EF7-5A9C-4BFF-ABAE-75992ACD8F78}
@@ -156,5 +174,9 @@ Global
 		{E3E9268B-5897-4A7D-BDC0-D5BF78269339} = {A5F586B6-DCE5-47A2-94B2-C8142A79BCF6}
 		{E25EAD9C-E6DB-4F63-B7FA-7FB45AD0B09B} = {F5CAEA70-FF1A-4CCE-8928-D579AA7750BA}
 		{A1E1C702-77D3-4279-9E42-2A18783A0586} = {E25EAD9C-E6DB-4F63-B7FA-7FB45AD0B09B}
+		{B95EAACA-FBE4-4CC0-B155-D0AD9BCDEE24} = {2B5E8DE7-8DA4-47B8-81B7-9E269CC77619}
+		{F33D0918-452F-4AB0-B842-E43AFE6F948D} = {B95EAACA-FBE4-4CC0-B155-D0AD9BCDEE24}
+		{CE5C821F-5610-490F-B096-EE91F0E34C10} = {2B5E8DE7-8DA4-47B8-81B7-9E269CC77619}
+		{AAE50681-1FEF-4D9E-9FEA-5406320BDB88} = {CE5C821F-5610-490F-B096-EE91F0E34C10}
 	EndGlobalSection
 EndGlobal