From 4a451c74f99c5ab252756c42a8d490569888cf5c Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Tue, 4 Feb 2025 14:26:23 +1100 Subject: [PATCH] fix: Admin service endpoint (#4285) --- cmd/ftl-admin/main.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/ftl-admin/main.go b/cmd/ftl-admin/main.go index c01f737fe..ce16efe33 100644 --- a/cmd/ftl-admin/main.go +++ b/cmd/ftl-admin/main.go @@ -24,13 +24,13 @@ import ( ) var cli struct { - Version kong.VersionFlag `help:"Show version."` - ObservabilityConfig observability.Config `embed:"" prefix:"o11y-"` - LogConfig log.Config `embed:"" prefix:"log-"` - AdminConfig admin.Config `embed:"" prefix:"admin-"` - SchemaServerEndpoint *url.URL `name:"ftl-endpoint" help:"Controller endpoint." env:"FTL_ENDPOINT" default:"http://127.0.0.1:8892"` - Config string `help:"Path to FTL configuration file." env:"FTL_CONFIG" required:""` - Secrets string `help:"Path to FTL secrets file." env:"FTL_SECRETS" required:""` + Version kong.VersionFlag `help:"Show version."` + ObservabilityConfig observability.Config `embed:"" prefix:"o11y-"` + LogConfig log.Config `embed:"" prefix:"log-"` + AdminConfig admin.Config `embed:"" prefix:"admin-"` + SchemaEndpoint *url.URL `help:"Schema endpoint." env:"FTL_SCHEMA_ENDPOINT" default:"http://127.0.0.1:8897"` + Config string `help:"Path to FTL configuration file." env:"FTL_CONFIG" required:""` + Secrets string `help:"Path to FTL secrets file." env:"FTL_SECRETS" required:""` } func main() { @@ -58,7 +58,7 @@ func main() { sm, err := manager.New[cf.Secrets](ctx, dbSecretResolver, asmSecretProvider) kctx.FatalIfErrorf(err) - schemaClient := rpc.Dial(ftlv1connect.NewSchemaServiceClient, cli.SchemaServerEndpoint.String(), log.Error) + schemaClient := rpc.Dial(ftlv1connect.NewSchemaServiceClient, cli.SchemaEndpoint.String(), log.Error) eventSource := schemaeventsource.New(ctx, schemaClient) err = admin.Start(ctx, cli.AdminConfig, cm, sm, admin.NewSchemaRetreiver(eventSource))