fix: Fix rpdk configs for new cloudformation cli versions (#881)

Co-authored-by: Agustin Bettati <[email protected]>
mongodb · Feb 1, 2024 · 11973c5 · 11973c5
1 parent d7cfcfc
commit 11973c5
Show file tree

Hide file tree

Showing 135 changed files with 319 additions and 315 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -12,6 +12,10 @@ After the above 2 steps are completed and we've agreed on a path forward:
 4. Commit and push your changes to your branch then submit a pull request against the current release branch, not master. The naming scheme of the branch is `release-staging-v#.#.#`. **Note**: There will only be one release branch at a time.  
 5. A repo maintainer will review the your pull request, and may either request additional changes or merge the pull request.
 
+## Requirements
+
+- Resources configurations, specifcally `.rpdk-config` and `Makefile` build commands, are compatible with cloudformation-cli (`cfn`) versions 0.2.34 and above.
+
 ## Testing
 We have a `/test/README.md` for every resource in `cfn-resources`. You will also find [TESTING.md](./TESTING.md) which provides testing practices common to all resources. Please follow below guidelines for testing to ensure quality:
 

diff --git a/cfn-resources/access-list-api-key/.rpdk-config b/cfn-resources/access-list-api-key/.rpdk-config
@@ -3,8 +3,8 @@
     "typeName": "MongoDB::Atlas::AccessListAPIKey",
     "language": "go",
     "runtime": "go1.x",
-    "entrypoint": "handler",
-    "testEntrypoint": "handler",
+    "entrypoint": "bootstrap",
+    "testEntrypoint": "bootstrap",
     "settings": {
         "version": false,
         "subparser_name": null,

diff --git a/cfn-resources/access-list-api-key/Makefile b/cfn-resources/access-list-api-key/Makefile
@@ -5,15 +5,15 @@ goos=linux
 goarch=amd64
 CFNREP_GIT_SHA?=$(shell git rev-parse HEAD)
 ldXflags=-s -w -X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLogLevel=info -X github.com/mongodb/mongodbatlas-cloudformation-resources/version.Version=${CFNREP_GIT_SHA}
-ldXflagsD=-s -w -X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLogLevel=debug -X github.com/mongodb/mongodbatlas-cloudformation-resources/version.Version=${CFNREP_GIT_SHA}
+ldXflagsD=-X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLogLevel=debug -X github.com/mongodb/mongodbatlas-cloudformation-resources/version.Version=${CFNREP_GIT_SHA}
 
 build:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflags)" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflags)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 debug:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 clean:
 	rm -rf bin

diff --git a/cfn-resources/access-list-api-key/template.yml b/cfn-resources/access-list-api-key/template.yml
@@ -11,14 +11,14 @@ Resources:
   TypeFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: handler
+      Handler: bootstrap
       Runtime: go1.x
       CodeUri: bin/
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: handler
+      Handler: bootstrap
       Runtime: go1.x
       CodeUri: bin/
       Environment: 

diff --git a/cfn-resources/alert-configuration/.rpdk-config b/cfn-resources/alert-configuration/.rpdk-config
@@ -3,8 +3,8 @@
     "typeName": "MongoDB::Atlas::AlertConfiguration",
     "language": "go",
     "runtime": "go1.x",
-    "entrypoint": "handler",
-    "testEntrypoint": "handler",
+    "entrypoint": "bootstrap",
+    "testEntrypoint": "bootstrap",
     "settings": {
         "version": false,
         "subparser_name": null,

diff --git a/cfn-resources/alert-configuration/Makefile b/cfn-resources/alert-configuration/Makefile
@@ -5,15 +5,15 @@ goos=linux
 goarch=amd64
 CFNREP_GIT_SHA?=$(shell git rev-parse HEAD)
 ldXflags=-s -w -X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLogLevel=info -X github.com/mongodb/mongodbatlas-cloudformation-resources/version.Version=${CFNREP_GIT_SHA}
-ldXflagsD=-s -w -X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLogLevel=debug -X github.com/mongodb/mongodbatlas-cloudformation-resources/version.Version=${CFNREP_GIT_SHA}
+ldXflagsD=-X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLogLevel=debug -X github.com/mongodb/mongodbatlas-cloudformation-resources/version.Version=${CFNREP_GIT_SHA}
 
 build:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflags)" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflags)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 debug:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 clean:
 	rm -rf bin
diff --git a/cfn-resources/alert-configuration/template.yml b/cfn-resources/alert-configuration/template.yml
@@ -11,14 +11,14 @@ Resources:
   TypeFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: handler
+      Handler: bootstrap
       Runtime: go1.x
       CodeUri: bin/
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: handler
+      Handler: bootstrap
       Runtime: go1.x
       CodeUri: bin/
       Environment:

diff --git a/cfn-resources/api-key/.rpdk-config b/cfn-resources/api-key/.rpdk-config
@@ -3,8 +3,8 @@
     "typeName": "MongoDB::Atlas::APIKey",
     "language": "go",
     "runtime": "go1.x",
-    "entrypoint": "handler",
-    "testEntrypoint": "handler",
+    "entrypoint": "bootstrap",
+    "testEntrypoint": "bootstrap",
     "settings": {
         "version": false,
         "subparser_name": null,

diff --git a/cfn-resources/api-key/Makefile b/cfn-resources/api-key/Makefile
@@ -5,15 +5,15 @@ goos=linux
 goarch=amd64
 CFNREP_GIT_SHA?=$(shell git rev-parse HEAD)
 ldXflags=-s -w -X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLogLevel=info -X github.com/mongodb/mongodbatlas-cloudformation-resources/version.Version=${CFNREP_GIT_SHA}
-ldXflagsD=-s -w -X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLogLevel=debug -X github.com/mongodb/mongodbatlas-cloudformation-resources/version.Version=${CFNREP_GIT_SHA}
+ldXflagsD=-X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLogLevel=debug -X github.com/mongodb/mongodbatlas-cloudformation-resources/version.Version=${CFNREP_GIT_SHA}
 
 build:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflags)" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflags)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 debug:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 clean:
 	rm -rf bin

diff --git a/cfn-resources/api-key/template.yml b/cfn-resources/api-key/template.yml
@@ -11,14 +11,14 @@ Resources:
   TypeFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: handler
+      Handler: bootstrap
       Runtime: go1.x
       CodeUri: bin/
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: handler
+      Handler: bootstrap
       Runtime: go1.x
       CodeUri: bin/
       Environment: 

diff --git a/cfn-resources/auditing/.rpdk-config b/cfn-resources/auditing/.rpdk-config
@@ -3,8 +3,8 @@
     "typeName": "MongoDB::Atlas::Auditing",
     "language": "go",
     "runtime": "go1.x",
-    "entrypoint": "handler",
-    "testEntrypoint": "handler",
+    "entrypoint": "bootstrap",
+    "testEntrypoint": "bootstrap",
     "settings": {
         "version": false,
         "subparser_name": null,
@@ -19,4 +19,4 @@
         "protocolVersion": "2.0.0",
         "pluginVersion": "2.0.4"
     }
-}
+}
diff --git a/cfn-resources/auditing/Makefile b/cfn-resources/auditing/Makefile
@@ -5,15 +5,15 @@ goos=linux
 goarch=amd64
 CFNREP_GIT_SHA?=$(shell git rev-parse HEAD)
 ldXflags=-s -w -X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLogLevel=info -X github.com/mongodb/mongodbatlas-cloudformation-resources/version.Version=${CFNREP_GIT_SHA}
