commented non required stuff

rudderlabs · Feb 5, 2024 · 235d8de · 235d8de
1 parent 6f3bbd5
commit 235d8de
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 66 deletions.
diff --git a/internal/cache/cache.go b/internal/cache/cache.go
@@ -1,6 +1,7 @@
 package cache
 
 import (
+	"github.com/rudderlabs/rudder-cp-sdk/modelv2/parser"
 	"sync"
 
 	"github.com/rudderlabs/rudder-cp-sdk/modelv2"
@@ -35,7 +36,9 @@ func (c *WorkspaceConfigCache) Get() *modelv2.WorkspaceConfigs {
 // If a workspace config is nil in input, it will not be updated.
 // Source and destination definitions are merged without removing any missing definitions.
 // It notifies all subscribers of the update.
-func (c *WorkspaceConfigCache) Set(configs *modelv2.WorkspaceConfigs) {
+func (c *WorkspaceConfigCache) Set(data []byte) {
+	configs, _ := parser.Parse(data)
+
 	c.updateLock.Lock()
 	c.merge(configs)
 	c.updateLock.Unlock()

diff --git a/internal/clients/namespace/client.go b/internal/clients/namespace/client.go
@@ -8,8 +8,6 @@ import (
 
 	"github.com/rudderlabs/rudder-cp-sdk/identity"
 	"github.com/rudderlabs/rudder-cp-sdk/internal/clients/base"
-	"github.com/rudderlabs/rudder-cp-sdk/modelv2"
-	"github.com/rudderlabs/rudder-cp-sdk/modelv2/parser"
 )
 
 type Client struct {
@@ -28,7 +26,7 @@ func (c *Client) Get(ctx context.Context, path string) (*http.Request, error) {
 	return req, nil
 }
 
-func (c *Client) GetWorkspaceConfigs(ctx context.Context) (*modelv2.WorkspaceConfigs, error) {
+func (c *Client) GetWorkspaceConfigs(ctx context.Context) ([]byte, error) {
 	req, err := c.Get(ctx, "/data-plane/v2/namespaces/"+c.Identity.Namespace+"/config")
 	if err != nil {
 		return nil, err
@@ -38,15 +36,9 @@ func (c *Client) GetWorkspaceConfigs(ctx context.Context) (*modelv2.WorkspaceCon
 	if err != nil {
 		return nil, err
 	}
-
-	wcs, err := parser.Parse(data)
-	if err != nil {
-		return nil, err
-	}
-
-	return wcs, nil
+	return data, nil
 }
 
-func (c *Client) GetUpdatedWorkspaceConfigs(ctx context.Context, updatedAfter time.Time) (*modelv2.WorkspaceConfigs, error) {
+func (c *Client) GetUpdatedWorkspaceConfigs(ctx context.Context, updatedAfter time.Time) ([]byte, error) {
 	return nil, errors.New("not implemented")
 }
diff --git a/internal/clients/workspace/client.go b/internal/clients/workspace/client.go
@@ -8,8 +8,6 @@ import (
 
 	"github.com/rudderlabs/rudder-cp-sdk/identity"
 	"github.com/rudderlabs/rudder-cp-sdk/internal/clients/base"
-	"github.com/rudderlabs/rudder-cp-sdk/modelv2"
-	"github.com/rudderlabs/rudder-cp-sdk/modelv2/parser"
 )
 
 type Client struct {
@@ -28,7 +26,7 @@ func (c *Client) Get(ctx context.Context, path string) (*http.Request, error) {
 	return req, nil
 }
 
-func (c *Client) GetWorkspaceConfigs(ctx context.Context) (*modelv2.WorkspaceConfigs, error) {
+func (c *Client) GetWorkspaceConfigs(ctx context.Context) ([]byte, error) {
 	req, err := c.Get(ctx, "/data-plane/v2/workspaceConfig")
 	if err != nil {
 		return nil, err
@@ -39,14 +37,9 @@ func (c *Client) GetWorkspaceConfigs(ctx context.Context) (*modelv2.WorkspaceCon
 		return nil, err
 	}
 
-	wcs, err := parser.Parse(data)
-	if err != nil {
-		return nil, err
-	}
-
-	return wcs, nil
+	return data, nil
 }
 
-func (c *Client) GetUpdatedWorkspaceConfigs(ctx context.Context, updatedAfter time.Time) (*modelv2.WorkspaceConfigs, error) {
+func (c *Client) GetUpdatedWorkspaceConfigs(ctx context.Context, updatedAfter time.Time) ([]byte, error) {
 	return nil, errors.New("not implemented")
 }
diff --git a/internal/poller/mocks/poller.go b/internal/poller/mocks/poller.go
diff --git a/internal/poller/poller.go b/internal/poller/poller.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/rudderlabs/rudder-cp-sdk/modelv2"
 	"github.com/rudderlabs/rudder-go-kit/logger"
 )
 
@@ -19,11 +18,11 @@ type Poller struct {
 	log       logger.Logger
 }
 
-type WorkspaceConfigHandler func(*modelv2.WorkspaceConfigs) error
+type WorkspaceConfigHandler func([]byte) error
 
 type Client interface {
-	GetWorkspaceConfigs(ctx context.Context) (*modelv2.WorkspaceConfigs, error)
-	GetUpdatedWorkspaceConfigs(ctx context.Context, updatedAt time.Time) (*modelv2.WorkspaceConfigs, error)
+	GetWorkspaceConfigs(ctx context.Context) ([]byte, error)
+	GetUpdatedWorkspaceConfigs(ctx context.Context, updatedAt time.Time) ([]byte, error)
 }
 
 func New(handler WorkspaceConfigHandler, opts ...Option) (*Poller, error) {
@@ -66,7 +65,7 @@ func (p *Poller) Start(ctx context.Context) {
 }
 
 func (p *Poller) poll(ctx context.Context) error {
-	var response *modelv2.WorkspaceConfigs
+	var response []byte
 	if p.updatedAt.IsZero() {
 		p.log.Debug("polling for workspace configs")
 		wcs, err := p.client.GetWorkspaceConfigs(ctx)

diff --git a/modelv2/sources.go b/modelv2/sources.go
@@ -1,16 +1,16 @@
 package modelv2
 
 type Source struct {
-	Name     string `json:"name"`
-	WriteKey string `json:"writeKey"`
-	Enabled  bool   `json:"enabled"`
-	//Deleted            bool                  `json:"deleted"`
-	//Config             any                   `json:"config"`
-	//Transient          bool                  `json:"transient"`
-	DefinitionName string `json:"sourceDefinitionName"`
-	//SecretVersion      int                   `json:"secretVersion"`
-	//AccountID          string                `json:"accountId"`
-	//TrackingPlanConfig *DGSourceTrackingPlan `json:"dgSourceTrackingPlanConfig"`
+	Name               string                `json:"name"`
+	WriteKey           string                `json:"writeKey"`
+	Enabled            bool                  `json:"enabled"`
+	Deleted            bool                  `json:"deleted"`
+	Config             any                   `json:"config"`
+	Transient          bool                  `json:"transient"`
+	DefinitionName     string                `json:"sourceDefinitionName"`
+	SecretVersion      int                   `json:"secretVersion"`
+	AccountID          string                `json:"accountId"`
+	TrackingPlanConfig *DGSourceTrackingPlan `json:"dgSourceTrackingPlanConfig"`
 	// TODO: consider adding the following fields
 	// CreatedBy string `json:"createdBy"`
 	// CreatedAt time.Time `json:"createdAt"`

diff --git a/modelv2/workspaceconfigs.go b/modelv2/workspaceconfigs.go
@@ -13,20 +13,20 @@ type WorkspaceConfigs struct {
 }
 
 type WorkspaceConfig struct {
-	//Settings *Settings `json:"settings"`
-	Sources map[string]*Source `json:"sources"`
-	//Destinations                     map[string]*Destination            `json:"destinations"`
-	//Connections                      map[string]*Connection             `json:"connections"`
-	//Libraries                        []*Library                         `json:"libraries"`
-	//WHTProjects                      map[string]*WHTProject             `json:"whtProjects"`
-	//Accounts                         map[string]*Account                `json:"accounts"`
-	//Transformations                  map[string]*Transformation         `json:"transformations"`
-	//TrackingPlans                    map[string]*TrackingPlan           `json:"trackingPlans"`
-	//Resources                        map[string]*Resource               `json:"resources"`
-	//AudienceSources                  []*AudienceSource                  `json:"audienceSources"`
-	//SQLModelVersions                 map[string]*SQLModelVersion        `json:"sqlModelVersions"`
-	//SQLModelVersionSourceConnections []*SQLModelVersionSourceConnection `json:"sqlModelVersionSourceConnections"`
-	UpdatedAt time.Time `json:"updatedAt"`
+	Settings                         *Settings                          `json:"settings"`
+	Sources                          map[string]*Source                 `json:"sources"`
+	Destinations                     map[string]*Destination            `json:"destinations"`
+	Connections                      map[string]*Connection             `json:"connections"`
+	Libraries                        []*Library                         `json:"libraries"`
+	WHTProjects                      map[string]*WHTProject             `json:"whtProjects"`
+	Accounts                         map[string]*Account                `json:"accounts"`
+	Transformations                  map[string]*Transformation         `json:"transformations"`
+	TrackingPlans                    map[string]*TrackingPlan           `json:"trackingPlans"`
+	Resources                        map[string]*Resource               `json:"resources"`
+	AudienceSources                  []*AudienceSource                  `json:"audienceSources"`
+	SQLModelVersions                 map[string]*SQLModelVersion        `json:"sqlModelVersions"`
+	SQLModelVersionSourceConnections []*SQLModelVersionSourceConnection `json:"sqlModelVersionSourceConnections"`
+	UpdatedAt                        time.Time                          `json:"updatedAt"`
 }
 
 // UpdatedAt returns the maximum UpdatedAt value of all included workspace configs.

diff --git a/sdk.go b/sdk.go
@@ -14,7 +14,6 @@ import (
 	"github.com/rudderlabs/rudder-cp-sdk/internal/clients/namespace"
 	"github.com/rudderlabs/rudder-cp-sdk/internal/clients/workspace"
 	"github.com/rudderlabs/rudder-cp-sdk/internal/poller"
-	"github.com/rudderlabs/rudder-cp-sdk/modelv2"
 	"github.com/rudderlabs/rudder-cp-sdk/notifications"
 	"github.com/rudderlabs/rudder-go-kit/logger"
 )
@@ -42,8 +41,8 @@ type ControlPlane struct {
 }
 
 type Client interface {
-	GetWorkspaceConfigs(ctx context.Context) (*modelv2.WorkspaceConfigs, error)
-	GetUpdatedWorkspaceConfigs(ctx context.Context, updatedAfter time.Time) (*modelv2.WorkspaceConfigs, error)
+	GetWorkspaceConfigs(ctx context.Context) ([]byte, error)
+	GetUpdatedWorkspaceConfigs(ctx context.Context, updatedAfter time.Time) ([]byte, error)
 }
 
 type RequestDoer interface {
@@ -115,7 +114,7 @@ func (cp *ControlPlane) setupPoller() error {
 		return nil
 	}
 
-	handle := func(wc *modelv2.WorkspaceConfigs) error {
+	handle := func(wc []byte) error {
 		cp.configsCache.Set(wc)
 		return nil
 	}
@@ -146,12 +145,8 @@ func (cp *ControlPlane) Close() {
 // GetWorkspaceConfigs returns the latest workspace configs.
 // If polling is enabled, this will return the cached configs, if they have been retrieved at least once.
 // Otherwise, it will make a request to the control plane to get the latest configs.
-func (cp *ControlPlane) GetWorkspaceConfigs() (*modelv2.WorkspaceConfigs, error) {
-	if cp.poller != nil {
-		return cp.configsCache.Get(), nil
-	} else {
-		return cp.Client.GetWorkspaceConfigs(context.Background())
-	}
+func (cp *ControlPlane) GetWorkspaceConfigs() ([]byte, error) {
+	return cp.Client.GetWorkspaceConfigs(context.Background())
 }
 
 type Subscriber interface {