diff --git a/docker/m8flow-docker-compose.yml b/docker/m8flow-docker-compose.yml index 4d6443538..62f215438 100644 --- a/docker/m8flow-docker-compose.yml +++ b/docker/m8flow-docker-compose.yml @@ -216,6 +216,7 @@ services: M8FLOW_BACKEND_BPMN_SPEC_ABSOLUTE_DIR: "${M8FLOW_BACKEND_BPMN_SPEC_ABSOLUTE_DIR:-/app/process_models}" M8FLOW_BACKEND_DATABASE_URI: "postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@m8flow-db:5432/${POSTGRES_DB:-postgres}" M8FLOW_BACKEND_UPGRADE_DB: "${M8FLOW_BACKEND_UPGRADE_DB:-true}" + M8FLOW_BACKEND_CONNECTOR_PROXY_URL: "http://m8flow-connector-proxy:${CONNECTOR_PROXY_PORT:-8004}" KEYCLOAK_URL: "http://keycloak-proxy:7002" M8FLOW_KEYCLOAK_URL: "http://keycloak-proxy:7002" KEYCLOAK_HOSTNAME: "${KEYCLOAK_HOSTNAME:-http://localhost:7002}" @@ -260,6 +261,7 @@ services: environment: M8FLOW_BACKEND_BPMN_SPEC_ABSOLUTE_DIR: "${M8FLOW_BACKEND_BPMN_SPEC_ABSOLUTE_DIR:-/app/process_models}" M8FLOW_BACKEND_DATABASE_URI: "postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@m8flow-db:5432/${POSTGRES_DB:-postgres}" + M8FLOW_BACKEND_CONNECTOR_PROXY_URL: "http://m8flow-connector-proxy:${CONNECTOR_PROXY_PORT:-8004}" M8FLOW_BACKEND_CELERY_BROKER_URL: "${M8FLOW_BACKEND_CELERY_BROKER_URL:-redis://redis:6379/0}" M8FLOW_BACKEND_CELERY_RESULT_BACKEND: "${M8FLOW_BACKEND_CELERY_RESULT_BACKEND:-redis://redis:6379/0}" M8FLOW_BACKEND_RUNNING_IN_CELERY_WORKER: "true" diff --git a/m8flow-connector-proxy/poetry.lock b/m8flow-connector-proxy/poetry.lock index bde6fccad..469c097ac 100644 --- a/m8flow-connector-proxy/poetry.lock +++ b/m8flow-connector-proxy/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.2.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.1.4 and should not be changed by hand. [[package]] name = "cachelib" @@ -193,67 +193,6 @@ url = "https://github.com/sartography/connector-postgres.git" reference = "HEAD" resolved_reference = "af95cbc52c326bc925e185009ea5888f3a5869be" -[[package]] -name = "connector-salesforce" -version = "1.0.0" -description = "Salesforce connector for m8flow: CRUD for Lead and Contact with OAuth" -optional = false -python-versions = "^3.10" -groups = ["main"] -files = [] -develop = false - -[package.dependencies] -requests = "^2.28.1" - -[package.source] -type = "git" -url = "https://github.com/AOT-Technologies/m8flow-connectors.git" -reference = "main" -resolved_reference = "4d809aef06747051fb5605605d0250b5d90dc29d" -subdirectory = "connectors/connector-salesforce" - -[[package]] -name = "connector-slack" -version = "1.0.0" -description = "Slack connector for m8flow: post message, send DM, upload file" -optional = false -python-versions = "^3.10" -groups = ["main"] -files = [] -develop = false - -[package.dependencies] -requests = "^2.28.1" -spiffworkflow-connector-command = {git = "https://github.com/sartography/spiffworkflow-connector-command.git", rev = "main"} - -[package.source] -type = "git" -url = "https://github.com/AOT-Technologies/m8flow-connectors.git" -reference = "main" -resolved_reference = "4d809aef06747051fb5605605d0250b5d90dc29d" -subdirectory = "connectors/connector-slack" - -[[package]] -name = "connector-stripe" -version = "1.0.0" -description = "Stripe connector for m8flow: Payment intents, charges, subscriptions, and refunds with idempotency" -optional = false -python-versions = "^3.10" -groups = ["main"] -files = [] -develop = false - -[package.dependencies] -requests = "^2.28.1" - -[package.source] -type = "git" -url = "https://github.com/AOT-Technologies/m8flow-connectors.git" -reference = "main" -resolved_reference = "4d809aef06747051fb5605605d0250b5d90dc29d" -subdirectory = "connectors/connector-stripe" - [[package]] name = "Flask" version = "2.2.2" @@ -357,6 +296,47 @@ MarkupSafe = ">=2.0" [package.extras] i18n = ["Babel (>=2.7)"] +[[package]] +name = "m8flow-connector-salesforce" +version = "1.0.0" +description = "Salesforce connector for m8flow: CRUD for Lead and Contact with OAuth" +optional = false +python-versions = "^3.10" +groups = ["main"] +files = [] +develop = false + +[package.dependencies] +requests = "^2.28.1" + +[package.source] +type = "git" +url = "https://github.com/AOT-Technologies/m8flow-connectors.git" +reference = "main" +resolved_reference = "5cb46902a562b889a206e1e4841c6e15fbbd0838" +subdirectory = "connectors/m8flow-connector-salesforce" + +[[package]] +name = "m8flow-connector-slack" +version = "1.0.0" +description = "Slack connector for m8flow: post message, send DM, upload file" +optional = false +python-versions = "^3.10" +groups = ["main"] +files = [] +develop = false + +[package.dependencies] +requests = "^2.28.1" +spiffworkflow-connector-command = {git = "https://github.com/sartography/spiffworkflow-connector-command.git", rev = "main"} + +[package.source] +type = "git" +url = "https://github.com/AOT-Technologies/m8flow-connectors.git" +reference = "main" +resolved_reference = "5cb46902a562b889a206e1e4841c6e15fbbd0838" +subdirectory = "connectors/m8flow-connector-slack" + [[package]] name = "m8flow-connector-smtp" version = "1.0.0" @@ -378,6 +358,26 @@ reference = "main" resolved_reference = "4d809aef06747051fb5605605d0250b5d90dc29d" subdirectory = "connectors/m8flow-connector-smtp" +[[package]] +name = "m8flow-connector-stripe" +version = "1.0.0" +description = "Stripe connector for m8flow: Payment intents, charges, subscriptions, and refunds with idempotency" +optional = false +python-versions = "^3.10" +groups = ["main"] +files = [] +develop = false + +[package.dependencies] +requests = "^2.28.1" + +[package.source] +type = "git" +url = "https://github.com/AOT-Technologies/m8flow-connectors.git" +reference = "main" +resolved_reference = "5cb46902a562b889a206e1e4841c6e15fbbd0838" +subdirectory = "connectors/m8flow-connector-stripe" + [[package]] name = "MarkupSafe" version = "2.1.1" @@ -684,4 +684,4 @@ files = [ [metadata] lock-version = "2.1" python-versions = "^3.11" -content-hash = "cdc9e100cb9d7b50767b4786c8fa16ae7299d40a20ce1301913b3a48433d0c9b" +content-hash = "79b3744fc47b9ad2b9b2eac20e0aef5c555cb0fb71246971d279c7925563c511" diff --git a/m8flow-connector-proxy/pyproject.toml b/m8flow-connector-proxy/pyproject.toml index 9711932d9..b7f490304 100644 --- a/m8flow-connector-proxy/pyproject.toml +++ b/m8flow-connector-proxy/pyproject.toml @@ -17,9 +17,9 @@ spiffworkflow-proxy = {git = "https://github.com/sartography/spiffworkflow-proxy # m8flow-connector-http = { git = "https://github.com/AOT-Technologies/m8flow-connectors.git", subdirectory = "connectors/m8flow-connector-http", branch = "main" } m8flow-connector-smtp = { git = "https://github.com/AOT-Technologies/m8flow-connectors.git", subdirectory = "connectors/m8flow-connector-smtp", branch = "main" } connector-postgres-v2 = {git = "https://github.com/sartography/connector-postgres.git"} -connector-slack = { git = "https://github.com/AOT-Technologies/m8flow-connectors.git", subdirectory = "connectors/connector-slack", branch = "main" } -connector-salesforce = { git = "https://github.com/AOT-Technologies/m8flow-connectors.git", subdirectory = "connectors/connector-salesforce", branch = "main" } -connector-stripe = { git = "https://github.com/AOT-Technologies/m8flow-connectors.git", subdirectory = "connectors/connector-stripe", branch = "main" } +m8flow-connector-slack = { git = "https://github.com/AOT-Technologies/m8flow-connectors.git", subdirectory = "connectors/m8flow-connector-slack", branch = "main" } +m8flow-connector-salesforce = { git = "https://github.com/AOT-Technologies/m8flow-connectors.git", subdirectory = "connectors/m8flow-connector-salesforce", branch = "main" } +m8flow-connector-stripe = { git = "https://github.com/AOT-Technologies/m8flow-connectors.git", subdirectory = "connectors/m8flow-connector-stripe", branch = "main" } # dependencies for connector psycopg2-binary = "^2.9.9" diff --git a/sample.env b/sample.env index 512923189..8ecd821b5 100644 --- a/sample.env +++ b/sample.env @@ -97,8 +97,8 @@ M8FLOW_BACKEND_CELERY_FLOWER_BASIC_AUTH=admin:admin # --- Connector proxy --- -CONNECTOR_PROXY_PORT=8004 -M8FLOW_BACKEND_CONNECTOR_PROXY_URL=http://localhost:8004 +# CONNECTOR_PROXY_PORT=8004 +# M8FLOW_BACKEND_CONNECTOR_PROXY_URL=http://localhost:8004 # --- M8Flow Connector: SMTP --- # Local directory for connector to map attachments to. M8FLOW_CONNECTOR_SMTP_ATTACHMENTS_DIR=../email_attachments