Merge "go/svc/leasifier, proto/hswaw -> hswaw/"
diff --git a/hswaw/README.md b/hswaw/README.md
new file mode 100644
index 0000000..cb11d17
--- /dev/null
+++ b/hswaw/README.md
@@ -0,0 +1,4 @@
+hscloud/hswaw
+=============
+
+Services and systems related to the Warsaw Hackerspace (ie. the physical place, not its cloud/ISP infrastructure).
diff --git a/go/svc/leasifier/BUILD.bazel b/hswaw/leasifier/BUILD.bazel
similarity index 81%
rename from go/svc/leasifier/BUILD.bazel
rename to hswaw/leasifier/BUILD.bazel
index c03fb35..1873ad8 100644
--- a/go/svc/leasifier/BUILD.bazel
+++ b/hswaw/leasifier/BUILD.bazel
@@ -6,12 +6,12 @@
"main.go",
"statusz.go",
],
- importpath = "code.hackerspace.pl/hscloud/go/svc/leasifier",
+ importpath = "code.hackerspace.pl/hscloud/hswaw/leasifier",
visibility = ["//visibility:private"],
deps = [
"//go/mirko:go_default_library",
"//go/statusz:go_default_library",
- "//proto/hswaw:go_default_library",
+ "//hswaw/proto:go_default_library",
"@com_github_golang_glog//:go_default_library",
],
)
diff --git a/hswaw/leasifier/README.md b/hswaw/leasifier/README.md
new file mode 100644
index 0000000..a88bbe3
--- /dev/null
+++ b/hswaw/leasifier/README.md
@@ -0,0 +1 @@
+Leasifier, a checkinator backend service.
diff --git a/go/svc/leasifier/main.go b/hswaw/leasifier/main.go
similarity index 98%
rename from go/svc/leasifier/main.go
rename to hswaw/leasifier/main.go
index a7ac49e..74ce88d 100644
--- a/go/svc/leasifier/main.go
+++ b/hswaw/leasifier/main.go
@@ -15,7 +15,7 @@
"github.com/golang/glog"
mirko "code.hackerspace.pl/hscloud/go/mirko"
- hpb "code.hackerspace.pl/hscloud/proto/hswaw"
+ hpb "code.hackerspace.pl/hscloud/hswaw/proto"
)
type lease struct {
diff --git a/go/svc/leasifier/statusz.go b/hswaw/leasifier/statusz.go
similarity index 100%
rename from go/svc/leasifier/statusz.go
rename to hswaw/leasifier/statusz.go
diff --git a/proto/hswaw/BUILD b/hswaw/proto/BUILD.bazel
similarity index 63%
rename from proto/hswaw/BUILD
rename to hswaw/proto/BUILD.bazel
index d7bc9f1..5e98007 100644
--- a/proto/hswaw/BUILD
+++ b/hswaw/proto/BUILD.bazel
@@ -2,22 +2,22 @@
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
proto_library(
- name = "hswaw_proto",
+ name = "proto_proto",
srcs = ["checkinator.proto"],
visibility = ["//visibility:public"],
)
go_proto_library(
- name = "hswaw_go_proto",
+ name = "proto_go_proto",
compilers = ["@io_bazel_rules_go//proto:go_grpc"],
- importpath = "code.hackerspace.pl/hscloud/proto/hswaw",
- proto = ":hswaw_proto",
+ importpath = "code.hackerspace.pl/hscloud/hswaw/proto",
+ proto = ":proto_proto",
visibility = ["//visibility:public"],
)
go_library(
name = "go_default_library",
- embed = [":hswaw_go_proto"],
- importpath = "code.hackerspace.pl/hscloud/proto/hswaw",
+ embed = [":proto_go_proto"],
+ importpath = "code.hackerspace.pl/hscloud/hswaw/proto",
visibility = ["//visibility:public"],
)
diff --git a/proto/hswaw/checkinator.proto b/hswaw/proto/checkinator.proto
similarity index 83%
rename from proto/hswaw/checkinator.proto
rename to hswaw/proto/checkinator.proto
index 1023727..882083c 100644
--- a/proto/hswaw/checkinator.proto
+++ b/hswaw/proto/checkinator.proto
@@ -1,5 +1,6 @@
syntax = "proto3";
package hswaw;
+option go_package = "code.hackerspace.pl/hscloud/hswaw/proto";
message LeasifierLeasesRequest {
};