feedback

scionproto · Oct 31, 2023 · 5bd83ad · 5bd83ad
1 parent 28ec322
commit 5bd83ad
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 31 deletions.
diff --git a/private/mgmtapi/api.bzl b/private/mgmtapi/api.bzl
@@ -29,27 +29,17 @@ def openapi_generate_go(
         **kwargs: Ad.
     """
 
-    _openapi_generate_go(
-        name = name + "_gen",
-        out_client = "client.bzl.gen.go" if client else None,
-        out_server = "server.bzl.gen.go" if server else None,
-        out_spec = "spec.bzl.gen.go" if spec else None,
-        out_types = "types.bzl.gen.go" if types else None,
-        **kwargs
-    )
-
-    out_files = []
     write_files = {}
     for typ, gen in {"client": client, "server": server, "spec": spec, "types": types}.items():
         if not gen:
             continue
         src = typ + ".bzl.gen.go"
-        out_files.append(src)
+        kwargs["out_" + typ] = typ + ".bzl.gen.go"
         write_files[typ + ".gen.go"] = src
 
-    native.filegroup(
+    _openapi_generate_go(
         name = name,
-        srcs = out_files,
+        **kwargs
     )
 
     write_source_files(

diff --git a/rules_openapi/defs.bzl b/rules_openapi/defs.bzl
@@ -17,12 +17,7 @@ def openapi_bundle(
         name = name,
         srcs = [name + "-no-header"],
         outs = [name + ".bzl.gen.yml"],
-        cmd = "$(location @com_github_scionproto_scion//rules_openapi/internal:header.sh)  \
-            '$(location " + name + "-no-header)' \
-            '$(location " + name + ".bzl.gen.yml)' \
-            '# GENERATED FILE DO NOT EDIT' \
-        ",
-        tools = ["@com_github_scionproto_scion//rules_openapi/internal:header.sh"],
+        cmd = "(echo '# GENERATED FILE DO NOT EDIT'; cat $<) > $@",
         visibility = visibility,
     )
 

diff --git a/rules_openapi/internal/header.sh b/rules_openapi/internal/header.sh