bazel: Fix package naming (#1060)

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

Author: phlax

.bcr/presubmit.yml

@@ -13,4 +13,4 @@ tasks:
     platform: ${{ unix_platform }}
     bazel: ${{ bazel }}
     build_targets:
-    - "@envoy_examples//..."
+    - "@envoy-examples//..."

.bcr/wasm-cc/presubmit.yml

@@ -13,4 +13,4 @@ tasks:
     platform: ${{ unix_platform }}
     bazel: ${{ bazel }}
     build_targets:
-    - "@envoy_example_wasm_cc//..."
+    - "@envoy-example-wasm-cc//..."

.github/workflows/docs.yml

@@ -43,20 +43,32 @@ jobs:
       with:
         path: examples
     - run: |
-        export UID
-        export GID=$(id -g)
-
-        cat >> ../envoy/WORKSPACE << 'EOF'
-        load("@envoy_examples//bazel:env.bzl", "envoy_examples_env")
+        cat >> WORKSPACE <<'EOF'
+        load("@envoy-examples//bazel:env.bzl", "envoy_examples_env")
         envoy_examples_env()
         EOF
 
-        cat > ../envoy/repo.bazelrc << 'EOF'
+        cat > repo.bazelrc <<'EOF'
         common --config=ci
         common --config=rbe
         common --config=bes
         EOF
 
+        # temp hacks to make envoy use new names
+        sed -i -f /dev/stdin bazel/repositories.bzl <<'SED'
+        /^[[:space:]]*external_http_archive[[:space:]]*(/,/^[[:space:]]*)[[:space:]]*$/{
+          s/^[[:space:]]*name[[:space:]]*=[[:space:]]*"envoy_examples",[[:space:]]*$/        name = "envoy-examples",\
+                location_name = "envoy_examples",/
+        }
+        SED
+
+        git grep -l '@envoy_example' | xargs sed -i 's/@envoy_example/@envoy-example/g'
+      working-directory: envoy
+
+    - run: |
+        export UID
+        export GID=$(id -g)
+
         docker compose run docs
       working-directory: examples
       env:

BUILD

@@ -68,7 +68,7 @@ filegroup(
             "kafka/*.yaml",
             "kafka-mesh/*.yaml",
         ],
-    ) + ["@envoy-example-wasmcc//:configs"],
+    ) + ["@envoy-example-wasm-cc//:configs"],
     visibility = ["//visibility:public"],
 )
 
@@ -98,7 +98,7 @@ filegroup(
 
 filegroup(
     name = "docs_rst",
-    srcs = glob(["**/example.rst"]) + ["@envoy-example-wasmcc//:example.rst"],
+    srcs = glob(["**/example.rst"]) + ["@envoy-example-wasm-cc//:example.rst"],
 )
 
 pkg_files(
@@ -115,7 +115,7 @@ genrule(
     cmd = """
     TEMP=$$(mktemp -d)
     for location in $(locations :docs_rst); do
-        if [[ "$$location" == *"/envoy-example"* ]]; then
+        if [[ "$$location" == *"/envoy-example-"* ]]; then
             example="$$(echo "$$location" | cut -d- -f3- | cut -d/ -f1)"
         else
             example=$$(echo $$location | sed -e 's#^external/[^/]*/##' | cut -d/ -f1)
@@ -165,7 +165,7 @@ pkg_tar(
     package_dir = "start/sandboxes",
     deps = [
         ":examples_docs",
-        "@envoy-example-wasmcc//:includes",
+        "@envoy-example-wasm-cc//:includes",
     ],
     visibility = ["//visibility:public"],
 )

MODULE.bazel

@@ -1,14 +1,15 @@
 module(
-    name = "envoy_examples",
+    name = "envoy-examples",
     version = "0.1.6-dev",
 )
 
+bazel_dep(name = "envoy-example-wasm-cc", version = "0.1.6-dev")
 bazel_dep(name = "rules_go", version = "0.59.0", repo_name = "io_bazel_rules_go")
 bazel_dep(name = "rules_pkg", version = "1.1.0")
 bazel_dep(name = "rules_python", version = "1.7.0")
 bazel_dep(name = "rules_shell", version = "0.6.1")
-bazel_dep(name = "envoy_example_wasm_cc", version = "0.1.6-dev")
+
 local_path_override(
-    module_name = "envoy_example_wasm_cc",
+    module_name = "envoy-example-wasm-cc",
     path = "wasm-cc",
 )

WORKSPACE

@@ -1,4 +1,4 @@
-workspace(name = "envoy_examples")
+workspace(name = "envoy-examples")
 
 load("//bazel:env.bzl", "envoy_examples_env")
 envoy_examples_env()

bazel/archives.bzl

@@ -1,5 +1,5 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@envoy-example-wasmcc//bazel:archives.bzl", "load_envoy_example_wasmcc_archives")
+load("@envoy-example-wasm-cc//bazel:archives.bzl", "load_envoy_example_wasmcc_archives")
 load("//bazel:versions.bzl", "VERSIONS")
 
 def load_github_archives():

bazel/deps.bzl

@@ -1,4 +1,4 @@
-load("@envoy-example-wasmcc//bazel:deps.bzl", "resolve_envoy_example_wasmcc_dependencies")
+load("@envoy-example-wasm-cc//bazel:deps.bzl", "resolve_envoy_example_wasmcc_dependencies")
 load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies")
 load("@rules_python//python:repositories.bzl", "py_repositories")
 

bazel/env.bzl

@@ -12,5 +12,5 @@ _envoy_examples_env = repository_rule(
 )
 
 def envoy_examples_env():
-    _envoy_examples_env(name = "envoy_examples_env")
+    _envoy_examples_env(name = "envoy-examples-env")
     load_envoy_nested_examples()

bazel/nested.bzl

@@ -16,13 +16,13 @@ def _example_repo_impl(ctx):
 example_repository = repository_rule(
     implementation = _example_repo_impl,
     attrs = {
-        "examples_root": attr.label(default = "@envoy_examples//:BUILD"),
+        "examples_root": attr.label(default = "@envoy-examples//:BUILD"),
         "path": attr.string(mandatory=True),
     },
 )
 
 def load_envoy_nested_examples():
     example_repository(
-        name = "envoy-example-wasmcc",
+        name = "envoy-example-wasm-cc",
         path = "wasm-cc",
     )