Merge pull request #398 from KamilBlaz/feature/cloudformation

ref: update python runtime && edit README.md
aws-cloudformation · Apr 22, 2024 · ed68d8a · ed68d8a
2 parents 0c5ec90 + a6b405d
commit ed68d8a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/aws/services/CloudFormation/MacrosExamples/Boto3/README.md b/aws/services/CloudFormation/MacrosExamples/Boto3/README.md
@@ -31,8 +31,9 @@ A typical use case for this macro might be, for example, to provide some basic c
 
     ```shell
     aws cloudformation deploy \
-        --stack-name boto3-macro-example \
-        --template-file example.template
+        --stack-name ExecutionRoleBuilderCFnMacro \
+        --template-file ExecutionRoleBuilderCFnMacro.packaged.template  \
+        --capabilities CAPABILITY_IAM
     ```
 
 ## Usage

diff --git a/aws/services/CloudFormation/MacrosExamples/Boto3/lambda/resource.py b/aws/services/CloudFormation/MacrosExamples/Boto3/lambda/resource.py
@@ -11,10 +11,8 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-from urllib2 import build_opener, HTTPHandler, Request
-import base64
+import urllib.request
 import boto3
-import httplib
 import json
 
 def sendResponse(event, context, status, message):
@@ -27,14 +25,13 @@ def sendResponse(event, context, status, message):
         "PhysicalResourceId": event["ResourceProperties"]["Action"],
         "Data": {},
     })
-
-    request = Request(event['ResponseURL'], data=body)
-    request.add_header('Content-Type', '')
+    request = urllib.request.Request(event['ResponseURL'], data=body.encode('utf-8'))
+    request.add_header('Content-Type', 'application/json')
     request.add_header('Content-Length', len(body))
     request.get_method = lambda: 'PUT'
 
-    opener = build_opener(HTTPHandler)
-    response = opener.open(request)
+    with urllib.request.urlopen(request) as response:
+        pass
 
 def execute(action, properties):
     action = action.split(".")

diff --git a/aws/services/CloudFormation/MacrosExamples/Boto3/macro.template b/aws/services/CloudFormation/MacrosExamples/Boto3/macro.template
@@ -4,15 +4,15 @@ Resources:
   ResourceFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: python2.7
+      Runtime: python3.11
       CodeUri: lambda
       Handler: resource.handler
       Policies: PowerUserAccess
 
   MacroFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: python3.6
+      Runtime: python3.11
       CodeUri: lambda
       Handler: macro.handler
       Environment: