add module as aws 2.x supported and styling changes

Author: grzesjam

modules/aws-codebuild-step/example/main.tf

@@ -1,12 +1,13 @@
 provider "aws" {
+  version = ">= 3.0"
   region = "us-east-1"
 }
 
 module "build" {
   source = "../"
 
   project_name    = "build-${var.environment}"
-  description     = "thing_that_build"
+  description     = "Step for building our frontend app"
   artifact_s3_arn = aws_s3_bucket.codepipeline_bucket.arn
 
   buildspec_path = ".aws/dev/build.yaml"
@@ -30,7 +31,7 @@ module "deploy" {
   source = "../"
 
   project_name    = "website-deploy-${var.environment}"
-  description     = "thing_that_deploys_whatever_we_built"
+  description     = "Step for deploying our frontend app"
   artifact_s3_arn = aws_s3_bucket.codepipeline_bucket.arn
 
   buildspec_path = ".aws/dev/deploy.yaml"
@@ -108,10 +109,10 @@ resource "aws_codepipeline" "codepipeline" {
   }
 
   stage {
-    name = "Deploy-front"
+    name = "DeployFront"
 
     action {
-      name            = "Deploy-front"
+      name            = "DeployFront"
       category        = "Build"
       owner           = "AWS"
       provider        = "CodeBuild"

modules/aws-codebuild-step/example/variables.tf

@@ -4,11 +4,11 @@ variable "environment" {
 }
 
 variable "repo_owner" {
-  description = "Organization/username owning repository on github "
+  description = "Organization/username owning repository on github."
 }
 
 variable "repo_name" {
-  description = "Name of repository"
+  description = "Name of repository."
 }
 
 variable "repo_branch" {

modules/aws-codebuild-step/main.tf

@@ -7,26 +7,24 @@
 data "aws_caller_identity" "current" {}
 data "aws_region" "current" {}
 
+data "aws_iam_policy_document" "task_assume" {
+  statement {
+    effect = "Allow"
+    actions = ["sts:AssumeRole"]
+    principals {
+      type = "Service"
+      identifiers = ["codebuild.amazonaws.com"]
+    }
+  }
+}
+
 resource "aws_iam_role" "role" {
   name = "${var.project_name}-role"
 
-  assume_role_policy = <<EOF
-{
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Effect": "Allow",
-      "Principal": {
-        "Service": "codebuild.amazonaws.com"
-      },
-      "Action": "sts:AssumeRole"
-    }
-  ]
-}
-EOF
+  assume_role_policy = data.aws_iam_policy_document.task_assume.json
 }
 
-data "aws_iam_policy_document" "task_role_assume" {
+data "aws_iam_policy_document" "task" {
   statement {
     actions = [
       "logs:CreateLogGroup",
@@ -70,7 +68,7 @@ data "aws_iam_policy_document" "task_role_assume" {
 
 resource "aws_iam_role_policy" "role_policy" {
   role   = aws_iam_role.role.name
-  policy = data.aws_iam_policy_document.task_role_assume.json
+  policy = data.aws_iam_policy_document.task.json
 }
 
 resource "aws_codebuild_project" "project" {

modules/aws-codebuild-step/versions.tf

@@ -2,6 +2,6 @@ terraform {
   required_version = ">= 0.12.6, < 0.14"
 
   required_providers {
-    aws = ">= 3.0, < 4.0"
+    aws = ">= 2.0, < 4.0"
   }
 }