feat: add updated starter templates for SF V.4

Gareth Mc Cumskey · Gareth Mc Cumskey · commit a5f85fbcd513 · 2024-02-19T11:49:54.000Z
diff --git a/aws-node-express-api/handler.js b/aws-node-express-api/handler.js
@@ -20,4 +20,4 @@ app.use((req, res, next) => {
   });
 });
 
-module.exports.handler = serverless(app);
+exports.handler = serverless(app);
diff --git a/aws-node-express-api/package.json b/aws-node-express-api/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "express": "^4.17.1",
-    "serverless-http": "^2.7.0"
+    "express": "^4.18.2",
+    "serverless-http": "^3.2.0"
   }
 }
diff --git a/aws-node-express-api/serverless.yml b/aws-node-express-api/serverless.yml
@@ -1,9 +1,9 @@
 service: aws-node-express-api
-frameworkVersion: '2 || 3'
+frameworkVersion: '4'
 
 provider:
   name: aws
-  runtime: nodejs12.x
+  runtime: nodejs20.x
   lambdaHashingVersion: '20201221'
 
 functions:
diff --git a/aws-node-express-dynamodb-api/handler.js b/aws-node-express-dynamodb-api/handler.js
@@ -1,11 +1,10 @@
-const AWS = require("aws-sdk");
+const { DynamoDBClient, PutItemCommand, GetItemCommand } = require("@aws-sdk/client-dynamodb");
 const express = require("express");
 const serverless = require("serverless-http");
 
 const app = express();
 
 const USERS_TABLE = process.env.USERS_TABLE;
-const dynamoDbClient = new AWS.DynamoDB.DocumentClient();
 
 app.use(express.json());
 
