Merge pull request #2533 from hashicorp/dev-asset-fix

Return instead of panic in code that is only used in dev
hashicorp · Oct 21, 2021 · 29294eb · 29294eb
2 parents 1a5a01a + a2ce0ca
commit 29294eb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.changelog/2533.txt 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
@@ -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"
 }