proto/invoice -> bgpwtf/invoice/proto

Change-Id: I5d25864046665e4b0e57ec62a29797fbce6ed3cb

bgpwtf/invoice/BUILD.bazel

@@ -12,10 +12,10 @@ go_library(
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/invoice",
     visibility = ["//visibility:private"],
     deps = [
+        "//bgpwtf/invoice/proto:go_default_library",
+        "//bgpwtf/invoice/templates:go_default_library",
         "//go/mirko:go_default_library",
         "//go/statusz:go_default_library",
-        "//bgpwtf/invoice/templates:go_default_library",
-        "//proto/invoice:go_default_library",
         "@com_github_golang_glog//:go_default_library",
         "@com_github_golang_protobuf//proto:go_default_library",
         "@com_github_mattn_go_sqlite3//:go_default_library",

bgpwtf/invoice/calc.go

@@ -3,7 +3,7 @@ package main
 import (
 	"time"
 
-	pb "code.hackerspace.pl/hscloud/proto/invoice"
+	pb "code.hackerspace.pl/hscloud/bgpwtf/invoice/proto"
 )
 
 func calculateInvoiceData(p *pb.Invoice) {

bgpwtf/invoice/main.go

@@ -8,8 +8,8 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
+	pb "code.hackerspace.pl/hscloud/bgpwtf/invoice/proto"
 	"code.hackerspace.pl/hscloud/go/mirko"
-	pb "code.hackerspace.pl/hscloud/proto/invoice"
 )
 
 var (

bgpwtf/invoice/model.go

@@ -13,7 +13,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	pb "code.hackerspace.pl/hscloud/proto/invoice"
+	pb "code.hackerspace.pl/hscloud/bgpwtf/invoice/proto"
 )
 
 type model struct {

bgpwtf/invoice/proto/BUILD.bazel

@@ -1,8 +1,23 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+
+proto_library(
+    name = "proto_proto",
+    srcs = ["invoice.proto"],
+    visibility = ["//visibility:public"],
+)
+
+go_proto_library(
+    name = "proto_go_proto",
+    compilers = ["@io_bazel_rules_go//proto:go_grpc"],
+    importpath = "code.hackerspace.pl/hscloud/bgpwtf/invoice/proto",
+    proto = ":proto_proto",
+    visibility = ["//visibility:public"],
+)
 
 go_library(
     name = "go_default_library",
-    srcs = ["generate.go"],
+    embed = [":proto_go_proto"],
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/invoice/proto",
     visibility = ["//visibility:public"],
 )

bgpwtf/invoice/proto/generate.go

@@ -1,3 +0,0 @@
-package proto
-
-//go:generate protoc -I.. ../inboice.proto --go_out=plugins=grpc:.

bgpwtf/invoice/proto/invoice.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
-
 package invoice;
+option go_package = "code.hackerspace.pl/hscloud/bgpwtf/invoice/proto";
 
 message Item {
     string title = 1;

bgpwtf/invoice/render.go

@@ -8,8 +8,8 @@ import (
 
 	wkhtml "github.com/sebastiaanklippert/go-wkhtmltopdf"
 
+	pb "code.hackerspace.pl/hscloud/bgpwtf/invoice/proto"
 	"code.hackerspace.pl/hscloud/bgpwtf/invoice/templates"
-	pb "code.hackerspace.pl/hscloud/proto/invoice"
 )
 
 var (

bgpwtf/invoice/statusz.go

@@ -7,9 +7,9 @@ import (
 	"sort"
 	"time"
 
+	pb "code.hackerspace.pl/hscloud/bgpwtf/invoice/proto"
 	"code.hackerspace.pl/hscloud/go/mirko"
 	"code.hackerspace.pl/hscloud/go/statusz"
-	pb "code.hackerspace.pl/hscloud/proto/invoice"
 	"github.com/golang/glog"
 )
 

proto/invoice/BUILD.bazel

@@ -1,23 +0,0 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
-load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
-
-proto_library(
-    name = "invoice_proto",
-    srcs = ["invoice.proto"],
-    visibility = ["//visibility:public"],
-)
-
-go_proto_library(
-    name = "invoice_go_proto",
-    compilers = ["@io_bazel_rules_go//proto:go_grpc"],
-    importpath = "code.hackerspace.pl/hscloud/proto/invoice",
-    proto = ":invoice_proto",
-    visibility = ["//visibility:public"],
-)
-
-go_library(
-    name = "go_default_library",
-    embed = [":invoice_go_proto"],
-    importpath = "code.hackerspace.pl/hscloud/proto/invoice",
-    visibility = ["//visibility:public"],
-)