From 6119e68cc8d253051a9f28273a5b7eb6bb00abb0 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Fri, 24 Dec 2021 08:53:23 -0800 Subject: [PATCH] updated terraform --- .../staging-background-worker-taskdef.json | 4 +- .../staging/terraform.tfstate | 370 ++++++++++++++++-- .../staging/terraform.tfstate.backup | 33 +- 3 files changed, 367 insertions(+), 40 deletions(-) diff --git a/terraform/staging-background-worker-taskdef.json b/terraform/staging-background-worker-taskdef.json index 18b8765a..9f69fe1c 100644 --- a/terraform/staging-background-worker-taskdef.json +++ b/terraform/staging-background-worker-taskdef.json @@ -20,7 +20,7 @@ "environment": [ { "name": "config", - "value": "/usr/local/config/prod-background-worker.edn" + "value": "/usr/local/config/staging-background-worker.edn" } ], "mountPoints": [], @@ -28,7 +28,7 @@ "logConfiguration": { "logDriver": "awslogs", "options": { - "awslogs-group": "/ecs/integreat-background-worker-prod", + "awslogs-group": "/ecs/integreat-background-worker-staging", "awslogs-region": "us-east-1", "awslogs-stream-prefix": "ecs" } diff --git a/terraform/terraform.tfstate.d/staging/terraform.tfstate b/terraform/terraform.tfstate.d/staging/terraform.tfstate index 069c3b5d..520b1c4e 100644 --- a/terraform/terraform.tfstate.d/staging/terraform.tfstate +++ b/terraform/terraform.tfstate.d/staging/terraform.tfstate @@ -1,12 +1,13 @@ { "version": 4, - "terraform_version": "0.13.3", - "serial": 70, + "terraform_version": "0.14.4", + "serial": 84, "lineage": "91d10fe0-8033-8778-c202-78d5a81632e8", "outputs": { "aws_access_key_id": { "value": "AKIAJIS67OSJARD2E6VQ", - "type": "string" + "type": "string", + "sensitive": true }, "aws_default_region": { "value": "us-east-1", @@ -14,7 +15,8 @@ }, "aws_secret_access_key": { "value": "Z+AOjQU9M4SwKVU2meYtyNxXtz1Axu/9xohvteXf", - "type": "string" + "type": "string", + "sensitive": true }, "queue_url": { "value": "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-staging", @@ -33,9 +35,10 @@ "attributes": { "account_id": "679918342773", "arn": "arn:aws:iam::679918342773:user/bryce", - "id": "2020-09-25 00:21:01.39516 +0000 UTC", + "id": "679918342773", "user_id": "AIDAJPUJFTOKO4IRADMV4" - } + }, + "sensitive_attributes": [] } ] }, @@ -71,9 +74,11 @@ "status": "ISSUED", "subject_alternative_names": [], "tags": {}, + "tags_all": {}, "validation_emails": [], "validation_method": "DNS" }, + "sensitive_attributes": [], "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjAifQ==" } ] @@ -89,6 +94,12 @@ "attributes": { "capacity_provider_strategy": [], "cluster": "arn:aws:ecs:us-east-1:679918342773:cluster/default", + "deployment_circuit_breaker": [ + { + "enable": false, + "rollback": false + } + ], "deployment_controller": [ { "type": "ECS" @@ -98,10 +109,11 @@ "deployment_minimum_healthy_percent": 100, "desired_count": 1, "enable_ecs_managed_tags": false, + "enable_execute_command": false, "force_new_deployment": null, "health_check_grace_period_seconds": 600, "iam_role": "aws-service-role", - "id": "arn:aws:ecs:us-east-1:679918342773:service/integreat_app_staging", + "id": "arn:aws:ecs:us-east-1:679918342773:service/default/integreat_app_staging", "launch_type": "FARGATE", "load_balancer": [ { @@ -136,19 +148,101 @@ "container_name": "", "container_port": 0, "port": 0, - "registry_arn": "arn:aws:servicediscovery:us-east-1:679918342773:service/srv-6auj2wqsh55k2nuj" + "registry_arn": "arn:aws:servicediscovery:us-east-1:679918342773:service/srv-nsn252bfk4r6bzpj" } ], - "tags": {}, - "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_staging:3", + "tags": null, + "tags_all": {}, + "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_staging:81", "timeouts": { "delete": null - } + }, + "wait_for_steady_state": false }, + "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjoxMjAwMDAwMDAwMDAwfX0=", "dependencies": [ "aws_ecs_task_definition.integreat_app", - "aws_lb_target_group.integreat_app" + "aws_lb_target_group.integreat_app", + "aws_service_discovery_service.service" + ] + } + ] + }, + { + "mode": "managed", + "type": "aws_ecs_service", + "name": "integreat_background_worker", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "capacity_provider_strategy": [], + "cluster": "arn:aws:ecs:us-east-1:679918342773:cluster/default", + "deployment_circuit_breaker": [ + { + "enable": false, + "rollback": false + } + ], + "deployment_controller": [ + { + "type": "ECS" + } + ], + "deployment_maximum_percent": 200, + "deployment_minimum_healthy_percent": 100, + "desired_count": 1, + "enable_ecs_managed_tags": false, + "enable_execute_command": false, + "force_new_deployment": null, + "health_check_grace_period_seconds": 0, + "iam_role": "aws-service-role", + "id": "arn:aws:ecs:us-east-1:679918342773:service/default/integreat_background_worker_staging", + "launch_type": "FARGATE", + "load_balancer": [], + "name": "integreat_background_worker_staging", + "network_configuration": [ + { + "assign_public_ip": true, + "security_groups": [ + "sg-004e5855310c453a3", + "sg-02d167406b1082698" + ], + "subnets": [ + "subnet-5e675761", + "subnet-8519fde2", + "subnet-89bab8d4" + ] + } + ], + "ordered_placement_strategy": [], + "placement_constraints": [], + "platform_version": "LATEST", + "propagate_tags": "NONE", + "scheduling_strategy": "REPLICA", + "service_registries": [ + { + "container_name": "", + "container_port": 0, + "port": 0, + "registry_arn": "arn:aws:servicediscovery:us-east-1:679918342773:service/srv-4cuqgdwqo5acwqtq" + } + ], + "tags": null, + "tags_all": {}, + "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_staging:1", + "timeouts": { + "delete": null + }, + "wait_for_steady_state": false + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjoxMjAwMDAwMDAwMDAwfX0=", + "dependencies": [ + "aws_ecs_task_definition.integreat_background_worker", + "aws_service_discovery_service.background_worker_service" ] } ] @@ -162,14 +256,53 @@ { "schema_version": 1, "attributes": { - "arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_staging:3", - "container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/staging.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-app\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[],\"name\":\"integreat-app\",\"portMappings\":[{\"containerPort\":3000,\"hostPort\":3000,\"protocol\":\"tcp\"},{\"containerPort\":9000,\"hostPort\":9000,\"protocol\":\"tcp\"}],\"volumesFrom\":[]}]", + "arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_staging:81", + "container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/staging.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-app-staging\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[],\"name\":\"integreat-app\",\"portMappings\":[{\"containerPort\":3000,\"hostPort\":3000,\"protocol\":\"tcp\"},{\"containerPort\":9000,\"hostPort\":9000,\"protocol\":\"tcp\"}],\"volumesFrom\":[]}]", "cpu": "2048", + "ephemeral_storage": [], "execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole", "family": "integreat_app_staging", "id": "integreat_app_staging", "inference_accelerator": [], "ipc_mode": "", + "memory": "8192", + "network_mode": "awsvpc", + "pid_mode": "", + "placement_constraints": [], + "proxy_configuration": [], + "requires_compatibilities": [ + "FARGATE" + ], + "revision": 81, + "runtime_platform": [], + "tags": null, + "tags_all": {}, + "task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb", + "volume": [] + }, + "sensitive_attributes": [], + "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ==" + } + ] + }, + { + "mode": "managed", + "type": "aws_ecs_task_definition", + "name": "integreat_background_worker", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "schema_version": 1, + "attributes": { + "arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_staging:1", + "container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/staging-background-worker.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-background-worker-staging\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[],\"name\":\"integreat-app\",\"portMappings\":[{\"containerPort\":9000,\"hostPort\":9000,\"protocol\":\"tcp\"},{\"containerPort\":9090,\"hostPort\":9090,\"protocol\":\"tcp\"}],\"volumesFrom\":[]}]", + "cpu": "1024", + "ephemeral_storage": [], + "execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole", + "family": "integreat_background-worker_staging", + "id": "integreat_background-worker_staging", + "inference_accelerator": [], + "ipc_mode": "", "memory": "4096", "network_mode": "awsvpc", "pid_mode": "", @@ -178,11 +311,14 @@ "requires_compatibilities": [ "FARGATE" ], - "revision": 3, - "tags": {}, + "revision": 1, + "runtime_platform": [], + "tags": null, + "tags_all": {}, "task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb", "volume": [] }, + "sensitive_attributes": [], "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ==" } ] @@ -196,7 +332,9 @@ { "schema_version": 0, "attributes": { + "create_date": "2018-04-08T22:09:45Z", "encrypted_secret": null, + "encrypted_ses_smtp_password_v4": null, "id": "AKIAJIS67OSJARD2E6VQ", "key_fingerprint": null, "pgp_key": null, @@ -205,6 +343,7 @@ "status": "Active", "user": "integreat-staging" }, + "sensitive_attributes": [], "dependencies": [ "aws_iam_user.app_user" ] @@ -227,8 +366,10 @@ "path": "/", "permissions_boundary": null, "tags": {}, + "tags_all": {}, "unique_id": "AIDAJ4KJ7STJZNLIN3M6S" - } + }, + "sensitive_attributes": [] } ] }, @@ -245,6 +386,7 @@ "policy_arn": "arn:aws:iam::aws:policy/AdministratorAccess", "user": "integreat-staging" }, + "sensitive_attributes": [], "dependencies": [ "aws_iam_user.app_user" ] @@ -269,13 +411,16 @@ ], "arn": "arn:aws:elasticloadbalancing:us-east-1:679918342773:loadbalancer/app/integreat-app-staging/dc040205e561419e", "arn_suffix": "app/integreat-app-staging/dc040205e561419e", + "customer_owned_ipv4_pool": "", + "desync_mitigation_mode": "defensive", "dns_name": "integreat-app-staging-229185591.us-east-1.elb.amazonaws.com", "drop_invalid_header_fields": false, "enable_cross_zone_load_balancing": null, "enable_deletion_protection": true, "enable_http2": true, + "enable_waf_fail_open": false, "id": "arn:aws:elasticloadbalancing:us-east-1:679918342773:loadbalancer/app/integreat-app-staging/dc040205e561419e", - "idle_timeout": 60, + "idle_timeout": 120, "internal": false, "ip_address_type": "ipv4", "load_balancer_type": "application", @@ -287,31 +432,43 @@ "subnet_mapping": [ { "allocation_id": "", + "ipv6_address": "", + "outpost_id": "", "private_ipv4_address": "", "subnet_id": "subnet-16161a39" }, { "allocation_id": "", + "ipv6_address": "", + "outpost_id": "", "private_ipv4_address": "", "subnet_id": "subnet-323deb78" }, { "allocation_id": "", + "ipv6_address": "", + "outpost_id": "", "private_ipv4_address": "", "subnet_id": "subnet-44c2774b" }, { "allocation_id": "", + "ipv6_address": "", + "outpost_id": "", "private_ipv4_address": "", "subnet_id": "subnet-5e675761" }, { "allocation_id": "", + "ipv6_address": "", + "outpost_id": "", "private_ipv4_address": "", "subnet_id": "subnet-8519fde2" }, { "allocation_id": "", + "ipv6_address": "", + "outpost_id": "", "private_ipv4_address": "", "subnet_id": "subnet-89bab8d4" } @@ -325,10 +482,12 @@ "subnet-89bab8d4" ], "tags": {}, + "tags_all": {}, "timeouts": null, "vpc_id": "vpc-b5b7d6ce", "zone_id": "Z35SXDOTRQ7X7K" }, + "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19" } ] @@ -342,6 +501,7 @@ { "schema_version": 0, "attributes": { + "alpn_policy": null, "arn": "arn:aws:elasticloadbalancing:us-east-1:679918342773:listener/app/integreat-app-staging/dc040205e561419e/8e5542063f461bb4", "certificate_arn": null, "default_action": [ @@ -370,10 +530,13 @@ "port": 80, "protocol": "HTTP", "ssl_policy": "", + "tags": {}, + "tags_all": {}, "timeouts": { "read": null } }, + "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsicmVhZCI6NjAwMDAwMDAwMDAwfX0=", "dependencies": [ "aws_lb.integreat_app" @@ -390,6 +553,7 @@ { "schema_version": 0, "attributes": { + "alpn_policy": null, "arn": "arn:aws:elasticloadbalancing:us-east-1:679918342773:listener/app/integreat-app-staging/dc040205e561419e/b89075bc6a559a4f", "certificate_arn": "arn:aws:acm:us-east-1:679918342773:certificate/eec88d2f-93c4-4e7e-a167-e75d853f0759", "default_action": [ @@ -409,10 +573,13 @@ "port": 443, "protocol": "HTTPS", "ssl_policy": "ELBSecurityPolicy-2016-08", + "tags": {}, + "tags_all": {}, "timeouts": { "read": null } }, + "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsicmVhZCI6NjAwMDAwMDAwMDAwfX0=", "dependencies": [ "aws_acm_certificate.cert", @@ -464,7 +631,7 @@ "/css/*", "/finance-font/*", "/img/*", - "/js/compiled/app.js", + "/js/compiled/*", "index.html" ] } @@ -475,14 +642,14 @@ ], "id": "arn:aws:elasticloadbalancing:us-east-1:679918342773:listener-rule/app/integreat-app-staging/dc040205e561419e/b89075bc6a559a4f/8bc88fa379868c55", "listener_arn": "arn:aws:elasticloadbalancing:us-east-1:679918342773:listener/app/integreat-app-staging/dc040205e561419e/b89075bc6a559a4f", - "priority": 1 + "priority": 1, + "tags": {}, + "tags_all": {} }, + "sensitive_attributes": [], "private": "bnVsbA==", "dependencies": [ - "aws_acm_certificate.cert", - "aws_lb.integreat_app", - "aws_lb_listener.https", - "aws_lb_target_group.integreat_app" + "aws_lb_listener.https" ] } ] @@ -498,7 +665,8 @@ "attributes": { "arn": "arn:aws:elasticloadbalancing:us-east-1:679918342773:targetgroup/integreat-app-staging/34af39c4c46e7ce1", "arn_suffix": "targetgroup/integreat-app-staging/34af39c4c46e7ce1", - "deregistration_delay": 120, + "connection_termination": false, + "deregistration_delay": "120", "health_check": [ { "enabled": true, @@ -508,8 +676,8 @@ "path": "/api/health-check", "port": "traffic-port", "protocol": "HTTP", - "timeout": 5, - "unhealthy_threshold": 2 + "timeout": 14, + "unhealthy_threshold": 5 } ], "id": "arn:aws:elasticloadbalancing:us-east-1:679918342773:targetgroup/integreat-app-staging/34af39c4c46e7ce1", @@ -518,20 +686,25 @@ "name": "integreat-app-staging", "name_prefix": null, "port": 80, + "preserve_client_ip": null, "protocol": "HTTP", + "protocol_version": "HTTP1", "proxy_protocol_v2": false, "slow_start": 0, "stickiness": [ { "cookie_duration": 86400, + "cookie_name": "", "enabled": false, "type": "lb_cookie" } ], "tags": {}, + "tags_all": {}, "target_type": "ip", "vpc_id": "vpc-b5b7d6ce" }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -560,12 +733,13 @@ "lifecycle_rule": [], "logging": [], "object_lock_configuration": [], - "policy": "{\"Id\":\"Policy1526084187222\",\"Statement\":[{\"Action\":\"s3:GetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::data.staging.app.integreatconsult.com/*\",\"Sid\":\"Stmt1526084185514\"}],\"Version\":\"2012-10-17\"}", + "policy": "{\"Id\":\"Policy1526084187222\",\"Statement\":[{\"Action\":[\"s3:GetObject\"],\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::data.staging.app.integreatconsult.com/*\",\"Sid\":\"Stmt1526084185514\"},{\"Action\":\"s3:*\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::679918342773:role/datomic-ddb\"},\"Resource\":\"arn:aws:s3:::data.staging.app.integreatconsult.com\",\"Sid\":\"AllowReadForProd\"}],\"Version\":\"2012-10-17\"}", "region": "us-east-1", "replication_configuration": [], "request_payer": "BucketOwner", "server_side_encryption_configuration": [], "tags": {}, + "tags_all": {}, "versioning": [ { "enabled": false, @@ -583,6 +757,7 @@ "website_domain": "s3-website-us-east-1.amazonaws.com", "website_endpoint": "data.staging.app.integreatconsult.com.s3-website-us-east-1.amazonaws.com" }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -617,6 +792,7 @@ "request_payer": "BucketOwner", "server_side_encryption_configuration": [], "tags": {}, + "tags_all": {}, "versioning": [ { "enabled": false, @@ -627,6 +803,7 @@ "website_domain": null, "website_endpoint": null }, + "sensitive_attributes": [], "dependencies": [ "data.aws_caller_identity.current" ] @@ -680,6 +857,7 @@ "request_payer": "BucketOwner", "server_side_encryption_configuration": [], "tags": {}, + "tags_all": {}, "versioning": [ { "enabled": false, @@ -697,6 +875,7 @@ "website_domain": "s3-website-us-east-1.amazonaws.com", "website_endpoint": "staging3.app.integreatconsult.com.s3-website-us-east-1.amazonaws.com" }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -726,6 +905,7 @@ ], "topic": [] }, + "sensitive_attributes": [], "dependencies": [ "aws_s3_bucket.invoices", "aws_sqs_queue.integreat-mail", @@ -734,6 +914,88 @@ } ] }, + { + "mode": "managed", + "type": "aws_service_discovery_service", + "name": "background_worker_service", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "arn": "arn:aws:servicediscovery:us-east-1:679918342773:service/srv-4cuqgdwqo5acwqtq", + "description": "", + "dns_config": [ + { + "dns_records": [ + { + "ttl": 10, + "type": "A" + } + ], + "namespace_id": "ns-gv2z744em7myo2jp", + "routing_policy": "MULTIVALUE" + } + ], + "force_destroy": false, + "health_check_config": [], + "health_check_custom_config": [ + { + "failure_threshold": 1 + } + ], + "id": "srv-4cuqgdwqo5acwqtq", + "name": "integreat-background-worker-staging", + "namespace_id": "ns-gv2z744em7myo2jp", + "tags": null, + "tags_all": {} + }, + "sensitive_attributes": [], + "private": "bnVsbA==" + } + ] + }, + { + "mode": "managed", + "type": "aws_service_discovery_service", + "name": "service", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "arn": "arn:aws:servicediscovery:us-east-1:679918342773:service/srv-nsn252bfk4r6bzpj", + "description": "", + "dns_config": [ + { + "dns_records": [ + { + "ttl": 10, + "type": "A" + } + ], + "namespace_id": "ns-gv2z744em7myo2jp", + "routing_policy": "MULTIVALUE" + } + ], + "force_destroy": false, + "health_check_config": [], + "health_check_custom_config": [ + { + "failure_threshold": 1 + } + ], + "id": "srv-nsn252bfk4r6bzpj", + "name": "integreat-app-staging", + "namespace_id": "ns-gv2z744em7myo2jp", + "tags": null, + "tags_all": {} + }, + "sensitive_attributes": [], + "private": "bnVsbA==" + } + ] + }, { "mode": "managed", "type": "aws_ses_receipt_rule", @@ -745,6 +1007,7 @@ "attributes": { "add_header_action": [], "after": null, + "arn": "arn:aws:ses:us-east-1:679918342773:receipt-rule-set/default-rule-set:receipt-rule/store-staging", "bounce_action": [], "enabled": true, "id": "store-staging", @@ -769,6 +1032,7 @@ "tls_policy": "Optional", "workmail_action": [] }, + "sensitive_attributes": [], "dependencies": [ "aws_s3_bucket.invoices", "aws_ses_receipt_rule_set.main", @@ -786,9 +1050,47 @@ { "schema_version": 0, "attributes": { + "arn": "arn:aws:ses:us-east-1:679918342773:receipt-rule-set/default-rule-set", "id": "default-rule-set", "rule_set_name": "default-rule-set" - } + }, + "sensitive_attributes": [] + } + ] + }, + { + "mode": "managed", + "type": "aws_sqs_queue", + "name": "background-request", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "arn": "arn:aws:sqs:us-east-1:679918342773:integreat-background-request-staging", + "content_based_deduplication": false, + "deduplication_scope": "", + "delay_seconds": 0, + "fifo_queue": false, + "fifo_throughput_limit": "", + "id": "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-background-request-staging", + "kms_data_key_reuse_period_seconds": 300, + "kms_master_key_id": "", + "max_message_size": 262144, + "message_retention_seconds": 345600, + "name": "integreat-background-request-staging", + "name_prefix": "", + "policy": "{\"Statement\":[{\"Action\":\"sqs:*\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::679918342773:role/datomic-ddb\"},\"Resource\":\"arn:aws:sqs:*:*:integreat-background-request-staging\"}],\"Version\":\"2012-10-17\"}", + "receive_wait_time_seconds": 0, + "redrive_policy": "", + "sqs_managed_sse_enabled": false, + "tags": null, + "tags_all": {}, + "url": "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-background-request-staging", + "visibility_timeout_seconds": 30 + }, + "sensitive_attributes": [], + "private": "bnVsbA==" } ] }, @@ -803,21 +1105,27 @@ "attributes": { "arn": "arn:aws:sqs:us-east-1:679918342773:integreat-mail-staging", "content_based_deduplication": false, + "deduplication_scope": "", "delay_seconds": 0, "fifo_queue": false, + "fifo_throughput_limit": "", "id": "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-staging", "kms_data_key_reuse_period_seconds": 300, "kms_master_key_id": "", "max_message_size": 262144, "message_retention_seconds": 345600, "name": "integreat-mail-staging", - "name_prefix": null, - "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":\"*\",\"Action\":\"sqs:SendMessage\",\"Resource\":\"arn:aws:sqs:*:*:integreat-mail-staging\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"arn:aws:s3:::integreat-mail-staging\"}}}]}", + "name_prefix": "", + "policy": "{\"Statement\":[{\"Action\":\"sqs:SendMessage\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"arn:aws:s3:::integreat-mail-staging\"}},\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:sqs:*:*:integreat-mail-staging\"}],\"Version\":\"2012-10-17\"}", "receive_wait_time_seconds": 0, "redrive_policy": "", + "sqs_managed_sse_enabled": false, "tags": {}, + "tags_all": {}, + "url": "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-staging", "visibility_timeout_seconds": 30 }, + "sensitive_attributes": [], "dependencies": [ "aws_s3_bucket.invoices", "data.aws_caller_identity.current" diff --git a/terraform/terraform.tfstate.d/staging/terraform.tfstate.backup b/terraform/terraform.tfstate.d/staging/terraform.tfstate.backup index 00c8af88..eb77bae5 100644 --- a/terraform/terraform.tfstate.d/staging/terraform.tfstate.backup +++ b/terraform/terraform.tfstate.d/staging/terraform.tfstate.backup @@ -1,7 +1,7 @@ { "version": 4, - "terraform_version": "0.13.3", - "serial": 68, + "terraform_version": "0.14.4", + "serial": 70, "lineage": "91d10fe0-8033-8778-c202-78d5a81632e8", "outputs": { "aws_access_key_id": { @@ -33,9 +33,10 @@ "attributes": { "account_id": "679918342773", "arn": "arn:aws:iam::679918342773:user/bryce", - "id": "2020-09-25 00:18:59.261808 +0000 UTC", + "id": "2020-09-25 00:21:01.39516 +0000 UTC", "user_id": "AIDAJPUJFTOKO4IRADMV4" - } + }, + "sensitive_attributes": [] } ] }, @@ -74,6 +75,7 @@ "validation_emails": [], "validation_method": "DNS" }, + "sensitive_attributes": [], "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjAifQ==" } ] @@ -145,6 +147,7 @@ "delete": null } }, + "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjoxMjAwMDAwMDAwMDAwfX0=", "dependencies": [ "aws_ecs_task_definition.integreat_app", @@ -183,6 +186,7 @@ "task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb", "volume": [] }, + "sensitive_attributes": [], "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ==" } ] @@ -205,6 +209,7 @@ "status": "Active", "user": "integreat-staging" }, + "sensitive_attributes": [], "dependencies": [ "aws_iam_user.app_user" ] @@ -228,7 +233,8 @@ "permissions_boundary": null, "tags": {}, "unique_id": "AIDAJ4KJ7STJZNLIN3M6S" - } + }, + "sensitive_attributes": [] } ] }, @@ -245,6 +251,7 @@ "policy_arn": "arn:aws:iam::aws:policy/AdministratorAccess", "user": "integreat-staging" }, + "sensitive_attributes": [], "dependencies": [ "aws_iam_user.app_user" ] @@ -329,6 +336,7 @@ "vpc_id": "vpc-b5b7d6ce", "zone_id": "Z35SXDOTRQ7X7K" }, + "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19" } ] @@ -374,6 +382,7 @@ "read": null } }, + "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsicmVhZCI6NjAwMDAwMDAwMDAwfX0=", "dependencies": [ "aws_lb.integreat_app" @@ -413,6 +422,7 @@ "read": null } }, + "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsicmVhZCI6NjAwMDAwMDAwMDAwfX0=", "dependencies": [ "aws_acm_certificate.cert", @@ -477,6 +487,7 @@ "listener_arn": "arn:aws:elasticloadbalancing:us-east-1:679918342773:listener/app/integreat-app-staging/dc040205e561419e/b89075bc6a559a4f", "priority": 1 }, + "sensitive_attributes": [], "private": "bnVsbA==", "dependencies": [ "aws_acm_certificate.cert", @@ -532,6 +543,7 @@ "target_type": "ip", "vpc_id": "vpc-b5b7d6ce" }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -583,6 +595,7 @@ "website_domain": "s3-website-us-east-1.amazonaws.com", "website_endpoint": "data.staging.app.integreatconsult.com.s3-website-us-east-1.amazonaws.com" }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -627,6 +640,7 @@ "website_domain": null, "website_endpoint": null }, + "sensitive_attributes": [], "dependencies": [ "data.aws_caller_identity.current" ] @@ -674,7 +688,7 @@ "lifecycle_rule": [], "logging": [], "object_lock_configuration": [], - "policy": "{\n \"Id\": \"Policy1526084187222\",\n \"Version\": \"2012-10-17\",\n \"Statement\": [\n {\n \"Sid\": \"Stmt1526084185514\",\n \"Action\": [\n \"s3:GetObject\"\n ],\n \"Effect\": \"Allow\",\n \"Resource\": \"arn:aws:s3:::staging.app.integreatconsult.com/*\",\n \"Principal\": \"*\"\n }\n ]\n}\n", + "policy": "{\"Id\":\"Policy1526084187222\",\"Statement\":[{\"Action\":\"s3:GetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::staging3.app.integreatconsult.com/*\",\"Sid\":\"Stmt1526084185514\"}],\"Version\":\"2012-10-17\"}", "region": "us-east-1", "replication_configuration": [], "request_payer": "BucketOwner", @@ -697,6 +711,7 @@ "website_domain": "s3-website-us-east-1.amazonaws.com", "website_endpoint": "staging3.app.integreatconsult.com.s3-website-us-east-1.amazonaws.com" }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -726,6 +741,7 @@ ], "topic": [] }, + "sensitive_attributes": [], "dependencies": [ "aws_s3_bucket.invoices", "aws_sqs_queue.integreat-mail", @@ -769,6 +785,7 @@ "tls_policy": "Optional", "workmail_action": [] }, + "sensitive_attributes": [], "dependencies": [ "aws_s3_bucket.invoices", "aws_ses_receipt_rule_set.main", @@ -788,7 +805,8 @@ "attributes": { "id": "default-rule-set", "rule_set_name": "default-rule-set" - } + }, + "sensitive_attributes": [] } ] }, @@ -818,6 +836,7 @@ "tags": {}, "visibility_timeout_seconds": 30 }, + "sensitive_attributes": [], "dependencies": [ "aws_s3_bucket.invoices", "data.aws_caller_identity.current"