Skip to content

Commit

Permalink
Bump server to 1.26.2, enable HTTP by default
Browse files Browse the repository at this point in the history
  • Loading branch information
bergundy committed Dec 23, 2024
1 parent e110570 commit 298569b
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
github.com/temporalio/ui-server/v2 v2.31.2
go.temporal.io/api v1.43.0
go.temporal.io/sdk v1.31.0
go.temporal.io/server v1.26.2-rc.0
go.temporal.io/server v1.26.2
google.golang.org/grpc v1.67.1
google.golang.org/protobuf v1.35.1
gopkg.in/yaml.v3 v3.0.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,8 @@ go.temporal.io/api v1.43.0 h1:lBhq+u5qFJqGMXwWsmg/i8qn1UA/3LCwVc88l2xUMHg=
go.temporal.io/api v1.43.0/go.mod h1:1WwYUMo6lao8yl0371xWUm13paHExN5ATYT/B7QtFis=
go.temporal.io/sdk v1.31.0 h1:CLYiP0R5Sdj0gq8LyYKDDz4ccGOdJPR8wNGJU0JGwj8=
go.temporal.io/sdk v1.31.0/go.mod h1:8U8H7rF9u4Hyb4Ry9yiEls5716DHPNvVITPNkgWUwE8=
go.temporal.io/server v1.26.2-rc.0 h1:jsWR2UzhPQ+UgDfqNHT6h6ZjzGTcw72i9KNkSNS0jN8=
go.temporal.io/server v1.26.2-rc.0/go.mod h1:tgY+4z/PuIdqs6ouV1bT90RWSWfEioWkzmrNrLYLUrk=
go.temporal.io/server v1.26.2 h1:vDW11lxslYPlGDbQklWi/tqbkVZ2ExtRO1jNjvZmUUI=
go.temporal.io/server v1.26.2/go.mod h1:tgY+4z/PuIdqs6ouV1bT90RWSWfEioWkzmrNrLYLUrk=
go.temporal.io/version v0.3.0 h1:dMrei9l9NyHt8nG6EB8vAwDLLTwx2SvRyucCSumAiig=
go.temporal.io/version v0.3.0/go.mod h1:UA9S8/1LaKYae6TyD9NaPMJTZb911JcbqghI2CBSP78=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
Expand Down
2 changes: 1 addition & 1 deletion temporalcli/commands.gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -1830,7 +1830,7 @@ func NewTemporalServerStartDevCommand(cctx *CommandContext, parent *TemporalServ
s.Command.Flags().StringVarP(&s.DbFilename, "db-filename", "f", "", "Path to file for persistent Temporal state store. By default, Workflow Executions are lost when the server process dies.")
s.Command.Flags().StringArrayVarP(&s.Namespace, "namespace", "n", nil, "Namespaces to be created at launch. The \"default\" Namespace is always created automatically.")
s.Command.Flags().IntVarP(&s.Port, "port", "p", 7233, "Port for the front-end gRPC Service.")
s.Command.Flags().IntVar(&s.HttpPort, "http-port", 0, "Port for the HTTP API service. Default is off.")
s.Command.Flags().IntVar(&s.HttpPort, "http-port", 7243, "Port for the HTTP API service.")
s.Command.Flags().IntVar(&s.MetricsPort, "metrics-port", 0, "Port for '/metrics'. Default is off.")
s.Command.Flags().IntVar(&s.UiPort, "ui-port", 0, "Port for the Web UI. Default is '--port' value + 1000.")
s.Command.Flags().BoolVar(&s.Headless, "headless", false, "Disable the Web UI.")
Expand Down
1 change: 1 addition & 0 deletions temporalcli/commands.server.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,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)
cctx.Printer.Printlnf("%-8s %v:%v", "HTTP:", toFriendlyIp(opts.FrontendIP), opts.FrontendHTTPPort)
if !t.Headless {
cctx.Printer.Printlnf("%-8s http://%v:%v%v", "UI:", toFriendlyIp(opts.UIIP), opts.UIPort, opts.PublicPath)
}
Expand Down
7 changes: 3 additions & 4 deletions temporalcli/commandsgen/commands.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1647,9 +1647,8 @@ commands:
default: 7233
- name: http-port
type: int
description: |
Port for the HTTP API service.
Default is off.
description: Port for the HTTP API service.
default: 7243
- name: metrics-port
type: int
description: |
Expand Down Expand Up @@ -3502,4 +3501,4 @@ option-sets:
description: |
An external Nexus Endpoint that receives forwarded Nexus requests.
May be used as an alternative to `--target-namespace` and
`--target-task-queue`.
`--target-task-queue`.
1 change: 0 additions & 1 deletion temporalcli/devserver/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ func (s *StartOptions) buildServerOptions() ([]temporal.ServerOption, error) {
dynConf[dynamicconfig.HistoryCacheHostLevelMaxSize.Key()] = 8096
// Up default visibility RPS
dynConf[dynamicconfig.FrontendMaxNamespaceVisibilityRPSPerInstance.Key()] = 100
// This doesn't enable Nexus but it is required for Nexus to work and simplifies the experience.
// NOTE that the URL scheme is fixed to HTTP since the dev server doesn't support TLS at the time of writing.
dynConf[nexusoperations.CallbackURLTemplate.Key()] = fmt.Sprintf(
"http://%s:%d/namespaces/{{.NamespaceName}}/nexus/callback", MaybeEscapeIPv6(s.FrontendIP), s.FrontendHTTPPort)
Expand Down

0 comments on commit 298569b

Please sign in to comment.