Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 10 commits into from
Feb 1, 2024
Merged

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

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c7610dd
fix import path setting in rpdk configs for new cfn cli versions
maastha Jan 22, 2024
fb38315
update project makefile
maastha Jan 24, 2024
1253ab7
fix env vars
maastha Jan 25, 2024
881ea56
Revert "fix env vars"
maastha Jan 25, 2024
c7c7bbc
fix env vars
maastha Jan 25, 2024
b534b6b
Merge remote-tracking branch 'origin/master' into CLOUDP-220385-cfn-c…
AgustinBettati Feb 1, 2024
f200454
Revert "fix env vars"
AgustinBettati Feb 1, 2024
121d9f5
additional adjustments in .rpdk-config file to have bootstrap as entr…
AgustinBettati Feb 1, 2024
f31b6dd
add requirement of cli version
AgustinBettati Feb 1, 2024
26a9aed
adjust all debug flags in make debug removing -s and -w
AgustinBettati Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cfn-resources/access-list-api-key/.rpdk-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/access-list-api-key/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ ldXflagsD=-s -w -X github.com/mongodb/mongodbatlas-cloudformation-resources/util

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
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/access-list-api-key/template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/alert-configuration/.rpdk-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/alert-configuration/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ ldXflagsD=-s -w -X github.com/mongodb/mongodbatlas-cloudformation-resources/util

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not changed in this PR but in case you can do it here, all ldXflagsD (debug) must not have -s -w, an example would be:

ldXflagsD=-X github.com/mongodb/mongodbatlas-cloudformation-resources/util.defaultLogLevel=debug -X github.com/mongodb/mongodbatlas-cloudformation-resources/version.Version=${CFNREP_GIT_SHA}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for suggestion, adjusted.

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
4 changes: 2 additions & 2 deletions cfn-resources/alert-configuration/template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/api-key/.rpdk-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/api-key/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ ldXflagsD=-s -w -X github.com/mongodb/mongodbatlas-cloudformation-resources/util

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
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/api-key/template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions cfn-resources/auditing/.rpdk-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -19,4 +19,4 @@
"protocolVersion": "2.0.0",
"pluginVersion": "2.0.4"
}
}
}
4 changes: 2 additions & 2 deletions cfn-resources/auditing/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ ldXflagsD=-s -w -X github.com/mongodb/mongodbatlas-cloudformation-resources/util

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
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/auditing/template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions cfn-resources/autogen/templateMakeFile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions cfn-resources/cloud-backup-restore-jobs/.rpdk-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/cloud-backup-restore-jobs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/cloud-backup-restore-jobs/template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/cloud-backup-schedule/.rpdk-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/cloud-backup-schedule/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions cfn-resources/cloud-backup-schedule/template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions cfn-resources/cloud-backup-snapshot-export-bucket/.rpdk-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/cloud-backup-snapshot-export-bucket/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions cfn-resources/cloud-backup-snapshot-export-bucket/template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/cloud-backup-snapshot/.rpdk-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/cloud-backup-snapshot/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions cfn-resources/cloud-backup-snapshot/template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/cluster-outage-simulation/.rpdk-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"typeName": "MongoDB::Atlas::ClusterOutageSimulation",
"language": "go",
"runtime": "go1.x",
"entrypoint": "handler",
"testEntrypoint": "handler",
"entrypoint": "bootstrap",
"testEntrypoint": "bootstrap",
"settings": {
"import_path": "github.com/mongodb/mongodbatlas-cloudformation-resources/cluster-outage-simulation",
"protocolVersion": "2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/cluster-outage-simulation/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ ldXflagsD=-s -w -X github.com/mongodb/mongodbatlas-cloudformation-resources/util

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
Expand Down
Loading
Loading