Merge pull request #1074 from bcgov/bcgov/chore/lob

chore: moves tenant lob demo out of core services
bcgov · Apr 18, 2024 · d2d77b7 · d2d77b7
2 parents efaf442 + 69ed218
commit d2d77b7
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 48 deletions.
diff --git a/services/tenant-lob/Dockerfile → demo/lob/Dockerfile b/services/tenant-lob/Dockerfile → demo/lob/Dockerfile
diff --git a/services/tenant-lob/README.md → demo/lob/README.md b/services/tenant-lob/README.md → demo/lob/README.md
@@ -17,8 +17,15 @@ The endpoints in this demo use `GET` for creates instead of `POST` to simplify t
 
 All data in this demo is completely ephemeral, it only exists in memory.
 
+### Starting the demo with Docker Compose
+
+Ensure you have Traction running locally. Please see the Traction [documentation](https://github.com/bcgov/traction/tree/main/scripts#run-local-traction) for instructions on how to run Traction locally with Docker.
+
+```sh
+docker compose up
+```
+
 ## Simple Demo Flow
-Assumes this is being run in a local environment stood up according to [scripts](../../scripts) documentation with default configuration.
 
 1. Create set of demo tenants
     1. Open browser at [http://localhost:9876/tasks/create-alice-faber-acme](http://localhost:9876/tasks/create-alice-faber-acme)
@@ -41,12 +48,4 @@ Assumes this is being run in a local environment stood up according to [scripts]
     4. Open browser at [http://localhost:9876/tenants/faber/webhook-data](http://localhost:9876/tenants/faber/webhook-data) to view faber's webhook data.
     5. Note that there is a new topic: `endorse_transaction`. This is faber asking the endorser to do work (write public did to ledger) on their behalf.
 
-When creating your own tenants in the [tenant-ui](http://localhost:5101), you can update their webhook url to `http://host.docker.internal:9876/webhook` and do not add an api key. You can see notifications for you webhook in the `tenant-lob` docker console.
-
-
-### Docker Build image
-
-```shell
-docker build -f Dockerfile -t tenant-lob .
-```
-
+When creating your own tenants in the [tenant-ui](http://localhost:5101), you can update their webhook url to `http://host.docker.internal:9876/webhook` and do not add an api key. You can see notifications for you webhook in the `tenant-lob` docker console.
diff --git a/services/tenant-lob/app/config.py → demo/lob/app/config.py b/services/tenant-lob/app/config.py → demo/lob/app/config.py
diff --git a/services/tenant-lob/app/connect_tenants.py → demo/lob/app/connect_tenants.py b/services/tenant-lob/app/connect_tenants.py → demo/lob/app/connect_tenants.py
diff --git a/services/tenant-lob/app/create_tenant.py → demo/lob/app/create_tenant.py b/services/tenant-lob/app/create_tenant.py → demo/lob/app/create_tenant.py
diff --git a/services/tenant-lob/app/server.py → demo/lob/app/server.py b/services/tenant-lob/app/server.py → demo/lob/app/server.py
diff --git a/services/tenant-lob/app/set_public_did.py → demo/lob/app/set_public_did.py b/services/tenant-lob/app/set_public_did.py → demo/lob/app/set_public_did.py
diff --git a/services/tenant-lob/app/storage.py → demo/lob/app/storage.py b/services/tenant-lob/app/storage.py → demo/lob/app/storage.py
diff --git a/services/tenant-lob/app/utils.py → demo/lob/app/utils.py b/services/tenant-lob/app/utils.py → demo/lob/app/utils.py
diff --git a/demo/lob/docker-compose.yml b/demo/lob/docker-compose.yml
@@ -0,0 +1,19 @@
+ tenant-lob:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: traction:tenant-lob
+    depends_on:
+      tenant-proxy:
+        condition: service_started
+    restart: unless-stopped
+    environment:
+      - SERVER_TRACTION_URL=${LOB_SERVER_TRACTION_URL}
+      - TRACTION_INNKEEPER_TENANT_ID=${TRACTION_INNKEEPER_TENANT_ID}
+      - TRACTION_INNKEEPER_WALLET_NAME=${TRACTION_INNKEEPER_WALLET_NAME}
+      - TRACTION_INNKEEPER_WALLET_KEY=${TRACTION_INNKEEPER_WALLET_KEY}
+      - WEBHOOK_URL=${LOB_WEBHOOK_URL}
+    ports:
+      - ${LOB_PORT}:8088
+    extra_hosts:
+      - host.docker.internal:host-gateway
diff --git a/services/tenant-lob/poetry.lock → demo/lob/poetry.lock b/services/tenant-lob/poetry.lock → demo/lob/poetry.lock
diff --git a/services/tenant-lob/pyproject.toml → demo/lob/pyproject.toml b/services/tenant-lob/pyproject.toml → demo/lob/pyproject.toml
diff --git a/services/tenant-lob/requirements.txt → demo/lob/requirements.txt b/services/tenant-lob/requirements.txt → demo/lob/requirements.txt
diff --git a/plugins/.devcontainer/devcontainer.json b/plugins/.devcontainer/devcontainer.json
@@ -37,7 +37,7 @@
             },
             "python.formatting.provider": "black",
             "python.formatting.blackArgs": [],
-            "python.venvFolders": ["~.cache/virtualenvs"]      
+            "python.venvFolders": ["~.cache/virtualenvs"]
           },
           "extensions": [
               "ms-python.python",

diff --git a/scripts/.env-example b/scripts/.env-example
@@ -201,16 +201,6 @@ FRONTEND_QUICK_CONNECT_ENDORSER_NAME=bcovrin-test-endorser
 
 TENANT_PROXY_PORT=8032
 
-# ------------------------------------------------------------
-# ------------------------------------------------------------
-# Tenant LOB Server/Controller
-# ------------------------------------------------------------
-# ------------------------------------------------------------
-
-LOB_SERVER_TRACTION_URL=http://host.docker.internal:8032
-LOB_WEBHOOK_URL=http://host.docker.internal:9876/webhook
-LOB_PORT=9876
-
 # ------------------------------------------------------------
 # ------------------------------------------------------------
 # Plugins

diff --git a/scripts/README.md b/scripts/README.md
@@ -209,6 +209,4 @@ You can use the wallet id and key to retrieve a token and use the Tenant API.
 9. In the bottom `AuthorizationHeader (apiKey)` section, for the Value field, enter `Bearer <your token value>` and Authorize.
 10. You are now logged in as your tenant/wallet/agent.
 11. Scroll to [GET /tenant](http://localhost:8032/api/doc#/traction-tenant/get_tenant), expand, Try it out and Execute.
-12. These are your tenant's details. Only you are authorized to fetch your tenant data.
-
-For Tenant Line of Business Integration, see more steps in the [tenant-lob demo](../services/tenant-lob/README.md) readme.
+12. These are your tenant's details. Only you are authorized to fetch your tenant data.
diff --git a/scripts/docker-compose.yml b/scripts/docker-compose.yml
@@ -162,30 +162,6 @@ services:
     extra_hosts:
       - host.docker.internal:host-gateway
 
-  ###############################################
-  # XXX: The following is breaking the build
-  ###############################################
-  # tenant-lob:
-  #   build:
-  #     context: ../services/tenant-lob
-  #     dockerfile: Dockerfile
-  #   image: traction:tenant-lob
-  #   depends_on:
-  #     tenant-proxy:
-  #       condition: service_started
-  #   restart: unless-stopped
-  #   environment:
-  #     - SERVER_TRACTION_URL=${LOB_SERVER_TRACTION_URL}
-  #     - TRACTION_INNKEEPER_TENANT_ID=${TRACTION_INNKEEPER_TENANT_ID}
-  #     - TRACTION_INNKEEPER_WALLET_NAME=${TRACTION_INNKEEPER_WALLET_NAME}
-  #     - TRACTION_INNKEEPER_WALLET_KEY=${TRACTION_INNKEEPER_WALLET_KEY}
-  #     - WEBHOOK_URL=${LOB_WEBHOOK_URL}
-  #   ports:
-  #     - ${LOB_PORT}:8088
-  #   extra_hosts:
-  #     - host.docker.internal:host-gateway
-  ###############################################
-
   endorser-api:
     pull_policy: missing
     build: