Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating modules dependencies #19

Merged
merged 20 commits into from
Jul 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -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
324 changes: 171 additions & 153 deletions README.md

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions README.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
322 changes: 170 additions & 152 deletions docs/terraform.md

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions examples/complete/fixtures.us-east-2.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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:*"
Expand Down
8 changes: 4 additions & 4 deletions examples/complete/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions examples/complete/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
1 change: 1 addition & 0 deletions examples/complete/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
24 changes: 13 additions & 11 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 2 additions & 0 deletions test/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading