diff --git a/.editorconfig b/.editorconfig index 1918605e..d72ff1b6 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,9 +7,13 @@ root = true [*] end_of_line = lf insert_final_newline = true +trim_trailing_whitespace = true charset = utf-8 # 4 space indentation -[*.{py,proto,go,js,ts,json,vue}] +[*.{py,proto,js,ts,json,vue}] indent_style = space indent_size = 4 + +[*.go] +indent_style = tab diff --git a/cmd/mock.go b/cmd/mock.go index e25798c9..387cdaac 100644 --- a/cmd/mock.go +++ b/cmd/mock.go @@ -31,6 +31,9 @@ type mockOption struct { port int prefix string metrics bool + tls bool + tlsCert string + tlsKey string } func createMockCmd() (c *cobra.Command) { @@ -47,12 +50,18 @@ func createMockCmd() (c *cobra.Command) { flags.IntVarP(&opt.port, "port", "", 6060, "The mock server port") flags.StringVarP(&opt.prefix, "prefix", "", "/mock", "The mock server API prefix") flags.BoolVarP(&opt.metrics, "metrics", "m", true, "Enable request metrics collection") + flags.BoolVarP(&opt.tls, "tls", "", false, "Enable TLS mode. Set to true to enable TLS. Alow SAN certificates") + flags.StringVarP(&opt.tlsCert, "cert-file", "", "", "The path to the certificate file, Alow SAN certificates") + flags.StringVarP(&opt.tlsKey, "key-file", "", "", "The path to the key file, Alow SAN certificates") return } func (o *mockOption) runE(c *cobra.Command, args []string) (err error) { reader := mock.NewLocalFileReader(args[0]) server := mock.NewInMemoryServer(c.Context(), o.port) + if o.tls { + server.WithTLS(o.tlsCert, o.tlsKey) + } if o.metrics { server.EnableMetrics() } diff --git a/cmd/server.go b/cmd/server.go index 44e6f382..34bee5db 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -297,6 +297,7 @@ func (o *serverOption) runE(cmd *cobra.Command, args []string) (err error) { server.RegisterMockServer(s, mockServerController) server.RegisterDataServerServer(s, remoteServer.(server.DataServerServer)) server.RegisterThemeExtensionServer(s, remoteServer.(server.ThemeExtensionServer)) + server.RegisterUIExtensionServer(s, remoteServer.(server.UIExtensionServer)) serverLogger.Info("gRPC server listening at", "addr", lis.Addr()) s.Serve(lis) }() @@ -345,7 +346,9 @@ func (o *serverOption) runE(cmd *cobra.Command, args []string) (err error) { server.RegisterRunnerHandlerFromEndpoint(ctx, mux, gRPCServerAddr, opts), server.RegisterMockHandlerFromEndpoint(ctx, mux, gRPCServerAddr, opts), server.RegisterThemeExtensionHandlerFromEndpoint(ctx, mux, gRPCServerAddr, opts), - server.RegisterDataServerHandlerFromEndpoint(ctx, mux, gRPCServerAddr, opts)) + server.RegisterDataServerHandlerFromEndpoint(ctx, mux, gRPCServerAddr, opts), + server.RegisterUIExtensionHandlerFromEndpoint(ctx, mux, gRPCServerAddr, opts), + ) } else { dialOption := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(math.MaxInt))} @@ -353,7 +356,9 @@ func (o *serverOption) runE(cmd *cobra.Command, args []string) (err error) { server.RegisterRunnerHandlerFromEndpoint(ctx, mux, gRPCServerAddr, dialOption), server.RegisterMockHandlerFromEndpoint(ctx, mux, gRPCServerAddr, dialOption), server.RegisterThemeExtensionHandlerFromEndpoint(ctx, mux, gRPCServerAddr, dialOption), - server.RegisterDataServerHandlerFromEndpoint(ctx, mux, gRPCServerAddr, dialOption)) + server.RegisterDataServerHandlerFromEndpoint(ctx, mux, gRPCServerAddr, dialOption), + server.RegisterUIExtensionHandlerFromEndpoint(ctx, mux, gRPCServerAddr, dialOption), + ) } if err == nil { diff --git a/console/atest-ui/src/App.vue b/console/atest-ui/src/App.vue index 7519c3a0..1652dbf9 100644 --- a/console/atest-ui/src/App.vue +++ b/console/atest-ui/src/App.vue @@ -1,6 +1,5 @@