Merge pull request #13 from 0x4447/development

No more bucket force
0x4447 · Apr 28, 2019 · 3de6a44 · 3de6a44
2 parents 40e29b0 + 252502e
commit 3de6a44
Show file tree

Hide file tree

Showing 8 changed files with 328 additions and 343 deletions.
diff --git a/07_Resources/Repos/converter/CodeBuild/Policies/s3.json b/07_Resources/Repos/converter/CodeBuild/Policies/s3.json
@@ -10,7 +10,7 @@
 					{
 						"Effect": "Allow",
 						"Action": "s3:*",
-						"Resource": { "Fn::Sub": "arn:aws:s3:::${S3Code}/*"}
+						"Resource": { "Fn::Sub": "arn:aws:s3:::${CodePipelineBucketName}/*"}
 					}
 				]
 			}

diff --git a/07_Resources/Repos/converter/CodePipeline/pipe_line.json b/07_Resources/Repos/converter/CodePipeline/pipe_line.json
@@ -4,7 +4,7 @@
 		"Properties": {
 			"Name": "0x4447_s3_email_lambda_converter",
 			"ArtifactStore": {
-				"Location": { "Ref": "S3Code" },
+				"Location": { "Ref": "CodePipelineBucketName" },
 				"Type": "S3"
 			},
 			"RoleArn": { "Fn::GetAtt": ["PipelineConverterRole", "Arn"] },

diff --git a/07_Resources/Repos/inbound/CodeBuild/Policies/s3.json b/07_Resources/Repos/inbound/CodeBuild/Policies/s3.json
@@ -10,7 +10,7 @@
 					{
 						"Effect": "Allow",
 						"Action": "s3:*",
-						"Resource": { "Fn::Sub": "arn:aws:s3:::${S3Code}/*"}
+						"Resource": { "Fn::Sub": "arn:aws:s3:::${CodePipelineBucketName}/*"}
 					}
 				]
 			}

diff --git a/07_Resources/Repos/inbound/CodePipeline/pipe_line.json b/07_Resources/Repos/inbound/CodePipeline/pipe_line.json
@@ -4,7 +4,7 @@
 		"Properties": {
 			"Name": "0x4447_s3_email_lambda_inbound",
 			"ArtifactStore": {
-				"Location": { "Ref": "S3Code" },
+				"Location": { "Ref": "CodePipelineBucketName" },
 				"Type": "S3"
 			},
 			"RoleArn": { "Fn::GetAtt": ["PipelineInboundRole", "Arn"] },

diff --git a/07_Resources/Repos/outbound/CodeBuild/Policies/s3.json b/07_Resources/Repos/outbound/CodeBuild/Policies/s3.json
@@ -10,7 +10,7 @@
 					{
 						"Effect": "Allow",
 						"Action": "s3:*",
-						"Resource": { "Fn::Sub": "arn:aws:s3:::${S3Code}/*"}
+						"Resource": { "Fn::Sub": "arn:aws:s3:::${CodePipelineBucketName}/*"}
 					}
 				]
 			}

diff --git a/07_Resources/Repos/outbound/CodePipeline/pipe_line.json b/07_Resources/Repos/outbound/CodePipeline/pipe_line.json
@@ -4,7 +4,7 @@
 		"Properties": {
 			"Name": "0x4447_s3_email_lambda_outbound",
 			"ArtifactStore": {
-				"Location": { "Ref": "S3Code" },
+				"Location": { "Ref": "CodePipelineBucketName" },
 				"Type": "S3"
 			},
 			"RoleArn": { "Fn::GetAtt": ["PipelineOutboundRole", "Arn"] },

diff --git a/07_Resources/S3/Artifact/bucket.json b/07_Resources/S3/Artifact/bucket.json