integrate Makefile; add protobuf.path to config

cmd/update.go

@@ -2,9 +2,10 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/lukasjarosch/godin/internal/bundle/transport"
 	"os"
 
+	"github.com/lukasjarosch/godin/internal/bundle/transport"
+
 	"github.com/lukasjarosch/godin/internal/bundle"
 
 	"strings"
@@ -226,7 +227,7 @@ func updateCmd(cmd *cobra.Command, args []string) {
 	}
 
 	// Makefile // TODO: remove and move to init
-	makefile := template.NewGenerator(template.MakefileOptions())
+	makefile := template.NewGenerator(template.MakefileOptions(tplContext))
 	if err := makefile.GenerateFile(TemplateFilesystem); err != nil {
 		logrus.Error(fmt.Sprintf("failed to generate Makefile: %s", err.Error()))
 	} else {

internal/godin/project.go

@@ -58,6 +58,7 @@ func (p *Project) InitializeConfiguration() {
 	config.Set("service.module", prompt.ServiceModule())
 	config.Set("protobuf.service", prompt.ProtoServiceName())
 	config.Set("protobuf.package", prompt.ProtoPackage())
+	config.Set("protobuf.path", prompt.ProtoPath())
 	config.Set("docker.registry", prompt.DockerRegistry())
 
 	SaveConfiguration()

internal/prompt/init.go

@@ -81,6 +81,22 @@ func ProtoPackage() string {
 	return protoPackage
 }
 
+func ProtoPath() string {
+	prompt := NewPrompt(
+		"Absolute path to the .proto file which defines the service",
+		"/home/lukas/devel/work/protobuf",
+		Validate(
+			MinLengthThree(),
+			ProtoFileExtension(),
+		),
+	)
+	protoPath, err := prompt.Run()
+	if err != nil {
+		os.Exit(1)
+	}
+	return protoPath
+}
+
 func DockerRegistry() string {
 	prompt := NewPrompt(
 		"Enter your docker registry",

internal/prompt/validate.go

@@ -69,4 +69,13 @@ func CamelCase() promptui.ValidateFunc {
 		}
 		return nil
 	}
+}
+
+func ProtoFileExtension() promptui.ValidateFunc {
+	return func(s string) error {
+		if !strings.HasSuffix(s, ".proto") {
+			return fmt.Errorf("must point to a .proto file")
+		}
+		return nil
+	}
 }

internal/template/context.go

@@ -78,6 +78,7 @@ func NewContextFromConfig() Context {
 		Protobuf: Protobuf{
 			Package: config.GetString("protobuf.package"),
 			Service: config.GetString("protobuf.service"),
+			Path:    config.GetString("protobuf.path"),
 		},
 		Project: Project{
 			Created: config.GetTime("project.created"),
@@ -164,6 +165,7 @@ type Service struct {
 type Protobuf struct {
 	Package string
 	Service string
+	Path    string
 }
 
 type Transport struct {
@@ -178,8 +180,8 @@ type Docker struct {
 type Subscriber struct {
 	Handler      string
 	Subscription rabbitmq.Subscription
-	Protobuf struct {
-		Import string
+	Protobuf     struct {
+		Import  string
 		Message string
 	}
 }

internal/template/godin.go

@@ -110,13 +110,7 @@ func K8sServiceOptions() GenerateOptions {
 	return opts
 }
 
-func MakefileOptions() GenerateOptions {
-	ctx := Context{
-		Service: Service{
-			Name:      config.GetString("service.name"),
-			Namespace: config.GetString("service.namespace"),
-		},
-	}
+func MakefileOptions(ctx Context) GenerateOptions {
 	opts := fileOptions["makefile"]
 	opts.Context = ctx
 

templates/makefile.tpl

@@ -1,43 +1,31 @@
-SERVICE_NAME=ticket
-
 GOBASE=$(shell pwd)
 GOBIN=$(GOBASE)/bin
 GODIRS = $(shell go list -f '{{.Dir}}' ./...)
-KUBE_CONTEXT=$(cat ~/.kube/config | grep "current-context:" | sed "s/current-context: //")
-
 COMMIT=$(shell git rev-parse --short HEAD)
 
-DOCKER_IMAGE="docker.coozzy.ch/ticket-ticket"
+DOCKER_IMAGE="docker.coozzy.ch/<< .Service.Namespace >>-<< .Service.Name >>"
 DOCKER_TAG="v-${COMMIT}-dev"
-
-MODULE="bitbucket.org/jdbergmann/ticket/ticket"
-PROTO_SRC="/home/lukas/devel/work/protobuf/ticket/ticket"
-PROTO_DST="proto"
+PROTO_SRC="<< .Protobuf.Path >>"
 
 .PHONY: build
 build:
 	@echo "--> building"
-	@go build -o ${GOBIN}/ticket ./cmd/ticket/main.go
+	@go build -o ${GOBIN}/<< .Service.Name >> ./cmd/<< .Service.Name >>/main.go
 
 .PHONY: run
 run:
-	echo "--> starting locally"
-	@LOG_LEVEL=${LOG_LEVEL} AMQP_CONNECTION=${AMQP_CONNECTION} AMQP_EXCHANGE=${AMQP_EXCHANGE} go run cmd/ticket/main.go
+	@echo "--> starting locally"
+	@LOG_LEVEL=debug go run cmd/<< .Service.Name >>/main.go
 
 .PHONY: grpcui
-	grpcui:
-	grpcui -proto ${PROTO_SRC}/ticket.proto -port 5000 -plaintext localhost:50051
+grpcui:
+	@grpcui -proto ${PROTO_SRC} -port 5000 -plaintext localhost:50051
 
 .PHONY: clean
 clean:
-	echo "--> cleaning up binaries"
-	go clean -tags netgo -i ./...
-	rm -rf $(GOBIN)/*
-
-.PHONY: clean
-skaffold:
-	@echo "--> starting skaffold, make sure minikube is running"
-	@skaffold dev
+	@echo "--> cleaning up binaries"
+	@go clean -tags netgo -i ./...
+	@rm -rf $(GOBIN)/*
 
 .PHONY: docker
 docker:
@@ -49,19 +37,10 @@ docker-run:
 	@echo "--> starting container ${DOCKER_IMAGE}:${DOCKER_TAG}"
 	@docker run \
 		--rm \
-		--name ${ticket} \
+		--name << .Service.Name >> \
 		--network host \
 		${DOCKER_IMAGE}:${DOCKER_TAG}
 
-.PHONY: proto
-proto:
-	@rm -rf ${PROTO_DST}
-	@echo "--> fetching proto from ${PROTO_SRC}"
-	@make -C ${PROTO_SRC} go
-	@mkdir ${PROTO_DST}
-	@echo "--< moving stubs into ${PROTO_DST}"
-	@cp ${PROTO_SRC}/go/* ${PROTO_DST}
-
 .PHONY: check
 check: format.check lint
 

templates/partials/amqp/encode_decode/publish_encode.tpl

@@ -1,6 +1,7 @@
 {{- define "amqp_publish_encode" }}
 // {{ .Name }}Encoder is called just before publishing an event to '{{ .Publishing.Topic }}' and encodes
-// the DAO to protobuf.
+// the DAO to protobuf. Godin doesn't know what you will pass to this function, so ensure that you
+// use a runtime-assertion to ensure that you've got the correct type.
 func {{ .Name }}Encoder(event interface{}) (*pb.{{ .Publishing.ProtobufMessage }}, error) {
 var encoded pb.{{ .Publishing.ProtobufMessage }}