Skip to content

Commit

Permalink
Merge pull request #21 from 0x4447/dg/#20
Browse files Browse the repository at this point in the history
FIxed Issue #20
  • Loading branch information
davidgatti authored Jul 13, 2019
2 parents d95ddd3 + 79e783b commit f620134
Show file tree
Hide file tree
Showing 9 changed files with 339 additions and 192 deletions.
2 changes: 1 addition & 1 deletion 03_Parameters/bucket_name.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"EmailRestingPlace": {
"Description": "The S3 bucket name where the emails will be stored when they come through AWS SES.",
"Description": "The S3 bucket name where the emails will be stored when they come through AWS SES. (This bucket will be made for you)",
"Type": "String"
}
}
2 changes: 1 addition & 1 deletion 03_Parameters/code_pipeline_bucket_name.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"CodePipelineBucketName": {
"Description": "The S3 bucket name where CodePipeline will store the artifacts (this is needed only by CP to work, and pass task results to the next stage).",
"Description": "The S3 bucket name where CodePipeline will store the artifacts (this is needed only by CP to work, and pass task results to the next stage) - (This bucket needs to exist already in S3)",
"Type": "String"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"Owner": "0x4447",
"Repo": "0x4447-product-s3-email-lambda-converter",
"Branch": { "Ref": "Stage" },
"PollForSourceChanges": true,
"PollForSourceChanges": false,
"OAuthToken": { "Ref": "GitHubToken" }
},
"OutputArtifacts": [
Expand Down
21 changes: 21 additions & 0 deletions 07_Resources/Repos/converter/CodePipeline/webhook.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"PipelineConverterWebhook": {
"Type": "AWS::CodePipeline::Webhook",
"Properties": {
"Authentication": "GITHUB_HMAC",
"AuthenticationConfiguration": {
"SecretToken": { "Ref": "GitHubToken" }
},
"Filters": [
{
"JsonPath": "$.ref",
"MatchEquals": "refs/heads/{Branch}"
}
],
"TargetPipeline": { "Ref": "PipelineConverter" },
"TargetAction": "Material",
"TargetPipelineVersion": { "Fn::GetAtt": [ "PipelineConverter", "Version" ]},
"RegisterWithThirdParty": true
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"Owner": "0x4447",
"Repo": "0x4447-product-s3-email-lambda-inbound",
"Branch": { "Ref": "Stage" },
"PollForSourceChanges": true,
"PollForSourceChanges": false,
"OAuthToken": { "Ref": "GitHubToken" }
},
"OutputArtifacts": [
Expand Down
21 changes: 21 additions & 0 deletions 07_Resources/Repos/inbound/CodePipeline/webhook.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"PipelineInboundWebhook": {
"Type": "AWS::CodePipeline::Webhook",
"Properties": {
"Authentication": "GITHUB_HMAC",
"AuthenticationConfiguration": {
"SecretToken": { "Ref": "GitHubToken" }
},
"Filters": [
{
"JsonPath": "$.ref",
"MatchEquals": "refs/heads/{Branch}"
}
],
"TargetPipeline": { "Ref": "PipelineInbound" },
"TargetAction": "Material",
"TargetPipelineVersion": { "Fn::GetAtt": [ "PipelineInbound", "Version" ]},
"RegisterWithThirdParty": true
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"Owner": "0x4447",
"Repo": "0x4447-product-s3-email-lambda-outbound",
"Branch": { "Ref": "Stage" },
"PollForSourceChanges": true,
"PollForSourceChanges": false,
"OAuthToken": { "Ref": "GitHubToken" }
},
"OutputArtifacts": [
Expand Down
21 changes: 21 additions & 0 deletions 07_Resources/Repos/outbound/CodePipeline/webhook.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"PipelineOutboundWebhook": {
"Type": "AWS::CodePipeline::Webhook",
"Properties": {
"Authentication": "GITHUB_HMAC",
"AuthenticationConfiguration": {
"SecretToken": { "Ref": "GitHubToken" }
},
"Filters": [
{
"JsonPath": "$.ref",
"MatchEquals": "refs/heads/{Branch}"
}
],
"TargetPipeline": { "Ref": "PipelineOutbound" },
"TargetAction": "Material",
"TargetPipelineVersion": { "Fn::GetAtt": [ "PipelineOutbound", "Version" ]},
"RegisterWithThirdParty": true
}
}
}
Loading

0 comments on commit f620134

Please sign in to comment.