From 00e27dd31b5e9b6695b78af9c120743fb95032fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Cie=C5=9Blak?= <rafal.cieslak@goteleport.com>
Date: Wed, 30 Nov 2022 18:02:53 +0100
Subject: [PATCH] Remove DEBUG env var from Connect macOS dronegen (#18899)

It was added in effort to debug flaky Connect builds (#15836).

However, we discovered that the v11.1.0 macOS version of Connect stopped
working. This was likely due to upgrade of electron-builder which recently
updated its process of building native deps
(electron-userland/electron-builder#7196).

In the Node.js ecosystem, the DEBUG env var is typically used to control
which packages emit debug messages [1]. However, after the update of
electron-builder, the env var also changed the behavior of one of the
packages responsible for building the apps.

This was confirmed by inspecting file tree between different app bundles
and running the build locally with DEBUG set to electron-*.

[1] https://www.npmjs.com/package/debug
---
 .drone.yml      | 4 +---
 dronegen/mac.go | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 50364461039f3..e051143b08623 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -593,7 +593,6 @@ steps:
   - security unlock-keychain -p $${BUILDBOX_PASSWORD} login.keychain
   - security find-identity -v
   - export CSC_NAME=0FFD3E3413AB4C599C53FBB1D8CA690915E33D83
-  - export DEBUG="electron-*"
   - export CONNECT_TSH_BIN_PATH=$WORKSPACE_DIR/go/src/github.com/gravitational/teleport/build/tsh
   - cd $WORKSPACE_DIR/go/src/github.com/gravitational/webapps
   - yarn install && yarn build-term && yarn package-term -c.extraMetadata.version=$VERSION
@@ -8043,7 +8042,6 @@ steps:
   - security unlock-keychain -p $${BUILDBOX_PASSWORD} login.keychain
   - security find-identity -v
   - export CSC_NAME=0FFD3E3413AB4C599C53FBB1D8CA690915E33D83
-  - export DEBUG="electron-*"
   - cd $WORKSPACE_DIR/go/src/github.com/gravitational
   - pkgutil --expand-full tsh-$${VERSION}.pkg tsh
   - export CONNECT_TSH_APP_PATH=$WORKSPACE_DIR/go/src/github.com/gravitational/tsh/Payload/tsh.app
@@ -18269,6 +18267,6 @@ volumes:
   temp: {}
 ---
 kind: signature
-hmac: 41be3692e984bd7b47556d7ddec58837eb430260bb7e6dec354d1e2df3d3e0d7
+hmac: 20d24342669e0a60b5d70d1bd1d28caedfb52e3580ad2b3998e2797a49d49217
 
 ...
diff --git a/dronegen/mac.go b/dronegen/mac.go
index db5a16c6014e8..8f73bd696bee4 100644
--- a/dronegen/mac.go
+++ b/dronegen/mac.go
@@ -557,8 +557,6 @@ func darwinBuildCommands(toolchainConfig toolchainConfig, artifactConfig darwinA
 			// available.
 			// https://www.electron.build/code-signing
 			`export CSC_NAME=0FFD3E3413AB4C599C53FBB1D8CA690915E33D83`,
-
-			`export DEBUG="electron-*"`,
 		)
 
 		if artifactConfig == binariesWithConnect {