This also solves the issue I had that pre-commit hooks wouldn't work without terraform init in self-hosted dir. And terraform init couldn't work without AWS login

rebase

Harbormaster completed remote builds in B29507: Diff 41080.Jun 6 2024, 9:28 PM

Closed by commit rCOMM7400698e3d52: [terraform] remove usage of s3 bucket for terraform config (authored by will). · Explain WhyJun 7 2024, 11:07 AM

This revision was automatically updated to reflect the committed changes.

will added a commit: rCOMM7400698e3d52: [terraform] remove usage of s3 bucket for terraform config.

Revision Contents
Changeset List

Path

Size

services/

terraform/

self-host/

main.tf

9 lines

Diff 41113

View Options

services/terraform/self-host/main.tf

		locals {
		mariadb_database_name = local.local_with_default_environment_vars.COMM_DATABASE_DATABASE
		mariadb_username = local.local_with_default_environment_vars.COMM_DATABASE_USER
		mariadb_password = local.local_with_default_environment_vars.COMM_DATABASE_PASSWORD
		mariadb_port = jsondecode(local.local_with_default_environment_vars.COMM_DATABASE_PORT)
		}

# MariaDB Security Group		# MariaDB Security Group
resource "aws_security_group" "keyserver_mariadb_security_group" {		resource "aws_security_group" "keyserver_mariadb_security_group" {
name = "keyserver-mariadb-sg"		name = "keyserver-mariadb-sg"
description = "Allow inbound traffic on port 3307 and all outbound traffic"		description = "Allow inbound traffic on port 3307 and all outbound traffic"
vpc_id = local.vpc_id		vpc_id = local.vpc_id

# Inbound rules		# Inbound rules
ingress {		ingress {
from_port = 3307		from_port = local.mariadb_port
to_port = 3307		to_port = local.mariadb_port
protocol = "tcp"		protocol = "tcp"
security_groups = [aws_security_group.keyserver_service.id]		security_groups = [aws_security_group.keyserver_service.id]
}		}

ingress {		ingress {
from_port = 3307		from_port = local.mariadb_port
to_port = 3307		to_port = local.mariadb_port
protocol = "tcp"		protocol = "tcp"
cidr_blocks = ["${var.allowed_ip}/32"]		cidr_blocks = ["${var.allowed_ip}/32"]
}		}

# Outbound rules		# Outbound rules
egress {		egress {
from_port = 0		from_port = 0
to_port = 0		to_port = 0
Show All 9 Lines	resource "aws_db_instance" "mariadb" {
storage_type = "gp3"		storage_type = "gp3"
db_name = "mariadb"		db_name = "mariadb"
identifier = "mariadb-instance"		identifier = "mariadb-instance"
engine = "mariadb"		engine = "mariadb"
engine_version = "10.11"		engine_version = "10.11"
instance_class = "db.m6g.large"		instance_class = "db.m6g.large"
db_subnet_group_name = aws_db_subnet_group.public_db_subnet_group.name		db_subnet_group_name = aws_db_subnet_group.public_db_subnet_group.name
vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id]		vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id]
username = var.mariadb_username		username = local.mariadb_username
password = var.mariadb_password		password = local.mariadb_password
parameter_group_name = aws_db_parameter_group.mariadb_parameter_group.name		parameter_group_name = aws_db_parameter_group.mariadb_parameter_group.name
storage_encrypted = true		storage_encrypted = true
publicly_accessible = true		publicly_accessible = true
port = 3307		port = local.mariadb_port
skip_final_snapshot = true		skip_final_snapshot = true
}		}

# MariaDB Parameter Group		# MariaDB Parameter Group
resource "aws_db_parameter_group" "mariadb_parameter_group" {		resource "aws_db_parameter_group" "mariadb_parameter_group" {
name = "mariadb-parameter-group"		name = "mariadb-parameter-group"
family = "mariadb10.11"		family = "mariadb10.11"

▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines	resource "aws_db_parameter_group" "mariadb_parameter_group" {
}		}
}		}

resource "null_resource" "create_comm_database" {		resource "null_resource" "create_comm_database" {
depends_on = [aws_db_instance.mariadb, aws_security_group.keyserver_mariadb_security_group]		depends_on = [aws_db_instance.mariadb, aws_security_group.keyserver_mariadb_security_group]

provisioner "local-exec" {		provisioner "local-exec" {
command = <<EOT		command = <<EOT
mysql --user=${var.mariadb_username} \		mysql --user=${local.mariadb_username} \
--port=3307 \		--port=${local.mariadb_port} \
--host=${aws_db_instance.mariadb.address} \		--host=${aws_db_instance.mariadb.address} \
--execute="CREATE DATABASE IF NOT EXISTS comm;" \		--execute="CREATE DATABASE IF NOT EXISTS ${local.mariadb_database_name};" \
--password=${var.mariadb_password}		--password=${local.mariadb_password}
EOT		EOT
}		}
}		}

[terraform] remove usage of s3 bucket for terraform configClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 41113

services/terraform/self-host/main.tf

[terraform] remove usage of s3 bucket for terraform config
ClosedPublic
Actions

Revision Contents
Changeset List