Skip to content

fix: Revert deleted tags from many resources since release 2.7.0 #121

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

Merged
merged 1 commit into from
May 12, 2020
Merged
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
18 changes: 18 additions & 0 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ locals {
name = "ATLANTIS_BITBUCKET_USER"
value = var.atlantis_bitbucket_user
},
{
name = "ATLANTIS_BITBUCKET_BASE_URL"
value = var.atlantis_bitbucket_base_url
},
{
name = "ATLANTIS_REPO_WHITELIST"
value = join(",", var.atlantis_repo_whitelist)
Expand Down Expand Up @@ -113,6 +117,8 @@ resource "aws_ssm_parameter" "webhook" {
name = var.webhook_ssm_parameter_name
type = "SecureString"
value = random_id.webhook.hex

tags = local.tags
}

resource "aws_ssm_parameter" "atlantis_github_user_token" {
Expand All @@ -121,6 +127,8 @@ resource "aws_ssm_parameter" "atlantis_github_user_token" {
name = var.atlantis_github_user_token_ssm_parameter_name
type = "SecureString"
value = var.atlantis_github_user_token

tags = local.tags
}

resource "aws_ssm_parameter" "atlantis_gitlab_user_token" {
Expand All @@ -129,6 +137,8 @@ resource "aws_ssm_parameter" "atlantis_gitlab_user_token" {
name = var.atlantis_gitlab_user_token_ssm_parameter_name
type = "SecureString"
value = var.atlantis_gitlab_user_token

tags = local.tags
}

resource "aws_ssm_parameter" "atlantis_bitbucket_user_token" {
Expand All @@ -137,6 +147,8 @@ resource "aws_ssm_parameter" "atlantis_bitbucket_user_token" {
name = var.atlantis_bitbucket_user_token_ssm_parameter_name
type = "SecureString"
value = var.atlantis_bitbucket_user_token

tags = local.tags
}

###################
Expand Down Expand Up @@ -309,6 +321,8 @@ module "ecs" {
version = "v2.0.0"

name = var.name

tags = local.tags
}

data "aws_iam_policy_document" "ecs_tasks" {
Expand All @@ -329,6 +343,8 @@ data "aws_iam_policy_document" "ecs_tasks" {
resource "aws_iam_role" "ecs_task_execution" {
name = "${var.name}-ecs_task_execution"
assume_role_policy = data.aws_iam_policy_document.ecs_tasks.json

tags = local.tags
}

resource "aws_iam_role_policy_attachment" "ecs_task_execution" {
Expand Down Expand Up @@ -479,6 +495,8 @@ resource "aws_ecs_task_definition" "atlantis" {
memory = var.ecs_task_memory

container_definitions = local.container_definitions

tags = local.tags
}

data "aws_ecs_task_definition" "atlantis" {
Expand Down