Skip to content

Config s3 bucket #281

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

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Config s3 bucket #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
989e7a8
Add bucket for private API config files
LDiazN Nov 12, 2025
9a63463
Set branch of ooniprobe to test config file read
LDiazN Nov 12, 2025
2ea8130
fix bad backend-hel path
LDiazN Nov 12, 2025
63691eb
Add read permission to ooniprobe for configs bucket
LDiazN Nov 12, 2025
0ba0a45
Point ooniprobe back to master
LDiazN Nov 12, 2025
b37d12a
Add configs bucket to prod
LDiazN Nov 12, 2025
dfc7b53
Add CONFIG_BUCKET setting in prod
LDiazN Nov 12, 2025
9f9ed4e
Add permission for ooniprobe to access configs bucket
LDiazN Nov 12, 2025
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
31 changes: 21 additions & 10 deletions tf/environments/dev/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,10 @@ module "oonidevops_github_user" {
module "oonipg" {
source = "../../modules/postgresql"

name = "ooni-tier0-postgres"
aws_region = var.aws_region
vpc_id = module.network.vpc_id
subnet_ids = module.network.vpc_subnet_public[*].id
name = "ooni-tier0-postgres"
aws_region = var.aws_region
vpc_id = module.network.vpc_id
subnet_ids = module.network.vpc_subnet_public[*].id
# By default, max_connections is computed as:
# LEAST({DBInstanceClassMemory/9531392}, 5000)
# see https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Limits.html
Expand Down Expand Up @@ -249,6 +249,10 @@ resource "aws_s3_bucket" "oonith_codepipeline_bucket" {
bucket = "codepipeline-oonith-${var.aws_region}-${random_id.artifact_id.hex}"
}

resource "aws_s3_bucket" "ooni_private_config_bucket" {
bucket = "ooni-config-${var.aws_region}-${random_id.artifact_id.hex}"
}

data "aws_secretsmanager_secret_version" "deploy_key" {
secret_id = module.adm_iam_roles.oonidevops_deploy_key_arn
depends_on = [module.adm_iam_roles]
Expand Down Expand Up @@ -367,6 +371,12 @@ resource "aws_iam_role_policy" "ooniprobe_role" {
"Effect": "Allow",
"Action": "s3:PutObject",
"Resource": "${aws_s3_bucket.ooniprobe_failed_reports.arn}/*"
},
{
"Sid": "",
"Effect": "Allow",
"Action": "s3:GetObject",
"Resource": "${aws_s3_bucket.ooni_private_config_bucket.arn}/*"
}
]
}
Expand All @@ -378,7 +388,7 @@ module "ooniapi_ooniprobe_deployer" {

service_name = "ooniprobe"
repo = "ooni/backend"
branch_name = "investigate-geoip-reporting"
branch_name = "master"
trigger_path = "ooniapi/services/ooniprobe/**"
buildspec_path = "ooniapi/services/ooniprobe/buildspec.yml"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand Down Expand Up @@ -417,6 +427,7 @@ module "ooniapi_ooniprobe" {
FASTPATH_URL = "http://fastpath.${local.environment}.ooni.io:8472"
FAILED_REPORTS_BUCKET = aws_s3_bucket.ooniprobe_failed_reports.bucket
COLLECTOR_ID = 3 # use a different one in prod
CONFIG_BUCKET = aws_s3_bucket.ooni_private_config_bucket.bucket
}

ooniapi_service_security_groups = [
Expand Down Expand Up @@ -916,7 +927,7 @@ module "ooniapi_oonimeasurements" {
dns_zone_ooni_io = local.dns_zone_ooni_io
key_name = module.adm_iam_roles.oonidevops_key_name
ecs_cluster_id = module.oonitier1plus_cluster.cluster_id
service_desired_count = 2
service_desired_count = 2

task_secrets = {
POSTGRESQL_URL = data.aws_ssm_parameter.oonipg_url.arn
Expand All @@ -927,9 +938,9 @@ module "ooniapi_oonimeasurements" {

task_environment = {
# it has to be a json-compliant array
OTHER_COLLECTORS = jsonencode(["https://backend-", "http://fastpath.${local.environment}.ooni.io:8475"])
BASE_URL = "https://api.${local.environment}.ooni.io"
S3_BUCKET_NAME = "ooni-data-eu-fra-test"
OTHER_COLLECTORS = jsonencode(["http://fastpath.${local.environment}.ooni.io:8475", "https://backend-hel.ooni.org"])
BASE_URL = "https://api.${local.environment}.ooni.io"
S3_BUCKET_NAME = "ooni-data-eu-fra-test"
}

ooniapi_service_security_groups = [
Expand Down Expand Up @@ -1095,7 +1106,7 @@ module "ooni_anonc" {
to_port = 9100,
protocol = "tcp"
cidr_blocks = ["${module.ooni_monitoring_proxy.aws_instance_private_ip}/32"],
}]
}]

egress_rules = [{
from_port = 0,
Expand Down
15 changes: 13 additions & 2 deletions tf/environments/prod/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,10 @@ resource "aws_s3_bucket" "oonith_codepipeline_bucket" {
bucket = "codepipeline-oonith-${var.aws_region}-${random_id.artifact_id.hex}"
}

resource "aws_s3_bucket" "ooni_private_config_bucket" {
bucket = "ooni-config-${var.aws_region}-${random_id.artifact_id.hex}"
}

data "aws_secretsmanager_secret_version" "deploy_key" {
secret_id = module.adm_iam_roles.oonidevops_deploy_key_arn
depends_on = [module.adm_iam_roles]
Expand Down Expand Up @@ -580,17 +584,23 @@ resource "aws_iam_role_policy" "ooniprobe_role" {
role = module.ooniapi_cluster.container_host_role.name

policy = <<EOF
{
{
"Version": "2012-10-17",
"Statement": [
{
"Sid": "",
"Effect": "Allow",
"Action": "s3:PutObject",
"Resource": "${aws_s3_bucket.ooniprobe_failed_reports.arn}/*"
},
{
"Sid": "",
"Effect": "Allow",
"Action": "s3:GetObject",
"Resource": "${aws_s3_bucket.ooni_private_config_bucket.arn}/*"
}
]
}
}
EOF
}

Expand Down Expand Up @@ -638,6 +648,7 @@ module "ooniapi_ooniprobe" {
FASTPATH_URL = "http://fastpath.${local.environment}.ooni.io:8472"
FAILED_REPORTS_BUCKET = aws_s3_bucket.ooniprobe_failed_reports.bucket
COLLECTOR_ID = 4 # be sure this is different from dev
CONFIG_BUCKET = aws_s3_bucket.ooni_private_config_bucket.bucket
}

ooniapi_service_security_groups = [
Expand Down