Skip to content

Commit 94f3638

Browse files
committed
unmix environment from secrets
1 parent 093c98f commit 94f3638

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

tf/environments/dev/main.tf

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -968,22 +968,21 @@ module "reuploader" {
968968
scheduled_task_cluster = module.ooniapi_cluster.cluster_name
969969
ecs_cluster_id = module.ooniapi_cluster.cluster_id
970970

971-
task_secrets = {
972-
AWS_SECRET_ACCESS_KEY = module.ooniapi_user.aws_secret_access_key_arn
973-
AWS_ACCESS_KEY_ID = module.ooniapi_user.aws_access_key_id_arn
974-
975-
#ROLE_ARN =
976-
#ROLE_DURATION_SECONDS = "3600"
977-
AWS_REGION = var.aws_region
971+
task_environment = {
978972
BATCH_SIZE = 10
979-
# required
980973
BUCKET_NAME = aws_s3_bucket.ooniprobe_failed_reports.bucket
981974
DRY_RUN = true
982975
# PREFIX # s3 path prefix
983976
# fastpath API endpoint; use the last (fallback) fastpath instance in set
984977
FASTPATH_API = "http://${local.fastpath_hosts[length(local.fastpath_hosts) - 1]}:8472"
985978
}
986979

980+
task_secrets = {
981+
AWS_SECRET_ACCESS_KEY = module.ooniapi_user.aws_secret_access_key_arn
982+
AWS_ACCESS_KEY_ID = module.ooniapi_user.aws_access_key_id_arn
983+
AWS_REGION = var.aws_region
984+
}
985+
987986
ooniapi_service_security_groups = [
988987
module.ooniapi_cluster.web_security_group_id
989988
]

0 commit comments

Comments
 (0)