Merge pull request #2425 from edx/benp/terraform-more

Terraform for SQS and SNS

terraform/sitespeed/sitespeed.tf

-resource "aws_iam_policy" "topic_policy" {
+
+# Configure the AWS Provider
+provider "aws" {
+    access_key = "${var.aws_access_key}"
+    secret_key = "${var.aws_secret_key}"
+    region = "us-east-1"
+}
+
+
+# pipeline-provision infrastructure
+resource "aws_sqs_queue" "edx-pipeline-provision-queue" {
+	name = "${var.queue_name_pipeline}"
+	delay_seconds = "${var.queue_delay_seconds}"
+	max_message_size = "${var.queue_max_message_size}"
+	message_retention_seconds = "${var.queue_message_retention_seconds}"
+	receive_wait_time_seconds = "${var.queue_receive_wait_time_seconds}"
+}
+
+resource "aws_sns_topic" "edx-pipeline-provision" {
+  name = "edx-pipeline-provision-topic"
+}
+
+resource "aws_sns_topic_subscription" "edx-pipeline-provision_sqs_target" {
+  topic_arn = "${aws_sns_topic.edx-pipeline-provision.arn}"
+  protocol  = "sqs"
+  endpoint  = "${aws_sqs_queue.edx-pipeline-provision-queue.arn}"
+}
+
+
+
+# pipeline-sitespeed infrastructure
+resource "aws_sqs_queue" "edx-pipeline-sitespeed-queue" {
+  name = "${var.queue_name_sitespeed}"
+  delay_seconds = "${var.queue_delay_seconds}"
+  max_message_size = "${var.queue_max_message_size}"
+  message_retention_seconds = "${var.queue_message_retention_seconds}"
+  receive_wait_time_seconds = "${var.queue_receive_wait_time_seconds}"
+}
+
+resource "aws_sns_topic" "edx-pipeline-sitespeed" {
+  name = "edx-pipeline-sitespeed-topic"
+}
+
+resource "aws_sns_topic_subscription" "edx-pipeline-sitespeed_sqs_target" {
+  topic_arn = "${aws_sns_topic.edx-pipeline-sitespeed.arn}"
+  protocol  = "sqs"
+  endpoint  = "${aws_sqs_queue.edx-pipeline-sitespeed-queue.arn}"
+}
+
+
+# Create IAM policy, user
+resource "aws_iam_user" "build_pipeline_user" {
+    name = "build_pipeline_user"
+}
+
+resource "aws_iam_access_key" "build_pipeline_user_key" {
+    user = "${aws_iam_user.build_pipeline_user.name}"
+}
+
+resource "aws_iam_user_policy" "sns_publish_policy" {
     name = "${var.environment}-${var.deployment}-${var.service}-sender"
-    path = "/"
-    description = "Sender policy"
+    user = "${aws_iam_user.build_pipeline_user.name}"
     policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -11,27 +69,17 @@ resource "aws_iam_policy" "topic_policy" {
         "sns:Publish"
       ],
       "Effect": "Allow",
-      "Resource": "${aws_sns_topic.build_requests.arn}"
+      "Resource": "${aws_sns_topic.edx-pipeline-provision.arn}"
+    },
+    {
+      "Action": [
+        "sns:Publish"
+      ],
+      "Effect": "Allow",
+      "Resource": "${aws_sns_topic.edx-pipeline-sitespeed.arn}"
     }
   ]
 }
 EOF
 }
 
-resource "aws_sqs_queue" "build_requests" {
-	name = "${var.queue_name}"
-	delay_seconds = "${var.queue_delay_seconds}"
-	max_message_size = "${var.queue_max_message_size}"
-	message_retention_seconds = "${var.queue_message_retention_seconds}"
-	receive_wait_time_seconds = "${var.queue_receive_wait_time_seconds}"
-}
-
-resource "aws_sns_topic" "build_requests" {
-	name = "user-updates-topic"
-}
-
-resource "aws_sns_topic_subscription" "build_requests_sqs_target" {
-	topic_arn = "${aws_sns_topic.build_requests.arn}"
-	protocol  = "sqs"
-	endpoint  = "${aws_sqs_queue.build_requests.arn}"
-}

terraform/sitespeed/terraform.tfvars

-environment = "prod"
-deployment = "edx"
-service = "jenkins"
-
-# SQS variables 
-queue_name = "my-queue"
-queue_delay_seconds = 90
-queue_max_message_size = 2048
-queue_message_retention_seconds = 86400
-queue_receive_wait_time_seconds = 10
-

terraform/sitespeed/terraform.tfvars.example

+#### Copy this file and remove the '.example' extension in order to
+#### use it in a terraform execution
+
+
+
+environment = "env_foo"
+deployment = "my_deployment"
+service = "my_ci_service"
+
+# AWS variables
+aws_access_key = "FOOBARAIAIAIA"
+aws_secret_key = "FOOBAT01010101"
+
+# SQS variables
+queue_name_pipeline = "my-pipeline-queue"
+queue_name_pipeline = "my-sitespeed-queue"
+queue_delay_seconds = 90
+queue_max_message_size = 2048
+queue_message_retention_seconds = 86400
+queue_receive_wait_time_seconds = 10
+

terraform/sitespeed/variables.tf

@@ -2,11 +2,18 @@ variable "environment" {}
 variable "deployment" {}
 variable "service" {}
 
-variable "queue_name" {
+variable "queue_name_pipeline" {
+     default = "default-queue"
+}
+
+variable "queue_name_sitespeed" {
 	 default = "default-queue"
 }
+
 variable "queue_delay_seconds" {}
 variable "queue_max_message_size" {}
 variable "queue_message_retention_seconds" {}
 variable "queue_receive_wait_time_seconds" {}
 
+variable "aws_access_key" {}
+variable "aws_secret_key" {}