-ldXflagsD=-s -w -X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLogLevel=debug -X github.com/mongodb/mongodbatlas-cloudformation-resources/version.Version=${CFNREP_GIT_SHA}
+ldXflagsD=-X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLogLevel=debug -X github.com/mongodb/mongodbatlas-cloudformation-resources/version.Version=${CFNREP_GIT_SHA}
 
 build:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflags)" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflags)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 debug:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 clean:
 	rm -rf bin

diff --git a/cfn-resources/auditing/template.yml b/cfn-resources/auditing/template.yml
@@ -11,14 +11,14 @@ Resources:
   TypeFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: handler
+      Handler: bootstrap
       Runtime: go1.x
       CodeUri: bin/
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: handler
+      Handler: bootstrap
       Runtime: go1.x
       CodeUri: bin/
       Environment:

diff --git a/cfn-resources/autogen/templateMakeFile b/cfn-resources/autogen/templateMakeFile
@@ -7,11 +7,11 @@ ldXflags=github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLo
 ldXflagsD=github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLogLevel=debug
 build:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="-s -w -X '$(ldXflags)'" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="-s -w -X '$(ldXflags)'" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 debug:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="-s -w -X '$(ldXflagsD)'" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="-s -w -X '$(ldXflagsD)'" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 clean:
-	rm -rf bin
+	rm -rf bin
diff --git a/cfn-resources/cloud-backup-restore-jobs/.rpdk-config b/cfn-resources/cloud-backup-restore-jobs/.rpdk-config
@@ -3,10 +3,10 @@
     "typeName": "MongoDB::Atlas::CloudBackUpRestoreJobs",
     "language": "go",
     "runtime": "go1.x",
-    "entrypoint": "handler",
-    "testEntrypoint": "handler",
+    "entrypoint": "bootstrap",
+    "testEntrypoint": "bootstrap",
     "settings": {
-        "importpath": "github.com/mongodb/mongodbatlas-cloudformation-resources/cloud-backup-restore-jobs",
+        "import_path": "github.com/mongodb/mongodbatlas-cloudformation-resources/cloud-backup-restore-jobs",
         "protocolVersion": "2.0.0",
         "pluginVersion": "2.0.4"
     }

