diff --git a/ansible/roles/fastpath/tasks/main.yml b/ansible/roles/fastpath/tasks/main.yml index 74ff60d6..c11c8c4e 100644 --- a/ansible/roles/fastpath/tasks/main.yml +++ b/ansible/roles/fastpath/tasks/main.yml @@ -154,7 +154,7 @@ - name: Ensure fastpath is running community.docker.docker_container: name: fastpath - image: ooni/fastpath:v0.88 + image: ooni/fastpath:v0.89 state: started user: "{{user_uid.stdout}}:{{user_gid.stdout}}" # use network mode = host to allow traffic from fastpath to the statsd exporter without diff --git a/tf/environments/dev/main.tf b/tf/environments/dev/main.tf index f023178f..a57442a0 100644 --- a/tf/environments/dev/main.tf +++ b/tf/environments/dev/main.tf @@ -206,6 +206,11 @@ data "aws_ssm_parameter" "prometheus_metrics_password" { name = "/oonidevops/ooni_services/prometheus_metrics_password" } +# Manually managed with the AWS console +data "aws_ssm_parameter" "anonc_secret_key" { + name = "/oonidevops/secrets/zkp/secret_key" +} + resource "aws_secretsmanager_secret" "oonipg_url" { name = "oonidevops/ooni-tier0-postgres/postgresql_url" tags = local.tags @@ -468,6 +473,18 @@ resource "aws_iam_role_policy" "ooniprobe_role" { "Effect": "Allow", "Action": "s3:GetObject", "Resource": "${aws_s3_bucket.ooni_private_config_bucket.arn}/*" + }, + { + "Sid": "", + "Effect": "Allow", + "Action": "s3:GetObject", + "Resource": "${aws_s3_bucket.anoncred_manifests.arn}/*" + }, + { + "Sid": "", + "Effect": "Allow", + "Action": "s3:ListBucket", + "Resource": "${aws_s3_bucket.anoncred_manifests.arn}/*" } ] } @@ -479,7 +496,7 @@ module "ooniapi_ooniprobe_deployer" { service_name = "ooniprobe" repo = "ooni/backend" - branch_name = "master" + branch_name = "userauth-dep" trigger_path = "ooniapi/services/ooniprobe/**" buildspec_path = "ooniapi/services/ooniprobe/buildspec.yml" codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn @@ -512,6 +529,7 @@ module "ooniapi_ooniprobe" { JWT_ENCRYPTION_KEY = data.aws_ssm_parameter.jwt_secret_legacy.arn PROMETHEUS_METRICS_PASSWORD = data.aws_ssm_parameter.prometheus_metrics_password.arn CLICKHOUSE_URL = data.aws_ssm_parameter.clickhouse_readonly_url.arn + ANONC_SECRET_KEY = data.aws_ssm_parameter.anonc_secret_key.arn } task_environment = { @@ -520,6 +538,8 @@ module "ooniapi_ooniprobe" { COLLECTOR_ID = 3 # use a different one in prod CONFIG_BUCKET = aws_s3_bucket.ooni_private_config_bucket.bucket TOR_TARGETS = "tor_targets.json" + ANONC_MANIFEST_BUCKET = aws_s3_bucket.anoncred_manifests.bucket + ANONC_MANIFEST_FILE = "manifest.json" } ooniapi_service_security_groups = [ @@ -822,7 +842,7 @@ module "fastpath_builder" { service_name = "fastpath" repo = "ooni/backend" - branch_name = "master" + branch_name = "userauth-dep" buildspec_path = "fastpath/buildspec.yml" trigger_path = "fastpath/**" codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn