Update sqs-lambda-{dotnet,java.nodejs,python}-sam patterns

Author: julianwood

sqs-lambda-dotnet-sam/README.md

@@ -1,14 +1,13 @@
-# Processing Amazon SQS records with AWS Lambda (.NET)
+# Process Amazon SQS records with AWS Lambda (.NET)
 
 This patterns shows how to process Amazon SQS messages using AWS Lambda. The AWS SAM template deploys an AWS Lambda function, an Amazon SQS queue, a dead-letter SQS queue, and the IAM permissions required to run the application. Lambda polls the SQS queue and invokes the Lambda function when new messages are available.
 
-- To demonstrate error handling, any message containing the text "error" will be reported as a failure.
 - Failed messages are automatically returned to the queue for retry using `batchItemFailures`.
 - After 3 failed processing attempts, messages are moved to the DLQ.
 - You should implement additional functionality to process messages that are sent to the DLQ.
 - Processing results are logged to Amazon CloudWatch Logs
 
-Learn more about this pattern at Serverless Land Patterns: [serverlessland.com/patterns/sql-lambda](https://serverlessland.com/patterns/sqs-lambda-dotnet-sam)
+Learn more about this pattern at Serverless Land Patterns: [https://serverlessland.com/patterns/sqs-lambda-dotnet-sam)](https://serverlessland.com/patterns/sqs-lambda-dotnet-sam)
 
 Important: this application uses various AWS services and there are costs associated with these services after the Free Tier usage - please see the [AWS Pricing page](https://aws.amazon.com/pricing/) for details. You are responsible for any AWS costs incurred. No warranty is implied in this example.
 
@@ -33,28 +32,35 @@ To download the patterns yourself:
     cd sqs-lambda-dotnet-sam
     ```
 
-## Deployment Instructions
+## Build Instructions
 
-*For additional information on features to help you author, build, debug, test, and deploy Lambda applications more efficiently when using Visual Studio Code, see [Introducing an enhanced local IDE experience for AWS Lambda developers](https://aws.amazon.com/blogs/compute/introducing-an-enhanced-local-ide-experience-for-aws-lambda-developers/).*
+*For additional information on features to help you author, build, debug, test, and deploy Lambda applications more efficiently when using Visual Studio Code, see [Introducing an enhanced local IDE experience for AWS Lambda developers](https://aws.amazon.com/blogs/compute/introducing-an-enhanced-local-ide-experience-for-aws-lambda-developers?trk=2dd77e51-cb93-4970-a61a-5993781e5576&sc_channel=el).*
 
-1. From the command line, use AWS SAM to deploy the AWS resources for the pattern as specified in the template.yml file:
+1. From the command line, use AWS SAM to build the AWS resources for the pattern as specified in the template.yml file:
     ```
-    sam deploy --guided
+    sam build
     ```
-
 * You can also use `--use-container` to build your function inside a Lambda-like Docker container:
     ```
-    sam deploy --guided --use-container
+    sam build --guided --use-container
+    ```
+
+## Deployment Instructions
+
+1. From the command line, use AWS SAM to deploy the AWS resources for the pattern as specified in the template.yaml file:
+    ```
+    sam deploy --guided
     ```
+1. During the prompts:
 
-2. During the prompts:
+1. During the prompts:
     * Enter a stack name
     * Enter the desired AWS Region
     * Allow AWS SAM CLI to create IAM roles with the required permissions.
 
     Once you have run `sam deploy -guided` mode once and saved arguments to a configuration file `samconfig.toml`, you can use `sam deploy` in future to use these defaults.
 
-3. Note the outputs from the AWS SAM deployment process. These contain the resource names and/or ARNs to use for testing.
+1. Note the outputs from the AWS SAM deployment process. These contain the resource names and/or ARNs to use for testing.
    
 ## Example event payload from SQS to Lambda
 
@@ -87,7 +93,7 @@ There is also a sample file `\events\test-event.json` which contains a sample ev
 
 Use the [AWS CLI](https://aws.amazon.com/cli/) to send a message to the SQS queue and observe the event delivered to the Lambda function:
 
-1. Send 10 messages to the SQS message:
+1. Send 10 messages to the SQS queue:
 
 #### Bash
 ```bash

sqs-lambda-dotnet-sam/example-pattern.json

@@ -22,7 +22,7 @@
       "bullets": [
         {
           "text": "Using Lambda with Amazon SQS",
-          "link": "https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html?trk=2dd77e51-cb93-4970-a61a-5993781e5576&sc_channel=el"        
+          "link": "https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html?trk=2dd77e51-cb93-4970-a61a-5993781e5576&sc_channel=el"
         },
         {
           "text": "Introducing an enhanced local IDE experience for AWS Lambda developers",

sqs-lambda-java-sam/ProcessSQSMessageBatchFunction/pom.xml

@@ -0,0 +1,51 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>processsqsmessagebatch</groupId>
+    <artifactId>ProcessSQSMessageBatch</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>1.2.2</version>
+        </dependency>
+        <dependency>
+          <groupId>com.amazonaws</groupId>
+          <artifactId>aws-lambda-java-events</artifactId>
+          <version>3.11.0</version>
+        </dependency>
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <version>4.13.2</version>
+          <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>3.2.4</version>
+          <configuration>
+          </configuration>
+          <executions>
+            <execution>
+              <phase>package</phase>
+              <goals>
+                <goal>shade</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </build>
+</project>

sqs-lambda-java-sam/ProcessSQSMessageBatchFunction/src/main/java/ProcessSQSMessageBatch/ProcessSQSMessageBatch.java

@@ -0,0 +1,28 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import com.amazonaws.services.lambda.runtime.events.SQSEvent;
+import com.amazonaws.services.lambda.runtime.events.SQSBatchResponse;
+ 
+import java.util.ArrayList;
+import java.util.List;
+ 
+public class ProcessSQSMessageBatch implements RequestHandler<SQSEvent, SQSBatchResponse> {
+    @Override
+    public SQSBatchResponse handleRequest(SQSEvent sqsEvent, Context context) {
+ 
+         List<SQSBatchResponse.BatchItemFailure> batchItemFailures = new ArrayList<SQSBatchResponse.BatchItemFailure>();
+         String messageId = "";
+         for (SQSEvent.SQSMessage message : sqsEvent.getRecords()) {
+             try {
+                 //process your message
+                 System.out.println("Processed message: " + message.getBody());
+             } catch (Exception e) {
+                 //Add failed message identifier to the batchItemFailures list
+                 batchItemFailures.add(new SQSBatchResponse.BatchItemFailure(message.getMessageId()));
+             }
+         }
+         return new SQSBatchResponse(batchItemFailures);
+     }
+}

sqs-lambda-java-sam/README.md

@@ -1,14 +1,13 @@
-# Processing Amazon SQS records with AWS Lambda (Java)
+# Process Amazon SQS records with AWS Lambda (Java)
 
-This patterns shows how to process Amazon SQS messages using AWS Lambda. The AWS SAM template deploys an AWS Lambda function, an Amazon SQS queue, a dead-letter SQS queue, and the IAM permissions required to run the application. Lambda polls the SQS queue and invokes the Lambda function when new messages are available.
+This pattern shows how to process Amazon SQS messages using AWS Lambda. The AWS SAM template deploys an AWS Lambda function, an Amazon SQS queue, a dead-letter SQS queue, and the IAM permissions required to run the application. Lambda polls the SQS queue and invokes the Lambda function when new messages are available.
 
-- To demonstrate error handling, each message has a 20% chance of random failure (remove this functionality for your own application).
 - Failed messages are automatically returned to the queue for retry using `batchItemFailures`.
 - After 3 failed processing attempts, messages are moved to the DLQ.
 - You should implement additional functionality to process messages that are sent to the DLQ.
 - Processing results are logged to Amazon CloudWatch Logs
 
-Learn more about this pattern at Serverless Land Patterns: [serverlessland.com/patterns/sql-lambda](https://serverlessland.com/patterns/sqs-lambda-nodejs-sam)
+Learn more about this pattern at Serverless Land Patterns: [https://serverlessland.com/patterns/sqs-lambda-java-sam](https://serverlessland.com/patterns/sqs-lambda-java-sam)
 
 Important: this application uses various AWS services and there are costs associated with these services after the Free Tier usage - please see the [AWS Pricing page](https://aws.amazon.com/pricing/) for details. You are responsible for any AWS costs incurred. No warranty is implied in this example.
 
@@ -21,7 +20,7 @@ Important: this application uses various AWS services and there are costs associ
 
 ## Download Instructions
 
-1. If you download this pattern as part of the AWS Toolkit for your IDE, the toolkit downloads the files into the directory you specify.
+If you download this pattern as part of the AWS Toolkit for your IDE, the toolkit downloads the files into the directory you specify.
 
 To download the patterns yourself: 
 1. Create a new directory, navigate to that directory in a terminal and clone the GitHub repository:
@@ -30,17 +29,30 @@ To download the patterns yourself:
     ```
 1. Change directory to the pattern directory:
     ```
-    cd sqs-lambda-nodejs-sam
+    cd sqs-lambda-java-sam
     ```
 
-## Deployment Instructions
+## Build Instructions
+
+*For additional information on features to help you author, build, debug, test, and deploy Lambda applications more efficiently when using Visual Studio Code, see [Introducing an enhanced local IDE experience for AWS Lambda developers](https://aws.amazon.com/blogs/compute/introducing-an-enhanced-local-ide-experience-for-aws-lambda-developers?trk=2dd77e51-cb93-4970-a61a-5993781e5576&sc_channel=el).*
+
+1. From the command line, use AWS SAM to build the AWS resources for the pattern as specified in the template.yml file:
+    ```
+    sam build
+    ```
+* You can also use `--use-container` to build your function inside a Lambda-like Docker container:
+    ```
+    sam build --guided --use-container
+    ```
 
-*For additional information on features to help you author, build, debug, test, and deploy Lambda applications more efficiently when using Visual Studio Code, see [Introducing an enhanced local IDE experience for AWS Lambda developers](https://aws.amazon.com/blogs/compute/introducing-an-enhanced-local-ide-experience-for-aws-lambda-developers/).*
+## Deployment Instructions
 
-1. From the command line, use AWS SAM to deploy the AWS resources for the pattern as specified in the template.yml file:
+1. From the command line, use AWS SAM to deploy the AWS resources for the pattern as specified in the template.yaml file:
     ```
     sam deploy --guided
     ```
+1. During the prompts:
+
 1. During the prompts:
     * Enter a stack name
     * Enter the desired AWS Region
@@ -56,32 +68,32 @@ To download the patterns yourself:
 {
     "Records": [
         {
-            "messageId": "fa2012345678e816-0a49-4681-ba8f-1234567890",
-            "receiptHandle": "1234567890NmjC1234567890qODTr1234567890/XPPk/f0qU4tJtQ1234567890ihWDp8YHKhDr3V1234567890e9amjZhgg1234567890RodR1234567890lwDGpf6oLa8/B/1234567890/Pq+xP/1234567890/1234567890fIV6nFUGs71234567890zsj616CBx912M12345678908rxtUEj1234567890J8d1234567890yDcI9E12345678905mTyYZ41S2cP01NCA1234567890jcalHD1234567890Kio+HFQp1234567890OI7bTs5I7pZJ4pu+BnM8Bcki1234567890aNML5B7S12345678904eYKKcrunp1234567890Qhz7BUWPG41",
-            "body": "Test message",
+            "messageId": "059f36b4-87a3-44ab-83d2-661975830a7d",
+            "receiptHandle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
+            "body": "test",
             "attributes": {
                 "ApproximateReceiveCount": "1",
-                "SentTimestamp": "1612966720445",
+                "SentTimestamp": "1545082649183",
                 "SenderId": "AIDAIENQZJOLO23YVJ4VO",
-                "ApproximateFirstReceiveTimestamp": "1612966720455"
+                "ApproximateFirstReceiveTimestamp": "1545082649185"
             },
             "messageAttributes": {},
-            "md5OfBody": "82dfa5549ebc91234567890ece5f",
+            "md5OfBody": "098f6bcd4621d373cade4e832627b4f6",
             "eventSource": "aws:sqs",
-            "eventSourceARN": "arn:aws:sqs:us-east-1:123456789012:patterns-sqs-to-lambda-MySqsQueue-1234567890",
+            "eventSourceARN": "arn:aws:sqs:us-east-1:111122223333:my-queue",
             "awsRegion": "us-east-1"
         }
     ]
 }
 
 ```
-There is also a sample file `\events\sqs-test-event.json` which contains a sample event payload with 10 items.
+There is also a sample file `\events\test-event.json` which contains a sample event payload with 10 items.
 
 ### Testing
 
 Use the [AWS CLI](https://aws.amazon.com/cli/) to send a message to the SQS queue and observe the event delivered to the Lambda function:
 
-1. Send 10 messages to the SQS message:
+1. Send 10 messages to the SQS queue:
 
 #### Bash
 ```bash