Add support for bzlmod

OpenAPITools · Jan 3, 2025 · c4136e4 · c4136e4
1 parent 5ea617b
commit c4136e4
Show file tree

Hide file tree

Showing 17 changed files with 2,309 additions and 40 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -26,5 +26,11 @@ jobs:
       # Build
       - name: Build all target
         run: |
-          cd internal/test
+          cd internal/test/basic
+          bazel build //...
+
+      - name: Integration BCR test
+        run: |
+          cd internal/test/bcr
+          bazel mod path
           bazel build //...
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -0,0 +1,11 @@
+module(
+    name = "openapi_tools_generator_bazel",
+    version = "0.1.7",
+    compatibility_level = 0,
+)
+
+bazel_dep(name = "rules_pkg", version = "1.0.1")
+openapi_gen = use_extension("@openapi_tools_generator_bazel//:extension.bzl", "openapi_gen")
+openapi_gen.client()
+use_repo(openapi_gen, "openapi_tools_generator_bazel_cli")
+
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/WORKSPACE b/WORKSPACE
diff --git a/defs.bzl b/defs.bzl
@@ -3,9 +3,7 @@
 load(
     "//internal:openapi_generator.bzl",
     _openapi_generator = "openapi_generator",
-    _openapi_tools_generator_bazel_repositories = "openapi_tools_generator_bazel_repositories",
 )
 
 openapi_generator = _openapi_generator
 
-openapi_tools_generator_bazel_repositories = _openapi_tools_generator_bazel_repositories
diff --git a/extension.bzl b/extension.bzl
@@ -0,0 +1,29 @@
+"modules extension to use with openapi-generator-bazel"
+load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external")
+
+def _openapi_generator_impl(module_ctx):
+    for mod in module_ctx.modules:
+        for install in mod.tags.client:
+            jvm_maven_import_external(
+                name = "openapi_tools_generator_bazel_cli",
+                artifact_sha256 = install.sha256,
+                artifact = "org.openapitools:openapi-generator-cli:" + install.version,
+                server_urls = install.server_urls,
+            )
+
+_cli = tag_class(attrs = {
+    "version": attr.string(
+        default = "7.2.0",
+    ),
+    "sha256": attr.string(
+        default = "1cf0c80de12c0fdc8594289c19e414b402108ef10b8dd0bfda1953151341ab5d",
+    ),
+    "server_urls": attr.string_list(
+        default = ["https://repo1.maven.org/maven2"],
+    ),
+})
+openapi_gen = module_extension(
+    implementation = _openapi_generator_impl,
+    tag_classes = {"client": _cli},
+)
+
diff --git a/internal/openapi_generator.bzl b/internal/openapi_generator.bzl
@@ -1,25 +1,5 @@
 # Copyright 2019 OpenAPI-Generator-Bazel Contributors
 
-load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external")
-
-def openapi_tools_generator_bazel_repositories(
-        openapi_generator_cli_version = "6.5.0",
-        sha256 = "f18d771e98f2c5bb169d1d1961de4f94866d2901abc1e16177dd7e9299834721",
-        prefix = "openapi_tools_generator_bazel",
-        server_urls = [
-            "https://repo1.maven.org/maven2"
-        ]):
-    jvm_maven_import_external(
-        name = "openapi_tools_generator_bazel_cli",
-        artifact_sha256 = sha256,
-        artifact = "org.openapitools:openapi-generator-cli:" + openapi_generator_cli_version,
-        server_urls = server_urls,
-    )
-    native.bind(
-        name = prefix + "/dependency/openapi-generator-cli",
-        actual = "@" + prefix + "_cli//jar",
-    )
-
 def _comma_separated_pairs(pairs):
     return ",".join([
         "{}={}".format(k, v)
@@ -193,7 +173,7 @@ _openapi_generator = rule(
         ),
         "openapi_generator_cli": attr.label(
             cfg = "exec",
-            default = Label("//external:openapi_tools_generator_bazel/dependency/openapi-generator-cli"),
+            default = Label("@openapi_tools_generator_bazel_cli//:openapi_tools_generator_bazel_cli"),
             allow_single_file = True,
         ),
     },

diff --git a/internal/test/BUILD.bazel → internal/test/basic/BUILD.bazel b/internal/test/BUILD.bazel → internal/test/basic/BUILD.bazel
diff --git a/internal/test/config.yaml → internal/test/basic/config.yaml b/internal/test/config.yaml → internal/test/basic/config.yaml
diff --git a/internal/test/petstore.yaml → internal/test/basic/petstore.yaml b/internal/test/petstore.yaml → internal/test/basic/petstore.yaml
diff --git a/...l/test/python-templates/__init__.mustache → .../basic/python-templates/__init__.mustache b/...l/test/python-templates/__init__.mustache → .../basic/python-templates/__init__.mustache
diff --git a/internal/test/bcr/.gitignore b/internal/test/bcr/.gitignore
@@ -0,0 +1,4 @@
+bazel-bcr
+bazel-bin
+bazel-out
+bazel-testlogs
diff --git a/internal/test/bcr/BUILD b/internal/test/bcr/BUILD
@@ -0,0 +1,9 @@
+load("@openapi_tools_generator_bazel//:defs.bzl", "openapi_generator")
+
+openapi_generator(
+    name = "pylib",
+    config = "config.yaml",
+    spec = "petstore.yaml",
+    generator = "python",
+)
+
diff --git a/internal/test/bcr/MODULE.bazel b/internal/test/bcr/MODULE.bazel
@@ -0,0 +1,13 @@
+module(
+    name = "openapi_tools_generator_bazel_bcr_tests",
+    version = "1.2.3",
+)
+
+bazel_dep(name = "openapi_tools_generator_bazel", version = "")
+local_path_override(
+    module_name = "openapi_tools_generator_bazel",
+    path = "../../..",
+)
+openapi_gen = use_extension("@openapi_tools_generator_bazel//:extension.bzl", "openapi_gen")
+use_repo(openapi_gen, "openapi_tools_generator_bazel_cli")
+