fix(siren): provider plugin interface

goto · Sep 24, 2023 · 1428d7d · 1428d7d
1 parent 48505b2
commit 1428d7d
Show file tree

Hide file tree

Showing 60 changed files with 863 additions and 1,877 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -1,5 +1,5 @@
 name: Lint
-on: [ push, pull_request, workflow_dispatch ]
+on: [push]
 
 jobs:
   golangci-lint:
@@ -14,4 +14,4 @@ jobs:
         with:
           skip-go-installation: true
           version: v1.50.1
-          args: --timeout=10m
+          args: --timeout=10m
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -1,6 +1,5 @@
-
 name: Test
-on: [push, pull_request]
+on: [push]
 
 jobs:
   test:

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ NAME="github.com/goto/siren"
 LAST_COMMIT := $(shell git rev-parse --short HEAD)
 LAST_TAG := "$(shell git rev-list --tags --max-count=1)"
 APP_VERSION := "$(shell git describe --tags ${LAST_TAG})-next"
-PROTON_COMMIT := "4fc96a5406f640044ebe0572385336af7bd221ae"
+PROTON_COMMIT := "534a703026bd70fa464c3bedc6a9aef3f8fcdd19"
 
 .PHONY: all build test clean dist vet proto install
 

diff --git a/cli/deps.go b/cli/deps.go
@@ -73,9 +73,6 @@ func InitDeps(
 	templateRepository := postgres.NewTemplateRepository(pgClient)
 	templateService := template.NewService(templateRepository)
 
-	providerRepository := postgres.NewProviderRepository(pgClient)
-	providerService := provider.NewService(providerRepository)
-
 	logRepository := postgres.NewLogRepository(pgClient)
 	logService := log.NewService(logRepository)
 
@@ -103,6 +100,13 @@ func InitDeps(
 		ruleUploaders[k] = pc.(rule.RuleUploader)
 	}
 
+	var supportedProviderTypes = []string{}
+	for typ := range providerPlugins {
+		supportedProviderTypes = append(supportedProviderTypes, typ)
+	}
+	providerRepository := postgres.NewProviderRepository(pgClient)
+	providerService := provider.NewService(providerRepository, supportedProviderTypes)
+
 	alertRepository := postgres.NewAlertRepository(pgClient)
 	alertService := alert.NewService(
 		alertRepository,

diff --git a/core/alert/service_test.go b/core/alert/service_test.go
@@ -26,7 +26,7 @@ func TestService_List(t *testing.T) {
 			{ID: 2, ProviderID: 1, ResourceName: "foo", Severity: "CRITICAL", MetricName: "baz", MetricValue: "0",
 				Rule: "bar", TriggeredAt: timenow},
 		}
-		repositoryMock.EXPECT().List(mock.AnythingOfType("*context.emptyCtx"), alert.Filter{
+		repositoryMock.EXPECT().List(mock.AnythingOfType("context.todoCtx"), alert.Filter{
 			ProviderID:   1,
 			ResourceName: "foo",
 			StartTime:    0,
@@ -53,7 +53,7 @@ func TestService_List(t *testing.T) {
 			{ID: 2, ProviderID: 1, ResourceName: "foo", Severity: "CRITICAL", MetricName: "baz", MetricValue: "0",
 				Rule: "bar", TriggeredAt: timenow},
 		}
-		repositoryMock.EXPECT().List(mock.AnythingOfType("*context.emptyCtx"), mock.Anything).Return(dummyAlerts, nil)
+		repositoryMock.EXPECT().List(mock.AnythingOfType("context.todoCtx"), mock.Anything).Return(dummyAlerts, nil)
 		actualAlerts, err := dummyService.List(ctx, alert.Filter{
 			ProviderID:   1,
 			ResourceName: "foo",
@@ -68,7 +68,7 @@ func TestService_List(t *testing.T) {
 	t.Run("should call repository List method and handle errors", func(t *testing.T) {
 		repositoryMock := &mocks.AlertRepository{}
 		dummyService := alert.NewService(repositoryMock, nil, nil)
-		repositoryMock.EXPECT().List(mock.AnythingOfType("*context.emptyCtx"), mock.Anything).
+		repositoryMock.EXPECT().List(mock.AnythingOfType("context.todoCtx"), mock.Anything).
 			Return(nil, errors.New("random error"))
 		actualAlerts, err := dummyService.List(ctx, alert.Filter{
 			ProviderID:   1,
@@ -116,19 +116,19 @@ func TestService_CreateAlerts(t *testing.T) {
 		{
 			name: "should return error if TransformToAlerts return error",
 			setup: func(ar *mocks.AlertRepository, at *mocks.AlertTransformer) {
-				at.EXPECT().TransformToAlerts(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64"), mock.AnythingOfType("uint64"), mock.AnythingOfType("map[string]interface {}")).Return(nil, 0, errors.New("some error"))
+				at.EXPECT().TransformToAlerts(mock.AnythingOfType("context.todoCtx"), mock.AnythingOfType("uint64"), mock.AnythingOfType("uint64"), mock.AnythingOfType("map[string]interface {}")).Return(nil, 0, errors.New("some error"))
 			},
 			alertsToBeCreated: alertsToBeCreated,
 			wantErr:           true,
 		},
 		{
 			name: "should call repository Create method with proper arguments",
 			setup: func(ar *mocks.AlertRepository, at *mocks.AlertTransformer) {
-				at.EXPECT().TransformToAlerts(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64"), mock.AnythingOfType("uint64"), mock.AnythingOfType("map[string]interface {}")).Return([]alert.Alert{
+				at.EXPECT().TransformToAlerts(mock.AnythingOfType("context.todoCtx"), mock.AnythingOfType("uint64"), mock.AnythingOfType("uint64"), mock.AnythingOfType("map[string]interface {}")).Return([]alert.Alert{
 					{ID: 1, ProviderID: 1, ResourceName: "foo", Severity: "CRITICAL", MetricName: "lag", MetricValue: "20",
 						Rule: "lagHigh", TriggeredAt: timenow},
 				}, 1, nil)
-				ar.EXPECT().Create(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("alert.Alert")).Return(alert.Alert{ID: 1, ProviderID: 1, ResourceName: "foo", Severity: "CRITICAL", MetricName: "lag", MetricValue: "20",
+				ar.EXPECT().Create(mock.AnythingOfType("context.todoCtx"), mock.AnythingOfType("alert.Alert")).Return(alert.Alert{ID: 1, ProviderID: 1, ResourceName: "foo", Severity: "CRITICAL", MetricName: "lag", MetricValue: "20",
 					Rule: "lagHigh", TriggeredAt: timenow}, nil)
 			},
 			alertsToBeCreated: alertsToBeCreated,
@@ -141,23 +141,23 @@ func TestService_CreateAlerts(t *testing.T) {
 		{
 			name: "should return error not found if repository return err relation",
 			setup: func(ar *mocks.AlertRepository, at *mocks.AlertTransformer) {
-				at.EXPECT().TransformToAlerts(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64"), mock.AnythingOfType("uint64"), mock.AnythingOfType("map[string]interface {}")).Return([]alert.Alert{
+				at.EXPECT().TransformToAlerts(mock.AnythingOfType("context.todoCtx"), mock.AnythingOfType("uint64"), mock.AnythingOfType("uint64"), mock.AnythingOfType("map[string]interface {}")).Return([]alert.Alert{
 					{ID: 1, ProviderID: 1, ResourceName: "foo", Severity: "CRITICAL", MetricName: "lag", MetricValue: "20",
 						Rule: "lagHigh", TriggeredAt: timenow},
 				}, 1, nil)
-				ar.EXPECT().Create(mock.AnythingOfType("*context.emptyCtx"), mock.Anything).Return(alert.Alert{}, alert.ErrRelation)
+				ar.EXPECT().Create(mock.AnythingOfType("context.todoCtx"), mock.Anything).Return(alert.Alert{}, alert.ErrRelation)
 			},
 			alertsToBeCreated: alertsToBeCreated,
 			wantErr:           true,
 		},
 		{
 			name: "should handle errors from repository",
 			setup: func(ar *mocks.AlertRepository, at *mocks.AlertTransformer) {
-				at.EXPECT().TransformToAlerts(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64"), mock.AnythingOfType("uint64"), mock.AnythingOfType("map[string]interface {}")).Return([]alert.Alert{
+				at.EXPECT().TransformToAlerts(mock.AnythingOfType("context.todoCtx"), mock.AnythingOfType("uint64"), mock.AnythingOfType("uint64"), mock.AnythingOfType("map[string]interface {}")).Return([]alert.Alert{
 					{ID: 1, ProviderID: 1, ResourceName: "foo", Severity: "CRITICAL", MetricName: "lag", MetricValue: "20",
 						Rule: "lagHigh", TriggeredAt: timenow},
 				}, 1, nil)
-				ar.EXPECT().Create(mock.AnythingOfType("*context.emptyCtx"), mock.Anything).Return(alert.Alert{}, errors.New("random error"))
+				ar.EXPECT().Create(mock.AnythingOfType("context.todoCtx"), mock.Anything).Return(alert.Alert{}, errors.New("random error"))
 			},
 			alertsToBeCreated: alertsToBeCreated,
 			wantErr:           true,