Skip to content

Commit

Permalink
run terraform fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
deltacodepl committed Jun 2, 2023
1 parent fd17aad commit 2655235
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 54 deletions.
10 changes: 5 additions & 5 deletions examples/flagsmith-on-ecs/terraform/01_provider.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ provider "aws" {
region = var.region

default_tags {
tags = {
Environment = var.app_environment
Project = var.app_name
}
}
tags = {
Environment = var.app_environment
Project = var.app_name
}
}
}
28 changes: 14 additions & 14 deletions examples/flagsmith-on-ecs/terraform/02_vpc.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@ data "aws_availability_zones" "available" {

locals {
azs = slice(data.aws_availability_zones.available.names, 0, 2)

}

module "vpc" {
# https://registry.terraform.io/modules/terraform-aws-modules/vpc/aws/latest
source = "terraform-aws-modules/vpc/aws"
version = "3.18.1"

name = "${var.app_name}-${var.app_environment}-vpc"
cidr = var.vpc_cidr
azs = local.azs
private_subnets = [for k, v in local.azs : cidrsubnet(var.vpc_cidr, 8, k + 10)]
public_subnets = [for k, v in local.azs : cidrsubnet(var.vpc_cidr, 8, k + 1)]
enable_nat_gateway = true
single_nat_gateway = true
name = "${var.app_name}-${var.app_environment}-vpc"
cidr = var.vpc_cidr
azs = local.azs
private_subnets = [for k, v in local.azs : cidrsubnet(var.vpc_cidr, 8, k + 10)]
public_subnets = [for k, v in local.azs : cidrsubnet(var.vpc_cidr, 8, k + 1)]

enable_nat_gateway = true
single_nat_gateway = true
one_nat_gateway_per_az = false
enable_dns_support = true
enable_dns_hostnames = true
enable_dns_support = true
enable_dns_hostnames = true


# for auto service discovery
# tags = {

Expand All @@ -37,7 +37,7 @@ module "vpc" {
# }

# private_subnet_tags = {

# }
}

Expand Down
8 changes: 4 additions & 4 deletions examples/flagsmith-on-ecs/terraform/04_loadbalancer.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ resource "aws_lb" "production" {

# Target group
resource "aws_alb_target_group" "default-target-group" {
name = "${var.app_environment}-${var.app_name}-tg"
port = 8000
protocol = "HTTP"
vpc_id = module.vpc.vpc_id
name = "${var.app_environment}-${var.app_name}-tg"
port = 8000
protocol = "HTTP"
vpc_id = module.vpc.vpc_id
target_type = "ip"

health_check {
Expand Down
2 changes: 1 addition & 1 deletion examples/flagsmith-on-ecs/terraform/05_iam.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource "aws_iam_role_policy" "ecs-host-role-policy" {
}

resource "aws_iam_role" "ecs_task" {
name = "${var.app_name}-ecs-task"
name = "${var.app_name}-ecs-task"
assume_role_policy = file("policies/ecs-host-role.json")
}

Expand Down
36 changes: 18 additions & 18 deletions examples/flagsmith-on-ecs/terraform/09_ecs_service.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@ data "template_file" "app" {
template = file("templates/flagsmith.json")

vars = {
container_name = var.app_name
docker_image_url = var.docker_image_url
region = var.region

allowed_hosts = var.allowed_hosts
settings_module = lookup(var.settings_module, "production")
AWS_ACCOUNT_ID = local.AWS_ACCOUNT_ID
app_environment = var.app_environment
app_name = var.app_name
container_name = var.app_name
docker_image_url = var.docker_image_url
region = var.region

allowed_hosts = var.allowed_hosts
settings_module = lookup(var.settings_module, "production")
AWS_ACCOUNT_ID = local.AWS_ACCOUNT_ID
app_environment = var.app_environment
app_name = var.app_name
}
}

resource "aws_ecs_task_definition" "app" {
family = "flagsmith"
container_definitions = data.template_file.app.rendered
depends_on = [aws_db_instance.production]
family = "flagsmith"
container_definitions = data.template_file.app.rendered
depends_on = [aws_db_instance.production]
requires_compatibilities = ["FARGATE"]
network_mode = "awsvpc"
cpu = var.cpu
memory = var.memory
task_role_arn = aws_iam_role.ecs_task.arn
execution_role_arn = aws_iam_role.ecs_host_role.arn
cpu = var.cpu
memory = var.memory
task_role_arn = aws_iam_role.ecs_task.arn
execution_role_arn = aws_iam_role.ecs_host_role.arn

}

Expand All @@ -33,8 +33,8 @@ resource "aws_ecs_service" "production" {
task_definition = aws_ecs_task_definition.app.arn
desired_count = var.app_count
## prevent race condition - iam
depends_on = [aws_alb_listener.ecs-alb-http-listener, aws_iam_role_policy.ecs_task]
depends_on = [aws_alb_listener.ecs-alb-http-listener, aws_iam_role_policy.ecs_task]

load_balancer {
target_group_arn = aws_alb_target_group.default-target-group.arn
container_name = var.app_name
Expand Down
12 changes: 6 additions & 6 deletions examples/flagsmith-on-ecs/terraform/10_secrets.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ data "aws_kms_key" "ssm_kms_key" {
}

resource "random_password" "rds_password" {
count = var.rds_password == "" ? 1 : 0
length = 15
special = true
count = var.rds_password == "" ? 1 : 0
length = 15
special = true
override_special = "#%!&"
}

resource "random_password" "django_secret_key" {
count = var.django_secret_key == "" ? 1 : 0
length = 25
special = true
count = var.django_secret_key == "" ? 1 : 0
length = 25
special = true
override_special = "#%!&"
}

Expand Down
2 changes: 1 addition & 1 deletion examples/flagsmith-on-ecs/terraform/11_rds.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

resource "aws_db_subnet_group" "production" {
name = "main"
name = "main"
# subnet_ids = module.vpc.public_subnets
subnet_ids = module.vpc.private_subnets
}
Expand Down
2 changes: 1 addition & 1 deletion examples/flagsmith-on-ecs/terraform/locals.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
locals {
ecs_cluster_name = "${var.app_name}-${var.app_environment}-cluster"
AWS_ACCOUNT_ID = data.aws_caller_identity.current.account_id
AWS_ACCOUNT_ID = data.aws_caller_identity.current.account_id
}
2 changes: 1 addition & 1 deletion examples/flagsmith-on-ecs/terraform/sts.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
data "aws_caller_identity" "current" {

}
6 changes: 3 additions & 3 deletions examples/flagsmith-on-ecs/terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ variable "rds_username" {

variable "rds_password" {
description = "RDS database password"
default = ""
default = ""
}

variable "rds_instance_class" {
Expand All @@ -90,14 +90,14 @@ variable "certificate_arn" {
}

variable "route53_hosted_zone" {
type = string
type = string
}

# Django

variable "django_secret_key" {
description = "Django env. variable DJANGO_SECRET_KEY"
default = ""
default = ""
}

variable "cpu" {
Expand Down

0 comments on commit 2655235

Please sign in to comment.