Merge branch 'main' into plugin-hostcatalogs

internal/servers/controller/handler_noui.go

@@ -8,13 +8,13 @@ import (
 	"github.com/hashicorp/boundary/internal/observability/event"
 )
 
-func devPassthroughHandler(passthroughDir string) http.Handler {
+func devUiPassthroughHandler(uiPassthroughDir string) http.Handler {
 	const op = "controller.devPassthroughHandler"
 	ctx := context.TODO()
 	// Panic may not be ideal but this is never a production call and it'll
 	// panic on startup. We could also just change the function to return
 	// an error.
-	abs, err := filepath.Abs(passthroughDir)
+	abs, err := filepath.Abs(uiPassthroughDir)
 	if err != nil {
 		panic(err)
 	}
@@ -26,8 +26,8 @@ func devPassthroughHandler(passthroughDir string) http.Handler {
 }
 
 var handleUi = func(c *Controller) http.Handler {
-	if c.conf.RawConfig.PassthroughDirectory != "" {
-		return devPassthroughHandler(c.conf.RawConfig.PassthroughDirectory)
+	if c.conf.RawConfig.DevUiPassthroughDir != "" {
+		return devUiPassthroughHandler(c.conf.RawConfig.DevUiPassthroughDir)
 	}
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusNotFound)

internal/servers/controller/handler_ui.go

@@ -16,8 +16,8 @@ func init() {
 
 func handleUiWithAssets(c *Controller) http.Handler {
 	var nextHandler http.Handler
-	if c.conf.RawConfig.PassthroughDirectory != "" {
-		nextHandler = devPassthroughHandler(c.conf.RawConfig.PassthroughDirectory)
+	if c.conf.RawConfig.DevUiPassthroughDir != "" {
+		nextHandler = devUiPassthroughHandler(c.conf.RawConfig.DevUiPassthroughDir)
 	} else {
 		nextHandler = ui.Handler()
 	}

internal/servers/controller/handler_ui_test.go

@@ -41,7 +41,7 @@ func TestUiRouting(t *testing.T) {
 
 	c := NewTestController(t, &TestControllerOpts{DisableAutoStart: true})
 
-	c.c.conf.RawConfig.PassthroughDirectory = tempDir
+	c.c.conf.RawConfig.DevUiPassthroughDir = tempDir
 	require.NoError(t, c.c.Start())
 	defer c.Shutdown()