add --public-path option to the command

temporalio · Aug 23, 2024 · 581fc21 · 581fc21
1 parent a223850
commit 581fc21
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/temporalcli/commands.gen.go b/temporalcli/commands.gen.go
@@ -1285,6 +1285,7 @@ type TemporalServerStartDevCommand struct {
 	Headless           bool
 	Ip                 string
 	UiIp               string
+	UiPublicPath       string
 	UiAssetPath        string
 	UiCodecEndpoint    string
 	SqlitePragma       []string
@@ -1314,6 +1315,7 @@ func NewTemporalServerStartDevCommand(cctx *CommandContext, parent *TemporalServ
 	s.Command.Flags().BoolVar(&s.Headless, "headless", false, "Disable the Web UI.")
 	s.Command.Flags().StringVar(&s.Ip, "ip", "localhost", "IP address bound to the frontend Service.")
 	s.Command.Flags().StringVar(&s.UiIp, "ui-ip", "", "IP address bound to the WebUI. Default is same as '--ip' value.")
+	s.Command.Flags().StringVar(&s.UiPublicPath, "ui-public-path", "", "The public base path for the Web UI. Default is `/`.")
 	s.Command.Flags().StringVar(&s.UiAssetPath, "ui-asset-path", "", "UI custom assets path.")
 	s.Command.Flags().StringVar(&s.UiCodecEndpoint, "ui-codec-endpoint", "", "UI remote codec HTTP endpoint.")
 	s.Command.Flags().StringArrayVar(&s.SqlitePragma, "sqlite-pragma", nil, "SQLite pragma statements in \"PRAGMA=VALUE\" format.")

diff --git a/temporalcli/commands.server.go b/temporalcli/commands.server.go
@@ -81,7 +81,7 @@ func (t *TemporalServerStartDevCommand) run(cctx *CommandContext, args []string)
 				return fmt.Errorf("can't set UI port %d: %w", opts.UIPort, err)
 			}
 		}
-		opts.UIAssetPath, opts.UICodecEndpoint = t.UiAssetPath, t.UiCodecEndpoint
+		opts.UIAssetPath, opts.UICodecEndpoint, opts.PublicPath = t.UiAssetPath, t.UiCodecEndpoint, t.UiPublicPath
 	}
 	// Pragmas and dyn config
 	var err error
@@ -157,7 +157,7 @@ func (t *TemporalServerStartDevCommand) run(cctx *CommandContext, args []string)
 	cctx.Printer.Printlnf("CLI %v\n", VersionString())
 	cctx.Printer.Printlnf("%-8s %v:%v", "Server:", toFriendlyIp(opts.FrontendIP), opts.FrontendPort)
 	if !t.Headless {
-		cctx.Printer.Printlnf("%-8s http://%v:%v", "UI:", toFriendlyIp(opts.UIIP), opts.UIPort)
+		cctx.Printer.Printlnf("%-8s http://%v:%v%v", "UI:", toFriendlyIp(opts.UIIP), opts.UIPort, opts.PublicPath)
 	}
 	cctx.Printer.Printlnf("%-8s http://%v:%v/metrics", "Metrics:", toFriendlyIp(opts.FrontendIP), opts.MetricsPort)
 	<-cctx.Done()

diff --git a/temporalcli/commandsmd/commands.md b/temporalcli/commandsmd/commands.md
@@ -1311,6 +1311,9 @@ temporal server start-dev \
 * `--ui-ip` (string) -
   IP address bound to the WebUI.
   Default is same as '--ip' value.
+* `--ui-public-path` (string) -
+  The public base path for the Web UI.
+  Default is `/`.
 * `--ui-asset-path` (string) -
   UI custom assets path.
 * `--ui-codec-endpoint` (string) -

diff --git a/temporalcli/devserver/server.go b/temporalcli/devserver/server.go
@@ -74,6 +74,7 @@ type StartOptions struct {
 	UIPort                int    // Required if UIIP is non-empty
 	UIAssetPath           string
 	UICodecEndpoint       string
+	PublicPath            string
 	DatabaseFile          string
 	MetricsPort           int
 	PProfPort             int
@@ -156,6 +157,7 @@ func (s *StartOptions) buildUIServer() *uiserver.Server {
 		Port:                s.UIPort,
 		TemporalGRPCAddress: fmt.Sprintf("%v:%v", MaybeEscapeIPv6(s.FrontendIP), s.FrontendPort),
 		EnableUI:            true,
+		PublicPath:          s.PublicPath,
 		UIAssetPath:         s.UIAssetPath,
 		Codec:               uiconfig.Codec{Endpoint: s.UICodecEndpoint},
 		CORS:                uiconfig.CORS{CookieInsecure: true},