update codebuild

Author: fiji-flo

terraform/codebuild/data.tf

@@ -1,2 +1,3 @@
-data "aws_caller_identity" "current" {}
+data "aws_caller_identity" "current" {
+}
 

terraform/codebuild/main.tf

@@ -5,10 +5,10 @@
 # You can find more options for customizing this resource to your needs
 # here: https://www.terraform.io/docs/providers/aws/r/codebuild_project.html
 resource "aws_codebuild_project" "build" {
-  name          = "${var.project_name}"
+  name          = var.project_name
   description   = "CI pipeline for ${var.project_name}"
   build_timeout = "60" #In minutes
-  service_role  = "${aws_iam_role.codebuild.arn}"
+  service_role  = aws_iam_role.codebuild.arn
 
   # Valid values for this parameter are: CODEPIPELINE, NO_ARTIFACTS or S3.
   # If you are building a Docker container and pushing it to some registry,
@@ -18,34 +18,45 @@ resource "aws_codebuild_project" "build" {
   }
 
   environment {
-    compute_type    = "BUILD_GENERAL1_LARGE"
-    image           = "${var.build_image}"
-    type            = "LINUX_CONTAINER"
+    compute_type = "BUILD_GENERAL1_LARGE"
+    image        = var.build_image
+    type         = "LINUX_CONTAINER"
+
     # You need "true" here to be able to run Docker daemon inside the building container
     privileged_mode = "true"
 
     environment_variable {
-      "name"  = "DOCKER_REPO"
-      "value" = "${aws_ecr_repository.registry.repository_url}"
+      name  = "DOCKER_REPO"
+      value = aws_ecr_repository.registry.repository_url
     }
   }
 
   source {
     # Choose type "NO_SOURCE" to don't build from Github
     type      = "GITHUB"
-    location  = "${var.github_repo}"
-    buildspec = "${var.buildspec_file}"
+    location  = var.github_repo
+    buildspec = var.buildspec_file
   }
 
-  tags {
-    "App" = "${var.project_name}"
+  tags = {
+    "App" = var.project_name
   }
 }
 
 # Unomment this section if you do want to build automatically on push
 resource "aws_codebuild_webhook" "webhook" {
-  project_name  = "${aws_codebuild_project.build.name}"
-  branch_filter = "^master$"
+  project_name = aws_codebuild_project.build.name
+  filter_group {
+    filter {
+      type    = "EVENT"
+      pattern = "PUSH"
+    }
+
+    filter {
+      type    = "HEAD_REF"
+      pattern = "(^refs/heads/master$|^refs/tags/.*-(prod|test))"
+    }
+  }
 }
 
 #---
@@ -69,10 +80,11 @@ resource "aws_iam_role" "codebuild" {
   ]
 }
 EOF
+
 }
 
 resource "aws_iam_role_policy" "codebuild" {
-  role = "${aws_iam_role.codebuild.name}"
+  role = aws_iam_role.codebuild.name
 
   policy = <<POLICY
 {
@@ -107,18 +119,19 @@ resource "aws_iam_role_policy" "codebuild" {
   ]
 }
 POLICY
+
 }
 
 #---
 # ECR
 #---
 
 resource "aws_ecr_repository" "registry" {
-  name  = "${var.project_name}"
+  name = var.project_name
 }
 
 resource "aws_ecr_repository_policy" "registrypolicy" {
-  repository = "${aws_ecr_repository.registry.name}"
+  repository = aws_ecr_repository.registry.name
 
   policy = <<EOF
 {
@@ -149,5 +162,6 @@ resource "aws_ecr_repository_policy" "registrypolicy" {
     ]
 }
 EOF
+
 }
 

terraform/codebuild/outputs.tf

@@ -1,10 +1,10 @@
 output "iam_role_arn" {
-  value       = "${aws_iam_role.codebuild.arn}"
+  value       = aws_iam_role.codebuild.arn
   description = "ARN of the codebuild user. Needed by cluster admins to authorize deploying to Kubernetes"
 }
 
 output "ecr_url" {
-  value       = "${aws_ecr_repository.registry.repository_url}"
+  value       = aws_ecr_repository.registry.repository_url
   description = "URL of the new container registry which will host your builds"
 }
 

terraform/codebuild/provider.tf

@@ -3,7 +3,7 @@
 #---
 
 provider "aws" {
-  region  = "us-west-2"
+  region = "us-west-2"
 }
 
 terraform {
@@ -15,3 +15,4 @@ terraform {
     region = "us-west-2"
   }
 }
+