treewide: fix "could not merge expression" from gazelle

This isn't any real bugfix, but more of a style thing. Gazelle can't work with select or glob statements (bazel-contrib/bazel-gazelle#1735), but will work fine with them and even ignore them if set to # keep. This adds that directive to make gazelle less verbose when running. Change-Id: I7c638867d6b566e1d398eef37aff2316bf90a00f Reviewed-on: https://review.monogon.dev/c/monogon/+/3241 Reviewed-by: Leopold Schabel <[email protected]> Tested-by: Jenkins CI
monogon-dev · Jul 24, 2024 · 93ba807 · 93ba807
1 parent 194c871
commit 93ba807
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cloud/apigw/model/BUILD.bazel b/cloud/apigw/model/BUILD.bazel
@@ -5,7 +5,7 @@ sqlc_go_library(
     name = "sqlc_model",
     dialect = "cockroachdb",
     importpath = "source.monogon.dev/cloud/apigw/model",
-    migrations = glob(["migrations/*sql"]),
+    migrations = glob(["migrations/*.sql"]),
     queries = [
         "queries.sql",
     ],
@@ -17,7 +17,7 @@ go_library(
     embed = [
         ":sqlc_model",  # keep
     ],
-    embedsrcs = glob(["migrations/*sql"]),
+    embedsrcs = glob(["migrations/*.sql"]),  # keep
     importpath = "source.monogon.dev/cloud/apigw/model",
     visibility = ["//visibility:public"],
     deps = [

diff --git a/cloud/bmaas/bmdb/model/BUILD.bazel b/cloud/bmaas/bmdb/model/BUILD.bazel
@@ -5,7 +5,7 @@ sqlc_go_library(
     name = "sqlc_model",
     dialect = "cockroachdb",
     importpath = "source.monogon.dev/cloud/bmaas/bmdb/model",
-    migrations = glob(["migrations/*sql"]),
+    migrations = glob(["migrations/*.sql"]),
     queries = [
         "queries_base.sql",
         "queries_stats.sql",
@@ -23,7 +23,7 @@ go_library(
     embed = [
         ":sqlc_model",  # keep
     ],
-    embedsrcs = glob(["migrations/*sql"]),
+    embedsrcs = glob(["migrations/*.sql"]),  # keep
     importpath = "source.monogon.dev/cloud/bmaas/bmdb/model",
     visibility = ["//visibility:public"],
     deps = [

diff --git a/metropolis/vm/kube/apis/vm/v1alpha1/BUILD.bazel b/metropolis/vm/kube/apis/vm/v1alpha1/BUILD.bazel
@@ -11,7 +11,7 @@ go_library(
     embed = select({
         "//metropolis/build/kube-code-generator:embed_deepcopy": [":go_kubernetes_library"],
         "//conditions:default": [],
-    }),
+    }),  # keep
     importpath = "source.monogon.dev/metropolis/vm/kube/apis/vm/v1alpha1",
     visibility = ["//visibility:public"],
     deps = [