go/svc: finish porting services to Bazel
The following services were never ported:
- cmc-proxy
- arista-proxy
- m6220-proxy
- topo
They now build.
Change-Id: I0688bfe43cdff946e6662e21969ef539382c0e86
diff --git a/go/svc/m6220-proxy/BUILD.bazel b/go/svc/m6220-proxy/BUILD.bazel
index ee500a9..90bfb1e 100644
--- a/go/svc/m6220-proxy/BUILD.bazel
+++ b/go/svc/m6220-proxy/BUILD.bazel
@@ -1,19 +1,4 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
-
-proto_library(
- name = "proto_proto",
- srcs = ["proxy.proto"],
- visibility = ["//visibility:public"],
-)
-
-go_proto_library(
- name = "proto_go_proto",
- compilers = ["@io_bazel_rules_go//proto:go_grpc"],
- importpath = "code.hackerspace.pl/hscloud/go/svc/m6220-proxy",
- proto = ":proto_proto",
- visibility = ["//visibility:public"],
-)
go_library(
name = "go_default_library",
@@ -21,13 +6,12 @@
"cli.go",
"main.go",
],
- embed = [":proto_go_proto"],
importpath = "code.hackerspace.pl/hscloud/go/svc/m6220-proxy",
visibility = ["//visibility:private"],
deps = [
"//go/mirko:go_default_library",
- "//go/proto/infra:go_default_library",
"//go/svc/m6220-proxy/proto:go_default_library",
+ "//proto/infra:go_default_library",
"@com_github_golang_glog//:go_default_library",
"@com_github_ziutek_telnet//:go_default_library",
"@org_golang_google_grpc//codes:go_default_library",
diff --git a/go/svc/m6220-proxy/main.go b/go/svc/m6220-proxy/main.go
index 54ce428..a2ca4db 100644
--- a/go/svc/m6220-proxy/main.go
+++ b/go/svc/m6220-proxy/main.go
@@ -14,8 +14,8 @@
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
- ipb "code.hackerspace.pl/hscloud/go/proto/infra"
pb "code.hackerspace.pl/hscloud/go/svc/m6220-proxy/proto"
+ ipb "code.hackerspace.pl/hscloud/proto/infra"
)
var (
diff --git a/go/svc/m6220-proxy/proto/BUILD.bazel b/go/svc/m6220-proxy/proto/BUILD.bazel
index 5fb4fac..8cbed6b 100644
--- a/go/svc/m6220-proxy/proto/BUILD.bazel
+++ b/go/svc/m6220-proxy/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 = ["proxy.proto"],
+ visibility = ["//visibility:public"],
+)
+
+go_proto_library(
+ name = "proto_go_proto",
+ compilers = ["@io_bazel_rules_go//proto:go_grpc"],
+ importpath = "code.hackerspace.pl/hscloud/go/svc/m6220-proxy/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/go/svc/m6220-proxy/proto",
visibility = ["//visibility:public"],
)
diff --git a/go/svc/m6220-proxy/proto/generate.go b/go/svc/m6220-proxy/proto/generate.go
deleted file mode 100644
index fc6193d..0000000
--- a/go/svc/m6220-proxy/proto/generate.go
+++ /dev/null
@@ -1,3 +0,0 @@
-//go:generate protoc -I.. ../proxy.proto --go_out=plugins=grpc:.
-
-package proto
diff --git a/go/svc/m6220-proxy/proxy.proto b/go/svc/m6220-proxy/proto/proxy.proto
similarity index 78%
rename from go/svc/m6220-proxy/proxy.proto
rename to go/svc/m6220-proxy/proto/proxy.proto
index d35a2c3..bc840ad 100644
--- a/go/svc/m6220-proxy/proxy.proto
+++ b/go/svc/m6220-proxy/proto/proxy.proto
@@ -1,5 +1,6 @@
syntax = "proto3";
package proto;
+option go_package = "code.hackerspace.pl/hscloud/go/svc/m6220-proxy/proto";
message RunCommandRequest {
string command = 1;