provided.al2 migration

.pre-commit-config.yaml

@@ -65,9 +65,6 @@ repos:
     description: Run pytest in the local virtualenv
     entry: >
       pytest
-      --cov-report=term
-      --cov-report=html
-      --cov="rpdk.go"
       --durations=5
       "tests/"
     language: system

.pylintrc

@@ -9,7 +9,6 @@ persistent=yes
 disable=
     missing-docstring,          # not everything needs a docstring
     fixme,                      # work in progress
-    bad-continuation,           # clashes with black
     too-few-public-methods,     # triggers when inheriting
     ungrouped-imports,          # clashes with isort
     duplicate-code,             # broken, setup.py

examples/github-repo/.rpdk-config

@@ -1,9 +1,9 @@
 {
     "typeName": "Example::GitHub::Repo",
     "language": "go",
-    "runtime": "go1.x",
-    "entrypoint": "handler",
-    "testEntrypoint": "handler",
+    "runtime": "provided.al2",
+    "entrypoint": "bootstrap",
+    "testEntrypoint": "bootstrap",
     "settings": {
         "import_path": "github.com/aws-cloudformation/cloudformation-cli-go-plugin/examples/github-repo",
         "protocolVersion": "2.0.0",

examples/github-repo/docs/README.md

@@ -43,9 +43,9 @@ _Required_: Yes
 
 _Type_: String
 
-_Minimum_: <code>1</code>
+_Minimum Length_: <code>1</code>
 
-_Maximum_: <code>50</code>
+_Maximum Length_: <code>50</code>
 
 _Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
 
@@ -67,9 +67,9 @@ _Required_: No
 
 _Type_: String
 
-_Minimum_: <code>20</code>
+_Minimum Length_: <code>20</code>
 
-_Maximum_: <code>250</code>
+_Maximum Length_: <code>250</code>
 
 _Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
 
@@ -81,9 +81,9 @@ _Required_: No
 
 _Type_: String
 
-_Minimum_: <code>20</code>
+_Minimum Length_: <code>20</code>
 
-_Maximum_: <code>250</code>
+_Maximum Length_: <code>250</code>
 
 _Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
 

examples/github-repo/makebuild

@@ -0,0 +1,8 @@
+# This file is autogenerated, do not edit;
+# changes will be undone by the next 'generate' command.
+
+.PHONY: build
+build:
+	cfn generate
+	#env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -tags="$(TAGS)" -o bin/handler cmd/main.go
+	env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -tags="lambda.norpc,$(TAGS)" -o bin/bootstrap cmd/main.go #local

examples/github-repo/resource-role.yaml

@@ -15,6 +15,13 @@ Resources:
             Principal:
               Service: resources.cloudformation.amazonaws.com
             Action: sts:AssumeRole
+            Condition:
+              StringEquals:
+                aws:SourceAccount:
+                  Ref: AWS::AccountId
+              StringLike:
+                aws:SourceArn:
+                  Fn::Sub: arn:${AWS::Partition}:cloudformation:${AWS::Region}:${AWS::AccountId}:type/resource/Example-GitHub-Repo/*
       Path: "/"
       Policies:
         - PolicyName: ResourceTypePolicy

examples/github-repo/template.yml

@@ -9,9 +9,13 @@ Globals:
 Resources:
   TypeFunction:
     Type: AWS::Serverless::Function
+    Metadata:
+      BuildMethod: go1.x
     Properties:
-      Handler: handler
-      Runtime: go1.x
+      Handler: bootstrap
+      Runtime: provided.al2
+      Architectures:
+        - x86_64
       CodeUri: bin/
       # Uncomment to test with AWS resources
       # Environment:
@@ -20,7 +24,11 @@ Resources:
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
+    Metadata:
+      BuildMethod: go1.x
     Properties:
-      Handler: handler
-      Runtime: go1.x
+      Handler: bootstrap
+      Runtime: provided.al2
+      Architectures:
+        - x86_64
       CodeUri: bin/

python/rpdk/go/codegen.py

@@ -32,9 +32,9 @@ class GoExecutableNotFoundError(SysExitRecommendedError):
 class GoLanguagePlugin(LanguagePlugin):
     MODULE_NAME = __name__
     NAME = "go"
-    RUNTIME = "go1.x"
-    ENTRY_POINT = "handler"
-    TEST_ENTRY_POINT = "handler"
+    RUNTIME = "provided.al2"
+    ENTRY_POINT = "bootstrap"
+    TEST_ENTRY_POINT = "bootstrap"
     CODE_URI = "bin/"
 
     def __init__(self):
@@ -154,7 +154,7 @@ def init_handlers(self, project: Project, src):
         contents = template.render()
         project.safewrite(path, contents)
 
-    # pylint: disable=unused-argument,no-self-use
+    # pylint: disable=unused-argument
     def _get_generated_root(self, project: Project):
         LOG.debug("Init started")
 
@@ -251,7 +251,7 @@ def pre_package(project: Project):
 
     @staticmethod
     def _find_exe(project: Project):
-        exe_glob = list((project.root / "bin").glob("handler"))
+        exe_glob = list((project.root / "bin").glob("bootstrap"))
         if not exe_glob:
             LOG.debug("No Go executable match")
             raise GoExecutableNotFoundError(

python/rpdk/go/templates/Makefile

@@ -5,7 +5,7 @@ build:
 
 test:
 	cfn generate
-	env GOOS=linux go build -ldflags="-s -w" -o bin/handler cmd/main.go
+	env GOOS=linux go build -ldflags="-s -w" -tags="lambda.norpc,$(TAGS)" -o bin/bootstrap cmd/main.go
 
 clean:
 	rm -rf bin

python/rpdk/go/templates/makebuild

@@ -4,4 +4,4 @@
 .PHONY: build
 build:
 	cfn generate
-	env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -tags="$(TAGS)" -o bin/handler cmd/main.go
+	env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -tags="lambda.norpc,$(TAGS)" -o bin/bootstrap cmd/main.go