From a2ce0ca11d589c5b283888f449d46a9ffcaaaac9 Mon Sep 17 00:00:00 2001
From: catsby <clint@ctshryock.com>
Date: Wed, 20 Oct 2021 14:39:34 -0500
Subject: [PATCH] Remove internal/assets/dev.go from production builds

Return instead of panic in code that is only used in dev
---
 .changelog/2533.txt    |  3 +++
 internal/assets/dev.go | 11 ++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 .changelog/2533.txt

diff --git a/.changelog/2533.txt b/.changelog/2533.txt
new file mode 100644
index 00000000000..bcf67a3b614
--- /dev/null
+++ b/.changelog/2533.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+serverinstall/ecs: Fix potential panic in some ECS On-Demand Runner releases
+```
diff --git a/internal/assets/dev.go b/internal/assets/dev.go
index 4cd712bedb9..6af47508922 100644
--- a/internal/assets/dev.go
+++ b/internal/assets/dev.go
@@ -1,5 +1,8 @@
 //go:generate go-bindata -dev -pkg assets -o dev_assets.go -tags !assetsembedded ceb
 
+//go:build !assetsembedded
+// +build !assetsembedded
+
 package assets
 
 import (
@@ -10,8 +13,13 @@ import (
 var rootDir string
 
 func init() {
+	// Set a reasonable default in the event we somehow fail to find the root
+	// directory
+	rootDir = "./internal/assets"
 	dir, err := os.Getwd()
 	if err != nil {
+		// There is some strange circumstance that would cause this to panic,
+		// but would only happen in a dev environment anyway.
 		panic(err)
 	}
 
@@ -29,7 +37,4 @@ func init() {
 
 		dir = nextDir
 	}
-
-	// Uuuuhhh...
-	rootDir = "./internal/assets"
 }