Updating modules dependencies (#19)

* Updating modules dependencies * Updating modules dependencies * Adding new ChatOps * Updated README.md * Fixing test and output vars * Fixing github test * Fixing github test * Fixing github test * Fixing github test * Fixing github test * Adding var export for github test * Adding var export for github test * Executed 'terraform fmt' * Updated README.md * Adding random attribute to tests * Adding random attribute to tests * Adding random attribute to tests * Adding random attribute to tests Co-authored-by: actions-bot <[email protected]>
cloudposse-archives · Jul 4, 2020 · 8dc9c29 · 8dc9c29
1 parent b71eedc
commit 8dc9c29
Show file tree

Hide file tree

Showing 13 changed files with 446 additions and 360 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,4 +1,14 @@
 # Use this file to define individuals or teams that are responsible for code in a repository.
 # Read more: <https://help.github.com/articles/about-codeowners/>
+#
+# Order is important: the last matching pattern takes the most precedence
 
-* @cloudposse/engineering
+# These owners will be the default owners for everything
+*             @cloudposse/engineering @cloudposse/contributors
+
+# Cloud Posse must review any changes to Makefiles
+**/Makefile   @cloudposse/engineering
+**/Makefile.* @cloudposse/engineering
+
+# Cloud Posse must review any changes to GitHub actions
+.github/*     @cloudposse/engineering
diff --git a/README.md b/README.md
diff --git a/README.yaml b/README.yaml
@@ -24,9 +24,6 @@ screenshots:
 
 # Badges to display
 badges:
-  - name: "Codefresh Build Status"
-    image: "https://g.codefresh.io/api/badges/pipeline/cloudposse/terraform-modules%2Fterraform-aws-ecs-atlantis?type=cf-1"
-    url: "https://g.codefresh.io/public/accounts/cloudposse/pipelines/5dc082b14d7990012e651a3b"
   - name: "Latest Release"
     image: "https://img.shields.io/github/release/cloudposse/terraform-aws-ecs-atlantis.svg"
     url: "https://github.com/cloudposse/terraform-aws-ecs-atlantis/releases/latest"

diff --git a/docs/terraform.md b/docs/terraform.md
diff --git a/examples/complete/fixtures.us-east-2.tfvars b/examples/complete/fixtures.us-east-2.tfvars
@@ -36,8 +36,6 @@ webhook_enabled = false
 
 github_oauth_token = "test"
 
-github_webhooks_token = "test"
-
 atlantis_gh_user = "test"
 
 atlantis_gh_team_whitelist = "dev:plan,ops:*"

diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -13,7 +13,7 @@ module "label" {
 }
 
 module "vpc" {
-  source     = "git::https://github.com/cloudposse/terraform-aws-vpc.git?ref=tags/0.8.1"
+  source     = "git::https://github.com/cloudposse/terraform-aws-vpc.git?ref=tags/0.14.0"
   namespace  = var.namespace
   stage      = var.stage
   name       = var.name
@@ -24,7 +24,7 @@ module "vpc" {
 }
 
 module "subnets" {
-  source               = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=tags/0.16.1"
+  source               = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=tags/0.19.0"
   availability_zones   = var.availability_zones
   namespace            = var.namespace
   stage                = var.stage
@@ -40,7 +40,7 @@ module "subnets" {
 }
 
 module "alb" {
-  source                                  = "git::https://github.com/cloudposse/terraform-aws-alb.git?ref=tags/0.7.0"
+  source                                  = "git::https://github.com/cloudposse/terraform-aws-alb.git?ref=tags/0.11.0"
   namespace                               = var.namespace
   stage                                   = var.stage
   name                                    = var.name
@@ -72,7 +72,7 @@ resource "aws_sns_topic" "sns_topic" {
 }
 
 module "kms_key" {
-  source                  = "git::https://github.com/cloudposse/terraform-aws-kms-key.git?ref=tags/0.3.0"
+  source                  = "git::https://github.com/cloudposse/terraform-aws-kms-key.git?ref=tags/0.4.0"
   enabled                 = var.enabled
   namespace               = var.namespace
   stage                   = var.stage

diff --git a/examples/complete/outputs.tf b/examples/complete/outputs.tf
@@ -83,14 +83,14 @@ output "ecr_registry_id" {
   description = "Registry ID"
 }
 
-output "ecr_registry_url" {
-  value       = module.atlantis.ecr_registry_url
-  description = "Registry URL"
+output "ecr_repository_url" {
+  value       = module.atlantis.ecr_repository_url
+  description = "Repository URL"
 }
 
 output "ecr_repository_name" {
   value       = module.atlantis.ecr_repository_name
-  description = "Registry name"
+  description = "Repository name"
 }
 
 output "alb_ingress_target_group_name" {

diff --git a/examples/complete/variables.tf b/examples/complete/variables.tf
@@ -68,6 +68,7 @@ variable "github_oauth_token" {
 variable "github_webhooks_token" {
   type        = string
   description = "GitHub OAuth Token with permissions to create webhooks. If not provided the token is looked up from SSM"
+  default     = ""
 }
 
 variable "codepipeline_enabled" {

diff --git a/main.tf b/main.tf
@@ -39,7 +39,7 @@ locals {
 # Modules
 #--------------------------------------------------------------
 module "ssh_key_pair" {
-  source               = "git::https://github.com/cloudposse/terraform-aws-ssm-tls-ssh-key-pair.git?ref=tags/0.4.0"
+  source               = "git::https://github.com/cloudposse/terraform-aws-ssm-tls-ssh-key-pair.git?ref=tags/0.5.0"
   enabled              = var.enabled
   namespace            = var.namespace
   stage                = var.stage
@@ -51,19 +51,21 @@ module "ssh_key_pair" {
   kms_key_id           = local.kms_key_id
 }
 
-module "webhooks" {
-  source              = "git::https://github.com/cloudposse/terraform-github-repository-webhooks.git?ref=tags/0.5.0"
-  enabled             = var.enabled && var.webhook_enabled
-  github_token        = local.github_webhooks_token
-  webhook_secret      = local.atlantis_gh_webhook_secret
-  webhook_url         = local.atlantis_webhook_url
-  github_organization = var.repo_owner
-  github_repositories = [var.repo_name]
-  events              = var.webhook_events
+module "github_webhooks" {
+  source               = "git::https://github.com/cloudposse/terraform-github-repository-webhooks.git?ref=tags/0.8.0"
+  enabled              = var.enabled && var.webhook_enabled ? true : false
+  github_anonymous     = var.github_anonymous
+  github_organization  = var.repo_owner
+  github_repositories  = [var.repo_name]
+  github_token         = local.github_webhooks_token
+  webhook_secret       = local.atlantis_gh_webhook_secret
+  webhook_url          = local.atlantis_webhook_url
+  webhook_content_type = "json"
+  events               = var.webhook_events
 }
 
 module "ecs_web_app" {
-  source     = "git::https://github.com/cloudposse/terraform-aws-ecs-web-app.git?ref=tags/0.24.0"
+  source     = "git::https://github.com/cloudposse/terraform-aws-ecs-web-app.git?ref=tags/0.31.0"
   namespace  = var.namespace
   stage      = var.stage
   name       = var.name

diff --git a/outputs.tf b/outputs.tf
@@ -18,14 +18,14 @@ output "ecr_registry_id" {
   description = "Registry ID"
 }
 
-output "ecr_registry_url" {
-  value       = module.ecs_web_app.ecr_registry_url
-  description = "Registry URL"
+output "ecr_repository_url" {
+  value       = module.ecs_web_app.ecr_repository_url
+  description = "Repository URL"
 }
 
 output "ecr_repository_name" {
   value       = module.ecs_web_app.ecr_repository_name
-  description = "Registry name"
+  description = "Repository name"
 }
 
 output "alb_ingress_target_group_name" {

diff --git a/test/src/Makefile b/test/src/Makefile
@@ -8,6 +8,8 @@ PATH 	:= $(PATH):$(GOBIN)
 export TF_DATA_DIR ?= $(CURDIR)/.terraform
 export TF_CLI_ARGS_init ?= -get-plugins=true
 export GOPATH
+# Expose GitHub Token as github_webhooks_token variable so that SSM does not fail
+export TF_VAR_github_webhooks_token ?= $(GITHUB_TOKEN)
 
 .PHONY: all
 ## Default target