bazel: Improve workspace setup (#726)

and bump `rules_pkg`

Signed-off-by: Ryan Northey <ryan@synca.io>

Author: phlax

.bazelignore

@@ -0,0 +1 @@
+node_modules

.bazelrc

@@ -3,3 +3,9 @@ common --color=yes
 common:ci --noshow_progress
 common:ci --noshow_loading_progress
 common:ci --test_output=errors
+
+common:examples --action_env=DEV_CONTAINER_ID
+common:examples --host_action_env=DEV_CONTAINER_ID
+
+try-import %workspace%/user.bazelrc
+try-import %workspace%/repo.bazelrc

.github/workflows/verify-examples.yml

@@ -43,7 +43,6 @@ jobs:
         sudo systemctl start docker
       if: steps.cache.outputs.cache-hit != 'true' && github.event_name != 'pull_request'
 
-
     - run: |
         TEMPDIR=/cache/docker
         sudo mkdir -p "${TEMPDIR}"
@@ -62,11 +61,11 @@ jobs:
         DEV_CONTAINER_ID=$(docker inspect --format='{{.Id}}' envoyproxy/envoy:dev)
         echo "DEV_CONTAINER_ID=${DEV_CONTAINER_ID}" >> $GITHUB_ENV
     - run: |
+        echo "common:examples --sandbox_writable_path=$HOME/.docker/" > repo.bazelrc
+        echo "common:examples --sandbox_writable_path=$HOME" >> repo.bazelrc
         bazel run --config=ci \
-                  --action_env="DEV_CONTAINER_ID=${DEV_CONTAINER_ID}" \
-                  --host_action_env="DEV_CONTAINER_ID=${DEV_CONTAINER_ID}" \
-                  --sandbox_writable_path="${HOME}/.docker/" \
-                  --sandbox_writable_path=$HOME :verify_examples
+                  --config=examples \
+                  //:verify_examples
 
     - run: |
         sudo systemctl stop docker docker.socket

.gitignore

@@ -45,6 +45,7 @@ TAGS
 /tools/spelling/.aspell.en.pws
 clang-tidy-fixes.yaml
 clang.bazelrc
+repo.bazelrc
 user.bazelrc
 CMakeLists.txt
 cmake-build-debug

BUILD

@@ -138,6 +138,10 @@ filegroup(
             "**/*",
         ],
         exclude = [
+            "**/*~",
+            "**/.*",
+            "**/#*",
+            ".*/**/*",
             "BUILD",
             ".git/**/*",
             "bazel-*/**/*",

WORKSPACE

@@ -1,13 +1,10 @@
 workspace(name = "envoy-examples")
 
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-http_archive(
-    name = "rules_pkg",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.9.1/rules_pkg-0.9.1.tar.gz",
-        "https://github.com/bazelbuild/rules_pkg/releases/download/0.9.1/rules_pkg-0.9.1.tar.gz",
-    ],
-    sha256 = "8f9ee2dc10c1ae514ee599a8b42ed99fa262b757058f65ad3c384289ff70c4b8",
-)
-load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
-rules_pkg_dependencies()
+load("//bazel:archives.bzl", "load_envoy_examples_archives")
+load_envoy_examples_archives()
+
+load("//bazel:deps.bzl", "resolve_envoy_examples_dependencies")
+resolve_envoy_examples_dependencies()
+
+load("//bazel:toolchains.bzl", "load_envoy_examples_toolchains")
+load_envoy_examples_toolchains()

bazel/BUILD

@@ -0,0 +1,38 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("//bazel:versions.bzl", "VERSIONS")
+
+def load_github_archives():
+    for k, v in VERSIONS.items():
+        if type(v) == type("") or v.get("type") != "github_archive":
+            continue
+        kwargs = dict(name = k, **v)
+        # Format string values, but not lists
+        formatted_kwargs = {}
+        for arg_k, arg_v in kwargs.items():
+            if arg_k in ["repo", "type", "version"]:
+                continue
+            if type(arg_v) == type(""):
+                formatted_kwargs[arg_k] = arg_v.format(**kwargs)
+            else:
+                formatted_kwargs[arg_k] = arg_v
+        http_archive(**formatted_kwargs)
+
+def load_http_archives():
+    for k, v in VERSIONS.items():
+        if type(v) == type("") or v.get("type") != "http_archive":
+            continue
+        kwargs = dict(name = k, **v)
+        # Format string values, but not lists
+        formatted_kwargs = {}
+        for arg_k, arg_v in kwargs.items():
+            if arg_k in ["type", "version"]:
+                continue
+            if type(arg_v) == type(""):
+                formatted_kwargs[arg_k] = arg_v.format(**kwargs)
+            else:
+                formatted_kwargs[arg_k] = arg_v
+        http_archive(**formatted_kwargs)
+
+def load_envoy_examples_archives():
+    load_github_archives()
+    load_http_archives()

bazel/archives.bzl

@@ -0,0 +1,6 @@
+load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies")
+load("@rules_python//python:repositories.bzl", "py_repositories")
+
+def resolve_envoy_examples_dependencies():
+    go_rules_dependencies()
+    py_repositories()

bazel/deps.bzl

@@ -0,0 +1,10 @@
+load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains")
+load("@rules_python//python:repositories.bzl", "python_register_toolchains")
+load("//bazel:versions.bzl", "VERSIONS")
+
+def load_envoy_examples_toolchains():
+    go_register_toolchains(VERSIONS["go"])
+    python_register_toolchains(
+        name = "python%s" % VERSIONS["python"].replace(".", "_"),
+        python_version = VERSIONS["python"].replace("-", "_"),
+    )