chore: update the pulumi stack name

Signed-off-by: Adetokunbo Ige <[email protected]>

Author: Adetokunbo Ige

.github/workflows/docker-publish.yml

@@ -82,6 +82,6 @@ jobs:
           file: todo-app/lambda_function/Dockerfile
           push: true
           tags: ${{ env.ECR_REGISTRY }}/${{ env.REPO_NAME }}:${{ steps.sha_short.outputs.sha_short }}
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           provenance: false
         continue-on-error: false

.github/workflows/pulumi-deploy.yml

@@ -10,8 +10,6 @@ on:
 jobs:
   pulumi-deploy:
     runs-on: ubuntu-latest
-    env:
-      AWS_REGION: ${{ secrets.AWS_REGION }}
 
     permissions:
       id-token: write
@@ -36,16 +34,25 @@ jobs:
         run: |
           pip install -r requirements.txt
 
-      - uses: pulumi/actions@v3
-        with:
-          command: preview
-          stack-name: dev
+      - name: Configure Pulumi
+        working-directory: todo-app
+        run: |
+          pulumi stack select ExitoLab/todo-app/dev --non-interactive || pulumi stack init ExitoLab/todo-app/dev
         env:
           PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
 
-      - uses: pulumi/actions@v3
-        with:
-          command: up
-          stack-name: dev
+      - name: Pulumi Preview
+        working-directory: todo-app
+        run: |
+          pulumi stack select ExitoLab/todo-app/dev
+          pulumi preview
+        env:
+          PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
+
+      - name: Pulumi Up
+        working-directory: todo-app
+        run: |
+          pulumi stack select ExitoLab/todo-app/dev
+          pulumi up --yes
         env:
           PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}

README.md

@@ -1,4 +1,4 @@
-# Building and Deploying a Serverless Todo App on AWS with Docker, Lambda, API Gateway, and GitHub Actions using Pulumi in Python
+# Building and Deploying a Serverless Todo App on AWS using Pulumi in Python
 
 ## Overview
 

todo-app/.gitignore

@@ -1,3 +1,2 @@
 *.pyc
 venv/
-

todo-app/Pulumi.dev.yaml

@@ -1,2 +1,3 @@
 config:
-  todo-app:location: eastus
+  todo-app:docker_image: 289940214902.dkr.ecr.us-east-1.amazonaws.com/todo_pulumi_docker_aws_lambda_api_gateway:3f8cc06
+  todo-app:environment: dev

todo-app/Pulumi.yaml

@@ -9,3 +9,4 @@ config:
   pulumi:tags:
     value:
       pulumi:template: aws-python
+

todo-app/__main__.py

@@ -3,8 +3,13 @@
 from pulumi_docker import Image, DockerBuild
 import pulumi_docker as docker
 
-# Step 1: Create an ECR repository
-docker_image = "289940214902.dkr.ecr.us-east-1.amazonaws.com/todo-app:v1.1"
+from pulumi import Config
+
+# Create a config object to access configuration values
+config = pulumi.Config()
+
+docker_image = config.get("docker_image")
+environment = config.get("environment")
 
 # Create an IAM Role for the Lambda function
 lambda_role = aws.iam.Role("lambdaExecutionRole",
@@ -29,6 +34,47 @@
     policy_arn="arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
 )
 
+# Define an IAM policy that allows DynamoDB scan action
+dynamodb_scan_policy = aws.iam.Policy("dynamodb-policy",
+    policy={
+        "Version": "2012-10-17",
+        "Statement": [
+            {
+                "Effect": "Allow",
+                "Action": "dynamodb:Scan",
+                "Resource": "arn:aws:dynamodb:us-east-1:289940214902:table/todo"
+            }
+        ]
+    }
+)
+
+# Attach the policy to the Lambda execution role
+role_policy_attachment = aws.iam.RolePolicyAttachment("lambda-role-policy-attachment",
+    role=lambda_role.name,
+    policy_arn=dynamodb_scan_policy.arn
+)
+
+# Define a DynamoDB table
+dynamodb_table = aws.dynamodb.Table(f"todo-{environment}",
+    hash_key="id",  # Partition key
+    range_key="timestamp",  # Sort key
+    attributes=[
+        aws.dynamodb.TableAttributeArgs(
+            name="id",
+            type="S"  # S for string
+        ),
+        aws.dynamodb.TableAttributeArgs(
+            name="timestamp",
+            type="N"  # N for number
+        ),
+    ],
+    billing_mode="PAY_PER_REQUEST",  # Use on-demand mode (no provisioned throughput)
+    tags={
+        "Environment": "dev",
+        "Created_By": "Pulumi"
+    }
+)
+
 # Create a Lambda function using the Docker image
 lambda_function = aws.lambda_.Function("my-serverless-function",
     name="my-serverless-function",
@@ -65,15 +111,13 @@
     type="AWS_PROXY",
     uri=lambda_function.invoke_arn)  # Ensure lambda_function is defined
 
