amqp subscriptions working

lukasjarosch · Jul 17, 2019 · 0f502a3 · 0f502a3
1 parent e59753a
commit 0f502a3
Show file tree

Hide file tree

Showing 17 changed files with 193 additions and 251 deletions.
diff --git a/a_main-packr.go b/a_main-packr.go
diff --git a/cmd/update.go b/cmd/update.go
@@ -164,7 +164,7 @@ func updateCmd(cmd *cobra.Command, args []string) {
 	// AMQP SUBSCRIBER BUNDLE
 	if config.IsSet(bundle.SubscriberKey) {
 
-		// subscriber/initialize.go
+		// amqp/subscriptions.go
 		amqpSubscriberInit := generate.NewAMQPSubscriber(TemplateFilesystem, service.Interface, tplContext)
 		fs.MakeDirs([]string{path.Dir(amqpSubscriberInit.TargetPath())}) // ignore errors, just ensure the path exists
 		if err := amqpSubscriberInit.Update(); err != nil {
@@ -176,6 +176,7 @@ func updateCmd(cmd *cobra.Command, args []string) {
 		for _, subscriber := range tplContext.Service.Subscriber {
 			fileName := bundle.SubscriberFileName(subscriber.Subscription.Topic)
 			impl := generate.NewAMQPSubscriberHandler(subscriber, TemplateFilesystem, service.Interface, tplContext)
+			fs.MakeDirs([]string{path.Dir(impl.TargetPath())}) // ignore errors, just ensure the path exists
 			if err := impl.Update(); err != nil {
 				logrus.Errorf("failed to update internal/service/subscriber/%s: %s", fileName, err)
 			} else {

diff --git a/go.mod b/go.mod
@@ -9,6 +9,7 @@ require (
 	github.com/VividCortex/gohistogram v1.0.0 // indirect
 	github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
 	github.com/fatih/structtag v1.0.0 // indirect
+	github.com/go-godin/rabbitmq v0.0.0-20190716163246-e909e622b8c7
 	github.com/go-kit/kit v0.8.0
 	github.com/go-logfmt/logfmt v0.4.0 // indirect
 	github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e // indirect

diff --git a/go.sum b/go.sum
@@ -32,6 +32,8 @@ github.com/fatih/structtag v1.0.0 h1:pTHj65+u3RKWYPSGaU290FpI/dXxTaHdVwVwbcPKmEc
 github.com/fatih/structtag v1.0.0/go.mod h1:IKitwq45uXL/yqi5mYghiD3w9H6eTOvI9vnk8tXMphA=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/go-godin/rabbitmq v0.0.0-20190716163246-e909e622b8c7 h1:dYvuqVELcsEcrUD1S+ztnmV5uCis6uh92oFxVcDUQPM=
+github.com/go-godin/rabbitmq v0.0.0-20190716163246-e909e622b8c7/go.mod h1:RC4VtaodR+xZa0/+CDeM1cXCSmkxnOYKvtDntFA4lIw=
 github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA=

diff --git a/internal/bundle/subscribe.go b/internal/bundle/subscribe.go
@@ -2,24 +2,25 @@ package bundle
 
 import (
 	"fmt"
-	"github.com/iancoleman/strcase"
 	"strings"
 
+	"github.com/iancoleman/strcase"
+
+	"github.com/go-godin/rabbitmq"
 	"github.com/lukasjarosch/godin/internal/godin"
 	"github.com/lukasjarosch/godin/internal/prompt"
-	"github.com/lukasjarosch/godin/pkg/amqp"
 	config "github.com/spf13/viper"
 )
 
 const SubscriberKey = "transport.amqp.subscriber"
 
 type subscriber struct {
-	Subscription amqp.Subscription
+	Subscription rabbitmq.Subscription
 	HandlerName  string `json:"handler_name"`
 }
 
 func InitializeSubscriber() (*subscriber, error) {
-	sub := amqp.Subscription{}
+	sub := rabbitmq.Subscription{}
 	err := promptValues(&sub)
 	if err != nil {
 		return nil, err
@@ -67,7 +68,7 @@ func SubscriberFileName(topic string) string {
 	return fmt.Sprintf("%s.go", name)
 }
 
-func promptValues(sub *amqp.Subscription) (err error) {
+func promptValues(sub *rabbitmq.Subscription) (err error) {
 	// Topic
 	p := prompt.NewPrompt(
 		"AMQP subscription Topic",
@@ -104,5 +105,5 @@ func promptValues(sub *amqp.Subscription) (err error) {
 	}
 	sub.Queue.Name = queue
 
-	return  nil
+	return nil
 }
diff --git a/internal/bundle/transport/amqp.go b/internal/bundle/transport/amqp.go
@@ -10,6 +10,7 @@ import (
 )
 
 const AMQPTransportKey = "transport.amqp"
+const AMQPTransportEnabledKey = "transport.amqp.enabled"
 const AMQPDefaultAddressKey = "transport.amqp.default_address"
 
 type amqpTransport struct {
@@ -32,6 +33,7 @@ func InitializeAMQP() (transport *amqpTransport, err error) {
 	}
 
 	config.Set(AMQPDefaultAddressKey, transport.DefaultAddress)
+	config.Set(AMQPTransportEnabledKey, true)
 	godin.SaveConfiguration()
 
 	return transport, nil

diff --git a/internal/generate/amqp_subscriber_handler.go b/internal/generate/amqp_subscriber_handler.go
@@ -10,6 +10,7 @@ import (
 
 type AmqpSubscriberHandler struct {
 	BaseGenerator
+	subscriber template.Subscriber
 }
 
 func NewAMQPSubscriberHandler(sub template.Subscriber, box packr.Box, serviceInterface *types.Interface, ctx template.Context, options ...Option) *AmqpSubscriberHandler {
@@ -31,10 +32,15 @@ func NewAMQPSubscriberHandler(sub template.Subscriber, box packr.Box, serviceInt
 			iface: serviceInterface,
 			opts:  defaults,
 		},
+		sub,
 	}
 }
 
 func (s *AmqpSubscriberHandler) Update() error {
+
+	// overwrite the contet subscribers with the - to be generated - subscriber.
+	s.opts.Context.Service.Subscriber = []template.Subscriber{s.subscriber}
+
 	if s.TargetExists() {
 		return nil
 	}

diff --git a/internal/generate/amqp_subscriber_init.go b/internal/generate/amqp_subscriber_init.go
@@ -16,7 +16,7 @@ func NewAMQPSubscriber(box packr.Box, serviceInterface *types.Interface, ctx tem
 		Overwrite:  true,
 		IsGoSource: true,
 		Template:   "amqp_subscriber_init",
-		TargetFile: "internal/service/subscriber/initialize.go",
+		TargetFile: "internal/amqp/subscriptions.go",
 	}
 
 	for _, opt := range options {
@@ -32,7 +32,7 @@ func NewAMQPSubscriber(box packr.Box, serviceInterface *types.Interface, ctx tem
 	}
 }
 
-// Update will call GenerateFull. The cmd/main.go cannot be updated.
+// Update will call GenerateFull
 func (s *AmqpSubscriber) Update() error {
 	return s.GenerateFull()
 }
diff --git a/internal/template/context.go b/internal/template/context.go
@@ -2,10 +2,11 @@ package template
 
 import (
 	"fmt"
+	"github.com/lukasjarosch/godin/internal/bundle/transport"
 	"strings"
 
+	"github.com/go-godin/rabbitmq"
 	"github.com/lukasjarosch/godin/internal/bundle"
-	"github.com/lukasjarosch/godin/pkg/amqp"
 	"github.com/mitchellh/mapstructure"
 
 	"github.com/lukasjarosch/godin/internal"
@@ -30,7 +31,7 @@ func NewContextFromConfig() Context {
 	sub := config.GetStringMap(bundle.SubscriberKey)
 	if len(sub) > 0 {
 		for x := range sub {
-			s := &amqp.Subscription{}
+			s := &rabbitmq.Subscription{}
 			mapstructure.Decode(sub[x], s)
 			subscribers = append(subscribers, Subscriber{
 				Subscription: *s,
@@ -46,6 +47,10 @@ func NewContextFromConfig() Context {
 			Module:            config.GetString("service.module"),
 			LoggingMiddleware: config.GetBool("service.middleware.logging"),
 			Subscriber:        subscribers,
+			Transport:Transport{
+				GRPC: config.GetBool("transport.grpc.enabled"),
+				AMQP: config.GetBool(transport.AMQPTransportEnabledKey),
+			},
 		},
 		Protobuf: Protobuf{
 			Package: config.GetString("protobuf.package"),
@@ -120,20 +125,26 @@ type Service struct {
 	Module            string
 	LoggingMiddleware bool
 	Subscriber        []Subscriber
+	Transport         Transport
 }
 
 type Protobuf struct {
 	Package string
 	Service string
 }
 
+type Transport struct {
+	GRPC bool
+	AMQP bool
+}
+
 type Docker struct {
 	Registry string
 }
 
 type Subscriber struct {
 	Handler      string
-	Subscription amqp.Subscription
+	Subscription rabbitmq.Subscription
 }
 
 type Variable struct {

diff --git a/pkg/amqp/publish.go b/pkg/amqp/publish.go
diff --git a/pkg/amqp/rabbitmq.go b/pkg/amqp/rabbitmq.go
diff --git a/pkg/amqp/subscribe.go b/pkg/amqp/subscribe.go