Cleaninig and reorganization

.gitignore

@@ -1 +1,2 @@
 **/*.DS_Store
+/CloudFormation.json

02_Metadata/interface.json

@@ -0,0 +1,27 @@
+{
+	"AWS::CloudFormation::Interface" : {
+		"ParameterGroups": [
+			{
+				"Label" : { "default" : "Basics" },
+				"Parameters" : [ "CodePipelineArtifactsParam" ]
+			},
+			{
+				"Label" : { "default" : "GitHub" },
+				"Parameters" : [ "GitHubAccountOwnerParam", "GitHubTokenParam", "StageParam", "AutoDeployParam" ]
+			},
+			{
+				"Label" : { "default" : "Product Configuration" },
+				"Parameters" : [ "EmailRestingPlace"]
+			}
+		],
+		"ParameterLabels": {
+			"CodePipelineArtifactsParam": { "default" : "CodePipeline Artifacts" },
+			"GitHubTokenParam": { "default" : "GitHub Token" },
+			"GitHubAccountOwnerParam": { "default" : "GitHub Owner" },
+			"StageParam": { "default" : "Deployment Stage" },
+			"AutoDeployParam": { "default" : "Autodeployment" },
+
+			"EmailRestingPlace": { "default" : "Email Bucket Name" }
+		}
+	}
+}

03_Parameters/code_pipeline_bucket_name.json

@@ -1,5 +1,5 @@
 {
-	"CodePipelineBucketName": {
+	"CodePipelineArtifactsParam": {
 		"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"
 	}

03_Parameters/github_account_name.json → 03_Parameters/github_owner.json

@@ -1,6 +1,6 @@
 {
-	"ParamGitHubAccountName": {
-		"Description": "The name of the GitHub account, it is the same names that you find in the URL. Organization or private account.",
+	"GitHubAccountOwnerParam": {
+		"Description": "The name of the GitHub account, it is the same names that you find in the URL (Organization or private account).",
 		"Type": "String",
 		"Default": "0x4447"
 	}

03_Parameters/github_token.json

@@ -1,6 +1,6 @@
 {
-	"GitHubToken": {
-		"Description": "You need to create a Personal access tokens (https://github.com/settings/tokens) for CodePipeline to have access to the GitHub repo even if they are public, and the Scope has to have: repo and admin:repo_hook",
+	"GitHubTokenParam": {
+		"Description": "You need to create a Personal access tokens (https://github.com/settings/tokens) for CodePipeline to have access to the GitHub repo despite it being public. Find out more here: https://docs.aws.amazon.com/codepipeline/latest/userguide/GitHub-authentication.html",
 		"NoEcho": true,
 		"Type": "String"
 	}

03_Parameters/stage.json

@@ -1,6 +1,6 @@
 {
-	"Stage": {
-		"Description": "Select what Stage are you deploying.",
+	"StageParam": {
+		"Description": "Select what type of environment are you deploying (branch of the repo).",
 		"Type": "String",
 		"AllowedValues": ["master", "development"],
 		"Default": "master",

07_Resources/Repos/converter/CodeBuild/Policies/s3.json

@@ -10,7 +10,7 @@
 					{
 						"Effect": "Allow",
 						"Action": "s3:*",
-						"Resource": { "Fn::Sub": "arn:aws:s3:::${CodePipelineBucketName}/*"}
+						"Resource": { "Fn::Sub": "arn:aws:s3:::${CodePipelineArtifactsParam}/*"}
 					}
 				]
 			}

07_Resources/Repos/converter/CodePipeline/_index.json

@@ -4,7 +4,7 @@
 		"Properties": {
 			"Name": "0x4447_s3_email_lambda_converter",
 			"ArtifactStore": {
-				"Location": { "Ref": "CodePipelineBucketName" },
+				"Location": { "Ref": "CodePipelineArtifactsParam" },
 				"Type": "S3"
 			},
 			"RoleArn": { "Fn::GetAtt": ["PipelineConverterRole", "Arn"] },
@@ -22,11 +22,11 @@
 								"Version": "1"
 							},
 							"Configuration": {
-								"Owner": { "Ref": "ParamGitHubAccountName" },
+								"Owner": { "Ref": "GitHubAccountOwnerParam" },
 								"Repo": "0x4447_product_s3_email_lambda_converter",
-								"Branch": { "Ref": "Stage" },
+								"Branch": { "Ref": "StageParam" },
 								"PollForSourceChanges": false,
-								"OAuthToken": { "Ref": "GitHubToken" }
+								"OAuthToken": { "Ref": "GitHubTokenParam" }
 							},
 							"OutputArtifacts": [
 								{

07_Resources/Repos/converter/CodePipeline/webhook.json

@@ -5,7 +5,7 @@
 		"Properties": {
 			"Authentication": "GITHUB_HMAC",
 			"AuthenticationConfiguration": {
-				"SecretToken": { "Ref": "GitHubToken" }
+				"SecretToken": { "Ref": "GitHubTokenParam" }
 			},
 			"Filters": [
 				{

07_Resources/Repos/inbound/CodeBuild/Policies/s3.json

@@ -10,7 +10,7 @@
 					{
 						"Effect": "Allow",
 						"Action": "s3:*",
-						"Resource": { "Fn::Sub": "arn:aws:s3:::${CodePipelineBucketName}/*"}
+						"Resource": { "Fn::Sub": "arn:aws:s3:::${CodePipelineArtifactsParam}/*"}
 					}
 				]
 			}

07_Resources/Repos/inbound/CodePipeline/_index.json

@@ -4,7 +4,7 @@
 		"Properties": {
 			"Name": "0x4447_s3_email_lambda_inbound",
 			"ArtifactStore": {
-				"Location": { "Ref": "CodePipelineBucketName" },
+				"Location": { "Ref": "CodePipelineArtifactsParam" },
 				"Type": "S3"
 			},
 			"RoleArn": { "Fn::GetAtt": ["PipelineInboundRole", "Arn"] },
@@ -22,11 +22,11 @@
 								"Version": "1"
 							},
 							"Configuration": {
-								"Owner": { "Ref": "ParamGitHubAccountName" },
+								"Owner": { "Ref": "GitHubAccountOwnerParam" },
 								"Repo": "0x4447_product_s3_email_lambda_inbound",
-								"Branch": { "Ref": "Stage" },
+								"Branch": { "Ref": "StageParam" },
 								"PollForSourceChanges": false,
-								"OAuthToken": { "Ref": "GitHubToken" }
+								"OAuthToken": { "Ref": "GitHubTokenParam" }
 							},
 							"OutputArtifacts": [
 								{

07_Resources/Repos/inbound/CodePipeline/webhook.json

@@ -5,7 +5,7 @@
 		"Properties": {
 			"Authentication": "GITHUB_HMAC",
 			"AuthenticationConfiguration": {
-				"SecretToken": { "Ref": "GitHubToken" }
+				"SecretToken": { "Ref": "GitHubTokenParam" }
 			},
 			"Filters": [
 				{

07_Resources/Repos/outbound/CodeBuild/Policies/s3.json

@@ -10,7 +10,7 @@
 					{
 						"Effect": "Allow",
 						"Action": "s3:*",
-						"Resource": { "Fn::Sub": "arn:aws:s3:::${CodePipelineBucketName}/*"}
+						"Resource": { "Fn::Sub": "arn:aws:s3:::${CodePipelineArtifactsParam}/*"}
 					}
 				]
 			}

07_Resources/Repos/outbound/CodePipeline/_index.json

@@ -4,7 +4,7 @@
 		"Properties": {
 			"Name": "0x4447_s3_email_lambda_outbound",
 			"ArtifactStore": {
-				"Location": { "Ref": "CodePipelineBucketName" },
+				"Location": { "Ref": "CodePipelineArtifactsParam" },
 				"Type": "S3"
 			},
 			"RoleArn": { "Fn::GetAtt": ["PipelineOutboundRole", "Arn"] },
@@ -22,11 +22,11 @@
 								"Version": "1"
 							},
 							"Configuration": {
-								"Owner": { "Ref": "ParamGitHubAccountName" },
+								"Owner": { "Ref": "GitHubAccountOwnerParam" },
 								"Repo": "0x4447_product_s3_email_lambda_outbound",
-								"Branch": { "Ref": "Stage" },
+								"Branch": { "Ref": "StageParam" },
 								"PollForSourceChanges": false,
-								"OAuthToken": { "Ref": "GitHubToken" }
+								"OAuthToken": { "Ref": "GitHubTokenParam" }
 							},
 							"OutputArtifacts": [
 								{

07_Resources/Repos/outbound/CodePipeline/webhook.json

@@ -5,7 +5,7 @@
 		"Properties": {
 			"Authentication": "GITHUB_HMAC",
 			"AuthenticationConfiguration": {
-				"SecretToken": { "Ref": "GitHubToken" }
+				"SecretToken": { "Ref": "GitHubTokenParam" }
 			},
 			"Filters": [
 				{