Skip to content

Commit b6eb01b

Browse files
oavdeevoavdeev
authored
terraform fmt (#15)
1 parent 753804b commit b6eb01b

21 files changed

+114
-110
lines changed

‎.pre-commit-config.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ repos:
44
hooks:
55
- id: end-of-file-fixer
66
- id: trailing-whitespace
7+
- repo: https://github.com/antonbabenko/pre-commit-terraform
8+
rev: v1.62.0 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases
9+
hooks:
10+
- id: terraform_fmt
711
- repo: https://github.com/terraform-docs/terraform-docs
812
rev: "v0.15.0"
913
hooks:

‎examples/eks/helm.tf

+9-9
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ locals {
5555
"containerRuntimeExecutor" = "emissary"
5656
}
5757
"useDefaultArtifactRepo" = true
58-
"useStaticCredentials" = false
58+
"useStaticCredentials" = false
5959
"artifactRepository" = {
6060
"s3" = {
61-
"bucket" = module.metaflow-datastore.s3_bucket_name
62-
"keyFormat" = "argo-artifacts/{{workflow.creationTimestamp.Y}}/{{workflow.creationTimestamp.m}}/{{workflow.creationTimestamp.d}}/{{workflow.name}}/{{pod.name}}"
63-
"region" = data.aws_region.current.name
64-
"endpoint" = "s3.amazonaws.com"
61+
"bucket" = module.metaflow-datastore.s3_bucket_name
62+
"keyFormat" = "argo-artifacts/{{workflow.creationTimestamp.Y}}/{{workflow.creationTimestamp.m}}/{{workflow.creationTimestamp.d}}/{{workflow.name}}/{{pod.name}}"
63+
"region" = data.aws_region.current.name
64+
"endpoint" = "s3.amazonaws.com"
6565
"useSDKCreds" = true
66-
"insecure" = false
66+
"insecure" = false
6767
}
6868
}
6969
}
@@ -74,9 +74,9 @@ resource "helm_release" "argo" {
7474

7575
depends_on = [module.eks]
7676

77-
repository = "https://argoproj.github.io/argo-helm"
78-
chart = "argo-workflows"
79-
namespace = kubernetes_namespace.argo.metadata[0].name
77+
repository = "https://argoproj.github.io/argo-helm"
78+
chart = "argo-workflows"
79+
namespace = kubernetes_namespace.argo.metadata[0].name
8080
force_update = true
8181

8282
values = [

‎examples/eks/metaflow.tf

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
resource "random_string" "suffix" {
22
length = 8
33
special = false
4-
upper = false
4+
upper = false
55
}
66

77
locals {
88
resource_prefix = "metaflow"
99
resource_suffix = random_string.suffix.result
1010
tags = {
11-
"managedBy" = "terraform"
12-
"application" = "metaflow-eks-example"
11+
"managedBy" = "terraform"
12+
"application" = "metaflow-eks-example"
1313
}
1414
cluster_name = "mf-${local.resource_suffix}"
1515
}
@@ -19,7 +19,7 @@ data "aws_availability_zones" "available" {
1919

2020

2121
module "metaflow-datastore" {
22-
source = "outerbounds/metaflow/aws//modules/datastore"
22+
source = "outerbounds/metaflow/aws//modules/datastore"
2323
version = "0.3.1"
2424

2525
resource_prefix = local.resource_prefix
@@ -34,7 +34,7 @@ module "metaflow-datastore" {
3434
}
3535

3636
module "metaflow-common" {
37-
source = "outerbounds/metaflow/aws//modules/common"
37+
source = "outerbounds/metaflow/aws//modules/common"
3838
version = "0.3.1"
3939
}
4040

@@ -46,19 +46,19 @@ module "metaflow-metadata-service" {
4646
resource_prefix = local.resource_prefix
4747
resource_suffix = local.resource_suffix
4848

49-
access_list_cidr_blocks = []
50-
api_basic_auth = true
51-
database_password = module.metaflow-datastore.database_password
52-
database_username = module.metaflow-datastore.database_username
53-
datastore_s3_bucket_kms_key_arn = module.metaflow-datastore.datastore_s3_bucket_kms_key_arn
54-
fargate_execution_role_arn = aws_iam_role.ecs_execution_role.arn
55-
metaflow_vpc_id = module.vpc.vpc_id
49+
access_list_cidr_blocks = []
50+
api_basic_auth = true
51+
database_password = module.metaflow-datastore.database_password
52+
database_username = module.metaflow-datastore.database_username
53+
datastore_s3_bucket_kms_key_arn = module.metaflow-datastore.datastore_s3_bucket_kms_key_arn
54+
fargate_execution_role_arn = aws_iam_role.ecs_execution_role.arn
55+
metaflow_vpc_id = module.vpc.vpc_id
5656
metadata_service_container_image = module.metaflow-common.default_metadata_service_container_image
57-
rds_master_instance_endpoint = module.metaflow-datastore.rds_master_instance_endpoint
58-
s3_bucket_arn = module.metaflow-datastore.s3_bucket_arn
59-
subnet1_id = module.vpc.private_subnets[0]
60-
subnet2_id = module.vpc.private_subnets[1]
61-
vpc_cidr_block = module.vpc.vpc_cidr_block
57+
rds_master_instance_endpoint = module.metaflow-datastore.rds_master_instance_endpoint
58+
s3_bucket_arn = module.metaflow-datastore.s3_bucket_arn
59+
subnet1_id = module.vpc.private_subnets[0]
60+
subnet2_id = module.vpc.private_subnets[1]
61+
vpc_cidr_block = module.vpc.vpc_cidr_block
6262

6363
standard_tags = local.tags
6464
}

‎examples/eks/metaflow_config.tf

+11-11
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ data "aws_api_gateway_api_key" "metadata_api_key" {
33
}
44

55
resource "local_file" "foo" {
6-
content = jsonencode({
7-
"METAFLOW_SERVICE_AUTH_KEY" = data.aws_api_gateway_api_key.metadata_api_key.value
8-
"METAFLOW_DATASTORE_SYSROOT_S3" = module.metaflow-datastore.METAFLOW_DATASTORE_SYSROOT_S3,
9-
"METAFLOW_DATATOOLS_S3ROOT" = module.metaflow-datastore.METAFLOW_DATATOOLS_S3ROOT,
10-
"METAFLOW_SERVICE_URL" = module.metaflow-metadata-service.METAFLOW_SERVICE_URL,
11-
"METAFLOW_KUBERNETES_NAMESPACE" ="default",
12-
"METAFLOW_KUBERNETES_SERVICE_ACCOUNT"= "argo-workflow",
13-
"METAFLOW_DEFAULT_DATASTORE" = "s3",
14-
"METAFLOW_DEFAULT_METADATA" = "service"
15-
})
16-
filename = "${path.module}/config.json"
6+
content = jsonencode({
7+
"METAFLOW_SERVICE_AUTH_KEY" = data.aws_api_gateway_api_key.metadata_api_key.value
8+
"METAFLOW_DATASTORE_SYSROOT_S3" = module.metaflow-datastore.METAFLOW_DATASTORE_SYSROOT_S3,
9+
"METAFLOW_DATATOOLS_S3ROOT" = module.metaflow-datastore.METAFLOW_DATATOOLS_S3ROOT,
10+
"METAFLOW_SERVICE_URL" = module.metaflow-metadata-service.METAFLOW_SERVICE_URL,
11+
"METAFLOW_KUBERNETES_NAMESPACE" = "default",
12+
"METAFLOW_KUBERNETES_SERVICE_ACCOUNT" = "argo-workflow",
13+
"METAFLOW_DEFAULT_DATASTORE" = "s3",
14+
"METAFLOW_DEFAULT_METADATA" = "service"
15+
})
16+
filename = "${path.module}/config.json"
1717
}

‎examples/eks/vpc.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# VPC infra using https://github.com/terraform-aws-modules/terraform-aws-vpc
33
module "vpc" {
4-
source = "terraform-aws-modules/vpc/aws"
4+
source = "terraform-aws-modules/vpc/aws"
55
version = "3.13.0"
66

77
name = "${local.resource_prefix}-${local.resource_suffix}"

‎examples/minimal/minimal_example.tf

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
resource "random_string" "suffix" {
88
length = 8
99
special = false
10-
upper = false
10+
upper = false
1111
}
1212

1313
locals {
@@ -20,7 +20,7 @@ data "aws_availability_zones" "available" {
2020

2121
# VPC infra using https://github.com/terraform-aws-modules/terraform-aws-vpc
2222
module "vpc" {
23-
source = "terraform-aws-modules/vpc/aws"
23+
source = "terraform-aws-modules/vpc/aws"
2424
version = "3.13.0"
2525

2626
name = "${local.resource_prefix}-${local.resource_suffix}"
@@ -37,7 +37,7 @@ module "vpc" {
3737

3838

3939
module "metaflow" {
40-
source = "outerbounds/metaflow/aws"
40+
source = "outerbounds/metaflow/aws"
4141
version = "0.3.0"
4242

4343
resource_prefix = local.resource_prefix
@@ -50,7 +50,7 @@ module "metaflow" {
5050
vpc_id = module.vpc.vpc_id
5151

5252
tags = {
53-
"managedBy" = "terraform"
53+
"managedBy" = "terraform"
5454
}
5555
}
5656

‎locals.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ locals {
1111

1212
batch_s3_task_role_name = "${local.resource_prefix}batch_s3_task_role${local.resource_suffix}"
1313
metaflow_batch_image_name = "${local.resource_prefix}batch${local.resource_suffix}"
14-
metadata_service_container_image = (
14+
metadata_service_container_image = (
1515
var.metadata_service_container_image == "" ?
1616
module.metaflow-common.default_metadata_service_container_image :
1717
var.metadata_service_container_image

‎main.tf

+20-20
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@ module "metaflow-metadata-service" {
1818
resource_prefix = local.resource_prefix
1919
resource_suffix = local.resource_suffix
2020

21-
access_list_cidr_blocks = var.access_list_cidr_blocks
22-
api_basic_auth = var.api_basic_auth
23-
database_password = module.metaflow-datastore.database_password
24-
database_username = module.metaflow-datastore.database_username
25-
datastore_s3_bucket_kms_key_arn = module.metaflow-datastore.datastore_s3_bucket_kms_key_arn
26-
fargate_execution_role_arn = module.metaflow-computation.ecs_execution_role_arn
27-
iam_partition = var.iam_partition
28-
metadata_service_container_image = local.metadata_service_container_image
29-
metaflow_vpc_id = var.vpc_id
30-
rds_master_instance_endpoint = module.metaflow-datastore.rds_master_instance_endpoint
31-
s3_bucket_arn = module.metaflow-datastore.s3_bucket_arn
32-
subnet1_id = var.subnet1_id
33-
subnet2_id = var.subnet2_id
34-
vpc_cidr_block = var.vpc_cidr_block
21+
access_list_cidr_blocks = var.access_list_cidr_blocks
22+
api_basic_auth = var.api_basic_auth
23+
database_password = module.metaflow-datastore.database_password
24+
database_username = module.metaflow-datastore.database_username
25+
datastore_s3_bucket_kms_key_arn = module.metaflow-datastore.datastore_s3_bucket_kms_key_arn
26+
fargate_execution_role_arn = module.metaflow-computation.ecs_execution_role_arn
27+
iam_partition = var.iam_partition
28+
metadata_service_container_image = local.metadata_service_container_image
29+
metaflow_vpc_id = var.vpc_id
30+
rds_master_instance_endpoint = module.metaflow-datastore.rds_master_instance_endpoint
31+
s3_bucket_arn = module.metaflow-datastore.s3_bucket_arn
32+
subnet1_id = var.subnet1_id
33+
subnet2_id = var.subnet2_id
34+
vpc_cidr_block = var.vpc_cidr_block
3535

3636
standard_tags = var.tags
3737
}
3838

3939
module "metaflow-ui" {
4040
source = "./modules/ui"
41-
count = var.ui_certificate_arn == "" ? 0 : 1
41+
count = var.ui_certificate_arn == "" ? 0 : 1
4242

4343
resource_prefix = local.resource_prefix
4444
resource_suffix = local.resource_suffix
@@ -55,13 +55,13 @@ module "metaflow-ui" {
5555
subnet2_id = var.subnet2_id
5656
ui_backend_container_image = local.metadata_service_container_image
5757

58-
METAFLOW_DATASTORE_SYSROOT_S3 = module.metaflow-datastore.METAFLOW_DATASTORE_SYSROOT_S3
59-
certificate_arn = var.ui_certificate_arn
60-
metadata_service_security_group_id = module.metaflow-metadata-service.metadata_service_security_group_id
58+
METAFLOW_DATASTORE_SYSROOT_S3 = module.metaflow-datastore.METAFLOW_DATASTORE_SYSROOT_S3
59+
certificate_arn = var.ui_certificate_arn
60+
metadata_service_security_group_id = module.metaflow-metadata-service.metadata_service_security_group_id
6161

62-
extra_ui_static_env_vars = var.extra_ui_static_env_vars
62+
extra_ui_static_env_vars = var.extra_ui_static_env_vars
6363
extra_ui_backend_env_vars = var.extra_ui_backend_env_vars
64-
standard_tags = var.tags
64+
standard_tags = var.tags
6565
}
6666

6767
module "metaflow-computation" {

‎modules/datastore/s3.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
resource "aws_s3_bucket" "this" {
2-
bucket = local.s3_bucket_name
3-
acl = "private"
2+
bucket = local.s3_bucket_name
3+
acl = "private"
44
force_destroy = var.force_destroy_s3_bucket
55
server_side_encryption_configuration {
66
rule {

‎modules/datastore/variables.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ variable "db_name" {
1111
}
1212

1313
variable "force_destroy_s3_bucket" {
14-
type = bool
14+
type = bool
1515
description = "Empty S3 bucket before destroying via terraform destroy"
16-
default = false
16+
default = false
1717
}
1818
variable "db_username" {
1919
type = string

‎modules/datastore/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
terraform {
22
required_providers {
33
aws = {
4-
source = "hashicorp/aws"
4+
source = "hashicorp/aws"
55
version = ">= 3.38.0, < 4.0"
66
}
77
random = {

‎modules/metadata-service/locals.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ locals {
1111

1212
# Name of Fargate security group used by the Metadata Service
1313
metadata_service_security_group_name = "${var.resource_prefix}metadata-service-security-group${var.resource_suffix}"
14-
metadata_service_container_image = (
14+
metadata_service_container_image = (
1515
var.metadata_service_container_image == "" ?
1616
module.metaflow-common.default_metadata_service_container_image :
1717
var.metadata_service_container_image

‎modules/metadata-service/variables.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ variable "is_gov" {
4242
}
4343

4444
variable "metadata_service_container_image" {
45-
type = string
46-
default = ""
45+
type = string
46+
default = ""
4747
description = "Container image for metadata service"
4848
}
4949

‎modules/ui/ec2.tf

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ resource "aws_security_group" "fargate_security_group" {
44
vpc_id = var.metaflow_vpc_id
55

66
ingress {
7-
from_port = 0
8-
to_port = 0
9-
protocol = -1
10-
security_groups = [ aws_security_group.ui_lb_security_group.id ]
7+
from_port = 0
8+
to_port = 0
9+
protocol = -1
10+
security_groups = [aws_security_group.ui_lb_security_group.id]
1111
}
1212

1313
ingress {
@@ -78,7 +78,7 @@ resource "aws_lb" "this" {
7878
internal = false
7979
load_balancer_type = "application"
8080
subnets = [var.subnet1_id, var.subnet2_id]
81-
security_groups = [
81+
security_groups = [
8282
aws_security_group.ui_lb_security_group.id
8383
]
8484

@@ -95,7 +95,7 @@ resource "aws_lb_target_group" "ui_backend" {
9595
health_check {
9696
protocol = "HTTP"
9797
port = 8083
98-
path = "/api/ping"
98+
path = "/api/ping"
9999
interval = 10
100100
healthy_threshold = 2
101101
unhealthy_threshold = 2
@@ -110,7 +110,7 @@ resource "aws_lb_target_group" "ui_static" {
110110
protocol = "HTTP"
111111
target_type = "ip"
112112
vpc_id = var.metaflow_vpc_id
113-
tags = var.standard_tags
113+
tags = var.standard_tags
114114
}
115115

116116
resource "aws_lb_listener" "this" {
@@ -123,7 +123,7 @@ resource "aws_lb_listener" "this" {
123123
default_action {
124124
type = "forward"
125125
target_group_arn = aws_lb_target_group.ui_static.id
126-
order = 100
126+
order = 100
127127
}
128128
}
129129

‎modules/ui/ecs_ui_backend.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ resource "aws_ecs_task_definition" "ui_backend" {
1515
hostPort = 8083
1616
}
1717
]
18-
environment = [for k, v in merge(local.default_ui_backend_env_vars, var.extra_ui_backend_env_vars): {name = k, value=v}]
18+
environment = [for k, v in merge(local.default_ui_backend_env_vars, var.extra_ui_backend_env_vars) : { name = k, value = v }]
1919
logConfiguration = {
2020
logDriver = "awslogs"
2121
options = {

‎modules/ui/ecs_ui_static.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resource "aws_ecs_task_definition" "ui_static" {
1616
hostPort = 3000
1717
}
1818
]
19-
environment = [for k, v in merge(local.default_ui_static_env_vars, var.extra_ui_static_env_vars): {name = k, value=v}]
19+
environment = [for k, v in merge(local.default_ui_static_env_vars, var.extra_ui_static_env_vars) : { name = k, value = v }]
2020
logConfiguration = {
2121
logDriver = "awslogs"
2222
options = {

0 commit comments

Comments
 (0)