From 91cb8c7678768f46173d9387589d6b6578ecc395 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 18 Jul 2018 04:27:59 -0700 Subject: [PATCH] lots of updates. --- docker-compose.staging.yml | 3 +- src/clj/auto_ap/routes/checks.clj | 8 +- src/clj/auto_ap/routes/exports.clj | 2 +- .../prod/terraform.tfstate | 182 +++++++++++++++++- .../prod/terraform.tfstate.backup | 29 ++- 5 files changed, 211 insertions(+), 13 deletions(-) diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml index 9b9217ee..2a632433 100644 --- a/docker-compose.staging.yml +++ b/docker-compose.staging.yml @@ -3,8 +3,7 @@ services: nginx-proxy: restart: "always" ports: - - "80:80" - - "443:443" + - "8080:80" - "8443:443" labels: - com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy=true diff --git a/src/clj/auto_ap/routes/checks.clj b/src/clj/auto_ap/routes/checks.clj index a4417007..8ec6717e 100644 --- a/src/clj/auto_ap/routes/checks.clj +++ b/src/clj/auto_ap/routes/checks.clj @@ -74,14 +74,14 @@ [[:cell {:colspan 6 :leading 50} [:spacer]] - [:cell {:colspan 6 :leading 50} (when (:signature-file company) - [:image { :top-margin 30 :xscale 0.35 :yscale 0.35 :align :right} + [:cell {:colspan 6 :rowspan 2} (when (:signature-file company) + [:image { :top-margin 90 :xscale 0.30 :yscale 0.30 :align :center} - (:signature-file company)])]] + (:signature-file company)])]] [[:cell {:size 9 } "MEMO"] [:cell {:colspan 5} memo [:line {:line-width 0.15 :color [50 50 50]}]] - [:cell {:colspan 6}]] + #_[:cell {:colspan 6}]] [[:cell {:colspan 2}] [:cell {:colspan 10 :leading 30} diff --git a/src/clj/auto_ap/routes/exports.clj b/src/clj/auto_ap/routes/exports.clj index 4dd8bdbd..942f7603 100644 --- a/src/clj/auto_ap/routes/exports.clj +++ b/src/clj/auto_ap/routes/exports.clj @@ -40,7 +40,7 @@ {:company-id (query-params "company")} [:id :check-number :amount :memo :date [:invoices [:invoice-id :amount]] - [:bank-account [:number :bank-name :bank-code]] + [:bank-account [:number :bank-name :bank-code :id]] [:vendor [:name :id :primary-contact :primary-email :primary-phone :default-expense-account [:address [:street1 :city :state :zip]]]] [:company [:id :name]] ]]] diff --git a/terraform/terraform.tfstate.d/prod/terraform.tfstate b/terraform/terraform.tfstate.d/prod/terraform.tfstate index dc7fd1ae..d1035012 100644 --- a/terraform/terraform.tfstate.d/prod/terraform.tfstate +++ b/terraform/terraform.tfstate.d/prod/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 3, "terraform_version": "0.11.5", - "serial": 26, + "serial": 27, "lineage": "9b630886-8cee-a57d-c7a2-4f19f13f9c51", "modules": [ { @@ -53,6 +53,28 @@ "deposed": [], "provider": "provider.aws" }, + "aws_cloudwatch_event_rule.yodlee_rule": { + "type": "aws_cloudwatch_event_rule", + "depends_on": [ + "aws_iam_role.yodlee_role" + ], + "primary": { + "id": "schedule-yodlee-import-prod", + "attributes": { + "arn": "arn:aws:events:us-east-1:679918342773:rule/schedule-yodlee-import-prod", + "description": "", + "id": "schedule-yodlee-import-prod", + "is_enabled": "true", + "name": "schedule-yodlee-import-prod", + "role_arn": "arn:aws:iam::679918342773:role/yodlee-role-prod", + "schedule_expression": "rate(4 hours)" + }, + "meta": {}, + "tainted": false + }, + "deposed": [], + "provider": "provider.aws" + }, "aws_cloudwatch_event_target.sns": { "type": "aws_cloudwatch_event_target", "depends_on": [ @@ -76,6 +98,29 @@ "deposed": [], "provider": "provider.aws" }, + "aws_cloudwatch_event_target.yodlee_sns_target": { + "type": "aws_cloudwatch_event_target", + "depends_on": [ + "aws_cloudwatch_event_rule.yodlee_rule", + "aws_sns_topic.yodlee_topic" + ], + "primary": { + "id": "schedule-yodlee-import-prod-SendToSNS", + "attributes": { + "arn": "arn:aws:sns:us-east-1:679918342773:events-yodlee-prod", + "id": "schedule-yodlee-import-prod-SendToSNS", + "input": "", + "input_path": "", + "role_arn": "", + "rule": "schedule-yodlee-import-prod", + "target_id": "SendToSNS" + }, + "meta": {}, + "tainted": false + }, + "deposed": [], + "provider": "provider.aws" + }, "aws_iam_access_key.app_user": { "type": "aws_iam_access_key", "depends_on": [ @@ -117,6 +162,45 @@ "deposed": [], "provider": "provider.aws" }, + "aws_iam_role.yodlee_role": { + "type": "aws_iam_role", + "depends_on": [], + "primary": { + "id": "yodlee-role-prod", + "attributes": { + "arn": "arn:aws:iam::679918342773:role/yodlee-role-prod", + "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Sid\":\"\",\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"events.amazonaws.com\"},\"Action\":\"sts:AssumeRole\"}]}", + "create_date": "2018-07-17T00:29:10Z", + "force_detach_policies": "false", + "id": "yodlee-role-prod", + "name": "yodlee-role-prod", + "path": "/", + "unique_id": "AROAIFTHATSTTTW472YFY" + }, + "meta": {}, + "tainted": false + }, + "deposed": [], + "provider": "provider.aws" + }, + "aws_iam_role_policy_attachment.allow_schedule_yodlee": { + "type": "aws_iam_role_policy_attachment", + "depends_on": [ + "aws_iam_role.yodlee_role" + ], + "primary": { + "id": "yodlee-role-prod-20180717002911573600000001", + "attributes": { + "id": "yodlee-role-prod-20180717002911573600000001", + "policy_arn": "arn:aws:iam::aws:policy/AmazonSNSFullAccess", + "role": "yodlee-role-prod" + }, + "meta": {}, + "tainted": false + }, + "deposed": [], + "provider": "provider.aws" + }, "aws_iam_role_policy_attachment.allow_send": { "type": "aws_iam_role_policy_attachment", "depends_on": [ @@ -172,6 +256,44 @@ "deposed": [], "provider": "provider.aws" }, + "aws_s3_bucket.data": { + "type": "aws_s3_bucket", + "depends_on": [], + "primary": { + "id": "data.prod.app.integreatconsult.com", + "attributes": { + "acceleration_status": "", + "acl": "private", + "arn": "arn:aws:s3:::data.prod.app.integreatconsult.com", + "bucket": "data.prod.app.integreatconsult.com", + "bucket_domain_name": "data.prod.app.integreatconsult.com.s3.amazonaws.com", + "force_destroy": "false", + "hosted_zone_id": "Z3AQBSTGFYJSTF", + "id": "data.prod.app.integreatconsult.com", + "logging.#": "0", + "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\"}", + "region": "us-east-1", + "replication_configuration.#": "0", + "request_payer": "BucketOwner", + "server_side_encryption_configuration.#": "0", + "tags.%": "0", + "versioning.#": "1", + "versioning.0.enabled": "false", + "versioning.0.mfa_delete": "false", + "website.#": "1", + "website.0.error_document": "", + "website.0.index_document": "index.html", + "website.0.redirect_all_requests_to": "", + "website.0.routing_rules": "", + "website_domain": "s3-website-us-east-1.amazonaws.com", + "website_endpoint": "data.prod.app.integreatconsult.com.s3-website-us-east-1.amazonaws.com" + }, + "meta": {}, + "tainted": false + }, + "deposed": [], + "provider": "provider.aws" + }, "aws_s3_bucket.invoices": { "type": "aws_s3_bucket", "depends_on": [ @@ -315,6 +437,37 @@ "deposed": [], "provider": "provider.aws" }, + "aws_sns_topic.yodlee_topic": { + "type": "aws_sns_topic", + "depends_on": [], + "primary": { + "id": "arn:aws:sns:us-east-1:679918342773:events-yodlee-prod", + "attributes": { + "application_failure_feedback_role_arn": "", + "application_success_feedback_role_arn": "", + "application_success_feedback_sample_rate": "0", + "arn": "arn:aws:sns:us-east-1:679918342773:events-yodlee-prod", + "delivery_policy": "", + "display_name": "", + "http_failure_feedback_role_arn": "", + "http_success_feedback_role_arn": "", + "http_success_feedback_sample_rate": "0", + "id": "arn:aws:sns:us-east-1:679918342773:events-yodlee-prod", + "lambda_failure_feedback_role_arn": "", + "lambda_success_feedback_role_arn": "", + "lambda_success_feedback_sample_rate": "0", + "name": "events-yodlee-prod", + "policy": "{\"Version\":\"2008-10-17\",\"Id\":\"__default_policy_ID\",\"Statement\":[{\"Sid\":\"__default_statement_ID\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"*\"},\"Action\":[\"SNS:Publish\",\"SNS:RemovePermission\",\"SNS:SetTopicAttributes\",\"SNS:DeleteTopic\",\"SNS:ListSubscriptionsByTopic\",\"SNS:GetTopicAttributes\",\"SNS:Receive\",\"SNS:AddPermission\",\"SNS:Subscribe\"],\"Resource\":\"arn:aws:sns:us-east-1:679918342773:yodlee\",\"Condition\":{\"StringEquals\":{\"AWS:SourceOwner\":\"679918342773\"}}},{\"Sid\":\"__console_pub_0\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"*\"},\"Action\":\"SNS:Publish\",\"Resource\":\"arn:aws:sns:us-east-1:679918342773:yodlee\"}]}", + "sqs_failure_feedback_role_arn": "", + "sqs_success_feedback_role_arn": "", + "sqs_success_feedback_sample_rate": "0" + }, + "meta": {}, + "tainted": false + }, + "deposed": [], + "provider": "provider.aws" + }, "aws_sns_topic_subscription.send_reminders_to_service": { "type": "aws_sns_topic_subscription", "depends_on": [ @@ -338,6 +491,29 @@ "deposed": [], "provider": "provider.aws" }, + "aws_sns_topic_subscription.trigger_yodlee_import": { + "type": "aws_sns_topic_subscription", + "depends_on": [ + "aws_sns_topic.yodlee_topic" + ], + "primary": { + "id": "arn:aws:sns:us-east-1:679918342773:events-yodlee-prod:77f8b52d-4e96-4c8a-82c2-964e85fb7403", + "attributes": { + "arn": "arn:aws:sns:us-east-1:679918342773:events-yodlee-prod:77f8b52d-4e96-4c8a-82c2-964e85fb7403", + "confirmation_timeout_in_minutes": "1", + "endpoint": "https://app.integreatconsult.com/api/events/yodlee-import", + "endpoint_auto_confirms": "true", + "id": "arn:aws:sns:us-east-1:679918342773:events-yodlee-prod:77f8b52d-4e96-4c8a-82c2-964e85fb7403", + "protocol": "https", + "raw_message_delivery": "false", + "topic_arn": "arn:aws:sns:us-east-1:679918342773:events-yodlee-prod" + }, + "meta": {}, + "tainted": false + }, + "deposed": [], + "provider": "provider.aws" + }, "aws_sqs_queue.integreat-mail": { "type": "aws_sqs_queue", "depends_on": [ @@ -369,11 +545,11 @@ "type": "aws_caller_identity", "depends_on": [], "primary": { - "id": "2018-04-10 06:39:11.533275039 +0000 UTC", + "id": "2018-07-17 00:28:02.848245172 +0000 UTC", "attributes": { "account_id": "679918342773", "arn": "arn:aws:iam::679918342773:user/bryce", - "id": "2018-04-10 06:39:11.533275039 +0000 UTC", + "id": "2018-07-17 00:28:02.848245172 +0000 UTC", "user_id": "AIDAJPUJFTOKO4IRADMV4" }, "meta": {}, diff --git a/terraform/terraform.tfstate.d/prod/terraform.tfstate.backup b/terraform/terraform.tfstate.d/prod/terraform.tfstate.backup index c8a4e227..101afa85 100644 --- a/terraform/terraform.tfstate.d/prod/terraform.tfstate.backup +++ b/terraform/terraform.tfstate.d/prod/terraform.tfstate.backup @@ -1,7 +1,7 @@ { "version": 3, "terraform_version": "0.11.5", - "serial": 26, + "serial": 27, "lineage": "9b630886-8cee-a57d-c7a2-4f19f13f9c51", "modules": [ { @@ -315,6 +315,29 @@ "deposed": [], "provider": "provider.aws" }, + "aws_sns_topic_subscription.send_reminders_to_service": { + "type": "aws_sns_topic_subscription", + "depends_on": [ + "aws_sns_topic.reminder_topic" + ], + "primary": { + "id": "arn:aws:sns:us-east-1:679918342773:reminders-prod:d55e8a84-a979-4bc2-9822-afc2dd047a35", + "attributes": { + "arn": "arn:aws:sns:us-east-1:679918342773:reminders-prod:d55e8a84-a979-4bc2-9822-afc2dd047a35", + "confirmation_timeout_in_minutes": "1", + "endpoint": "https://app.integreatconsult.com/api/reminders/send", + "endpoint_auto_confirms": "true", + "id": "arn:aws:sns:us-east-1:679918342773:reminders-prod:d55e8a84-a979-4bc2-9822-afc2dd047a35", + "protocol": "https", + "raw_message_delivery": "false", + "topic_arn": "arn:aws:sns:us-east-1:679918342773:reminders-prod" + }, + "meta": {}, + "tainted": false + }, + "deposed": [], + "provider": "provider.aws" + }, "aws_sqs_queue.integreat-mail": { "type": "aws_sqs_queue", "depends_on": [ @@ -346,11 +369,11 @@ "type": "aws_caller_identity", "depends_on": [], "primary": { - "id": "2018-04-10 06:21:49.828482761 +0000 UTC", + "id": "2018-04-10 06:39:11.533275039 +0000 UTC", "attributes": { "account_id": "679918342773", "arn": "arn:aws:iam::679918342773:user/bryce", - "id": "2018-04-10 06:21:49.828482761 +0000 UTC", + "id": "2018-04-10 06:39:11.533275039 +0000 UTC", "user_id": "AIDAJPUJFTOKO4IRADMV4" }, "meta": {},