Skip to content

admin api infra #79

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

Merged
saito-sv merged 1 commit into from
Jan 10, 2023
Merged

admin api infra #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions infra/internal/prod/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions infra/internal/prod/alb.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module "alb_acm" {
source = "../../acm"
domain_name = "admin.${local.root_domain}"
domain_name = local.root_domain
aws_region = "us-west-2"
zone_id = data.aws_route53_zone.root.zone_id
tags = {
Name = "admin-${local.root_domain}-alb"
Name = "${local.root_domain}-alb"
}
}

Expand All @@ -13,7 +13,7 @@ resource "aws_alb" "alb" {
internal = true
drop_invalid_header_fields = true
security_groups = [aws_security_group.ecs_alb_https_sg.id]
subnets = data.terraform_remote_state.vpc.outputs.public_subnets
subnets = data.terraform_remote_state.vpc.outputs.private_subnets

tags = {
Name = "${local.service_name}-alb"
Expand Down Expand Up @@ -77,7 +77,7 @@ resource "aws_alb_listener_rule" "ecs_alb_listener_rule" {

condition {
host_header {
values = ["admin.${local.root_domain}"]
values = [local.root_domain]
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion infra/internal/prod/domain.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ data "aws_route53_zone" "root" {
}

resource "aws_route53_record" "domain" {
name = "admin.${local.root_domain}"
name = local.root_domain
type = "A"
zone_id = data.aws_route53_zone.root.zone_id
alias {
Expand Down
2 changes: 1 addition & 1 deletion infra/internal/prod/ecs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ resource "aws_ecs_task_definition" "task_definition" {

resource "aws_ecr_repository" "repo" {
name = local.service_name
image_tag_mutability = "MUTABLE"
image_tag_mutability = "IMMUTABLE"

image_scanning_configuration {
scan_on_push = true
Expand Down
4 changes: 2 additions & 2 deletions infra/internal/prod/security_group.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ resource "aws_security_group" "ecs_task_sg" {

# Give access to DB through Security group rule
data "aws_security_group" "rds" {
name = "${local.env}-string-write-master-client-rds"
name = "pg-cluster-20221103192516479600000004"
vpc_id = data.terraform_remote_state.vpc.outputs.id
}

Expand All @@ -81,4 +81,4 @@ resource "aws_security_group_rule" "redis_to_ecs" {
to_port = local.redis_port
source_security_group_id = aws_security_group.ecs_task_sg.id
security_group_id = data.aws_security_group.redis.id
}
}
10 changes: 5 additions & 5 deletions infra/internal/prod/ssm.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@ data "aws_ssm_parameter" "datadog" {
}

data "aws_ssm_parameter" "db_password" {
name = "string-rds-pg-db-password"
name = "string-pg-db-password"
}

data "aws_ssm_parameter" "db_username" {
name = "string-rds-pg-db-username"
name = "string-pg-db-username"
}

data "aws_ssm_parameter" "db_name" {
name = "string-rds-pg-db-name"
name = "string-pg-db-name"
}

data "aws_ssm_parameter" "db_host" {
name = "${local.env}-string-write-db-host-url"
name = "pg-cluster-write-host-url"
}

data "aws_ssm_parameter" "redis_auth_token" {
name = "redis-auth-token"
}

data "aws_ssm_parameter" "redis_host_url" {
name = "redis-host-url"
name = "redis-host-url"
}

data "aws_kms_key" "kms_key" {
Expand Down
12 changes: 6 additions & 6 deletions infra/internal/prod/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
locals {
cluster_name = "admin"
env = "dev"
env = "prod"
service_name = "admin"
root_domain = "string-api.xyz"
root_domain = "admin.string-api.xyz"
container_port = "3000"
origin_id = "admin-api"
desired_task_count = "1"
Expand All @@ -15,7 +15,7 @@ locals {

variable "versioning" {
type = string
default = "latest"
default = "v1.0.0.0"
}

locals {
Expand Down Expand Up @@ -49,11 +49,11 @@ locals {
valueFrom = data.aws_ssm_parameter.db_name.arn
},
{
name = "REDIS_HOST",
name = "REDIS_HOST",
valuefrom = data.aws_ssm_parameter.redis_host_url.arn
},
{
name = "REDIS_PASSWORD",
name = "REDIS_PASSWORD",
valuefrom = data.aws_ssm_parameter.redis_auth_token.arn
}
]
Expand All @@ -66,7 +66,7 @@ locals {
name = "REDIS_PORT"
value = local.redis_port
},
{
{
name = "DB_PORT",
value = local.db_port
},
Expand Down