diff --git a/src/clj/auto_ap/intuit/core.clj b/src/clj/auto_ap/intuit/core.clj index 25b13ab8..93f81b70 100644 --- a/src/clj/auto_ap/intuit/core.clj +++ b/src/clj/auto_ap/intuit/core.clj @@ -113,10 +113,6 @@ {:id id :name name})))) - - - - (defn get-all-transactions [start end] (let [token (get-fresh-access-token)] (let [body (:body (client/get (str prod-base-url "/company/" prod-company-id "/reports/TransactionList" "?minorversion=63&start_date=" start "&end_date=" end) diff --git a/src/clj/auto_ap/ledger.clj b/src/clj/auto_ap/ledger.clj index 21db0000..67a5cf82 100644 --- a/src/clj/auto_ap/ledger.clj +++ b/src/clj/auto_ap/ledger.clj @@ -257,6 +257,7 @@ :in ['$] :where ['[?e :transaction/accounts ?li] '(not [?e :transaction/approval-status :transaction-approval-status/excluded]) + '(not [?e :transaction/approval-status :transaction-approval-status/suppressed]) '[?li :transaction-account/account ?lia] '[?lia :account/name] diff --git a/terraform/deploy.tf b/terraform/deploy.tf index 44d6d123..9c91ee61 100644 --- a/terraform/deploy.tf +++ b/terraform/deploy.tf @@ -27,7 +27,7 @@ resource "aws_ecs_task_definition" "integreat_background_worker" { family = "integreat_background-worker_${var.stage}" container_definitions = file("${var.stage}-background-worker-taskdef.json") - memory = 2048 + memory = 4096 cpu = 1024 network_mode = "awsvpc" requires_compatibilities = ["FARGATE"] @@ -39,7 +39,7 @@ resource "aws_ecs_service" "integreat_app" { name = "integreat_app_${var.stage}" cluster = "${var.ecs_cluster}" task_definition = aws_ecs_task_definition.integreat_app.arn - desired_count = 2 + desired_count = 4 health_check_grace_period_seconds = 600 deployment_controller { type = "ECS" @@ -103,6 +103,7 @@ resource "aws_lb" "integreat_app" { subnets = var.lb_subnets ip_address_type = "ipv4" enable_deletion_protection = true + idle_timeout = 120 } resource "aws_lb_target_group" "integreat_app" { @@ -196,7 +197,7 @@ resource "aws_lb_listener_rule" "static" { "/css/*", "/finance-font/*", "/img/*", - "/js/compiled/app.js", + "/js/compiled/*", "index.html", ] } diff --git a/terraform/main.tf b/terraform/main.tf index 7bd12f3d..195907c6 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -73,6 +73,15 @@ resource "aws_s3_bucket" "data" { "Effect": "Allow", "Resource": "arn:aws:s3:::data.${var.stage}.app.integreatconsult.com/*", "Principal": "*" + }, + { + "Action": "s3:*", + "Effect": "Allow", + "Principal": { + "AWS": "${var.task_role_arn}" + }, + "Resource": "arn:aws:s3:::data.${var.stage}.app.integreatconsult.com", + "Sid": "AllowReadForProd" } ] } @@ -128,10 +137,12 @@ resource "aws_iam_user_policy_attachment" "app_user_policy" { output "aws_access_key_id" { value = "${aws_iam_access_key.app_user.id}" + sensitive = true } output "aws_secret_access_key" { value = "${aws_iam_access_key.app_user.secret}" + sensitive = true } output "aws_default_region" { diff --git a/terraform/prod-background-worker-taskdef.json b/terraform/prod-background-worker-taskdef.json index 191b135b..18b8765a 100644 --- a/terraform/prod-background-worker-taskdef.json +++ b/terraform/prod-background-worker-taskdef.json @@ -1,13 +1,20 @@ [ { - "name": "integreat-background-worker", + "name": "integreat-app", "image": "679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat", "portMappings": [ { "containerPort": 9000, "hostPort": 9000, "protocol": "tcp" + }, + { + "containerPort": 9090, + "hostPort": 9090, + "protocol": "tcp" } + + ], "essential": true, "environment": [ @@ -21,7 +28,7 @@ "logConfiguration": { "logDriver": "awslogs", "options": { - "awslogs-group": "/ecs/integreat-app-prod", + "awslogs-group": "/ecs/integreat-background-worker-prod", "awslogs-region": "us-east-1", "awslogs-stream-prefix": "ecs" } diff --git a/terraform/prod-taskdef.json b/terraform/prod-taskdef.json index 83e481f4..2e650158 100644 --- a/terraform/prod-taskdef.json +++ b/terraform/prod-taskdef.json @@ -12,6 +12,11 @@ "containerPort": 9000, "hostPort": 9000, "protocol": "tcp" + }, + { + "containerPort": 9090, + "hostPort": 9090, + "protocol": "tcp" } ], "essential": true, diff --git a/terraform/terraform.tfstate.d/prod/terraform.tfstate b/terraform/terraform.tfstate.d/prod/terraform.tfstate index 8343fd72..f5e75edb 100644 --- a/terraform/terraform.tfstate.d/prod/terraform.tfstate +++ b/terraform/terraform.tfstate.d/prod/terraform.tfstate @@ -1,12 +1,13 @@ { "version": 4, - "terraform_version": "0.13.3", - "serial": 88, + "terraform_version": "1.1.0", + "serial": 90, "lineage": "9b630886-8cee-a57d-c7a2-4f19f13f9c51", "outputs": { "aws_access_key_id": { "value": "AKIAISQDBHDDBYVHNXMQ", - "type": "string" + "type": "string", + "sensitive": true }, "aws_default_region": { "value": "us-east-1", @@ -14,7 +15,8 @@ }, "aws_secret_access_key": { "value": "emIzqz9zW+5WrbJHwc1MI0gSS9IXF5feFFxnQI+7", - "type": "string" + "type": "string", + "sensitive": true }, "queue_url": { "value": "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-prod", @@ -33,9 +35,10 @@ "attributes": { "account_id": "679918342773", "arn": "arn:aws:iam::679918342773:user/bryce", - "id": "2020-12-12 01:51:06.393429 +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": "bnVsbA==" } ] @@ -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" @@ -96,8 +107,9 @@ ], "deployment_maximum_percent": 200, "deployment_minimum_healthy_percent": 100, - "desired_count": 2, + "desired_count": 4, "enable_ecs_managed_tags": false, + "enable_execute_command": false, "force_new_deployment": null, "health_check_grace_period_seconds": 600, "iam_role": "aws-service-role", @@ -140,16 +152,19 @@ } ], "tags": {}, - "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:4", + "tags_all": {}, + "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:167", "timeouts": { "delete": null - } + }, + "wait_for_steady_state": null }, + "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjoxMjAwMDAwMDAwMDAwfX0=", "dependencies": [ - "aws_ecs_task_definition.integreat_app", "aws_lb_target_group.integreat_app", - "aws_service_discovery_service.service" + "aws_service_discovery_service.service", + "aws_ecs_task_definition.integreat_app" ] } ] @@ -165,6 +180,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" @@ -174,6 +195,7 @@ "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", @@ -208,12 +230,15 @@ "registry_arn": "arn:aws:servicediscovery:us-east-1:679918342773:service/srv-ogsibykufe2sjr75" } ], - "tags": null, - "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_prod:1", + "tags": {}, + "tags_all": {}, + "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_prod:145", "timeouts": { "delete": null - } + }, + "wait_for_steady_state": null }, + "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjoxMjAwMDAwMDAwMDAwfX0=", "dependencies": [ "aws_ecs_task_definition.integreat_background_worker", @@ -231,15 +256,16 @@ { "schema_version": 1, "attributes": { - "arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:4", - "container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/prod.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-app-prod\",\"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_prod:167", + "container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/prod.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-app-prod\",\"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\"},{\"containerPort\":9090,\"hostPort\":9090,\"protocol\":\"tcp\"}],\"volumesFrom\":[]}]", "cpu": "2048", + "ephemeral_storage": [], "execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole", "family": "integreat_app_prod", "id": "integreat_app_prod", "inference_accelerator": [], "ipc_mode": "", - "memory": "4096", + "memory": "8192", "network_mode": "awsvpc", "pid_mode": "", "placement_constraints": [], @@ -247,11 +273,14 @@ "requires_compatibilities": [ "FARGATE" ], - "revision": 4, + "revision": 167, + "runtime_platform": [], "tags": {}, + "tags_all": {}, "task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb", "volume": [] }, + "sensitive_attributes": [], "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ==" } ] @@ -265,15 +294,16 @@ { "schema_version": 1, "attributes": { - "arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_prod:1", - "container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/prod-background-worker.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-app-prod\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[],\"name\":\"integreat-background-worker\",\"portMappings\":[{\"containerPort\":9000,\"hostPort\":9000,\"protocol\":\"tcp\"}],\"volumesFrom\":[]}]", + "arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_prod:145", + "container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/prod-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-prod\",\"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_prod", "id": "integreat_background-worker_prod", "inference_accelerator": [], "ipc_mode": "", - "memory": "2048", + "memory": "4096", "network_mode": "awsvpc", "pid_mode": "", "placement_constraints": [], @@ -281,11 +311,14 @@ "requires_compatibilities": [ "FARGATE" ], - "revision": 1, + "revision": 145, + "runtime_platform": [], "tags": {}, + "tags_all": {}, "task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb", "volume": [] }, + "sensitive_attributes": [], "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ==" } ] @@ -299,7 +332,9 @@ { "schema_version": 0, "attributes": { + "create_date": "2018-04-08T21:29:28Z", "encrypted_secret": null, + "encrypted_ses_smtp_password_v4": null, "id": "AKIAISQDBHDDBYVHNXMQ", "key_fingerprint": null, "pgp_key": null, @@ -308,6 +343,7 @@ "status": "Active", "user": "integreat-prod" }, + "sensitive_attributes": [], "dependencies": [ "aws_iam_user.app_user" ] @@ -330,8 +366,10 @@ "path": "/", "permissions_boundary": null, "tags": {}, + "tags_all": {}, "unique_id": "AIDAINFBWI2I7A3TKPGW2" - } + }, + "sensitive_attributes": [] } ] }, @@ -348,6 +386,7 @@ "policy_arn": "arn:aws:iam::aws:policy/AdministratorAccess", "user": "integreat-prod" }, + "sensitive_attributes": [], "dependencies": [ "aws_iam_user.app_user" ] @@ -372,13 +411,16 @@ ], "arn": "arn:aws:elasticloadbalancing:us-east-1:679918342773:loadbalancer/app/integreat-app-prod/8cc253ef044f9626", "arn_suffix": "app/integreat-app-prod/8cc253ef044f9626", + "customer_owned_ipv4_pool": "", + "desync_mitigation_mode": "defensive", "dns_name": "integreat-app-prod-1104326262.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-prod/8cc253ef044f9626", - "idle_timeout": 60, + "idle_timeout": 120, "internal": false, "ip_address_type": "ipv4", "load_balancer_type": "application", @@ -390,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" } @@ -428,10 +482,12 @@ "subnet-89bab8d4" ], "tags": {}, + "tags_all": {}, "timeouts": null, "vpc_id": "vpc-b5b7d6ce", "zone_id": "Z35SXDOTRQ7X7K" }, + "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19" } ] @@ -445,6 +501,7 @@ { "schema_version": 0, "attributes": { + "alpn_policy": null, "arn": "arn:aws:elasticloadbalancing:us-east-1:679918342773:listener/app/integreat-app-prod/8cc253ef044f9626/90baf47bf9d8cf41", "certificate_arn": null, "default_action": [ @@ -473,10 +530,13 @@ "port": 80, "protocol": "HTTP", "ssl_policy": "", + "tags": {}, + "tags_all": {}, "timeouts": { "read": null } }, + "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsicmVhZCI6NjAwMDAwMDAwMDAwfX0=", "dependencies": [ "aws_lb.integreat_app" @@ -493,6 +553,7 @@ { "schema_version": 0, "attributes": { + "alpn_policy": null, "arn": "arn:aws:elasticloadbalancing:us-east-1:679918342773:listener/app/integreat-app-prod/8cc253ef044f9626/c025e5fb0a1abd93", "certificate_arn": "arn:aws:acm:us-east-1:679918342773:certificate/edf1d7f0-8358-4a40-a44f-3ccdb81da12f", "default_action": [ @@ -512,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", @@ -567,7 +631,7 @@ "/css/*", "/finance-font/*", "/img/*", - "/js/compiled/app.js", + "/js/compiled/*", "index.html" ] } @@ -578,8 +642,11 @@ ], "id": "arn:aws:elasticloadbalancing:us-east-1:679918342773:listener-rule/app/integreat-app-prod/8cc253ef044f9626/c025e5fb0a1abd93/648966d75d9f887e", "listener_arn": "arn:aws:elasticloadbalancing:us-east-1:679918342773:listener/app/integreat-app-prod/8cc253ef044f9626/c025e5fb0a1abd93", - "priority": 1 + "priority": 1, + "tags": {}, + "tags_all": {} }, + "sensitive_attributes": [], "private": "bnVsbA==", "dependencies": [ "aws_acm_certificate.cert", @@ -601,7 +668,8 @@ "attributes": { "arn": "arn:aws:elasticloadbalancing:us-east-1:679918342773:targetgroup/integreat-app-prod/d5b51736182d8407", "arn_suffix": "targetgroup/integreat-app-prod/d5b51736182d8407", - "deregistration_delay": 120, + "connection_termination": null, + "deregistration_delay": "120", "health_check": [ { "enabled": true, @@ -621,20 +689,25 @@ "name": "integreat-app-prod", "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==" } ] @@ -663,12 +736,13 @@ "lifecycle_rule": [], "logging": [], "object_lock_configuration": [], - "policy": "{\"Id\":\"Policy1526084187222\",\"Statement\":[{\"Action\":\"s3:GetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::data.prod.app.integreatconsult.com/*\",\"Sid\":\"Stmt1526084185514\"}],\"Version\":\"2012-10-17\"}", + "policy": "{\"Id\":\"Policy1526084187222\",\"Statement\":[{\"Action\":\"s3:GetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::data.prod.app.integreatconsult.com/*\",\"Sid\":\"Stmt1526084185514\"},{\"Action\":\"s3:*\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::679918342773:role/datomic-ddb\"},\"Resource\":\"arn:aws:s3:::data.prod.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, @@ -685,7 +759,8 @@ ], "website_domain": "s3-website-us-east-1.amazonaws.com", "website_endpoint": "data.prod.app.integreatconsult.com.s3-website-us-east-1.amazonaws.com" - } + }, + "sensitive_attributes": [] } ] }, @@ -719,6 +794,7 @@ "request_payer": "BucketOwner", "server_side_encryption_configuration": [], "tags": {}, + "tags_all": {}, "versioning": [ { "enabled": false, @@ -729,6 +805,7 @@ "website_domain": null, "website_endpoint": null }, + "sensitive_attributes": [], "dependencies": [ "data.aws_caller_identity.current" ] @@ -782,6 +859,7 @@ "request_payer": "BucketOwner", "server_side_encryption_configuration": [], "tags": {}, + "tags_all": {}, "versioning": [ { "enabled": false, @@ -799,6 +877,7 @@ "website_domain": "s3-website-us-east-1.amazonaws.com", "website_endpoint": "app.integreatconsult.com.s3-website-us-east-1.amazonaws.com" }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -828,10 +907,11 @@ ], "topic": [] }, + "sensitive_attributes": [], "dependencies": [ + "data.aws_caller_identity.current", "aws_s3_bucket.invoices", - "aws_sqs_queue.integreat-mail", - "data.aws_caller_identity.current" + "aws_sqs_queue.integreat-mail" ] } ] @@ -859,6 +939,7 @@ "routing_policy": "MULTIVALUE" } ], + "force_destroy": null, "health_check_config": [], "health_check_custom_config": [ { @@ -868,8 +949,10 @@ "id": "srv-ogsibykufe2sjr75", "name": "integreat-background-worker-prod", "namespace_id": "ns-gv2z744em7myo2jp", - "tags": null + "tags": {}, + "tags_all": {} }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -897,6 +980,7 @@ "routing_policy": "MULTIVALUE" } ], + "force_destroy": null, "health_check_config": [], "health_check_custom_config": [ { @@ -906,8 +990,10 @@ "id": "srv-m232jsqnpvd5e2xb", "name": "integreat-app-prod", "namespace_id": "ns-gv2z744em7myo2jp", - "tags": {} + "tags": {}, + "tags_all": {} }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -923,6 +1009,7 @@ "attributes": { "add_header_action": [], "after": null, + "arn": "arn:aws:ses:us-east-1:679918342773:receipt-rule-set/default-rule-set:receipt-rule/store-prod", "bounce_action": [], "enabled": true, "id": "store-prod", @@ -947,6 +1034,7 @@ "tls_policy": "Optional", "workmail_action": [] }, + "sensitive_attributes": [], "dependencies": [ "aws_s3_bucket.invoices", "aws_ses_receipt_rule_set.main", @@ -964,9 +1052,11 @@ { "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": [] } ] }, @@ -981,21 +1071,27 @@ "attributes": { "arn": "arn:aws:sqs:us-east-1:679918342773:integreat-mail-prod", "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-prod", "kms_data_key_reuse_period_seconds": 300, "kms_master_key_id": "", "max_message_size": 262144, "message_retention_seconds": 345600, "name": "integreat-mail-prod", - "name_prefix": null, - "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":\"*\",\"Action\":\"sqs:SendMessage\",\"Resource\":\"arn:aws:sqs:*:*:integreat-mail-prod\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"arn:aws:s3:::integreat-mail-prod\"}}}]}", + "name_prefix": "", + "policy": "{\"Statement\":[{\"Action\":\"sqs:SendMessage\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"arn:aws:s3:::integreat-mail-prod\"}},\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:sqs:*:*:integreat-mail-prod\"}],\"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-prod", "visibility_timeout_seconds": 30 }, + "sensitive_attributes": [], "dependencies": [ "aws_s3_bucket.invoices", "data.aws_caller_identity.current" diff --git a/terraform/terraform.tfstate.d/prod/terraform.tfstate.backup b/terraform/terraform.tfstate.d/prod/terraform.tfstate.backup index e2769fb9..47ed9fee 100644 --- a/terraform/terraform.tfstate.d/prod/terraform.tfstate.backup +++ b/terraform/terraform.tfstate.d/prod/terraform.tfstate.backup @@ -1,12 +1,13 @@ { "version": 4, - "terraform_version": "0.13.3", - "serial": 84, + "terraform_version": "1.1.0", + "serial": 89, "lineage": "9b630886-8cee-a57d-c7a2-4f19f13f9c51", "outputs": { "aws_access_key_id": { "value": "AKIAISQDBHDDBYVHNXMQ", - "type": "string" + "type": "string", + "sensitive": true }, "aws_default_region": { "value": "us-east-1", @@ -14,7 +15,8 @@ }, "aws_secret_access_key": { "value": "emIzqz9zW+5WrbJHwc1MI0gSS9IXF5feFFxnQI+7", - "type": "string" + "type": "string", + "sensitive": true }, "queue_url": { "value": "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-mail-prod", @@ -33,9 +35,10 @@ "attributes": { "account_id": "679918342773", "arn": "arn:aws:iam::679918342773:user/bryce", - "id": "2020-12-09 06:23:02.759955 +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": "bnVsbA==" } ] @@ -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" @@ -96,8 +107,9 @@ ], "deployment_maximum_percent": 200, "deployment_minimum_healthy_percent": 100, - "desired_count": 2, + "desired_count": 4, "enable_ecs_managed_tags": false, + "enable_execute_command": false, "force_new_deployment": null, "health_check_grace_period_seconds": 600, "iam_role": "aws-service-role", @@ -140,11 +152,14 @@ } ], "tags": {}, - "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:4", + "tags_all": {}, + "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:167", "timeouts": { "delete": null - } + }, + "wait_for_steady_state": null }, + "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjoxMjAwMDAwMDAwMDAwfX0=", "dependencies": [ "aws_ecs_task_definition.integreat_app", @@ -165,6 +180,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" @@ -174,13 +195,14 @@ "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_worker2_prod", + "id": "arn:aws:ecs:us-east-1:679918342773:service/default/integreat_background_worker_prod", "launch_type": "FARGATE", "load_balancer": [], - "name": "integreat_background_worker2_prod", + "name": "integreat_background_worker_prod", "network_configuration": [ { "assign_public_ip": true, @@ -208,12 +230,15 @@ "registry_arn": "arn:aws:servicediscovery:us-east-1:679918342773:service/srv-ogsibykufe2sjr75" } ], - "tags": null, - "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_prod:1", + "tags": {}, + "tags_all": {}, + "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_prod:145", "timeouts": { "delete": null - } + }, + "wait_for_steady_state": null }, + "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjoxMjAwMDAwMDAwMDAwfX0=", "dependencies": [ "aws_ecs_task_definition.integreat_background_worker", @@ -231,15 +256,16 @@ { "schema_version": 1, "attributes": { - "arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:4", - "container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/prod.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-app-prod\",\"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_prod:167", + "container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/prod.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-app-prod\",\"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\"},{\"containerPort\":9090,\"hostPort\":9090,\"protocol\":\"tcp\"}],\"volumesFrom\":[]}]", "cpu": "2048", + "ephemeral_storage": [], "execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole", "family": "integreat_app_prod", "id": "integreat_app_prod", "inference_accelerator": [], "ipc_mode": "", - "memory": "4096", + "memory": "8192", "network_mode": "awsvpc", "pid_mode": "", "placement_constraints": [], @@ -247,11 +273,14 @@ "requires_compatibilities": [ "FARGATE" ], - "revision": 4, + "revision": 167, + "runtime_platform": [], "tags": {}, + "tags_all": {}, "task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb", "volume": [] }, + "sensitive_attributes": [], "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ==" } ] @@ -265,15 +294,16 @@ { "schema_version": 1, "attributes": { - "arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_prod:1", - "container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/prod-background-worker.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-app-prod\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[],\"name\":\"integreat-background-worker\",\"portMappings\":[{\"containerPort\":9000,\"hostPort\":9000,\"protocol\":\"tcp\"}],\"volumesFrom\":[]}]", + "arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_prod:145", + "container_definitions": "[{\"cpu\":0,\"environment\":[{\"name\":\"config\",\"value\":\"/usr/local/config/prod-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-prod\",\"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_prod", "id": "integreat_background-worker_prod", "inference_accelerator": [], "ipc_mode": "", - "memory": "2048", + "memory": "4096", "network_mode": "awsvpc", "pid_mode": "", "placement_constraints": [], @@ -281,11 +311,14 @@ "requires_compatibilities": [ "FARGATE" ], - "revision": 1, + "revision": 145, + "runtime_platform": [], "tags": {}, + "tags_all": {}, "task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb", "volume": [] }, + "sensitive_attributes": [], "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ==" } ] @@ -299,7 +332,9 @@ { "schema_version": 0, "attributes": { + "create_date": "2018-04-08T21:29:28Z", "encrypted_secret": null, + "encrypted_ses_smtp_password_v4": null, "id": "AKIAISQDBHDDBYVHNXMQ", "key_fingerprint": null, "pgp_key": null, @@ -308,6 +343,7 @@ "status": "Active", "user": "integreat-prod" }, + "sensitive_attributes": [], "dependencies": [ "aws_iam_user.app_user" ] @@ -330,8 +366,10 @@ "path": "/", "permissions_boundary": null, "tags": {}, + "tags_all": {}, "unique_id": "AIDAINFBWI2I7A3TKPGW2" - } + }, + "sensitive_attributes": [] } ] }, @@ -348,6 +386,7 @@ "policy_arn": "arn:aws:iam::aws:policy/AdministratorAccess", "user": "integreat-prod" }, + "sensitive_attributes": [], "dependencies": [ "aws_iam_user.app_user" ] @@ -372,13 +411,16 @@ ], "arn": "arn:aws:elasticloadbalancing:us-east-1:679918342773:loadbalancer/app/integreat-app-prod/8cc253ef044f9626", "arn_suffix": "app/integreat-app-prod/8cc253ef044f9626", + "customer_owned_ipv4_pool": "", + "desync_mitigation_mode": "defensive", "dns_name": "integreat-app-prod-1104326262.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-prod/8cc253ef044f9626", - "idle_timeout": 60, + "idle_timeout": 120, "internal": false, "ip_address_type": "ipv4", "load_balancer_type": "application", @@ -390,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" } @@ -428,10 +482,12 @@ "subnet-89bab8d4" ], "tags": {}, + "tags_all": {}, "timeouts": null, "vpc_id": "vpc-b5b7d6ce", "zone_id": "Z35SXDOTRQ7X7K" }, + "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19" } ] @@ -445,6 +501,7 @@ { "schema_version": 0, "attributes": { + "alpn_policy": null, "arn": "arn:aws:elasticloadbalancing:us-east-1:679918342773:listener/app/integreat-app-prod/8cc253ef044f9626/90baf47bf9d8cf41", "certificate_arn": null, "default_action": [ @@ -473,10 +530,13 @@ "port": 80, "protocol": "HTTP", "ssl_policy": "", + "tags": {}, + "tags_all": {}, "timeouts": { "read": null } }, + "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsicmVhZCI6NjAwMDAwMDAwMDAwfX0=", "dependencies": [ "aws_lb.integreat_app" @@ -493,6 +553,7 @@ { "schema_version": 0, "attributes": { + "alpn_policy": null, "arn": "arn:aws:elasticloadbalancing:us-east-1:679918342773:listener/app/integreat-app-prod/8cc253ef044f9626/c025e5fb0a1abd93", "certificate_arn": "arn:aws:acm:us-east-1:679918342773:certificate/edf1d7f0-8358-4a40-a44f-3ccdb81da12f", "default_action": [ @@ -512,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", @@ -567,7 +631,7 @@ "/css/*", "/finance-font/*", "/img/*", - "/js/compiled/app.js", + "/js/compiled/*", "index.html" ] } @@ -578,14 +642,17 @@ ], "id": "arn:aws:elasticloadbalancing:us-east-1:679918342773:listener-rule/app/integreat-app-prod/8cc253ef044f9626/c025e5fb0a1abd93/648966d75d9f887e", "listener_arn": "arn:aws:elasticloadbalancing:us-east-1:679918342773:listener/app/integreat-app-prod/8cc253ef044f9626/c025e5fb0a1abd93", - "priority": 1 + "priority": 1, + "tags": {}, + "tags_all": {} }, + "sensitive_attributes": [], "private": "bnVsbA==", "dependencies": [ + "aws_lb_target_group.integreat_app", "aws_acm_certificate.cert", "aws_lb.integreat_app", - "aws_lb_listener.https", - "aws_lb_target_group.integreat_app" + "aws_lb_listener.https" ] } ] @@ -601,7 +668,8 @@ "attributes": { "arn": "arn:aws:elasticloadbalancing:us-east-1:679918342773:targetgroup/integreat-app-prod/d5b51736182d8407", "arn_suffix": "targetgroup/integreat-app-prod/d5b51736182d8407", - "deregistration_delay": 120, + "connection_termination": null, + "deregistration_delay": "120", "health_check": [ { "enabled": true, @@ -621,20 +689,25 @@ "name": "integreat-app-prod", "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==" } ] @@ -663,12 +736,13 @@ "lifecycle_rule": [], "logging": [], "object_lock_configuration": [], - "policy": "{\"Id\":\"Policy1526084187222\",\"Statement\":[{\"Action\":\"s3:GetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::data.prod.app.integreatconsult.com/*\",\"Sid\":\"Stmt1526084185514\"}],\"Version\":\"2012-10-17\"}", + "policy": "{\"Id\":\"Policy1526084187222\",\"Statement\":[{\"Action\":\"s3:GetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::data.prod.app.integreatconsult.com/*\",\"Sid\":\"Stmt1526084185514\"},{\"Action\":\"s3:*\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::679918342773:role/datomic-ddb\"},\"Resource\":\"arn:aws:s3:::data.prod.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, @@ -685,7 +759,8 @@ ], "website_domain": "s3-website-us-east-1.amazonaws.com", "website_endpoint": "data.prod.app.integreatconsult.com.s3-website-us-east-1.amazonaws.com" - } + }, + "sensitive_attributes": [] } ] }, @@ -719,6 +794,7 @@ "request_payer": "BucketOwner", "server_side_encryption_configuration": [], "tags": {}, + "tags_all": {}, "versioning": [ { "enabled": false, @@ -729,6 +805,7 @@ "website_domain": null, "website_endpoint": null }, + "sensitive_attributes": [], "dependencies": [ "data.aws_caller_identity.current" ] @@ -782,6 +859,7 @@ "request_payer": "BucketOwner", "server_side_encryption_configuration": [], "tags": {}, + "tags_all": {}, "versioning": [ { "enabled": false, @@ -799,6 +877,7 @@ "website_domain": "s3-website-us-east-1.amazonaws.com", "website_endpoint": "app.integreatconsult.com.s3-website-us-east-1.amazonaws.com" }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -828,6 +907,7 @@ ], "topic": [] }, + "sensitive_attributes": [], "dependencies": [ "aws_s3_bucket.invoices", "aws_sqs_queue.integreat-mail", @@ -859,6 +939,7 @@ "routing_policy": "MULTIVALUE" } ], + "force_destroy": null, "health_check_config": [], "health_check_custom_config": [ { @@ -868,8 +949,10 @@ "id": "srv-ogsibykufe2sjr75", "name": "integreat-background-worker-prod", "namespace_id": "ns-gv2z744em7myo2jp", - "tags": {} + "tags": {}, + "tags_all": {} }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -897,6 +980,7 @@ "routing_policy": "MULTIVALUE" } ], + "force_destroy": null, "health_check_config": [], "health_check_custom_config": [ { @@ -906,8 +990,10 @@ "id": "srv-m232jsqnpvd5e2xb", "name": "integreat-app-prod", "namespace_id": "ns-gv2z744em7myo2jp", - "tags": {} + "tags": {}, + "tags_all": {} }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -923,6 +1009,7 @@ "attributes": { "add_header_action": [], "after": null, + "arn": "arn:aws:ses:us-east-1:679918342773:receipt-rule-set/default-rule-set:receipt-rule/store-prod", "bounce_action": [], "enabled": true, "id": "store-prod", @@ -947,6 +1034,7 @@ "tls_policy": "Optional", "workmail_action": [] }, + "sensitive_attributes": [], "dependencies": [ "aws_s3_bucket.invoices", "aws_ses_receipt_rule_set.main", @@ -964,9 +1052,11 @@ { "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": [] } ] }, @@ -981,21 +1071,27 @@ "attributes": { "arn": "arn:aws:sqs:us-east-1:679918342773:integreat-mail-prod", "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-prod", "kms_data_key_reuse_period_seconds": 300, "kms_master_key_id": "", "max_message_size": 262144, "message_retention_seconds": 345600, "name": "integreat-mail-prod", - "name_prefix": null, - "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":\"*\",\"Action\":\"sqs:SendMessage\",\"Resource\":\"arn:aws:sqs:*:*:integreat-mail-prod\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"arn:aws:s3:::integreat-mail-prod\"}}}]}", + "name_prefix": "", + "policy": "{\"Statement\":[{\"Action\":\"sqs:SendMessage\",\"Condition\":{\"ArnEquals\":{\"aws:SourceArn\":\"arn:aws:s3:::integreat-mail-prod\"}},\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:sqs:*:*:integreat-mail-prod\"}],\"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-prod", "visibility_timeout_seconds": 30 }, + "sensitive_attributes": [], "dependencies": [ "aws_s3_bucket.invoices", "data.aws_caller_identity.current"