Skip to content
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
2 changes: 1 addition & 1 deletion iac/provider-aws/alb_athena.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
locals {
ingress_logs_path_prefix = "ingress"
ingress_logs_path_location = "s3://${data.aws_s3_bucket.load_balancer_logs.id}/${local.ingress_logs_path_prefix}/AWSLogs/${data.aws_caller_identity.current.account_id}/elasticloadbalancing/${data.aws_region.current.name}"
ingress_logs_path_location = "s3://${data.aws_s3_bucket.load_balancer_logs.id}/${local.ingress_logs_path_prefix}/AWSLogs/${data.aws_caller_identity.current.account_id}/elasticloadbalancing/${data.aws_region.current.id}"
}

data "aws_s3_bucket" "load_balancer_logs" {
Expand Down
6 changes: 3 additions & 3 deletions iac/provider-aws/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module "init" {
prefix = var.prefix
bucket_prefix = var.bucket_prefix

region = data.aws_region.current.name
region = data.aws_region.current.id
endpoint_ingress_subnet_ids = [
aws_security_group.cluster_node.id
]
Expand Down Expand Up @@ -153,7 +153,7 @@ module "cluster" {
client_server_nested_virtualization = var.client_server_nested_virtualization
client_node_labels = var.client_node_labels

clickhouse_az = "${data.aws_region.current.name}a"
clickhouse_az = "${data.aws_region.current.id}a"
clickhouse_cluster_size = var.clickhouse_cluster_size
clickhouse_image_family_prefix = var.clickhouse_image_family_prefix != "" ? var.clickhouse_image_family_prefix : local.ami_family_prefix
clickhouse_machine_type = var.clickhouse_server_machine_type
Expand All @@ -168,7 +168,7 @@ module "nomad" {

domain_name = var.domain_name
environment = var.environment
aws_region = data.aws_region.current.name
aws_region = data.aws_region.current.id

nomad_acl_token = module.init.cluster.nomad_acl_token
consul_acl_token = module.init.cluster.consul_acl_token
Expand Down
Loading