Skip to content

ROX-13502: Remove the circular dependency between cluster datastore init and cscc notifier init #3790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clickboo merged 1 commit into from
Nov 11, 2022
Merged

ROX-13502: Remove the circular dependency between cluster datastore init and cscc notifier init #3790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions central/notifiers/cscc/cscc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var (

func init() {
notifiers.Add("cscc", func(notifier *storage.Notifier) (notifiers.Notifier, error) {
j, err := newCSCC(notifier, clusterDatastore.Singleton())
j, err := newCSCC(notifier)
return j, err
})
}
Expand All @@ -42,9 +42,8 @@ type cscc struct {
// The Service Account is a Google JSON service account key.
// The GCP Organization ID is a numeric identifier for the Google Cloud Platform
// organization. It is required so that we can tag findings to the right org.
client client.Config
config *config
clusterStore clusterDatastore.DataStore
client client.Config
config *config
*storage.Notifier
}

Expand Down Expand Up @@ -131,8 +130,9 @@ func processUUID(u string) string {
return strings.Replace(u, "-", "", -1)
}

func (c *cscc) getCluster(id string) (*storage.Cluster, error) {
cluster, exists, err := c.clusterStore.GetCluster(clusterForAlertContext, id)
func (c *cscc) getCluster(id string, clusterDatastore clusterDatastore.DataStore) (*storage.Cluster, error) {

cluster, exists, err := clusterDatastore.GetCluster(clusterForAlertContext, id)
if err != nil {
return nil, err
}
Expand All @@ -159,7 +159,7 @@ func (c *cscc) Close(ctx context.Context) error {
// AlertNotify takes in an alert and generates the notification
func (c *cscc) AlertNotify(ctx context.Context, alert *storage.Alert) error {

findingID, finding, err := c.initFinding(ctx, alert)
findingID, finding, err := c.initFinding(ctx, alert, clusterDatastore.Singleton())

if err != nil {
return err
Expand All @@ -179,7 +179,7 @@ func (c *cscc) AlertNotify(ctx context.Context, alert *storage.Alert) error {
}

// initFinding takes in an alert and generates the notification
func (c *cscc) initFinding(ctx context.Context, alert *storage.Alert) (string, *findings.Finding, error) {
func (c *cscc) initFinding(ctx context.Context, alert *storage.Alert, clusterDatastore clusterDatastore.DataStore) (string, *findings.Finding, error) {
if alert.GetImage() != nil {
return "", nil, errors.New("CSCC integration can only handle alerts for deployments and resources")
}
Expand All @@ -189,7 +189,7 @@ func (c *cscc) initFinding(ctx context.Context, alert *storage.Alert) (string, *

findingID := processUUID(alert.GetId())

cluster, err := c.getCluster(alert.GetDeployment().GetClusterId())
cluster, err := c.getCluster(alert.GetDeployment().GetClusterId(), clusterDatastore)
if err != nil {
return "", nil, err
}
Expand Down Expand Up @@ -243,7 +243,7 @@ func (c *cscc) initFinding(ctx context.Context, alert *storage.Alert) (string, *

}

func newCSCC(protoNotifier *storage.Notifier, clusterStore clusterDatastore.DataStore) (*cscc, error) {
func newCSCC(protoNotifier *storage.Notifier) (*cscc, error) {
csccConfig, ok := protoNotifier.GetConfig().(*storage.Notifier_Cscc)
if !ok {
return nil, errors.New("Cloud SCC config is required")
Expand All @@ -257,19 +257,18 @@ func newCSCC(protoNotifier *storage.Notifier, clusterStore clusterDatastore.Data
if err := cfg.validate(); err != nil {
return nil, err
}
return newWithConfig(protoNotifier, cfg, clusterStore), nil
return newWithConfig(protoNotifier, cfg), nil
}

func newWithConfig(protoNotifier *storage.Notifier, cfg *config, clusterStore clusterDatastore.DataStore) *cscc {
func newWithConfig(protoNotifier *storage.Notifier, cfg *config) *cscc {
return &cscc{
Notifier: protoNotifier,
client: client.Config{
ServiceAccount: []byte(cfg.ServiceAccount),
SourceID: cfg.SourceID,
Logger: log,
},
config: cfg,
clusterStore: clusterStore,
config: cfg,
}
}

Expand Down
4 changes: 2 additions & 2 deletions central/notifiers/cscc/cscc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func TestWithFakeCSCC(t *testing.T) {
mockCtrl := gomock.NewController(t)
clusterStore := clusterMocks.NewMockDataStore(mockCtrl)
clusterStore.EXPECT().GetCluster(gomock.Any(), "test_id").Return(cluster, true, nil)
scc, _ := newCSCC(s, clusterStore)
scc, _ := newCSCC(s)

alertID := "myAlertID"
severity := findings.High
Expand All @@ -76,7 +76,7 @@ func TestWithFakeCSCC(t *testing.T) {
findingID := ""
var finding *findings.Finding
var err error
findingID, finding, err = scc.initFinding(context.Background(), testAlert)
findingID, finding, err = scc.initFinding(context.Background(), testAlert, clusterStore)
assert.NoError(t, err)
assert.Equal(t, "myAlertID", findingID)
assert.NotEmpty(t, finding)
Expand Down