Resolve merge conflicts: integrate AI extension with database drivers

- Merged AI extension functionality from HEAD branch
- Integrated Cassandra driver support from origin/master
- Regenerated protobuf files to resolve conflicts
- Combined storeExtensions with new AI parameters and database drivers

Author: KariHall619

.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

.gitignore

@@ -21,4 +21,11 @@ console/atest-desktop/atest.exe
 console/atest-desktop/coverage
 atest-store-git
 .db
-.marscode/
+.marscode/
+e2e/test.pem
+e2e/test.csr
+e2e/test.key
+e2e/server.srl
+e2e/server.key
+e2e/server.csr
+e2e/server.crt

cmd/function.go

@@ -18,6 +18,7 @@ package cmd
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"go/ast"
 	"go/doc"
@@ -44,14 +45,27 @@ func createFunctionCmd() (c *cobra.Command) {
 	}
 	flags := c.Flags()
 	flags.StringVarP(&opt.feature, "feature", "", "", "The feature query")
+	flags.StringVarP(&opt.extensionFile, "extension-file", "", "", "The extension file")
 	return
 }
 
 type funcPrinterOption struct {
-	feature string
+	feature       string
+	extensionFile string
 }
 
 func (o *funcPrinterOption) runE(cmd *cobra.Command, args []string) (err error) {
+	if o.extensionFile != "" {
+		var tpl *render.UserDefinedTemplates
+		if tpl, err = render.ParseUserDefinedTemplatesFromFile(o.extensionFile); err != nil {
+			return
+		}
+
+		if err = errors.Join(err, tpl.Validate(), tpl.ConflictWith(render.FuncMap())); err != nil {
+			return
+		}
+	}
+
 	if len(args) > 0 {
 		name := args[0]
 		filterAndPrint(cmd, name)

cmd/function_test.go

@@ -29,6 +29,7 @@ func TestCreateFunctionCommand(t *testing.T) {
 	tests := []struct {
 		name   string
 		args   []string
+		hasErr bool
 		verify func(t *testing.T, output string)
 	}{{
 		name: "normal",
@@ -61,6 +62,13 @@ func TestCreateFunctionCommand(t *testing.T) {
 			assert.Equal(t, `{{generateJSONString "name"}}
 `, output)
 		},
+	}, {
+		name:   "verify template functions with error",
+		args:   []string{"func", "--extension-file", "testdata/function-with-conflicts.yaml"},
+		hasErr: true,
+		verify: func(t *testing.T, output string) {
+			assert.Contains(t, output, "conflict with existing function")
+		},
 	}}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -69,10 +77,15 @@ func TestCreateFunctionCommand(t *testing.T) {
 
 			buf := new(bytes.Buffer)
 			c.SetOut(buf)
+			c.SetErr(buf)
 			c.SetArgs(tt.args)
 
 			err := c.Execute()
-			assert.NoError(t, err)
+			if tt.hasErr {
+				assert.Error(t, err)
+			} else {
+				assert.NoError(t, err)
+			}
 
 			if tt.verify != nil {
 				tt.verify(t, buf.String())

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()
 	}

cmd/server.go

@@ -109,8 +109,8 @@ func createServerCmd(execer fakeruntime.Execer, httpServer server.HTTPServer) (c
 
 	// gc related flags
 	flags.IntVarP(&opt.gcPercent, "gc-percent", "", 100, "The GC percent of Go")
-	//grpc_tls
-	flags.BoolVarP(&opt.tls, "tls-grpc", "", false, "Enable TLS mode. Set to true to enable TLS. Alow SAN certificates")
+
+	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")
 
@@ -124,8 +124,12 @@ type serverOption struct {
 	httpServer server.HTTPServer
 	execer     fakeruntime.Execer
 
-	port              int
-	httpPort          int
+	port     int
+	httpPort int
+	tls      bool
+	tlsCert  string
+	tlsKey   string
+
 	printProto        bool
 	localStorage      []string
 	consolePath       string
@@ -148,17 +152,12 @@ type serverOption struct {
 	mockConfig []string
 	mockPrefix string
 
-	gcPercent int
-
-	dryRun bool
-
+	gcPercent          int
+	dryRun             bool
 	grpcMaxRecvMsgSize int
 
 	// inner fields, not as command flags
 	provider oauth.OAuthProvider
-	tls      bool
-	tlsCert  string
-	tlsKey   string
 }
 
 func (o *serverOption) preRunE(cmd *cobra.Command, args []string) (err error) {
@@ -190,15 +189,20 @@ func (o *serverOption) preRunE(cmd *cobra.Command, args []string) (err error) {
 
 		grpcOpts = append(grpcOpts, atestoauth.NewAuthInterceptor(o.oauthGroup))
 	}
+
 	if o.tls {
 		if o.tlsCert != "" && o.tlsKey != "" {
 			creds, err := credentials.NewServerTLSFromFile(o.tlsCert, o.tlsKey)
 			if err != nil {
 				return fmt.Errorf("failed to load credentials: %v", err)
 			}
 			grpcOpts = append(grpcOpts, grpc.Creds(creds))
+		} else {
+			err = fmt.Errorf("both --cert-file and --key-file flags are required when --tls is enabled")
+			return
 		}
 	}
+
 	if o.dryRun {
 		o.gRPCServer = &fakeGRPCServer{}
 	} else {
@@ -260,13 +264,12 @@ func (o *serverOption) runE(cmd *cobra.Command, args []string) (err error) {
 	storeExtMgr := server.NewStoreExtManager(o.execer)
 	storeExtMgr.WithDownloader(extDownloader)
 	remoteServer := server.NewRemoteServer(loader, remote.NewGRPCloaderFromStore(), secretServer, storeExtMgr, o.configDir, o.grpcMaxRecvMsgSize)
-	kinds, storeKindsErr := remoteServer.GetStoreKinds(ctx, nil)
-	if storeKindsErr != nil {
-		cmd.PrintErrf("failed to get store kinds, error: %v\n", storeKindsErr)
-	} else {
-		if runPluginErr := startPlugins(storeExtMgr, kinds); runPluginErr != nil {
+	if stores, storeErr := remoteServer.GetStores(ctx, nil); storeErr == nil {
+		if runPluginErr := startPlugins(storeExtMgr, stores); runPluginErr != nil {
 			cmd.PrintErrf("error occurred during starting plugins, error: %v\n", runPluginErr)
 		}
+	} else {
+		cmd.PrintErrf("error occurred during getting stores, error: %v\n", storeErr)
 	}
 
 	// create mock server controller
@@ -278,7 +281,7 @@ func (o *serverOption) runE(cmd *cobra.Command, args []string) (err error) {
 		mockWriter = mock.NewInMemoryReader("")
 	}
 
-	dynamicMockServer := mock.NewInMemoryServer(cmd.Context(), 0)
+	dynamicMockServer := mock.NewInMemoryServer(cmd.Context(), 0).WithTLS(o.tlsCert, o.tlsKey)
 	mockServerController := server.NewMockServerController(mockWriter, dynamicMockServer, o.httpPort)
 
 	clean := make(chan os.Signal, 1)
@@ -293,6 +296,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)
 	}()
@@ -330,23 +334,30 @@ func (o *serverOption) runE(cmd *cobra.Command, args []string) (err error) {
 	gRPCServerAddr := fmt.Sprintf("127.0.0.1:%s", gRPCServerPort)
 
 	if o.tls {
-		creds, err := credentials.NewClientTLSFromFile(o.tlsCert, "localhost")
+		var creds credentials.TransportCredentials
+		creds, err = credentials.NewClientTLSFromFile(o.tlsCert, "127.0.0.1")
 		if err != nil {
 			return fmt.Errorf("failed to load credentials: %v", err)
 		}
+
+		opts := []grpc.DialOption{grpc.WithTransportCredentials(creds)}
 		err = errors.Join(
-			server.RegisterRunnerHandlerFromEndpoint(ctx, mux, gRPCServerAddr, []grpc.DialOption{grpc.WithTransportCredentials(creds)}),
-			server.RegisterMockHandlerFromEndpoint(ctx, mux, gRPCServerAddr, []grpc.DialOption{grpc.WithTransportCredentials(creds)}),
-			server.RegisterThemeExtensionHandlerFromEndpoint(ctx, mux, gRPCServerAddr, []grpc.DialOption{grpc.WithTransportCredentials(creds)}),
-			server.RegisterDataServerHandlerFromEndpoint(ctx, mux, gRPCServerAddr, []grpc.DialOption{grpc.WithTransportCredentials(creds)}))
+			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.RegisterUIExtensionHandlerFromEndpoint(ctx, mux, gRPCServerAddr, opts),
+		)
 	} else {
 		dialOption := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials()),
 			grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(math.MaxInt))}
 		err = errors.Join(
 			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 {
@@ -426,13 +437,14 @@ func postRequestProxy(proxy string) func(w http.ResponseWriter, r *http.Request,
 	}
 }
 
-func startPlugins(storeExtMgr server.ExtManager, kinds *server.StoreKinds) (err error) {
-	const socketPrefix = "unix://"
-
-	for _, kind := range kinds.Data {
-		if kind.Enabled && (strings.HasPrefix(kind.Url, socketPrefix) || strings.Contains(kind.Url, ":")) {
-			err = errors.Join(err, storeExtMgr.Start(kind.Name, kind.Url))
+func startPlugins(storeExtMgr server.ExtManager, stores *server.Stores) (err error) {
+	for _, store := range stores.Data {
+		if store.Disabled || store.Kind == nil {
+			continue
 		}
+
+		kind := store.Kind
+		err = errors.Join(err, storeExtMgr.Start(kind.Name, kind.Url))
 	}
 	return
 }

cmd/testdata/function-with-conflicts.yaml

@@ -0,0 +1,4 @@
+items:
+  - name: randEnum
+    render: |
+      {{ randInt 18 60 }}