Update Bazel dependencies (#27)

* Update Bazel dependencies

Update rules_go, Gazelle and Bazel Go version
Add all tests to module BUILD.bazel
Ignore MODULE.bazel for now

* Makefile: Add OS feature detection

Use build mechanism appropriate on host platform
Provide cross-compilation options on Linux for macOS and Windows target
platforms
Remove rpm toolchain dependency on non-rpm targets
Update dependency install dialog

Author: FR4NK-W

Makefile

@@ -1,33 +1,79 @@
 
-.PHONY: all bazel build clean realclean package package_deb package_rpm
-
-build: bazel
-#go build -ldflags "-X github.com/netsec-ethz/bootstrapper/config.versionString="$(./.bazel-build-env | awk '{print $2}')
+.PHONY: all bazel bootstrappper build go_build install_deps clean realclean package package_deb package_rpm
+
+build: install_deps bazel
+
+go_build:
+	@go build -o scion-bootstrapper -ldflags "-X github.com/netsec-ethz/bootstrapper/config.versionString="$$(git describe --tags --dirty --always)
+
+bootstrapper:
+	@if [ -n "$${OS}" ] ; then \
+	  UNAME_OS="$${OS}"; \
+	else \
+	  UNAME_OS=$$(uname --kernel-name); \
+	fi; \
+	if [ "$${UNAME_OS}" = "Linux" ] ; then \
+	  make -s build; \
+	elif [ "$${UNAME_OS}" = "Windows_NT" ] ; then \
+	  make.exe -s go_build; \
+	  cp scion-bootstrapper scion-bootstrapper.exe; \
+	else \
+	  make -s go_build; \
+	fi;
+
+install_deps:
+	@if [ -z "$${CC}" ] ; then \
+	  if [ ! -x "$$(command -v gcc)" ]; then \
+	    echo "Cannot find gcc or CC; set the CC environment variable or make sure gcc is on your PATH."; \
+	  else \
+	    exit 0; \
+	  fi; \
+	else \
+	  exit 0; \
+	fi; \
+	apt-get install build-essential 2>/dev/null; \
+	test $$? -eq 0 || echo "Install build tools?\nsudo apt-get install build-essential" && sudo apt-get install build-essential
 
 bazel: go_deps.bzl
 	rm -f bin/*
+	@if [ -z "$${CC}" ] ; then \
+	  if [ ! -x "$$(command -v gcc)" ]; then \
+	    echo "Cannot find gcc or CC; set the CC environment variable or make sure gcc is on your PATH." && exit 1; \
+	  fi; \
+	fi;
 	./.bazel-build-env
 	bazel build //:bootstrapper
-	cp `bazel aquery  'outputs(".*bin/bootstrapper", //:bootstrapper)' --output=text 2>/dev/null | grep "Outputs" | sed -r 's/\s*Outputs: \[(.*)\]/\1/'` bin/
+	@cp `bazel aquery  'outputs(".*bin/bootstrapper", //:bootstrapper)' --output=text 2>/dev/null | grep "Outputs" | sed -r 's/\s*Outputs: \[(.*)\]/\1/'` bin/
+	@ln -sf ./bin/bootstrapper ./scion-bootstrapper
 
-all: build test package
+all: bootstrapper test package
 
 clean:
 	bazel clean
-	rm -f bin/*
+	rm -f ./bin/*
 
 realclean: clean
 	bazel clean --expunge
-	rm ~/.cache/bazel
-	rm -f go_deps.bzl
+	rm -f ./MODULE.bazel*
+	rm -f ./go_deps.bzl
 
 package: package_deb
 
 package_deb: build
+	@if [ ! -x "$$(command -v python3)" ]; then \
+	  echo "Cannot find python3 on your PATH."; \
+	  apt-get install python3 &>/dev/null; \
+	  test $$? -eq 0 || echo "Install python3?\nsudo apt-get install python3" && sudo apt-get install python3; \
+	fi;
 	bazel build //:scion-bootstrapper-deb
 	cp bazel-bin/scion-bootstrapper_*_*.deb bin/
 
 package_rpm: build
+	@if [ ! -x "$$(command -v rpmbuild)" ]; then \
+	  echo "Cannot find rpmbuild on your PATH."; \
+	  apt-get install rpm &>/dev/null; \
+	  test $$? -eq 0 || echo "Install rpm toolchain?\nsudo apt-get install rpm" && sudo apt-get install rpm; \
+	fi;
 	bazel build //:scion-bootstrapper-rpm
 	cp bazel-bin/scion-bootstrapper-*.*.rpm bin/
 
@@ -52,7 +98,16 @@ ifeq (,$(wildcard go_deps.bzl))
 	$(file > ./go_deps.bzl,$(go_deps_boilerplate))
 endif
 	bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro=go_deps.bzl%go_deps -prune
+	bazel clean --expunge
 
 test: build
-	bazel test --config=unit --test_output=errors ...
+	@if [ ! -x "$$(command -v "scion-pki")" ]; then \
+	  echo "Cannot find scion-pki; make sure scion-pki is on your PATH otherwise the tests relying on it will fail."; \
+	fi;
+	bazel test --test_output=errors //hinting:go_default_test //fetcher:go_default_test //config:go_default_test
+	# Do not filter on unit tag for now, as doing so forces all loaded packages
+	# to satisfy their dependencies, which is not desirable for pkg_rpm
+	# which forces to have a full rpm toolchain loaded, even when the target
+	# is not executed. Explicitly list all test targets.
+	#bazel test --config=unit --test_output=errors ...
 

README.md

@@ -56,7 +56,7 @@ To build the bootstrapper executable, simply run `make bootstrapper` in the top
 In order to build the bootstrapper debian package, we use Bazel.
 The service files are in the `./res/packaging/debian/` directory.
 You can install Bazel by following the instructions at https://docs.bazel.build/versions/master/install-ubuntu.html
-You can then build the package by running `bazel build //:scion-bootstrapper-deb`.
+You can then build the package by running `make package_deb`.
 When contributing, please run `make all` in order to make sure that all targets build and to run the linter.
 
 Experimental availability is also provided for macOS and Windows. Run `make darwin` or `make windows` to build a

WORKSPACE

@@ -5,10 +5,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file"
 # Bazel rules for Golang
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "f2dcd210c7095febe54b804bb1cd3a58fe8435a909db2ec04e31542631cf715c",
+    sha256 = "d93ef02f1e72c82d8bb3d5169519b36167b33cf68c252525e3b9d3d5dd143de7",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.31.0/rules_go-v0.31.0.zip",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.31.0/rules_go-v0.31.0.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.49.0/rules_go-v0.49.0.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.49.0/rules_go-v0.49.0.zip",
     ],
 )
 
@@ -18,7 +18,7 @@ go_rules_dependencies()
 
 go_register_toolchains(
     nogo = "@//:nogo",
-    go_version = "1.18",
+    version = "1.22.7"
 )
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -39,10 +39,10 @@ rules_pkg_dependencies()
 # Gazelle
 http_archive(
     name = "bazel_gazelle",
-    sha256 = "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb",
+    integrity = "sha256-12v3pg/YsFBEQJDfooN6Tq+YKeEWVhjuNdzspcvfWNU=",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz",
-        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.37.0/bazel-gazelle-v0.37.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.37.0/bazel-gazelle-v0.37.0.tar.gz",
     ],
 )
 

hinting/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
@@ -11,6 +11,9 @@ go_library(
         "dns.go",
         "dns_config_resolv.go",
         "dns_config_windows.go",
+        "dns_search_domain_fallbacks.go",
+        "dns_search_domain_fallbacks_reverse.go",
+        "dns_search_domain_fallbacks_whois.go",
         "hinting.go",
         "ipv6_nd_rad.go",
         "mdns.go",
@@ -65,10 +68,6 @@ go_library(
             "@com_github_insomniacslk_dhcp//dhcpv4/client4:go_default_library",
             "@org_golang_x_sys//unix:go_default_library",
         ],
-        "@io_bazel_rules_go//go/platform:nacl": [
-            "@org_golang_x_net//ipv4:go_default_library",
-            "@org_golang_x_sys//unix:go_default_library",
-        ],
         "@io_bazel_rules_go//go/platform:netbsd": [
             "@org_golang_x_net//ipv4:go_default_library",
             "@org_golang_x_sys//unix:go_default_library",
@@ -92,3 +91,11 @@ go_library(
         "//conditions:default": [],
     }),
 )
+
+go_test(
+    name = "go_default_test",
+    srcs = ["dns_search_domain_fallbacks_test.go"],
+    embed = [":go_default_library"],
+    tags = ["unit"],
+    deps = ["@com_github_stretchr_testify//assert:go_default_library"],
+)