From e43455cc49a2684c433944a90000b61ed9a2b68b Mon Sep 17 00:00:00 2001
From: Keepers <ryanfkeepers@gmail.com>
Date: Mon, 23 Jan 2023 12:52:26 -0700
Subject: [PATCH] re-enable stderr logs in tests (#2215)

## Does this PR need a docs update or release note?

- [x] :no_entry: No

## Type of change

- [x] :bug: Bugfix
- [x] :robot: Test
- [x] :computer: CI/Deployment

## Test Plan

- [x] :muscle: Manual
---
 .github/workflows/ci.yml        | 3 ++-
 .github/workflows/load_test.yml | 1 +
 src/pkg/logger/logger.go        | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 035c3ee4d..9739788cb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -208,6 +208,7 @@ jobs:
           CORSO_M365_TEST_USER_ID: ${{ secrets.CORSO_M365_TEST_USER_ID }}
           CORSO_SECONDARY_M365_TEST_USER_ID: ${{ secrets.CORSO_SECONDARY_M365_TEST_USER_ID }}
           CORSO_PASSPHRASE: ${{ secrets.INTEGRATION_TEST_CORSO_PASSPHRASE }}
+          CORSO_LOG_FILE: stderr
           LOG_GRAPH_REQUESTS: true
         run: |
           set -euo pipefail
@@ -219,7 +220,7 @@ jobs:
           -p 1          \
           ./... 2>&1 | tee ./testlog/gotest.log | gotestfmt -hide successful-tests
 
-      # Upload the original go test log as an artifact for later review.
+      # Upload the original go test output as an artifact for later review.
       - name: Upload test log
         if: failure()
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/load_test.yml b/.github/workflows/load_test.yml
index c5c8faec1..ced4a80af 100644
--- a/.github/workflows/load_test.yml
+++ b/.github/workflows/load_test.yml
@@ -53,6 +53,7 @@ jobs:
           AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
           AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
           CORSO_LOAD_TESTS: true 
+          CORSO_LOG_FILE: stderr
           CORSO_M365_LOAD_TEST_USER_ID: ${{ secrets.CORSO_M365_LOAD_TEST_USER_ID }}
           CORSO_M365_LOAD_TEST_ORG_USERS: ${{ secrets.CORSO_M365_LOAD_TEST_ORG_USERS }}
           CORSO_PASSPHRASE: ${{ secrets.CORSO_PASSPHRASE }}
diff --git a/src/pkg/logger/logger.go b/src/pkg/logger/logger.go
index bead584b5..f64febe2e 100644
--- a/src/pkg/logger/logger.go
+++ b/src/pkg/logger/logger.go
@@ -106,6 +106,11 @@ func PreloadLoggingFlags() (string, string) {
 		return "info", dlf
 	}
 
+	// if not specified, attempt to fall back to env declaration.
+	if len(logfile) == 0 {
+		logfile = os.Getenv("CORSO_LOG_FILE")
+	}
+
 	if logfile == "-" {
 		logfile = "stdout"
 	}