Merge pull request StubbornJava#66 from StubbornJava/f/jenkins

rodriguezsergio · web-flow · commit a6ca4e217176 · 2018-03-04T22:57:59.000-05:00
F/jenkins
diff --git a/terraform/global.tfvars b/terraform/global.tfvars
@@ -1,3 +1,5 @@
+region = "us-east-1"
+
 amis = {
     amazon-linux-2017-09 = "ami-8c1be5f6"
 }
diff --git a/terraform/iam/iam.tf b/terraform/iam/iam.tf
@@ -0,0 +1,55 @@
+variable "region" {}
+
+provider "aws" {
+    region = "${var.region}"
+}
+
+resource "aws_iam_policy" "jenkins-s3" {
+    name        = "jenkins-s3"
+    policy      = <<EOF
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Effect": "Allow",
+            "Action": [
+                "s3:PutObject"
+            ],
+            "Resource": [
+                "arn:aws:s3:::stubbornjava-jenkins/*"
+            ]
+        }
+    ]
+}
+EOF
+}
+
+resource "aws_iam_role" "jenkins" {
+  name = "jenkins"
+
+  assume_role_policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": "sts:AssumeRole",
+      "Principal": {
+        "Service": "ec2.amazonaws.com"
+      },
+      "Effect": "Allow",
+      "Sid": ""
+    }
+  ]
+}
+EOF
+}
+
+resource "aws_iam_instance_profile" "jenkins" {
+  name  = "jenkins"
+  role = "${aws_iam_role.jenkins.name}"
+}
+
+resource "aws_iam_role_policy_attachment" "jenkins-s3" {
+    role       = "${aws_iam_role.jenkins.name}"
+    policy_arn = "${aws_iam_policy.jenkins-s3.arn}"
+}
diff --git a/terraform/iam/remote_state.tf b/terraform/iam/remote_state.tf
@@ -0,0 +1,7 @@
+terraform {
+  backend "s3" {
+    bucket = "stubbornjava-terraform"
+    key    = "iam/terraform.tfstate"
+    region = "us-east-1"
+  }
+}
diff --git a/terraform/remote_state.tf b/terraform/remote_state.tf
diff --git a/terraform/s3/remote_state.tf b/terraform/s3/remote_state.tf
@@ -0,0 +1,7 @@
+terraform {
+  backend "s3" {
+    bucket = "stubbornjava-terraform"
+    key    = "s3/terraform.tfstate"
+    region = "us-east-1"
+  }
+}
diff --git a/terraform/s3/s3.tf b/terraform/s3/s3.tf
@@ -0,0 +1,23 @@
+variable "region" {}
+
+provider "aws" {
+    region = "${var.region}"
+}
+
+resource "aws_s3_bucket" "stubbornjava-terraform" {
+    bucket = "stubbornjava-terraform"
+    acl    = "private"
+
+    versioning {
+        enabled = true
+    }
+}
+
+resource "aws_s3_bucket" "stubbornjava-jenkins" {
+    bucket = "stubbornjava-jenkins"
+    acl    = "private"
+
+    versioning {
+        enabled = true
+    }
+}
diff --git a/terraform/stubbornjava.tf b/terraform/stubbornjava.tf
@@ -13,6 +13,7 @@ resource "aws_instance" "ci" {
   count                       = 1
   ami                         = "${var.amis["amazon-linux-2017-09"]}"
   disable_api_termination     = true
+  iam_instance_profile        = "jenkins"
   instance_type               = "t2.micro"
   monitoring                  = false
   subnet_id                   = "${element(data.aws_subnet_ids.public.ids, count.index)}"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+region = "us-east-1"`
	`2`	`+`
`1`	`3`	`amis = {`
`2`	`4`	`amazon-linux-2017-09 = "ami-8c1be5f6"`
`3`	`5`	`}`