Skip to content

Updated to abstract out the S3 buckets #1

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Updated to abstract out the S3 buckets #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c1a6e8
Updated to abstract out the S3 buckets
May 19, 2017
2058060
Updated to fix whitespace differences
May 20, 2017
d1c2a08
Updated per peer review comments to clarify the description of the ne…
May 22, 2017
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
18 changes: 14 additions & 4 deletions transit-vpc-primary-account-existing-vpc.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,16 @@
"Type" : "String",
"Default" : ""
},
"CodeLocationS3Bucket" : {
"Description" : "The location of the Transit VPC automation code used by this solution",
"Type" : "String",
"Default" : "solutions-reference",
,
"SolutionsHelperS3BucketPrefix" : {
"Description" : "The S3 Bucket name prefix of S3 bucket location for the Solutions Helper Lambda code used by this solution. The AWS REGION will be appended to this prefix",
"Type" : "String",
"Default" : "solutions",
,
"SendAnonymousData": {
"Description": "Choose to send anonymous data to AWS.",
"Type": "String",
Expand Down Expand Up @@ -143,7 +153,7 @@
"Mappings" : {
"Function" : {
"Configurator" : {
"CodeLocation" : "solutions-reference/transit-vpc/v3/transit-vpc-push-cisco-config.zip",
"CodeLocation" : { "Fn::Join" : ["", [{ "Ref" : "CodeLocationS3Bucket" }, "/transit-vpc/v3/transit-vpc-push-cisco-config.zip"]]},
"CodeRegion" : "us-east-1",
"Name" : "cisco-configurator",
"Description": "Transit VPC: This function is invoked when a generic VPN configuration is placed in an S3 bucket - it converts the generic information into Cisco IOS specific commands and pushes the config to transit VPC routers.",
Expand All @@ -152,7 +162,7 @@
"MemorySize": "128"
},
"Poller" : {
"CodeLocation" : "solutions-reference/transit-vpc/v3/transit-vpc-poller.py",
"CodeLocation" : { "Fn::Join" : ["", [{ "Ref" : "CodeLocationS3Bucket" }, "/transit-vpc/v3/transit-vpc-poller.py"]]},
"CodeRegion" : "us-east-1",
"Name" : "vgw-poller",
"Description": "Transit VPC: Poller function responsible for identifying specifically tagged VGWs and creating VPN connections to transit VPC.",
Expand Down Expand Up @@ -475,7 +485,7 @@
"Action": [
"s3:GetObject"
],
"Resource": "arn:aws:s3:::solutions-reference/*"
"Resource": { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "CodeLocationS3Bucket" }, "/*"]]}
}
]
}
Expand All @@ -489,7 +499,7 @@
"Role": { "Fn::GetAtt" : [ "SolutionHelperRole" , "Arn" ] },
"Description": "Transit VPC: CloudFormation custom resource function invoked during transit VPC CloudFormation create, update, and delete stack operations.",
"Code": {
"S3Bucket": { "Fn::Join": ["", ["solutions-", {"Ref" : "AWS::Region"}]] },
"S3Bucket": { "Fn::Join": ["", [ {"Ref" : "SolutionsHelperS3BucketPrefix"}, {"Ref" : "AWS::Region"}]] },
"S3Key": "library/solution-helper/v3/solution-helper.zip"
},
"Runtime": "python2.7",
Expand Down
18 changes: 14 additions & 4 deletions transit-vpc-primary-account.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@
"Type" : "String",
"Default" : ""
},
"CodeLocationS3Bucket" : {
"Description" : "The location of the Transit VPC automation code used by this solution",
"Type" : "String",
"Default" : "solutions-reference",
,
"SolutionsHelperS3BucketPrefix" : {
"Description" : "The S3 Bucket name prefix of S3 bucket location for the Solutions Helper Lambda code used by this solution. The AWS REGION will be appended to this prefix",
"Type" : "String",
"Default" : "solutions",
,
"SendAnonymousData": {
"Description": "Choose to send anonymous data to AWS.",
"Type": "String",
Expand Down Expand Up @@ -132,7 +142,7 @@
"Mappings" : {
"Function" : {
"Configurator" : {
"CodeLocation" : "solutions-reference/transit-vpc/v3/transit-vpc-push-cisco-config.zip",
"CodeLocation" : { "Fn::Join" : ["", [{ "Ref" : "CodeLocationS3Bucket" }, "/transit-vpc/v3/transit-vpc-push-cisco-config.zip"]]},
"CodeRegion" : "us-east-1",
"Name" : "cisco-configurator",
"Description": "Transit VPC: This function is invoked when a generic VPN configuration is placed in an S3 bucket - it converts the generic information into Cisco IOS specific commands and pushes the config to transit VPC routers.",
Expand All @@ -141,7 +151,7 @@
"MemorySize": "128"
},
"Poller" : {
"CodeLocation" : "solutions-reference/transit-vpc/v3/transit-vpc-poller.py",
"CodeLocation" : { "Fn::Join" : ["", [{ "Ref" : "CodeLocationS3Bucket" }, "/transit-vpc/v3/transit-vpc-poller.py"]]},
"CodeRegion" : "us-east-1",
"Name" : "vgw-poller",
"Description": "Transit VPC: Poller function responsible for identifying specifically tagged VGWs and creating VPN connections to transit VPC.",
Expand Down Expand Up @@ -543,7 +553,7 @@
"Action": [
"s3:GetObject"
],
"Resource": "arn:aws:s3:::solutions-reference/*"
"Resource": { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "CodeLocationS3Bucket" }, "/*"]]}
}
]
}
Expand All @@ -557,7 +567,7 @@
"Role": { "Fn::GetAtt" : [ "SolutionHelperRole" , "Arn" ] },
"Description": "Transit VPC: CloudFormation custom resource function invoked during transit VPC CloudFormation create, update, and delete stack operations.",
"Code": {
"S3Bucket": { "Fn::Join": ["", ["solutions-", {"Ref" : "AWS::Region"}]] },
"S3Bucket": { "Fn::Join": ["", [ {"Ref" : "SolutionsHelperS3BucketPrefix"}, {"Ref" : "AWS::Region"}]] },
"S3Key": "library/solution-helper/v3/solution-helper.zip"
},
"Runtime": "python2.7",
Expand Down
15 changes: 12 additions & 3 deletions transit-vpc-second-account.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,21 @@
"Type" : "String",
"Default" : "vpnconfigs/"
}
"CodeLocationS3Bucket" : {
"Description" : "The location of the Transit VPC automation code used by this solution",
"Type" : "String",
"Default" : "solutions-reference",
,
"SolutionsHelperS3BucketPrefix" : {
"Description" : "The S3 Bucket name prefix of S3 bucket location for the Solutions Helper Lambda code used by this solution. The AWS REGION will be appended to this prefix",
"Type" : "String",
"Default" : "solutions",
}
},
"Mappings" : {
"Function" : {
"Poller" : {
"CodeLocation" : "solutions-reference/transit-vpc/v3/transit-vpc-poller.py",
"CodeLocation" : { "Fn::Join" : ["", [{ "Ref" : "CodeLocationS3Bucket" }, "/transit-vpc/v3/transit-vpc-poller.py"]]},
"Name" : "vgw-poller",
"Description": "Transit VPC: Poller function responsible for identifying specifically tagged VGWs and creating VPN connections to transit VPC.",
"Runtime": "python2.7",
Expand Down Expand Up @@ -86,7 +96,7 @@
"Role": { "Fn::GetAtt" : [ "SolutionHelperRole" , "Arn" ] },
"Description": "Transit VPC: CloudFormation custom resource function invoked during transit VPC CloudFormation create, update, and delete stack operations.",
"Code": {
"S3Bucket": { "Fn::Join": ["", ["solutions-", {"Ref" : "AWS::Region"}]] },
"S3Bucket": { "Fn::Join": ["", [ {"Ref" : "SolutionsHelperS3BucketPrefix"}, "-", {"Ref" : "AWS::Region"}]] },
"S3Key": "library/solution-helper/v2/solution-helper.zip"
},
"Runtime": "python2.7",
Expand Down Expand Up @@ -200,4 +210,3 @@
}
}
}