From 1f3c32e80a7f15fa47c15a75cd8cb9342c1ee67e Mon Sep 17 00:00:00 2001
From: Gunnar Skjold <gunnar.skjold@gmail.com>
Date: Tue, 17 Jan 2023 18:57:11 +0100
Subject: [PATCH] Adding secrets to build

---
 .github/workflows/build.yml          |  6 ++++++
 .github/workflows/release.yml        |  6 ++++++
 lib/EntsoePriceApi/src/EntsoeApi.cpp |  2 ++
 platformio.ini                       | 13 +++++++++----
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9d5f84ed..d39778a5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,6 +23,12 @@ jobs:
     steps:
     - name: Check out code from repo
       uses: actions/checkout@v1
+
+    - name: Inject secrets into ini file
+      run: |
+        sed -i 's/NO_AMS2MQTT_PRICE_KEY/AMS2MQTT_PRICE_KEY="${{secrets.AMS2MQTT_PRICE_KEY}}"/g' platformio.ini
+        sed -i 's/NO_AMS2MQTT_PRICE_AUTHENTICATION/AMS2MQTT_PRICE_AUTHENTICATION="${{secrets.AMS2MQTT_PRICE_AUTHENTICATION}}"/g' platformio.ini
+
     - name: Cache Python dependencies
       uses: actions/cache@v1
       with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a67a99fe..6ec08587 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,6 +23,12 @@ jobs:
       env:
         GITHUB_REF: ${{ github.ref }}
       run: echo "GITHUB_TAG=$(echo ${GITHUB_REF##*/})" >> $GITHUB_ENV
+
+    - name: Inject secrets into ini file
+      run: |
+        sed -i 's/NO_AMS2MQTT_PRICE_KEY/AMS2MQTT_PRICE_KEY="${{secrets.AMS2MQTT_PRICE_KEY}}"/g' platformio.ini
+        sed -i 's/NO_AMS2MQTT_PRICE_AUTHENTICATION/AMS2MQTT_PRICE_AUTHENTICATION="${{secrets.AMS2MQTT_PRICE_AUTHENTICATION}}"/g' platformio.ini
+
     - name: Cache Python dependencies
       uses: actions/cache@v1
       with:
diff --git a/lib/EntsoePriceApi/src/EntsoeApi.cpp b/lib/EntsoePriceApi/src/EntsoeApi.cpp
index 2d64ae5a..50f7b506 100644
--- a/lib/EntsoePriceApi/src/EntsoeApi.cpp
+++ b/lib/EntsoePriceApi/src/EntsoeApi.cpp
@@ -41,12 +41,14 @@ void EntsoeApi::setup(EntsoeConfig& config) {
     http.useHTTP10(true);
 
     #if defined(AMS2MQTT_PRICE_KEY)
+        #pragma message("Using AMS2MQTT_PRICE_KEY from environment")
         key = new uint8_t[16] AMS2MQTT_PRICE_KEY;
         hub = true;
     #else
         hub = false;
     #endif
     #if defined(AMS2MQTT_PRICE_AUTHENTICATION)
+        #pragma message("Using AMS2MQTT_PRICE_AUTHENTICATION from environment")
         auth = new uint8_t[16] AMS2MQTT_PRICE_AUTHENTICATION;
         hub = hub && true;
     #else
diff --git a/platformio.ini b/platformio.ini
index 627f9b0a..7b1fde3e 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -10,6 +10,11 @@ extra_scripts =
     lib/DomoticzMqttHandler/scripts/generate_includes.py
     lib/HomeAssistantMqttHandler/scripts/generate_includes.py
     lib/SvelteUi/scripts/generate_includes.py
+build_flags = 
+    -D WEBSOCKET_DISABLED=1
+    -D NO_AMS2MQTT_PRICE_KEY
+    -D NO_AMS2MQTT_PRICE_AUTHENTICATION
+    -fexceptions
 
 [esp32]
 lib_deps = WiFi, ESPmDNS, WiFiClientSecure, HTTPClient, FS, Update, HTTPUpdate, WebServer, ${common.lib_deps}
@@ -19,7 +24,7 @@ platform = espressif8266@3.2.0
 framework = arduino
 board = esp12e
 board_build.ldscript = eagle.flash.4m2m.ld
-build_flags = -D WEBSOCKET_DISABLED=1 -fexceptions
+build_flags = ${common.build_flags}
 lib_ldf_mode = off
 lib_compat_mode = off
 lib_deps = ESP8266WiFi, ESP8266mDNS, ESP8266WebServer, ESP8266HTTPClient, ESP8266httpUpdate, ${common.lib_deps}
@@ -31,7 +36,7 @@ platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.
 framework = arduino
 board = esp32dev
 board_build.f_cpu = 160000000L
-build_flags = -D WEBSOCKET_DISABLED=1 -fexceptions
+build_flags = ${common.build_flags}
 lib_ldf_mode = off
 lib_compat_mode = off
 lib_deps = ${esp32.lib_deps}
@@ -50,7 +55,7 @@ board_build.variant = esp32s2
 board_build.flash_mode = qio
 board_build.f_cpu = 160000000L
 board_build.f_flash = 40000000L
-build_flags = -D WEBSOCKET_DISABLED=1 -fexceptions
+build_flags = ${common.build_flags}
 lib_ldf_mode = off
 lib_compat_mode = off
 lib_deps = ${esp32.lib_deps}
@@ -62,7 +67,7 @@ platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.
 framework = arduino
 board = esp32-solo1
 board_build.f_cpu = 160000000L
-build_flags = -D WEBSOCKET_DISABLED=1 -DFRAMEWORK_ARDUINO_SOLO1 -fexceptions
+build_flags = ${common.build_flags} -DFRAMEWORK_ARDUINO_SOLO1
 lib_ldf_mode = off
 lib_compat_mode = off
 lib_deps = ${esp32.lib_deps}