-
 lambda_permission = aws.lambda_.Permission("api-gateway-lambda-permission",
     action="lambda:InvokeFunction",
     function=lambda_function.name,
     principal="apigateway.amazonaws.com",
     source_arn=pulumi.Output.concat(api.execution_arn, "/*/*")
 )
 
-
 # Deployment of the API, explicitly depends on method and integration to avoid timing issues
 deployment = aws.apigateway.Deployment("api-deployment",
     rest_api=api.id,

todo-app/lambda_function/.dockerignore

@@ -1,4 +1,5 @@
 README.md
 invoke-function-policy.json
 __pycache__/
-event.json
+event.json
+

todo-app/lambda_function/lambda.py

@@ -5,6 +5,9 @@
 from fastapi.middleware.cors import CORSMiddleware
 from mangum import Mangum
 
+from pydantic import BaseModel
+from typing import List, Dict
+
 logging.basicConfig(level=logging.DEBUG)
 
 app = FastAPI()
@@ -19,55 +22,83 @@
 )
 
 # Connect to DynamoDB
-dynamodb = boto3.resource('dynamodb')
-table_name = 'todo'
-table = dynamodb.Table(table_name)
+dynamodb = boto3.resource('dynamodb', region_name='us-east-1')
+table = dynamodb.Table("todo")
 
-@app.get("/todos")
+@app.get("/todos", response_model=List[dict])
 async def get_todos():
     try:
+        # Perform a scan operation on the DynamoDB table
         response = table.scan()
+        # Return the 'Items' from the scan result, which contains the table data
         return response.get('Items', [])
     except Exception as e:
         logging.error(f"Error getting todos: {e}")
         raise HTTPException(status_code=500, detail=str(e))
 
+# POST request to create a new todo
 @app.post("/todos", status_code=201)
-async def create_todo(todo: dict):
+async def create_todo(todo: Dict):
     if not todo:
         raise HTTPException(status_code=400, detail="Invalid input")
+
+    # Ensure 'id' is present in the todo item, or else raise an error
+    if 'id' not in todo:
+        raise HTTPException(status_code=400, detail="Missing 'id' in request body")
+
     try:
+        # Add the todo item to DynamoDB
         table.put_item(Item=todo)
-        return todo
+        return todo  # Return the created todo item
+
     except Exception as e:
         logging.error(f"Error creating todo: {e}")
-        raise HTTPException(status_code=500, detail=str(e))
+        raise HTTPException(status_code=500, detail="Internal server error")
 
+# PUT request to update an existing todo
 @app.put("/todos/{id}")
-async def update_todo(id: str, todo: dict):
+async def update_todo(id: str, todo: Dict):
+    # Validate that 'text' is in the request body
     if 'text' not in todo:
-        raise HTTPException(status_code=400, detail='Missing "text" in request body')
+        raise HTTPException(status_code=400, detail="Missing 'text' in request body")
+
     try:
-        table.update_item(
+        # Update the todo item in DynamoDB based on the 'id'
+        response = table.update_item(
             Key={'id': id},
             UpdateExpression='SET #t = :t',
             ExpressionAttributeNames={'#t': 'text'},
-            ExpressionAttributeValues={':t': todo['text']}
+            ExpressionAttributeValues={':t': todo['text']},
+            ReturnValues="ALL_NEW"  # Return the updated item
         )
-        return todo
+
+        # Check if the item was updated and return the updated todo
+        updated_todo = response.get('Attributes')
+        if not updated_todo:
+            raise HTTPException(status_code=404, detail="Todo not found")
+
+        return updated_todo
+
     except Exception as e:
         logging.error(f"Error updating todo: {e}")
-        raise HTTPException(status_code=500, detail=str(e))
+        raise HTTPException(status_code=500, detail="Internal server error")
 
+# DELETE request to delete a todo
 @app.delete("/todos/{id}", status_code=204)
 async def delete_todo(id: str):
     try:
-        table.delete_item(Key={'id': id})
-        return {"detail": "Todo deleted"}  # You can return a message or an empty response
+        # Attempt to delete the todo item from DynamoDB
+        response = table.delete_item(Key={'id': id})
+
+        # Check if the item exists based on the HTTP status code
+        if response.get('ResponseMetadata', {}).get('HTTPStatusCode') != 200:
+            raise HTTPException(status_code=404, detail="Todo not found")
+
+        return {"detail": "Todo deleted successfully"}  # Confirm deletion
+
     except Exception as e:
         logging.error(f"Error deleting todo: {e}")
-        raise HTTPException(status_code=500, detail=str(e))
-
+        raise HTTPException(status_code=500, detail="Internal server error")
 @app.get("/health")
 async def health():
     try:

todo-app/requirements.txt

@@ -1,4 +1,6 @@
 pulumi>=3.0.0,<4.0.0
 pulumi-aws>=6.0.2,<7.0.0
 pulumi_docker==3.4.0
-setuptools
+setuptools
+
+