feat: update provider plugin contract (#33)

goto · Oct 21, 2023 · 2d31719 · 2d31719
1 parent 33dd04f
commit 2d31719
Show file tree

Hide file tree

Showing 66 changed files with 1,533 additions and 294 deletions.
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/core/alert/mocks/alert_repository.go b/core/alert/mocks/alert_repository.go
diff --git a/core/alert/mocks/alert_transformer.go b/core/alert/mocks/alert_transformer.go
diff --git a/core/alert/mocks/log_service.go b/core/alert/mocks/log_service.go
diff --git a/core/log/mocks/notification_log_repository.go b/core/log/mocks/notification_log_repository.go
diff --git a/core/namespace/mocks/config_syncer.go b/core/namespace/mocks/config_syncer.go
diff --git a/core/namespace/mocks/encryptor.go b/core/namespace/mocks/encryptor.go
diff --git a/core/namespace/mocks/namespace_repository.go b/core/namespace/mocks/namespace_repository.go
diff --git a/core/namespace/mocks/provider_service.go b/core/namespace/mocks/provider_service.go
diff --git a/core/namespace/mocks/transactor.go b/core/namespace/mocks/transactor.go
diff --git a/core/namespace/v1beta1.go b/core/namespace/v1beta1.go
@@ -0,0 +1,42 @@
+package namespace
+
+import (
+	"fmt"
+
+	"github.com/goto/siren/core/provider"
+	sirenv1beta1 "github.com/goto/siren/proto/gotocompany/siren/v1beta1"
+	"google.golang.org/protobuf/types/known/structpb"
+	"google.golang.org/protobuf/types/known/timestamppb"
+)
+
+func (n *Namespace) ToV1beta1Proto() (*sirenv1beta1.Namespace, error) {
+	creds, err := structpb.NewStruct(n.Credentials)
+	if err != nil {
+		return nil, fmt.Errorf("cannot transform credentials to proto: %w", err)
+	}
+	return &sirenv1beta1.Namespace{
+		Id:          n.ID,
+		Urn:         n.URN,
+		Name:        n.Name,
+		Provider:    n.Provider.ID,
+		Credentials: creds,
+		Labels:      n.Labels,
+		CreatedAt:   timestamppb.New(n.CreatedAt),
+		UpdatedAt:   timestamppb.New(n.UpdatedAt),
+	}, nil
+}
+
+func FromV1beta1Proto(proto *sirenv1beta1.Namespace) Namespace {
+	return Namespace{
+		ID:   proto.GetId(),
+		URN:  proto.GetUrn(),
+		Name: proto.GetName(),
+		Provider: provider.Provider{
+			ID: proto.GetProvider(),
+		},
+		Credentials: proto.GetCredentials().AsMap(),
+		Labels:      proto.GetLabels(),
+		CreatedAt:   proto.GetCreatedAt().AsTime(),
+		UpdatedAt:   proto.GetUpdatedAt().AsTime(),
+	}
+}
diff --git a/core/notification/mocks/alert_service.go b/core/notification/mocks/alert_service.go
diff --git a/core/notification/mocks/dispatcher.go b/core/notification/mocks/dispatcher.go
diff --git a/core/notification/mocks/idempotency_repository.go b/core/notification/mocks/idempotency_repository.go
diff --git a/core/notification/mocks/log_service.go b/core/notification/mocks/log_service.go
diff --git a/core/notification/mocks/notifier.go b/core/notification/mocks/notifier.go
diff --git a/core/notification/mocks/queuer.go b/core/notification/mocks/queuer.go
diff --git a/core/notification/mocks/receiver_service.go b/core/notification/mocks/receiver_service.go
diff --git a/core/notification/mocks/repository.go b/core/notification/mocks/repository.go
diff --git a/core/notification/mocks/silence_service.go b/core/notification/mocks/silence_service.go
diff --git a/core/notification/mocks/subscription_service.go b/core/notification/mocks/subscription_service.go
diff --git a/core/provider/mocks/provider_repository.go b/core/provider/mocks/provider_repository.go
diff --git a/core/provider/v1beta1.go b/core/provider/v1beta1.go
@@ -27,16 +27,16 @@ func (p *Provider) ToV1beta1Proto() (*sirenv1beta1.Provider, error) {
 	}, nil
 }
 
