From 4b8b078476d81c2b01a3fc21587db028cee5df5a Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Mon, 7 Oct 2024 10:03:45 -0700
Subject: [PATCH] try to not put vcap services into a secret

---
 .ds.baseline                 |  4 ++--
 .github/workflows/checks.yml | 34 ++++++++++++++++------------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/.ds.baseline b/.ds.baseline
index 1b8fb476a..461d36912 100644
--- a/.ds.baseline
+++ b/.ds.baseline
@@ -133,7 +133,7 @@
         "filename": ".github/workflows/checks.yml",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 81,
+        "line_number": 80,
         "is_secret": false
       }
     ],
@@ -684,5 +684,5 @@
       }
     ]
   },
-  "generated_at": "2024-10-07T14:47:10Z"
+  "generated_at": "2024-10-07T17:03:38Z"
 }
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index f26779d86..16668bb12 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -71,8 +71,7 @@ jobs:
       NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
       NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
       NOTIFY_E2E_TEST_URI: http://localhost:6012/
-      GRRR_SERVICES: ${{ secrets.VCAP_SERVICES }}
-      GRRR_BUCKET: ${{ secrets.E2E_BUCKET_NAME }}
+      GRRR_SERVICES: ${{ env.VCAP_SERVICES }}
     services:
       postgres:
         image: postgres
@@ -115,25 +114,25 @@ jobs:
 
 
         run: |
-          if [ -z "${{ secrets.SECRET_KEY }}" ]; then
-            echo "Secret key is not set"
+          if [ -z "${{ env.VCAP_SERVICES }}" ]; then
+            echo "env vcap is not set"
           else
-            echo "Length of secret key is ${#SECRET_KEY}"
+            echo "env vcap is ${#SECRET_KEY}"
           fi
-          if [ -z "${{ secrets.ADMIN_CLIENT_SECRET }}" ]; then
-            echo "Admin client secret is not set"
+          if [ -z "${{ PLAIN_VCAP }}" ]; then
+            echo "Plain vcap is not set"
           else
-            echo "Length of admin client secret is ${#ADMIN_CLIENT_SECRET}"
+            echo "Length of plain is ${#PLAIN_VCAP}"
           fi
-          if [ -z "${{ secrets.E2E_BUCKET_NAME }}" ]; then
-            echo "Bucket name is not set"
+          if [ -z "${{ env.GRRR_SERVICES }}" ]; then
+            echo "env grrr is not set"
           else
-            echo "Length of bucket name is ${#BUCKET_NAME}"
+            echo "env grrr is ${#GRRR_SERVICES}"
           fi
-          if [ -z "${{ secrets.VCAP_SERVICES }}" ]; then
-            echo "VCAP services is not set"
+          if [ -z "${{ PLAIN_GRRR }}" ]; then
+            echo "Plain grrr is not set"
           else
-            echo "Length of VCAP services is ${#VCAP_SERVICES}"
+            echo "Length of plain grrr is ${#PLAIN_GRRR}"
           fi
           make run-flask > admin-server.log 2>&1 &
           tail -f admin-server.log &
@@ -150,11 +149,10 @@ jobs:
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
           NOTIFY_E2E_TEST_URI: http://localhost:6012/
-          VCAP_SERVICES: ${{ secrets.VCAP_SERVICES }}
+          VCAP_SERVICES: ${{ env.VCAP_SERVICES }}
+          PLAIN_VCAP: $VCAP_SERVICES
           GRRR_SERVICES: ${{ env.GRRR_SERVICES }}
-          E2E_BUCKET_HMMM: ${{ secrets.E2E_BUCKET_NAME }}
-          GRRR_BUCKET: ${{ env.GRRR_BUCKET_NAME }}
-
+          PLAIN_GRRR: $GRRR_SERVICES
   validate-new-relic-config:
     runs-on: ubuntu-latest
     environment: staging