go: re-do the entire thing
This is a mega-change, but attempting to split this up further is
probably not worth the effort.
Summary:
1. Bump up bazel, rules_go, and others.
2. Switch to new go target naming (bye bye go_default_library)
3. Move go deps to go.mod/go.sum, use make gazelle generate from that
4. Bump up Python deps a bit
And also whatever was required to actually get things to work - loads of
small useless changes.
Tested to work on NixOS and Ubuntu 20.04:
$ bazel build //...
$ bazel test //...
Change-Id: I8364bdaa1406b9ae4d0385a6b607f3e7989f98a9
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1583
Reviewed-by: q3k <q3k@hackerspace.pl>
diff --git a/bgpwtf/invoice/BUILD.bazel b/bgpwtf/invoice/BUILD.bazel
index 950474e..461af84 100644
--- a/bgpwtf/invoice/BUILD.bazel
+++ b/bgpwtf/invoice/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
go_library(
- name = "go_default_library",
+ name = "invoice_lib",
srcs = [
"calc.go",
"main.go",
@@ -13,27 +13,28 @@
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",
- "@com_github_golang_glog//:go_default_library",
+ "//bgpwtf/invoice/proto",
+ "//bgpwtf/invoice/templates",
+ "//go/mirko",
+ "//go/statusz",
+ "@com_github_golang_glog//:glog",
"@com_github_golang_protobuf//proto:go_default_library",
- "@com_github_mattn_go_sqlite3//:go_default_library",
- "@com_github_sebastiaanklippert_go_wkhtmltopdf//:go_default_library",
- "@org_golang_google_grpc//codes:go_default_library",
- "@org_golang_google_grpc//status:go_default_library",
+ "@com_github_mattn_go_sqlite3//:go-sqlite3",
+ "@com_github_sebastiaanklippert_go_wkhtmltopdf//:go-wkhtmltopdf",
+ "@org_golang_google_grpc//codes",
+ "@org_golang_google_grpc//status",
],
)
go_binary(
name = "invoice",
- embed = [":go_default_library"],
+ embed = [":invoice_lib"],
visibility = ["//visibility:public"],
)
go_test(
- name = "go_default_test",
+ name = "invoice_test",
srcs = ["calc_test.go"],
- embed = [":go_default_library"],
+ embed = [":invoice_lib"],
+ deps = ["//bgpwtf/invoice/proto"],
)
diff --git a/bgpwtf/invoice/proto/BUILD.bazel b/bgpwtf/invoice/proto/BUILD.bazel
index a1a7033..6eff00e 100644
--- a/bgpwtf/invoice/proto/BUILD.bazel
+++ b/bgpwtf/invoice/proto/BUILD.bazel
@@ -20,7 +20,7 @@
)
go_library(
- name = "go_default_library",
+ name = "proto",
embed = [":proto_go_proto"],
importpath = "code.hackerspace.pl/hscloud/bgpwtf/invoice/proto",
visibility = ["//visibility:public"],
diff --git a/bgpwtf/invoice/recurrent/BUILD.bazel b/bgpwtf/invoice/recurrent/BUILD.bazel
index b9fc578..2e456ee 100644
--- a/bgpwtf/invoice/recurrent/BUILD.bazel
+++ b/bgpwtf/invoice/recurrent/BUILD.bazel
@@ -1,14 +1,14 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
- name = "go_default_library",
+ name = "recurrent_lib",
srcs = ["main.go"],
importpath = "code.hackerspace.pl/hscloud/bgpwtf/invoice/recurrent",
visibility = ["//visibility:private"],
deps = [
- "//bgpwtf/invoice/proto:go_default_library",
- "//go/pki:go_default_library",
- "@com_github_golang_glog//:go_default_library",
+ "//bgpwtf/invoice/proto",
+ "//go/pki",
+ "@com_github_golang_glog//:glog",
"@com_github_golang_protobuf//proto:go_default_library",
"@org_golang_google_grpc//:go_default_library",
],
@@ -16,6 +16,6 @@
go_binary(
name = "recurrent",
- embed = [":go_default_library"],
+ embed = [":recurrent_lib"],
visibility = ["//visibility:public"],
)
diff --git a/bgpwtf/invoice/render.go b/bgpwtf/invoice/render.go
index db5c151..dc80e41 100644
--- a/bgpwtf/invoice/render.go
+++ b/bgpwtf/invoice/render.go
@@ -7,7 +7,7 @@
"strings"
"time"
- wkhtml "github.com/sebastiaanklippert/go-wkhtmltopdf"
+ wkhtml "github.com/SebastiaanKlippert/go-wkhtmltopdf"
pb "code.hackerspace.pl/hscloud/bgpwtf/invoice/proto"
"code.hackerspace.pl/hscloud/bgpwtf/invoice/templates"
diff --git a/bgpwtf/invoice/templates/BUILD.bazel b/bgpwtf/invoice/templates/BUILD.bazel
index 4756da4..4b7baa3 100644
--- a/bgpwtf/invoice/templates/BUILD.bazel
+++ b/bgpwtf/invoice/templates/BUILD.bazel
@@ -9,7 +9,7 @@
)
go_library(
- name = "go_default_library",
+ name = "templates",
srcs = [
":templates_bindata", # keep
],