From 6f02e729da8e781e1fbed8cc4f65851e6331a371 Mon Sep 17 00:00:00 2001
From: "Erik A. Brandstadmoen" <erik@brandstadmoen.net>
Date: Tue, 12 Mar 2024 22:19:48 +0100
Subject: [PATCH] WIP

---
 .github/workflows/integration-tests.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 9b5bd12e..056fa742 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -155,8 +155,7 @@ jobs:
         working-directory: ${{ env.tf_actions_working_dir }}
 
     outputs:
-      mariadb_connection_string: ${{ steps.show.outputs.mariadb_connstr }}
-      mariadb_test_value: ${{ steps.show.outputs.mariadb_test_value }}
+      mariadb_connection_string: ${{ steps.show.outputs.mariadb_connection_string }}
       mariadb_p: ${{ steps.show.outputs.mariadb_p }}
 
     steps:
@@ -204,11 +203,14 @@ jobs:
           terraform show -json > state.json
           HOST=$(cat state.json | jq -r '.values.outputs | ."mariadb-fqdn".value')
           PW=$(cat state.json | jq -r '.values.outputs | ."mariadb-admin-password".value')
-          # CONNSTR="Server=${HOST};Port=3306;Database=mysql;Uid=root;Pwd=${PW}"
-          # CONNSTR="'Server=${HOST};Port=3306;Database=mysql;Uid=root'"
+          CONNSTR="Server=${HOST};Port=3306;Database=mysql;Uid=root;Pwd=${PW}"
+
+          # echo "mariadb_connection_string='Server=${HOST};Port=3306;Database=mysql;Uid=root'"
+          # echo "mariadb_connection_string='Server=${HOST};Port=3306;Database=mysql;Uid=root'" >> "$GITHUB_OUTPUT"
+
+          echo "mariadb_connection_string='${CONNSTR}'"
+          echo "mariadb_connection_string='${CONNSTR}'" >> "$GITHUB_OUTPUT"
 
-          echo "mariadb_connstr='Server=${HOST};Port=3306;Database=mysql;Uid=root'"
-          echo "mariadb_connstr='Server=${HOST};Port=3306;Database=mysql;Uid=root'" >> "$GITHUB_OUTPUT"
           echo "mariadb_p='${PW}'" >> "$GITHUB_OUTPUT"
 
       # - run: echo ${{ steps.apply.outputs.stdout }}