Make UUID generation a responsibility of StreamingClientFactory

Signed-off-by: Michael Stergianis <[email protected]>
vmware-archive · Jun 16, 2021 · 4834ebc · 4834ebc
1 parent 863a7a5
commit 4834ebc
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 28 deletions.
diff --git a/pkg/api/fake/mock_client_factory.go b/pkg/api/fake/mock_client_factory.go
diff --git a/pkg/api/streaming.go b/pkg/api/streaming.go
@@ -8,8 +8,6 @@ import (
  "context"
  "net/http"
 
- "github.com/google/uuid"
-
  "github.com/vmware-tanzu/octant/internal/config"
  "github.com/vmware-tanzu/octant/internal/octant"
  "github.com/vmware-tanzu/octant/pkg/action"
@@ -57,6 +55,6 @@ type StreamingClient interface {
 }
 
 type StreamingClientFactory interface {
- NewConnection(uuid.UUID, http.ResponseWriter, *http.Request, ClientManager, config.Dash) (StreamingClient, context.CancelFunc, error)
- NewTemporaryConnection(uuid.UUID, http.ResponseWriter, *http.Request, ClientManager) (StreamingClient, context.CancelFunc, error)
+ NewConnection(http.ResponseWriter, *http.Request, ClientManager, config.Dash) (StreamingClient, context.CancelFunc, error)
+ NewTemporaryConnection(http.ResponseWriter, *http.Request, ClientManager) (StreamingClient, context.CancelFunc, error)
 }
diff --git a/pkg/api/streaming_connection_manager.go b/pkg/api/streaming_connection_manager.go
@@ -8,8 +8,6 @@ import (
  "context"
  "net/http"
 
- "github.com/google/uuid"
-
  "github.com/vmware-tanzu/octant/internal/config"
  "github.com/vmware-tanzu/octant/pkg/event"
 )
@@ -87,12 +85,8 @@ func (m *StreamingConnectionManager) Run(ctx context.Context) {
 
 // ClientFromRequest creates a websocket client from a http request.
 func (m *StreamingConnectionManager) ClientFromRequest(dashConfig config.Dash, w http.ResponseWriter, r *http.Request) (StreamingClient, error) {
- clientID, err := uuid.NewUUID()
- if err != nil {
- return nil, err
- }
 
- client, cancel, err := m.clientFactory.NewConnection(clientID, w, r, m, dashConfig)
+ client, cancel, err := m.clientFactory.NewConnection(w, r, m, dashConfig)
  if err != nil {
  return nil, err
  }
@@ -108,12 +102,7 @@ func (m *StreamingConnectionManager) ClientFromRequest(dashConfig config.Dash, w
 }
 
 func (m *StreamingConnectionManager) TemporaryClientFromLoadingRequest(w http.ResponseWriter, r *http.Request) (StreamingClient, error) {
- clientID, err := uuid.NewUUID()
- if err != nil {
- return nil, err
- }
-
- client, cancel, err := m.clientFactory.NewTemporaryConnection(clientID, w, r, m)
+ client, cancel, err := m.clientFactory.NewTemporaryConnection(w, r, m)
  if err != nil {
  return nil, err
  }

diff --git a/pkg/api/websockets/websocket_connection_factory.go b/pkg/api/websockets/websocket_connection_factory.go
@@ -37,8 +37,13 @@ func NewWebsocketConnectionFactory() *WebsocketConnectionFactory {
 var _ api.StreamingClientFactory = (*WebsocketConnectionFactory)(nil)
 
 func (wcf *WebsocketConnectionFactory) NewConnection(
- clientID uuid.UUID, w http.ResponseWriter, r *http.Request, m api.ClientManager, dashConfig config.Dash,
+ w http.ResponseWriter, r *http.Request, m api.ClientManager, dashConfig config.Dash,
 ) (api.StreamingClient, context.CancelFunc, error) {
+ clientID, err := uuid.NewUUID()
+ if err != nil {
+ return nil, nil, err
+ }
+
  conn, err := wcf.upgrader.Upgrade(w, r, nil)
  if err != nil {
  return nil, nil, err
@@ -54,8 +59,13 @@ func (wcf *WebsocketConnectionFactory) NewConnection(
 }
 
 func (wcf *WebsocketConnectionFactory) NewTemporaryConnection(
- clientID uuid.UUID, w http.ResponseWriter, r *http.Request, m api.ClientManager,
+ w http.ResponseWriter, r *http.Request, m api.ClientManager,
 ) (api.StreamingClient, context.CancelFunc, error) {
+ clientID, err := uuid.NewUUID()
+ if err != nil {
+ return nil, nil, err
+ }
+
  conn, err := wcf.upgrader.Upgrade(w, r, nil)
  if err != nil {
  return nil, nil, err