-func FromV1beta1Proto(proto *sirenv1beta1.Provider) *Provider {
-	return &Provider{
+func FromV1beta1Proto(proto *sirenv1beta1.Provider) Provider {
+	return Provider{
 		ID:          proto.GetId(),
 		Host:        proto.GetHost(),
 		URN:         proto.GetUrn(),
 		Name:        proto.GetName(),
 		Type:        proto.GetType(),
 		Credentials: proto.GetCredentials().AsMap(),
 		Labels:      proto.GetLabels(),
-		CreatedAt:   proto.CreatedAt.AsTime(),
-		UpdatedAt:   proto.UpdatedAt.AsTime(),
+		CreatedAt:   proto.GetCreatedAt().AsTime(),
+		UpdatedAt:   proto.GetUpdatedAt().AsTime(),
 	}
 }
diff --git a/core/receiver/mocks/config_resolver.go b/core/receiver/mocks/config_resolver.go
diff --git a/core/receiver/mocks/encryptor.go b/core/receiver/mocks/encryptor.go
diff --git a/core/receiver/mocks/receiver_repository.go b/core/receiver/mocks/receiver_repository.go
diff --git a/core/rule/mocks/namespace_service.go b/core/rule/mocks/namespace_service.go
diff --git a/core/rule/mocks/rule_repository.go b/core/rule/mocks/rule_repository.go
diff --git a/core/rule/mocks/rule_uploader.go b/core/rule/mocks/rule_uploader.go
diff --git a/core/rule/mocks/template_service.go b/core/rule/mocks/template_service.go
diff --git a/core/rule/provider_plugin.go b/core/rule/provider_plugin.go
@@ -3,6 +3,7 @@ package rule
 import (
 	"context"
 
+	"github.com/goto/siren/core/namespace"
 	"github.com/goto/siren/core/provider"
 	"github.com/goto/siren/core/template"
 )
@@ -13,5 +14,5 @@ import (
 //
 //go:generate mockery --name=RuleUploader -r --case underscore --with-expecter --structname RuleUploader --filename rule_uploader.go --output=./mocks
 type RuleUploader interface {
-	UpsertRule(ctx context.Context, namespaceURN string, prov provider.Provider, rl *Rule, templateToUpdate *template.Template) error
+	UpsertRule(ctx context.Context, ns namespace.Namespace, prov provider.Provider, rl *Rule, templateToUpdate *template.Template) error
 }
diff --git a/core/rule/service.go b/core/rule/service.go
@@ -98,7 +98,7 @@ func (s *Service) Upsert(ctx context.Context, rl *Rule) error {
 		return err
 	}
 
-	if err := pluginService.UpsertRule(ctx, ns.URN, ns.Provider, rl, templateToUpdate); err != nil {
+	if err := pluginService.UpsertRule(ctx, *ns, ns.Provider, rl, templateToUpdate); err != nil {
 		if err := s.repository.Rollback(ctx, err); err != nil {
 			return err
 		}

diff --git a/core/rule/service_test.go b/core/rule/service_test.go
@@ -138,7 +138,7 @@ func TestService_Upsert(t *testing.T) {
 
 					rr.EXPECT().WithTransaction(ctx).Return(ctx)
 					rr.EXPECT().Upsert(mock.AnythingOfType("context.todoCtx"), mock.AnythingOfType("*rule.Rule")).Return(nil)
-					ru.EXPECT().UpsertRule(mock.Anything, mock.AnythingOfType("string"), mock.AnythingOfType("provider.Provider"), mock.AnythingOfType("*rule.Rule"), mock.AnythingOfType("*template.Template")).Return(nil)
+					ru.EXPECT().UpsertRule(mock.Anything, mock.AnythingOfType("namespace.Namespace"), mock.AnythingOfType("provider.Provider"), mock.AnythingOfType("*rule.Rule"), mock.AnythingOfType("*template.Template")).Return(nil)
 					rr.EXPECT().Commit(ctx).Return(nil)
 				},
 			},
@@ -175,7 +175,7 @@ func TestService_Upsert(t *testing.T) {
 
 					rr.EXPECT().WithTransaction(ctx).Return(ctx)
 					rr.EXPECT().Upsert(mock.AnythingOfType("context.todoCtx"), mock.AnythingOfType("*rule.Rule")).Return(nil)
-					ru.EXPECT().UpsertRule(mock.Anything, mock.AnythingOfType("string"), mock.AnythingOfType("provider.Provider"), mock.AnythingOfType("*rule.Rule"), mock.AnythingOfType("*template.Template")).Return(errors.New("some error"))
+					ru.EXPECT().UpsertRule(mock.Anything, mock.AnythingOfType("namespace.Namespace"), mock.AnythingOfType("provider.Provider"), mock.AnythingOfType("*rule.Rule"), mock.AnythingOfType("*template.Template")).Return(errors.New("some error"))
 					rr.EXPECT().Rollback(ctx, mock.Anything).Return(nil)
 				},
 				ErrString: "some error",
@@ -213,7 +213,7 @@ func TestService_Upsert(t *testing.T) {
 
 					rr.EXPECT().WithTransaction(ctx).Return(ctx)
 					rr.EXPECT().Upsert(mock.AnythingOfType("context.todoCtx"), mock.AnythingOfType("*rule.Rule")).Return(nil)
-					ru.EXPECT().UpsertRule(mock.Anything, mock.AnythingOfType("string"), mock.AnythingOfType("provider.Provider"), mock.AnythingOfType("*rule.Rule"), mock.AnythingOfType("*template.Template")).Return(errors.New("some error"))
+					ru.EXPECT().UpsertRule(mock.Anything, mock.AnythingOfType("namespace.Namespace"), mock.AnythingOfType("provider.Provider"), mock.AnythingOfType("*rule.Rule"), mock.AnythingOfType("*template.Template")).Return(errors.New("some error"))
 					rr.EXPECT().Rollback(ctx, mock.Anything).Return(errors.New("rollback error"))
 				},
 				ErrString: "rollback error",
@@ -251,7 +251,7 @@ func TestService_Upsert(t *testing.T) {
 
 					rr.EXPECT().WithTransaction(ctx).Return(ctx)
 					rr.EXPECT().Upsert(mock.AnythingOfType("context.todoCtx"), mock.AnythingOfType("*rule.Rule")).Return(nil)
-					ru.EXPECT().UpsertRule(mock.Anything, mock.AnythingOfType("string"), mock.AnythingOfType("provider.Provider"), mock.AnythingOfType("*rule.Rule"), mock.AnythingOfType("*template.Template")).Return(nil)
+					ru.EXPECT().UpsertRule(mock.Anything, mock.AnythingOfType("namespace.Namespace"), mock.AnythingOfType("provider.Provider"), mock.AnythingOfType("*rule.Rule"), mock.AnythingOfType("*template.Template")).Return(nil)
 					rr.EXPECT().Commit(ctx).Return(errors.New("some commit error"))
 				},
 				ErrString: "some commit error",

diff --git a/core/rule/v1beta1.go b/core/rule/v1beta1.go
@@ -29,7 +29,7 @@ func (r *Rule) ToV1beta1Proto() *sirenv1beta1.Rule {
 	}
 }
 
-func FromV1beta1Proto(proto *sirenv1beta1.Rule) *Rule {
+func FromV1beta1Proto(proto *sirenv1beta1.Rule) Rule {
 	variables := make([]RuleVariable, 0)
 	for _, variable := range proto.GetVariables() {
 		variables = append(variables, RuleVariable{
@@ -40,7 +40,7 @@ func FromV1beta1Proto(proto *sirenv1beta1.Rule) *Rule {
 		})
 	}
 
-	return &Rule{
+	return Rule{
 		ID:                proto.GetId(),
 		Name:              proto.GetName(),
 		Enabled:           proto.GetEnabled(),

diff --git a/core/silence/mocks/subscription_repository.go b/core/silence/mocks/subscription_repository.go
diff --git a/core/subscription/mocks/log_service.go b/core/subscription/mocks/log_service.go
diff --git a/core/subscription/mocks/namespace_service.go b/core/subscription/mocks/namespace_service.go
diff --git a/core/subscription/mocks/receiver_service.go b/core/subscription/mocks/receiver_service.go