@@ -18,7 +17,8 @@ app.get("/users/:userId", async function (req, res) {
   };
 
   try {
-    const { Item } = await dynamoDbClient.get(params).promise();
+    const command = new GetItemCommand(params);
+    const { Item } = await client.send(command);
     if (Item) {
       const { userId, name } = Item;
       res.json({ userId, name });
@@ -50,7 +50,8 @@ app.post("/users", async function (req, res) {
   };
 
   try {
-    await dynamoDbClient.put(params).promise();
+    const command = new PutItemCommand(input);
+    await client.send(command);
     res.json({ userId, name });
   } catch (error) {
     console.log(error);
@@ -64,5 +65,4 @@ app.use((req, res, next) => {
   });
 });
 
-
-module.exports.handler = serverless(app);
+exports.handler = serverless(app);
diff --git a/aws-node-express-dynamodb-api/package.json b/aws-node-express-dynamodb-api/package.json
@@ -3,7 +3,8 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "express": "^4.17.1",
-    "serverless-http": "^2.7.0"
+    "express": "^4.18.2",
+    "serverless-http": "^3.2.0",
+    "@aws-sdk/client-dynamodb": "^3.515.0"
   }
 }
diff --git a/aws-node-express-dynamodb-api/serverless.yml b/aws-node-express-dynamodb-api/serverless.yml
@@ -1,12 +1,12 @@
 service: aws-node-express-dynamodb-api
-frameworkVersion: '2 || 3'
+frameworkVersion: '4'
 
 custom:
   tableName: 'users-table-${sls:stage}'
 
 provider:
   name: aws
-  runtime: nodejs12.x
+  runtime: nodejs20.x
   lambdaHashingVersion: '20201221'
   iam:
     role:
diff --git a/aws-node-http-api/handler.js b/aws-node-http-api/handler.js
@@ -1,6 +1,6 @@
 "use strict";
 
-module.exports.hello = async (event) => {
+exports.hello = async (event) => {
   return {
     statusCode: 200,
     body: JSON.stringify(
diff --git a/aws-node-http-api/serverless.yml b/aws-node-http-api/serverless.yml
@@ -1,9 +1,9 @@
 service: serverless-http-api
-frameworkVersion: '2 || 3'
+frameworkVersion: '4'
 
 provider:
   name: aws
-  runtime: nodejs12.x
+  runtime: nodejs20.x
   lambdaHashingVersion: '20201221'
 
 functions:
diff --git a/aws-node-scheduled-cron/handler.js b/aws-node-scheduled-cron/handler.js
@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports.run = async (event, context) => {
+exports.run = async (event, context) => {
   const time = new Date();
   console.log(`Your cron function "${context.functionName}" ran at ${time}`);
 };
diff --git a/aws-node-scheduled-cron/serverless.yml b/aws-node-scheduled-cron/serverless.yml
@@ -1,11 +1,10 @@
 service: aws-node-scheduled-cron
 
-frameworkVersion: '2 || 3'
-
+frameworkVersion: '4'
 
 provider:
   name: aws
-  runtime: nodejs12.x
+  runtime: nodejs20.x
   lambdaHashingVersion: 20201221
 
 functions:
diff --git a/aws-node-sqs-worker/handler.js b/aws-node-sqs-worker/handler.js
@@ -1,61 +1,5 @@
-const { SQS } = require("aws-sdk");
-
-const sqs = new SQS();
-
-const producer = async (event) => {
-  let statusCode = 200;
-  let message;
-
-  if (!event.body) {
-    return {
-      statusCode: 400,
-      body: JSON.stringify({
-        message: "No body was found",
-      }),
-    };
-  }
-
-  try {
-    await sqs
-      .sendMessage({
-        QueueUrl: process.env.QUEUE_URL,
-        MessageBody: event.body,
-        MessageAttributes: {
-          AttributeName: {
-            StringValue: "Attribute Value",
-            DataType: "String",
-          },
-        },
-      })
-      .promise();
-
-    message = "Message accepted!";
-  } catch (error) {
-    console.log(error);
-    message = error;
-    statusCode = 500;
-  }
-
-  return {
-    statusCode,
-    body: JSON.stringify({
-      message,
-    }),
-  };
-};
-
-const consumer = async (event) => {
+exports.consumer = async (event) => {
   for (const record of event.Records) {
-    const messageAttributes = record.messageAttributes;
-    console.log(
-      "Message Attribute: ",
-      messageAttributes.AttributeName.stringValue
-    );
     console.log("Message Body: ", record.body);
   }
 };
-
-module.exports = {
-  producer,
-  consumer,
-};
diff --git a/aws-node-sqs-worker/package.json b/aws-node-sqs-worker/package.json
@@ -3,8 +3,5 @@
   "version": "1.0.0",
   "description": "Serverless Framework Node SQS Producer-Consumer on AWS",
   "author": "",
-  "license": "MIT",
-  "devDependencies": {
-    "serverless-lift": "^1.1.2"
-  }
+  "license": "MIT"
 }
diff --git a/aws-node-sqs-worker/serverless.yml b/aws-node-sqs-worker/serverless.yml
@@ -1,26 +1,21 @@
 service: aws-node-sqs-worker
-frameworkVersion: '2 || 3'
+frameworkVersion: '4'
 
 provider:
   name: aws
-  runtime: nodejs12.x
+  runtime: nodejs20.x
   lambdaHashingVersion: '20201221'
 
-constructs:
-  jobs:
-    type: queue
-    worker:
-      handler: handler.consumer
-
 functions:
   producer:
-    handler: handler.producer
+    handler: handler.consumer
     events:
-      - httpApi:
-          method: post
-          path: /produce
-    environment:
-      QUEUE_URL: ${construct:jobs.queueUrl}
+      - sqs: arn:aws:sqs:${aws:region}:${aws:accountId}:MyFirstQueue
+
+resources:
+  Resources:
+    JobQueue:
+      Type: AWS::SQS::Queue
+      Properties:
+        QueueName: MyFirstQueue
 
-plugins:
-  - serverless-lift
diff --git a/aws-node/handler.js b/aws-node/handler.js
@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports.hello = async (event) => {
+exports.hello = async (event) => {
   return {
     statusCode: 200,
     body: JSON.stringify(
diff --git a/aws-node/serverless.yml b/aws-node/serverless.yml
@@ -1,12 +1,11 @@
 service: aws-node # NOTE: update this with your service name
 
-frameworkVersion: '2 || 3'
+frameworkVersion: '4'
 
 
 provider:
   name: aws
-  runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
+  runtime: nodejs20.x
 
 functions:
   hello:
diff --git a/aws-python-flask-api/requirements.txt b/aws-python-flask-api/requirements.txt
@@ -1,3 +1,3 @@
 Flask==1.1.4
 Werkzeug==1.0.1
-
+markupsafe==2.0.1
diff --git a/aws-python-flask-api/serverless.yml b/aws-python-flask-api/serverless.yml
@@ -1,14 +1,14 @@
 service: aws-python-flask-api
 
-frameworkVersion: '2 || 3'
+frameworkVersion: '4'
 
 custom:
   wsgi:
     app: app.app
 
 provider:
   name: aws
-  runtime: python3.8
+  runtime: python3.12
   lambdaHashingVersion: '20201221'
 
 functions:
diff --git a/aws-python-flask-dynamodb-api/package.json b/aws-python-flask-dynamodb-api/package.json
@@ -4,7 +4,7 @@
   "description": "Example of a Python Flask API service backed by DynamoDB with traditional Serverless Framework",
   "author": "",
   "devDependencies": {
-    "serverless-python-requirements": "^5.1.0",
-    "serverless-wsgi": "^1.7.6"
+    "serverless-python-requirements": "^6.0.1",
+    "serverless-wsgi": "^3.0.3"
   }
 }
diff --git a/aws-python-flask-dynamodb-api/requirements.txt b/aws-python-flask-dynamodb-api/requirements.txt
@@ -1,3 +1,3 @@
 Flask==1.1.4
 Werkzeug==1.0.1
-
+markupsafe==2.0.1
diff --git a/aws-python-flask-dynamodb-api/serverless.yml b/aws-python-flask-dynamodb-api/serverless.yml
@@ -1,6 +1,6 @@
 service: aws-python-flask-dynamodb-api
 
-frameworkVersion: '2 || 3'
+frameworkVersion: '4'
 
 custom:
   tableName: 'users-table-${self:provider.stage}'
@@ -9,9 +9,8 @@ custom:
 
 provider:
   name: aws
-  runtime: python3.8
+  runtime: python3.12
   lambdaHashingVersion: '20201221'
-  stage: dev
   iam:
     role:
       statements:
diff --git a/aws-python-http-api/serverless.yml b/aws-python-http-api/serverless.yml
@@ -1,9 +1,9 @@
 service: aws-python-http-api
-frameworkVersion: '2 || 3'
+frameworkVersion: '4'
 
 provider:
   name: aws
-  runtime: python3.8
+  runtime: python3.12
   lambdaHashingVersion: '20201221'
 
 functions:
diff --git a/aws-python-scheduled-cron/serverless.yml b/aws-python-scheduled-cron/serverless.yml
@@ -1,11 +1,11 @@
 service: aws-python-scheduled-cron
 
-frameworkVersion: '2 || 3'
+frameworkVersion: '4'
 
 
 provider:
   name: aws
-  runtime: python3.8
+  runtime: python3.12
   lambdaHashingVersion: 20201221
 
 functions:
diff --git a/aws-python-sqs-worker/serverless.yml b/aws-python-sqs-worker/serverless.yml
@@ -1,9 +1,9 @@
 service: aws-python-sqs-worker
-frameworkVersion: '2 || 3'
+frameworkVersion: '4'
 
 provider:
   name: aws
-  runtime: python3.8
+  runtime: python3.12
   lambdaHashingVersion: '20201221'
 
 constructs:
diff --git a/aws-python/serverless.yml b/aws-python/serverless.yml
@@ -1,11 +1,11 @@
 service: aws-python # NOTE: update this with your service name
 
-frameworkVersion: '2 || 3'
+frameworkVersion: '4'
 
 
 provider:
   name: aws
-  runtime: python3.8
+  runtime: python3.12
   lambdaHashingVersion: 20201221
 
 functions:

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"version": "1.0.0",`
`4`	`4`	`"description": "",`
`5`	`5`	`"dependencies": {`
`6`		`- "express": "^4.17.1",`
`7`		`- "serverless-http": "^2.7.0"`
	`6`	`+ "express": "^4.18.2",`
	`7`	`+ "serverless-http": "^3.2.0"`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@`
`3`	`3`	`"version": "1.0.0",`
`4`	`4`	`"description": "",`
`5`	`5`	`"dependencies": {`
`6`		`- "express": "^4.17.1",`
`7`		`- "serverless-http": "^2.7.0"`
	`6`	`+ "express": "^4.18.2",`
	`7`	`+ "serverless-http": "^3.2.0",`
	`8`	`+ "@aws-sdk/client-dynamodb": "^3.515.0"`
`8`	`9`	`}`
`9`	`10`	`}`