Merge branch 'main' into log-ctx

Signed-off-by: Nicko Guyer <[email protected]>
hyperledger · Feb 29, 2024 · 901bd3a · 901bd3a
2 parents bec7b66 + 04b5589
commit 901bd3a
Show file tree

Hide file tree

Showing 38 changed files with 1,472 additions and 812 deletions.
diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ endef
 $(eval $(call makemock, $$(DBMIGRATE_PATH),        Driver,             dbmigratemocks))
 $(eval $(call makemock, pkg/httpserver,            GoHTTPServer,       httpservermocks))
 $(eval $(call makemock, pkg/auth,                  Plugin,             authmocks))
-$(eval $(call makemock, pkg/wsserver,              WebSocketChannels,  wsservermocks))
+$(eval $(call makemock, pkg/wsserver,              Protocol,           wsservermocks))
 $(eval $(call makemock, pkg/wsserver,              WebSocketServer,    wsservermocks))
 $(eval $(call makemock, pkg/dbsql,                 CRUD,               crudmocks))
 

diff --git a/examples/ffpubsub.go b/examples/ffpubsub.go
@@ -128,6 +128,8 @@ func setup(ctx context.Context) (pubSubESManager, *inMemoryStream, func()) {
 	// Use SQLite in-memory DB
 	conf := config.RootSection("ffpubsub")
 	eventstreams.InitConfig(conf)
+	wsConf := conf.SubSection("ws")
+	wsserver.InitConfig(wsConf)
 	dbConf := conf.SubSection("sqlite")
 	dbsql.InitSQLiteConfig(dbConf)
 	dbConf.Set(dbsql.SQLConfMigrationsAuto, true)
@@ -139,7 +141,7 @@ func setup(ctx context.Context) (pubSubESManager, *inMemoryStream, func()) {
 	sql, err := dbsql.NewSQLiteProvider(ctx, dbConf)
 	assertNoError(err)
 
-	wsServer := wsserver.NewWebSocketServer(ctx)
+	wsServer := wsserver.NewWebSocketServer(ctx, wsserver.GenerateConfig(wsConf))
 	server := httptest.NewServer(http.HandlerFunc(wsServer.Handler))
 	u, err := url.Parse(server.URL)
 	assertNoError(err)

diff --git a/mocks/authmocks/plugin.go b/mocks/authmocks/plugin.go
diff --git a/mocks/crudmocks/crud.go b/mocks/crudmocks/crud.go
diff --git a/mocks/dbmigratemocks/driver.go b/mocks/dbmigratemocks/driver.go
diff --git a/mocks/httpservermocks/go_http_server.go b/mocks/httpservermocks/go_http_server.go
diff --git a/mocks/wsservermocks/protocol.go b/mocks/wsservermocks/protocol.go
diff --git a/mocks/wsservermocks/web_socket_channels.go b/mocks/wsservermocks/web_socket_channels.go
diff --git a/mocks/wsservermocks/web_socket_server.go b/mocks/wsservermocks/web_socket_server.go
diff --git a/pkg/dbsql/crud.go b/pkg/dbsql/crud.go
@@ -1,4 +1,4 @@
-// Copyright © 2023 Kaleido, Inc.
+// Copyright © 2024 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -117,6 +117,7 @@ type CRUD[T Resource] interface {
 	NewFilterBuilder(ctx context.Context) ffapi.FilterBuilder
 	NewUpdateBuilder(ctx context.Context) ffapi.UpdateBuilder
 	GetQueryFactory() ffapi.QueryFactory
+	TableAlias() string
 	Scoped(scope sq.Eq) CRUD[T] // allows dynamic scoping to a collection
 }
 
@@ -151,6 +152,13 @@ func (c *CrudBase[T]) Scoped(scope sq.Eq) CRUD[T] {
 	return &cScoped
 }
 
+func (c *CrudBase[T]) TableAlias() string {
+	if c.ReadTableAlias != "" {
+		return c.ReadTableAlias
+	}
+	return c.Table
+}
+
 func (c *CrudBase[T]) GetQueryFactory() ffapi.QueryFactory {
 	return c.QueryFactory
 }

diff --git a/pkg/dbsql/crud_test.go b/pkg/dbsql/crud_test.go
@@ -656,7 +656,9 @@ func TestLeftJOINExample(t *testing.T) {
 	ctx := context.Background()
 
 	crudables := newCRUDCollection(sql.db, "ns1")
+	assert.Equal(t, "crudables", crudables.TableAlias())
 	linkables := newLinkableCollection(sql.db, "ns1")
+	assert.Equal(t, "l", linkables.TableAlias())
 
 	c1 := &TestCRUDable{
 		ResourceBase: ResourceBase{