From efe84167890842dcc6a5271cdb3a771fff4662b8 Mon Sep 17 00:00:00 2001
From: Yuriy Gerasymov <yuri.gerasimov@gmail.com>
Date: Thu, 25 Jul 2024 09:49:11 -0700
Subject: [PATCH] Fix for env variables.

---
 commands/diffy/screenshot |  2 +-
 docker-compose.diffy.yaml |  2 +-
 install.yaml              | 24 +++++++++++++++++++++---
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/commands/diffy/screenshot b/commands/diffy/screenshot
index 34df9ce..cad9ef9 100755
--- a/commands/diffy/screenshot
+++ b/commands/diffy/screenshot
@@ -1,3 +1,3 @@
 #!/bin/bash
 export NODE_NO_WARNINGS=1
-cd /mnt/ddev_config/diffy-worker-main/ && node diffy-screenshots --url=https://web --screenshot-name=$VIRTUAL_HOST
+cd /mnt/ddev_config/diffy-worker-main/ && node diffy-screenshots --url=https://web --screenshot-name=$DDEV_HOSTNAME
diff --git a/docker-compose.diffy.yaml b/docker-compose.diffy.yaml
index e33e4b8..4c7cadb 100644
--- a/docker-compose.diffy.yaml
+++ b/docker-compose.diffy.yaml
@@ -11,7 +11,7 @@ services:
       com.ddev.site-name: ${DDEV_SITENAME}
       com.ddev.approot: $DDEV_APPROOT
     environment:
-      VIRTUAL_HOST: ${DDEV_HOSTNAME}
+      - DDEV_HOSTNAME
     volumes:
     - ".:/mnt/ddev_config"
     - "ddev-global-cache:/mnt/ddev-global-cache"
diff --git a/install.yaml b/install.yaml
index d8a0aca..1754f9f 100644
--- a/install.yaml
+++ b/install.yaml
@@ -58,10 +58,28 @@ post_install_actions:
   - cd diffy-worker-main && npm install
   - |
     #ddev-nodisplay
-    #ddev-description:Create .env file with env variables.
+    #ddev-description:Create .env file
+    DIFFY_API_KEY='{{- $foundDiffApiKey := false -}}
+    {{- range .DdevGlobalConfig.web_environment }}
+      {{- if not $foundDiffApiKey }}
+        {{- $keyVal := splitList "=" . }}
+        {{- if eq (index $keyVal 0) "DIFFY_API_KEY" }}
+          {{- index $keyVal 1 -}}
+          {{- $foundDiffApiKey = true -}}
+        {{- end }}
+      {{- end }}
+    {{- end }}'
 
-    DIFFY_PROJECT_ID=$(ddev exec 'echo $DIFFY_PROJECT_ID')
-    DIFFY_API_KEY=$(ddev exec 'echo $DIFFY_API_KEY')
+    DIFFY_PROJECT_ID='{{- $foundDiffProjectId := false -}}
+    {{- range .DdevProjectConfig.web_environment }}
+      {{- if not $foundDiffProjectId }}
+        {{- $keyVal := splitList "=" . }}
+        {{- if eq (index $keyVal 0) "DIFFY_PROJECT_ID" }}
+          {{- index $keyVal 1 -}}
+          {{- $foundDiffProjectId = true -}}
+        {{- end }}
+      {{- end }}
+    {{- end }}'
 
     cat <<-EOF >diffy-worker-main/.env
     # #ddev-generated