pr comments

Author: GarrettBeatty

Libraries/src/Amazon.Lambda.Annotations/DynamoDB/DynamoDBEventAttribute.cs

@@ -31,9 +31,15 @@ public string ResourceName
                 {
                     return resourceName;
                 }
+
+                if (string.IsNullOrWhiteSpace(Stream))
+                {
+                    return string.Empty;
+                }
+
                 if (Stream.StartsWith("@"))
                 {
-                    return Stream.Substring(1);
+                    return Stream.Length > 1 ? Stream.Substring(1) : string.Empty;
                 }
 
                 // DynamoDB stream ARN format: arn:aws:dynamodb:region:account:table/TableName/stream/timestamp
@@ -57,7 +63,7 @@ public string ResourceName
         /// </summary>
         public uint BatchSize
         {
-            get => batchSize.GetValueOrDefault();
+            get => batchSize.GetValueOrDefault(100);
             set => batchSize = value;
         }
         private uint? batchSize { get; set; }
@@ -75,7 +81,7 @@ public uint BatchSize
         /// </summary>
         public bool Enabled
         {
-            get => enabled.GetValueOrDefault();
+            get => enabled.GetValueOrDefault(true);
             set => enabled = value;
         }
         private bool? enabled { get; set; }
@@ -119,13 +125,21 @@ internal List<string> Validate()
             {
                 validationErrors.Add($"{nameof(DynamoDBEventAttribute.MaximumBatchingWindowInSeconds)} = {MaximumBatchingWindowInSeconds}. It must be between 0 and 300");
             }
-            if (!string.IsNullOrEmpty(StartingPosition) && StartingPosition != "TRIM_HORIZON" && StartingPosition != "LATEST")
+            if (string.IsNullOrEmpty(StartingPosition))
+            {
+                validationErrors.Add($"{nameof(DynamoDBEventAttribute.StartingPosition)} must not be null or empty. It must be either TRIM_HORIZON or LATEST");
+            }
+            else if (StartingPosition != "TRIM_HORIZON" && StartingPosition != "LATEST")
             {
                 validationErrors.Add($"{nameof(DynamoDBEventAttribute.StartingPosition)} = {StartingPosition}. It must be either TRIM_HORIZON or LATEST");
             }
-            if (!Stream.StartsWith("@"))
+            if (string.IsNullOrWhiteSpace(Stream))
+            {
+                validationErrors.Add($"{nameof(DynamoDBEventAttribute.Stream)} must not be null or empty");
+            }
+            else if (!Stream.StartsWith("@"))
             {
-                if (!Stream.Contains(":dynamodb:") && !Stream.Contains("/stream/"))
+                if (!Stream.Contains(":dynamodb:") || !Stream.Contains("/stream/"))
                 {
                     validationErrors.Add($"{nameof(DynamoDBEventAttribute.Stream)} = {Stream}. The DynamoDB stream ARN is invalid");
                 }

Libraries/test/TestServerlessApp.IntegrationTests/IntegrationTestContextFixture.cs

@@ -87,7 +87,7 @@ public async Task InitializeAsync()
             Console.WriteLine($"[IntegrationTest] TestTable: {testTableName}");
             if (!string.IsNullOrEmpty(testTableName))
             {
-                var dynamoDbClient = new Amazon.DynamoDBv2.AmazonDynamoDBClient(Amazon.RegionEndpoint.USWest2);
+                using var dynamoDbClient = new Amazon.DynamoDBv2.AmazonDynamoDBClient(Amazon.RegionEndpoint.USWest2);
                 var describeTableResponse = await dynamoDbClient.DescribeTableAsync(testTableName);
                 TestTableStreamARN = describeTableResponse.Table.LatestStreamArn;
                 Console.WriteLine($"[IntegrationTest] TestTable Stream ARN: {TestTableStreamARN}");

Libraries/test/TestServerlessApp.IntegrationTests/TestServerlessApp.IntegrationTests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
@@ -8,7 +8,7 @@
     <ItemGroup>
         <!-- AWSSDK.SecurityToken is needed at runtime for environments which uses assume-role operation for credentials -->
         <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.1.99" />
-        <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.*" />
+        <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.513.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="xunit" Version="2.4.1" />

Libraries/test/TestServerlessApp/aws-lambda-tools-defaults.json

@@ -13,7 +13,7 @@
   "template": "serverless.template",
   "template-parameters": "",
   "docker-host-build-output-dir": "./bin/Release/lambda-publish",
-  "s3-bucket": "test-serverless-app",
-  "stack-name": "test-serverless-app",
-  "function-architecture": "x86_64"
-}
+"s3-bucket" : "test-serverless-app-18716bb0",
+"stack-name" : "test-serverless-app-18716bb0",
+"function-architecture" : "x86_64"
+}

Libraries/test/TestServerlessApp/serverless.template

@@ -1417,6 +1417,51 @@
     },
     "TestS3Bucket": {
       "Type": "AWS::S3::Bucket"
+    },
+    "DynamoDBStreamHandler": {
+      "Type": "AWS::Serverless::Function",
+      "Metadata": {
+        "Tool": "Amazon.Lambda.Annotations",
+        "SyncedEvents": [
+          "TestTableStream"
+        ],
+        "SyncedEventProperties": {
+          "TestTableStream": [
+            "Stream.Fn::GetAtt",
+            "StartingPosition",
+            "BatchSize"
+          ]
+        }
+      },
+      "Properties": {
+        "MemorySize": 512,
+        "Timeout": 30,
+        "Policies": [
+          "AWSLambdaDynamoDBExecutionRole"
+        ],
+        "PackageType": "Image",
+        "ImageUri": ".",
+        "ImageConfig": {
+          "Command": [
+            "TestServerlessApp::TestServerlessApp.DynamoDbStreamProcessing_HandleStream_Generated::HandleStream"
+          ]
+        },
+        "Events": {
+          "TestTableStream": {
+            "Type": "DynamoDB",
+            "Properties": {
+              "StartingPosition": "TRIM_HORIZON",
+              "BatchSize": 100,
+              "Stream": {
+                "Fn::GetAtt": [
+                  "TestTable",
+                  "StreamArn"
+                ]
+              }
+            }
+          }
+        }
+      }
     }
   }
 }