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.

Sign up for GitHub

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

Revert "UML-3155 Enable account resources in eu-west-2" #2395

Merged
merged 2 commits into from
Nov 2, 2023
+1 −33
Merged

Revert "UML-3155 Enable account resources in eu-west-2" #2395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
960a8e3
Revert "UML-3155 Enable account resources in eu-west-2 (#2393)"
Nov 1, 2023
cdf8786
Don't revert secret
Nov 1, 2023
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
19 changes: 0 additions & 19 deletions terraform/account/region.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,3 @@ module "eu_west_1" {
aws.shared = aws.shared
}
}

module "eu_west_2" {
source = "./region"

account = local.account
account_name = local.account_name
environment_name = local.environment
lambda_container_version = var.lambda_container_version

depends_on = [
module.cloudwatch_mrk,
]

providers = {
aws.region = aws.eu_west_2
aws.management = aws.management
aws.shared = aws.shared
}
}
2 changes: 1 addition & 1 deletion terraform/environment/region/data_sources.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ data "aws_kms_alias" "pagerduty_sns" {
}

data "aws_kms_alias" "cloudwatch_encryption" {
name = "alias/cloudwatch_encryption"
name = "alias/cloudwatch-encryption-mrk"

provider = aws.region
}
Expand Down
13 changes: 0 additions & 13 deletions terraform/environment/terraform.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,6 @@ provider "aws" {
}
}

provider "aws" {
region = "eu-west-2"
alias = "eu_west_2"
default_tags {
tags = local.default_tags
}
assume_role {
role_arn = "arn:aws:iam::${local.environment.account_id}:role/${var.default_role}"
session_name = "terraform-session"
}
}


provider "aws" {
region = "us-east-1"
alias = "us-east-1"
Expand Down
Loading