diff --git a/cfn-resources/cloud-backup-restore-jobs/Makefile b/cfn-resources/cloud-backup-restore-jobs/Makefile
@@ -9,11 +9,11 @@ ldXflagsD=-X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defau
 
 build:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflags)" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflags)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 debug:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 clean:
 	rm -rf bin

diff --git a/cfn-resources/cloud-backup-restore-jobs/template.yml b/cfn-resources/cloud-backup-restore-jobs/template.yml
@@ -10,14 +10,14 @@ Resources:
   TypeFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: handler
+      Handler: bootstrap
       Runtime: go1.x
       CodeUri: bin/
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: handler
+      Handler: bootstrap
       Runtime: go1.x
       CodeUri: bin/
       Environment:

diff --git a/cfn-resources/cloud-backup-schedule/.rpdk-config b/cfn-resources/cloud-backup-schedule/.rpdk-config
@@ -3,8 +3,8 @@
     "typeName": "MongoDB::Atlas::CloudBackupSchedule",
     "language": "go",
     "runtime": "go1.x",
-    "entrypoint": "handler",
-    "testEntrypoint": "handler",
+    "entrypoint": "bootstrap",
+    "testEntrypoint": "bootstrap",
     "settings": {
         "version": false,
         "subparser_name": null,

diff --git a/cfn-resources/cloud-backup-schedule/Makefile b/cfn-resources/cloud-backup-schedule/Makefile
@@ -9,11 +9,11 @@ ldXflagsD=-X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defau
 
 build:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflags)" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflags)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 debug:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 clean:
 	rm -rf bin
diff --git a/cfn-resources/cloud-backup-schedule/template.yml b/cfn-resources/cloud-backup-schedule/template.yml
@@ -11,14 +11,14 @@ Resources:
   TypeFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: handler
+      Handler: bootstrap
       Runtime: go1.x
       CodeUri: bin/
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: handler
+      Handler: bootstrap
       Runtime: go1.x
       CodeUri: bin/
       Environment:

diff --git a/cfn-resources/cloud-backup-snapshot-export-bucket/.rpdk-config b/cfn-resources/cloud-backup-snapshot-export-bucket/.rpdk-config
@@ -2,10 +2,10 @@
     "typeName": "MongoDB::Atlas::CloudBackupSnapshotExportBucket",
     "language": "go",
     "runtime": "go1.x",
-    "entrypoint": "handler",
-    "testEntrypoint": "handler",
+    "entrypoint": "bootstrap",
+    "testEntrypoint": "bootstrap",
     "settings": {
-        "importpath": "github.com/mongodb/mongodbatlas-cloudformation-resources/cloud-backup-snapshot-export-bucket",
+        "import_path": "github.com/mongodb/mongodbatlas-cloudformation-resources/cloud-backup-snapshot-export-bucket",
         "protocolVersion": "2.0.0",
         "pluginVersion": "2.0.4"
     }

diff --git a/cfn-resources/cloud-backup-snapshot-export-bucket/Makefile b/cfn-resources/cloud-backup-snapshot-export-bucket/Makefile
@@ -9,11 +9,11 @@ ldXflagsD=-X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defau
 
 build:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflags)" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflags)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 debug:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 clean:
 	rm -rf bin
diff --git a/cfn-resources/cloud-backup-snapshot-export-bucket/template.yml b/cfn-resources/cloud-backup-snapshot-export-bucket/template.yml
@@ -11,14 +11,14 @@ Resources:
   TypeFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: handler
+      Handler: bootstrap
       Runtime: go1.x
       CodeUri: bin/
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: handler
+      Handler: bootstrap
       Runtime: go1.x
       CodeUri: bin/
       Environment:

diff --git a/cfn-resources/cloud-backup-snapshot/.rpdk-config b/cfn-resources/cloud-backup-snapshot/.rpdk-config
@@ -3,8 +3,8 @@
     "typeName": "MongoDB::Atlas::CloudBackupSnapshot",
     "language": "go",
     "runtime": "go1.x",
-    "entrypoint": "handler",
-    "testEntrypoint": "handler",
+    "entrypoint": "bootstrap",
+    "testEntrypoint": "bootstrap",
     "settings": {
 
         "import_path": "github.com/mongodb/mongodbatlas-cloudformation-resources/cloud-backup-snapshot",

diff --git a/cfn-resources/cloud-backup-snapshot/Makefile b/cfn-resources/cloud-backup-snapshot/Makefile
@@ -9,11 +9,11 @@ ldXflagsD=-X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defau
 
 build:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflags)" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflags)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 debug:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/handler cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
 
 clean:
 	rm -rf bin
diff --git a/cfn-resources/cloud-backup-snapshot/template.yml b/cfn-resources/cloud-backup-snapshot/template.yml
@@ -12,14 +12,14 @@ Resources:
   TypeFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: handler
+      Handler: bootstrap
       Runtime: go1.x
       CodeUri: bin/
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: handler
+      Handler: bootstrap
       Runtime: go1.x
       CodeUri: bin/
       Environment: