From 7fa2ee80243b1539cbdbed0e5e44f587e60d14cc Mon Sep 17 00:00:00 2001
From: Bret Mckee <bret.mckee@gmail.com>
Date: Mon, 1 Feb 2021 14:33:23 -0800
Subject: [PATCH] rename api.proto files to avoid namespace collision warning

It seems like a proto library problem that we were getting these
warnings, but we were.

See https://github.com/golang/protobuf/issues/1122 for more details. At
the time of this commit that issue is still open, but since I'm renaming
the files it should fix our problem.
---
 Makefile                                           | 14 +++++++-------
 .../proto/backend_api.proto}                       |  4 ++--
 backend/cmd/main.go                                |  2 +-
 frontend/cmd/main.go                               |  4 ++--
 .../proto/frontend_api.proto}                      |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename backend/{api/proto/api.proto => backendapi/proto/backend_api.proto} (70%)
 rename frontend/{api/proto/api.proto => frontendapi/proto/frontend_api.proto} (83%)

diff --git a/Makefile b/Makefile
index c09c704..38f948a 100644
--- a/Makefile
+++ b/Makefile
@@ -26,19 +26,19 @@ grpc-tools:
 %.pb.gw.go: proto/%.proto
 	${PROTOC} -I "$(<D)" -I "${ANNOTATIONS_DIR}" --grpc-gateway_out="$(@D)" --grpc-gateway_opt=logtostderr=true --grpc-gateway_opt=paths=source_relative $<
 
-.PHONY: frontend-generated
-frontend-generated: frontend/api/api.pb.go frontend/api/api_grpc.pb.go frontend/api/api.pb.gw.go
+.PHONY: frontend-api
+frontend-api: frontend/frontendapi/frontend_api.pb.go frontend/frontendapi/frontend_api_grpc.pb.go frontend/frontendapi/frontend_api.pb.gw.go
 
-.PHONY: backend-generated
-backend-generated: backend/api/api.pb.go backend/api/api_grpc.pb.go backend/api/api.pb.gw.go
+.PHONY: backend-api
+backend-api: backend/backendapi/backend_api.pb.go backend/backendapi/backend_api_grpc.pb.go backend/backendapi/backend_api.pb.gw.go
 
-.PHONY: generated
-generated: frontend-generated backend-generated
+.PHONY: api
+api: frontend-api backend-api
 
 .PHONY: clean
 clean:
 	rm frontend/api/*.go backend/api/*.go
 
 .PHONY: $(CONTAINERS)
-$(CONTAINERS): generated
+$(CONTAINERS): api
 	docker build -f Dockerfile  -t $@:dev --build-arg TARGET=$@ .
diff --git a/backend/api/proto/api.proto b/backend/backendapi/proto/backend_api.proto
similarity index 70%
rename from backend/api/proto/api.proto
rename to backend/backendapi/proto/backend_api.proto
index e835e90..4a99322 100644
--- a/backend/api/proto/api.proto
+++ b/backend/backendapi/proto/backend_api.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
-package github.com.bretmckee.microservice.backend.api;
-option go_package = "github.com/bretmckee/microservice/backend/api";
+package github.com.bretmckee.microservice.backend.backendapi;
+option go_package = "github.com/bretmckee/microservice/backend/backendapi";
 
 import "google/api/annotations.proto";
 
diff --git a/backend/cmd/main.go b/backend/cmd/main.go
index bf5de83..664e718 100644
--- a/backend/cmd/main.go
+++ b/backend/cmd/main.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"strings"
 
-	pb "github.com/bretmckee/microservice/backend/api"
+	pb "github.com/bretmckee/microservice/backend/backendapi"
 	"github.com/golang/protobuf/proto"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"google.golang.org/grpc"
diff --git a/frontend/cmd/main.go b/frontend/cmd/main.go
index 37dbba7..8311987 100644
--- a/frontend/cmd/main.go
+++ b/frontend/cmd/main.go
@@ -14,8 +14,8 @@ import (
 	"strings"
 	"time"
 
-	backend "github.com/bretmckee/microservice/backend/api"
-	pb "github.com/bretmckee/microservice/frontend/api"
+	backend "github.com/bretmckee/microservice/backend/backendapi"
+	pb "github.com/bretmckee/microservice/frontend/frontendapi"
 	"github.com/golang/protobuf/proto"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"google.golang.org/grpc"
diff --git a/frontend/api/proto/api.proto b/frontend/frontendapi/proto/frontend_api.proto
similarity index 83%
rename from frontend/api/proto/api.proto
rename to frontend/frontendapi/proto/frontend_api.proto
index 873c3e1..e53b555 100644
--- a/frontend/api/proto/api.proto
+++ b/frontend/frontendapi/proto/frontend_api.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
-package github.com.bretmckee.microservice.frontend.api;
-option go_package = "github.com/bretmckee/microservice/frontend/api";
+package github.com.bretmckee.microservice.frontend.frontendapi;
+option go_package = "github.com/bretmckee/microservice/frontend/frontendapi";
 
 import "google/api/annotations.proto";