proto/invoice -> bgpwtf/invoice/proto
Change-Id: I5d25864046665e4b0e57ec62a29797fbce6ed3cb
diff --git a/bgpwtf/invoice/BUILD.bazel b/bgpwtf/invoice/BUILD.bazel
index b2e2ee8..c85bb4d 100644
--- a/bgpwtf/invoice/BUILD.bazel
+++ b/bgpwtf/invoice/BUILD.bazel
@@ -12,10 +12,10 @@
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",
diff --git a/bgpwtf/invoice/calc.go b/bgpwtf/invoice/calc.go
index 5df763f..9c411da 100644
--- a/bgpwtf/invoice/calc.go
+++ b/bgpwtf/invoice/calc.go
@@ -3,7 +3,7 @@
import (
"time"
- pb "code.hackerspace.pl/hscloud/proto/invoice"
+ pb "code.hackerspace.pl/hscloud/bgpwtf/invoice/proto"
)
func calculateInvoiceData(p *pb.Invoice) {
diff --git a/bgpwtf/invoice/main.go b/bgpwtf/invoice/main.go
index 4a80441..d93034c 100644
--- a/bgpwtf/invoice/main.go
+++ b/bgpwtf/invoice/main.go
@@ -8,8 +8,8 @@
"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 (
diff --git a/bgpwtf/invoice/model.go b/bgpwtf/invoice/model.go
index d628e1a..1fb89b9 100644
--- a/bgpwtf/invoice/model.go
+++ b/bgpwtf/invoice/model.go
@@ -13,7 +13,7 @@
"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 {
diff --git a/bgpwtf/invoice/proto/BUILD.bazel b/bgpwtf/invoice/proto/BUILD.bazel
index 511bf26..51f85fe 100644
--- a/bgpwtf/invoice/proto/BUILD.bazel
+++ b/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"],
)
diff --git a/bgpwtf/invoice/proto/generate.go b/bgpwtf/invoice/proto/generate.go
deleted file mode 100644
index b0f6618..0000000
--- a/bgpwtf/invoice/proto/generate.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package proto
-
-//go:generate protoc -I.. ../inboice.proto --go_out=plugins=grpc:.
diff --git a/proto/invoice/invoice.proto b/bgpwtf/invoice/proto/invoice.proto
similarity index 96%
rename from proto/invoice/invoice.proto
rename to bgpwtf/invoice/proto/invoice.proto
index a5c6a84..75720b7 100644
--- a/proto/invoice/invoice.proto
+++ b/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;
diff --git a/bgpwtf/invoice/render.go b/bgpwtf/invoice/render.go
index 2353014..693aa62 100644
--- a/bgpwtf/invoice/render.go
+++ b/bgpwtf/invoice/render.go
@@ -8,8 +8,8 @@
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 (
diff --git a/bgpwtf/invoice/statusz.go b/bgpwtf/invoice/statusz.go
index 0a64ce4..9490660 100644
--- a/bgpwtf/invoice/statusz.go
+++ b/bgpwtf/invoice/statusz.go
@@ -7,9 +7,9 @@
"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"
)
diff --git a/proto/invoice/BUILD.bazel b/proto/invoice/BUILD.bazel
deleted file mode 100644
index 0108f44..0000000
--- a/proto/invoice/BUILD.bazel
+++ /dev/null
@@ -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"],
-)