Commit 31aea0a6 by Ben Patterson

Additional refactoring.

parent 78e9af25
...@@ -11,14 +11,21 @@ resource "aws_iam_policy" "topic_policy" { ...@@ -11,14 +11,21 @@ resource "aws_iam_policy" "topic_policy" {
"sns:Publish" "sns:Publish"
], ],
"Effect": "Allow", "Effect": "Allow",
"Resource": "${aws_sns_topic.build_requests.arn}" "Resource": "${aws_sns_topic.deploy_requests.arn}"
} }
] ]
} }
EOF EOF
} }
resource "aws_sqs_queue" "build_requests" { # Configure the AWS Provider
provider "aws" {
access_key = "${var.aws_access_key}"
secret_key = "${var.aws_secret_key}"
region = "us-east-1"
}
resource "aws_sqs_queue" "deploy_requests" {
name = "${var.queue_name}" name = "${var.queue_name}"
delay_seconds = "${var.queue_delay_seconds}" delay_seconds = "${var.queue_delay_seconds}"
max_message_size = "${var.queue_max_message_size}" max_message_size = "${var.queue_max_message_size}"
...@@ -26,12 +33,13 @@ resource "aws_sqs_queue" "build_requests" { ...@@ -26,12 +33,13 @@ resource "aws_sqs_queue" "build_requests" {
receive_wait_time_seconds = "${var.queue_receive_wait_time_seconds}" receive_wait_time_seconds = "${var.queue_receive_wait_time_seconds}"
} }
resource "aws_sns_topic" "build_requests" { resource "aws_sns_topic" "deploy_requests" {
name = "user-updates-topic" name = "user-updates-topic"
policy = "topic_policy"
} }
resource "aws_sns_topic_subscription" "build_requests_sqs_target" { resource "aws_sns_topic_subscription" "deploy_requests_sqs_target" {
topic_arn = "${aws_sns_topic.build_requests.arn}" topic_arn = "${aws_sns_topic.deploy_requests.arn}"
protocol = "sqs" protocol = "sqs"
endpoint = "${aws_sqs_queue.build_requests.arn}" endpoint = "${aws_sqs_queue.deploy_requests.arn}"
} }
...@@ -2,6 +2,10 @@ environment = "prod" ...@@ -2,6 +2,10 @@ environment = "prod"
deployment = "edx" deployment = "edx"
service = "jenkins" service = "jenkins"
# AWS variables
aws_access_key = "FOOBARAIAIAIA"
aws_secret_key = "FOOBAT01010101"
# SQS variables # SQS variables
queue_name = "my-queue" queue_name = "my-queue"
queue_delay_seconds = 90 queue_delay_seconds = 90
......
...@@ -10,3 +10,5 @@ variable "queue_max_message_size" {} ...@@ -10,3 +10,5 @@ variable "queue_max_message_size" {}
variable "queue_message_retention_seconds" {} variable "queue_message_retention_seconds" {}
variable "queue_receive_wait_time_seconds" {} variable "queue_receive_wait_time_seconds" {}
variable "aws_access_key" {}
variable "aws_secret_key" {}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment