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/go/mirko/BUILD.bazel b/go/mirko/BUILD.bazel
index 4a83104..8069b7d 100644
--- a/go/mirko/BUILD.bazel
+++ b/go/mirko/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_library(
- name = "go_default_library",
+ name = "mirko",
srcs = [
"kubernetes.go",
"mirko.go",
@@ -13,22 +13,22 @@
importpath = "code.hackerspace.pl/hscloud/go/mirko",
visibility = ["//visibility:public"],
deps = [
- "//go/pki:go_default_library",
- "//go/statusz:go_default_library",
- "@com_github_gchaincl_sqlhooks//:go_default_library",
- "@com_github_golang_glog//:go_default_library",
- "@com_github_golang_migrate_migrate_v4//source:go_default_library",
- "@io_k8s_client_go//kubernetes:go_default_library",
- "@io_k8s_client_go//rest:go_default_library",
+ "//go/pki",
+ "//go/statusz",
+ "@com_github_gchaincl_sqlhooks//:sqlhooks",
+ "@com_github_golang_glog//:glog",
+ "@com_github_golang_migrate_migrate_v4//source",
+ "@io_k8s_client_go//kubernetes",
+ "@io_k8s_client_go//rest",
"@org_golang_google_grpc//:go_default_library",
- "@org_golang_google_grpc//reflection:go_default_library",
- "@org_golang_x_net//trace:go_default_library",
+ "@org_golang_google_grpc//reflection",
+ "@org_golang_x_net//trace",
],
)
go_test(
- name = "go_default_test",
+ name = "mirko_test",
srcs = ["revproxy_test.go"],
- embed = [":go_default_library"],
- deps = ["@io_k8s_client_go//kubernetes:go_default_library"],
+ embed = [":mirko"],
+ deps = ["@io_k8s_client_go//kubernetes"],
)
diff --git a/go/mirko/tests/sql/BUILD.bazel b/go/mirko/tests/sql/BUILD.bazel
index 5831dcd..aab01df 100644
--- a/go/mirko/tests/sql/BUILD.bazel
+++ b/go/mirko/tests/sql/BUILD.bazel
@@ -4,7 +4,16 @@
name = "go_default_test",
srcs = ["sql_test.go"],
deps = [
- "//go/mirko/tests/sql/migrations:go_default_library",
- "@com_github_golang_migrate_migrate_v4//database/sqlite3:go_default_library",
+ "//go/mirko/tests/sql/migrations",
+ "@com_github_golang_migrate_migrate_v4//database/sqlite3",
+ ],
+)
+
+go_test(
+ name = "sql_test",
+ srcs = ["sql_test.go"],
+ deps = [
+ "//go/mirko/tests/sql/migrations",
+ "@com_github_golang_migrate_migrate_v4//database/sqlite3",
],
)
diff --git a/go/mirko/tests/sql/migrations/BUILD.bazel b/go/mirko/tests/sql/migrations/BUILD.bazel
index 585ea48..5d0a98c 100644
--- a/go/mirko/tests/sql/migrations/BUILD.bazel
+++ b/go/mirko/tests/sql/migrations/BUILD.bazel
@@ -4,12 +4,12 @@
go_embed_data(
name = "migrations_data",
srcs = glob(["*.sql"]),
- package = "migrations",
flatten = True,
+ package = "migrations",
)
go_library(
- name = "go_default_library",
+ name = "migrations",
srcs = [
"migrations.go",
":migrations_data", # keep
@@ -17,7 +17,7 @@
importpath = "code.hackerspace.pl/hscloud/go/mirko/tests/sql/migrations",
visibility = ["//go/mirko/tests/sql:__subpackages__"],
deps = [
- "//go/mirko:go_default_library",
- "@com_github_golang_migrate_migrate_v4//:go_default_library",
+ "//go/mirko",
+ "@com_github_golang_migrate_migrate_v4//:migrate",
],
)
diff --git a/go/pki/BUILD.bazel b/go/pki/BUILD.bazel
index f2eae41..8f3d38b 100644
--- a/go/pki/BUILD.bazel
+++ b/go/pki/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_library(
- name = "go_default_library",
+ name = "pki",
srcs = [
"grpc.go",
"locate.go",
@@ -9,19 +9,19 @@
importpath = "code.hackerspace.pl/hscloud/go/pki",
visibility = ["//visibility:public"],
deps = [
- "@com_github_golang_glog//:go_default_library",
+ "@com_github_golang_glog//:glog",
"@org_golang_google_grpc//:go_default_library",
- "@org_golang_google_grpc//codes:go_default_library",
- "@org_golang_google_grpc//credentials:go_default_library",
- "@org_golang_google_grpc//peer:go_default_library",
- "@org_golang_google_grpc//status:go_default_library",
- "@org_golang_x_net//trace:go_default_library",
+ "@org_golang_google_grpc//codes",
+ "@org_golang_google_grpc//credentials",
+ "@org_golang_google_grpc//peer",
+ "@org_golang_google_grpc//status",
+ "@org_golang_x_net//trace",
],
)
go_test(
- name = "go_default_test",
+ name = "pki_test",
srcs = ["grpc_test.go"],
- embed = [":go_default_library"],
- deps = ["@com_github_go_test_deep//:go_default_library"],
+ embed = [":pki"],
+ deps = ["@com_github_go_test_deep//:deep"],
)
diff --git a/go/statusz/BUILD.bazel b/go/statusz/BUILD.bazel
index 4434b95..9becefc 100644
--- a/go/statusz/BUILD.bazel
+++ b/go/statusz/BUILD.bazel
@@ -1,21 +1,21 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
- name = "go_default_library",
+ name = "statusz",
srcs = [
"load.go",
"statusz.go",
],
importpath = "code.hackerspace.pl/hscloud/go/statusz",
visibility = ["//visibility:public"],
- deps = [
- "@com_github_golang_glog//:go_default_library",
- "@com_github_shirou_gopsutil//load:go_default_library",
- ],
x_defs = {
"code.hackerspace.pl/hscloud/go/statusz.GitCommit": "{STABLE_GIT_COMMIT}",
"code.hackerspace.pl/hscloud/go/statusz.GitVersion": "{STABLE_GIT_VERSION}",
"code.hackerspace.pl/hscloud/go/statusz.Builder": "{STABLE_BUILDER}",
"code.hackerspace.pl/hscloud/go/statusz.BuildTimestamp": "{BUILD_TIMESTAMP}",
},
+ deps = [
+ "@com_github_golang_glog//:glog",
+ "@com_github_shirou_gopsutil//load",
+ ],
)
diff --git a/go/workspace/BUILD.bazel b/go/workspace/BUILD.bazel
index 222d3c7..0d8405a 100644
--- a/go/workspace/BUILD.bazel
+++ b/go/workspace/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_library(
- name = "go_default_library",
+ name = "workspace",
srcs = [
"nix.go",
"workspace.go",
@@ -11,7 +11,7 @@
)
go_test(
- name = "go_default_test",
+ name = "workspace_test",
srcs = ["nix_test.go"],
data = [
":exports.nix",
@@ -19,6 +19,6 @@
"//:default.nix",
"//nix/readtree:default.nix",
],
- embed = [":go_default_library"],
- deps = ["@com_github_google_go_cmp//cmp:go_default_library"],
+ embed = [":workspace"],
+ deps = ["@com_github_google_go_cmp//cmp"],
)