Merge pull request #19 from sliedig/py-upg

sliedig · web-flow · commit e95c7f967f51 · 2023-06-14T21:46:23.000+08:00
feat: Python 3.10.x upgrade
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,3 +1,3 @@
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-* @aws-samples/aws-serverless-developer-experience-workshop-python
+* @aws-samples/aws-serverless-developer-experience-workshop-py
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/unicorn_contracts/poetry.lock b/unicorn_contracts/poetry.lock
diff --git a/unicorn_contracts/pyproject.toml b/unicorn_contracts/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "contracts_service"
-version = "0.1.0"
+version = "0.2.0"
 description = "Unicorn Properties Contact Service"
 authors = ["Amazon Web Services"]
 exclude = ["src/events/"]
@@ -9,7 +9,8 @@ packages = [{ include = "contracts_service", from = "src" }]
 [tool.poetry.dependencies]
 python = "3.10.11"
 boto3 = "^1.26.121"
-aws-lambda-powertools = {extras = ["tracer"], version = "^2.14.1"}
+aws-lambda-powertools = {extras = ["tracer"], version = "^2.16.2"}
+aws-xray-sdk = "^2.12.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.1.2"
@@ -19,7 +20,6 @@ coverage = "^6.4.2"
 requests = "^2.28.1"
 moto = "^3.1.17"
 importlib-metadata = "^4.12.0"
-aws-lambda-powertools = {extras = ["aws-sdk"], version = "^2.14.1"}
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
diff --git a/unicorn_contracts/template.yaml b/unicorn_contracts/template.yaml
@@ -54,7 +54,7 @@ Globals:
   Api:
     OpenApiVersion: 3.0.1
   Function:
-    Runtime: python3.9
+    Runtime: python3.10
     MemorySize: 128
     Timeout: 3
     Tracing: Active
diff --git a/unicorn_contracts/tests/unit/helper.py b/unicorn_contracts/tests/unit/helper.py
@@ -2,14 +2,20 @@
 
 TABLE_NAME = "table1"
 
+
 def load_event(filename):
     file_dir = os.path.dirname(os.path.abspath((inspect.stack()[0])[1]))
     print(file_dir)
+
     with open(os.path.join(file_dir, filename), 'r') as f:
         return json.load(f)
 
-def return_env_vars_dict(k={}):
-    d = {
+
+def return_env_vars_dict(k=None):
+    if k is None:
+        k = {}
+
+    env_dict = {
         "AWS_DEFAULT_REGION": "ap-southeast-2",
         "DYNAMODB_TABLE": TABLE_NAME,
         "EVENT_BUS": "test-eventbridge",
@@ -21,8 +27,10 @@ def return_env_vars_dict(k={}):
         "POWERTOOLS_TRACE_DISABLED":"true",
         "SERVICE_NAMESPACE": "unicorn.contracts",
     }
-    d.update(k)
-    return d
+
+    env_dict |= k
+
+    return env_dict
 
 
 def create_ddb_table_contracts(dynamodb):
@@ -48,6 +56,7 @@ def create_ddb_table_contracts(dynamodb):
     table.meta.client.get_waiter('table_exists').wait(TableName='table1')
     return table
 
+
 def create_ddb_table_contracts_with_entry(dynamodb):
     table = dynamodb.create_table(
         TableName=TABLE_NAME,
diff --git a/unicorn_properties/poetry.lock b/unicorn_properties/poetry.lock
diff --git a/unicorn_properties/pyproject.toml b/unicorn_properties/pyproject.toml
@@ -9,9 +9,10 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.9"
-boto3 = "^1.26.121"
-aws-lambda-powertools = {extras = ["tracer"], version = "^2.14.1"}
+python = "^3.10"
+boto3 = "^1.26.151"
+aws-lambda-powertools = {extras = ["tracer"], version = "^2.16.2"}
+aws-xray-sdk = "^2.12.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.1.2"
@@ -20,7 +21,6 @@ pytest-cov = "^3.0.0"
 coverage = "^6.4.2"
 requests = "^2.28.1"
 moto = "^3.1.17"
-aws-lambda-powertools = {extras = ["aws-sdk"], version = "^2.14.1"}
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
diff --git a/unicorn_properties/template.yaml b/unicorn_properties/template.yaml
@@ -57,7 +57,7 @@ Conditions:
 ######################################
 Globals:
   Function:
-    Runtime: python3.9
+    Runtime: python3.10
     MemorySize: 128
     Timeout: 15
     Tracing: Active
diff --git a/unicorn_web/poetry.lock b/unicorn_web/poetry.lock
diff --git a/unicorn_web/pyproject.toml b/unicorn_web/pyproject.toml
@@ -9,11 +9,12 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.9"
-boto3 = "^1.26.121"
-aws-lambda-powertools = {extras = ["tracer"], version = "^2.14.1"}
+python = "^3.10"
+boto3 = "^1.26.151"
+aws-lambda-powertools = {extras = ["tracer"], version = "^2.16.2"}
 requests = "2.28.1"
 crhelper = "2.0.11"
+aws-xray-sdk = "^2.12.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.1.2"
@@ -23,7 +24,6 @@ coverage = "^6.4.2"
 requests = "^2.28.1"
 moto = "^3.1.17"
 importlib-metadata = "^4.12.0"
-aws-lambda-powertools = {extras = ["aws-sdk"], version = "^2.14.1"}
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
diff --git a/unicorn_web/src/approvals_service/publication_approved.py b/unicorn_web/src/approvals_service/publication_approved.py
@@ -1,7 +1,6 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: MIT-0
 import os
-
 import boto3
 from aws_lambda_powertools.logging import Logger
 from aws_lambda_powertools.tracing import Tracer
@@ -23,7 +22,7 @@
 metrics: Metrics = Metrics()
 
 # Initialise boto3 clients
-event_bridge = boto3.client('events')
+
 dynamodb = boto3.resource('dynamodb')
 table = dynamodb.Table(DYNAMODB_TABLE)  # type: ignore
 
diff --git a/unicorn_web/template.yaml b/unicorn_web/template.yaml
@@ -54,7 +54,7 @@ Mappings:
 ######################################
 Globals:
   Function:
-    Runtime: python3.9
+    Runtime: python3.10
     Tracing: Active
     Timeout: 15
     MemorySize: 128

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners`
`2`	`2`
`3`		`-* @aws-samples/aws-serverless-developer-experience-workshop-python`
	`3`	`+* @aws-samples/aws-serverless-developer-experience-workshop-py`