Merge pull request #26 from opsmill/fix_env_vars

update environment variables for SDK prefix removal

.devcontainer/devcontainer.json

@@ -27,9 +27,8 @@
   "remoteUser": "vscode",
   "remoteEnv": {
       "ANSIBLE_CONFIG": "/workspaces/infrahub-demo-dc-fabric/ansible.cfg",
-      "INFRAHUB_API": "http://localhost:8000",
-      "INFRAHUB_TOKEN": "06438eb2-8019-4776-878c-0941b1f1d1ec",
-      "INFRAHUB_SDK_API_TOKEN": "06438eb2-8019-4776-878c-0941b1f1d1ec",
+      "INFRAHUB_ADDRESS": "http://localhost:8000",
+      "INFRAHUB_API_TOKEN": "06438eb2-8019-4776-878c-0941b1f1d1ec",
       "INFRAHUB_DOCKER_IMAGE": "9r2s1098.c1.gra9.container-registry.ovh.net/opsmill/infrahub:0.13.0",
       "DATABASE_DOCKER_IMAGE": "neo4j:5.19-community",
       "INFRAHUB_DB_TYPE": "neo4j",

README.md

@@ -13,9 +13,8 @@ The infrahub-demo-dc-fabric repository demonstrates the capabilities to use Infr
 - If you are not using devcontainer, you will need to export those variables before the `docker-compose` :
 
 ```shell
-export INFRAHUB_API="http://localhost:8000"
-export INFRAHUB_TOKEN="06438eb2-8019-4776-878c-0941b1f1d1ec"
-export INFRAHUB_SDK_API_TOKEN="06438eb2-8019-4776-878c-0941b1f1d1ec"
+export INFRAHUB_ADDRESS="http://localhost:8000"
+export INFRAHUB_API_TOKEN="06438eb2-8019-4776-878c-0941b1f1d1ec"
 export INFRAHUB_DOCKER_IMAGE="9r2s1098.c1.gra9.container-registry.ovh.net/opsmill/infrahub:0.13.0"
 export DATABASE_DOCKER_IMAGE="neo4j:5.19-community"
 export INFRAHUB_SECURITY_SECRET_KEY="327f747f-efac-42be-9e73-999f08f86b92"

ansible-requirements.yml

@@ -1,6 +1,6 @@
 collections:
   - name: opsmill.infrahub
-    version: 1.0.2
+    version: 1.0.8
   - name: ansible.utils
   - name: ansible.netcommon
   - name: arista.avd

docker-compose.yml

@@ -51,7 +51,7 @@ services:
       - "INFRAHUB_CONFIG=/source/development/infrahub.toml"
       - "INFRAHUB_PRODUCTION=false"
       - "INFRAHUB_LOG_LEVEL=INFO"
-      - "INFRAHUB_SECURITY_INITIAL_ADMIN_TOKEN=${INFRAHUB_SDK_API_TOKEN}"
+      - "INFRAHUB_SECURITY_INITIAL_ADMIN_TOKEN=${INFRAHUB_API_TOKEN}"
       - "INFRAHUB_SECURITY_SECRET_KEY=${INFRAHUB_SECURITY_SECRET_KEY}"
       - "INFRAHUB_ALLOW_ANONYMOUS_ACCESS=true"
       - "PROMETHEUS_MULTIPROC_DIR=/prom_shared"
@@ -83,8 +83,8 @@ services:
       - "INFRAHUB_ADDRESS=http://infrahub-server:8000"
       - "INFRAHUB_PRODUCTION=false"
       - "INFRAHUB_LOG_LEVEL=DEBUG"
-      - "INFRAHUB_SDK_API_TOKEN=${INFRAHUB_SDK_API_TOKEN}"
-      - "INFRAHUB_SDK_TIMEOUT=20"
+      - "INFRAHUB_API_TOKEN=${INFRAHUB_API_TOKEN}"
+      - "INFRAHUB_TIMEOUT=20"
       - "INFRAHUB_DB_TYPE=neo4j"
     volumes:
       - "git_data:/opt/infrahub/git"