Add use_os and use_arch to module extension

Will be followed by using these two attributes in the lockfile to store platform dependent extensions related issue: #19154 PiperOrigin-RevId: 559392081 Change-Id: Ib0cfa2df648effe785068fa4d03da02c39d1fdd8
bazelbuild · Sep 12, 2023 · 15c442c · 15c442c
1 parent 5e1ceaf
commit 15c442c
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 2 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtension.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtension.java
@@ -37,6 +37,10 @@ public abstract class ModuleExtension implements StarlarkValue {
 
   public abstract ImmutableList<String> getEnvVariables();
 
+  public abstract boolean getUseOs();
+
+  public abstract boolean getUseArch();
+
   public static Builder builder() {
     return new AutoValue_ModuleExtension.Builder();
   }
@@ -54,6 +58,10 @@ public abstract static class Builder {
 
     public abstract Builder setEnvVariables(ImmutableList<String> value);
 
+    public abstract Builder setUseOs(boolean useOs);
+
+    public abstract Builder setUseArch(boolean useArch);
+
     public abstract ModuleExtension build();
   }
 }
diff --git a/...ava/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryModule.java b/...ava/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryModule.java
@@ -268,6 +268,8 @@ public ModuleExtension moduleExtension(
       Dict<?, ?> tagClasses, // Dict<String, TagClass>
       String doc,
       Sequence<?> environ, // <String>
+      Boolean useOs,
+      Boolean useArch,
       StarlarkThread thread)
       throws EvalException {
     return ModuleExtension.builder()
@@ -277,6 +279,8 @@ public ModuleExtension moduleExtension(
         .setDoc(doc)
         .setEnvVariables(ImmutableList.copyOf(Sequence.cast(environ, String.class, "environ")))
         .setLocation(thread.getCallerLocation())
+        .setUseOs(useOs)
+        .setUseArch(useArch)
         .build();
   }
 

diff --git a/...n/java/com/google/devtools/build/lib/starlarkbuildapi/repository/RepositoryModuleApi.java b/...n/java/com/google/devtools/build/lib/starlarkbuildapi/repository/RepositoryModuleApi.java
@@ -164,13 +164,27 @@ StarlarkCallable repositoryRule(
                     + "re-evaluated.",
             named = true,
             positional = false),
+        @Param(
+            name = "use_os",
+            defaultValue = "False",
+            doc = "Indicates whether this extension is OS-dependent or not",
+            named = true,
+            positional = false),
+        @Param(
+            name = "use_arch",
+            defaultValue = "False",
+            doc = "Indicates whether this extension is architecture-dependent or not",
+            named = true,
+            positional = false)
       },
       useStarlarkThread = true)
   Object moduleExtension(
       StarlarkCallable implementation,
       Dict<?, ?> tagClasses, // Dict<String, TagClassApi>
       String doc,
       Sequence<?> environ, // <String>
+      Boolean useOs,
+      Boolean useArch,
       StarlarkThread thread)
       throws EvalException;
 

diff --git a/...n/java/com/google/devtools/build/skydoc/fakebuildapi/repository/FakeRepositoryModule.java b/...n/java/com/google/devtools/build/skydoc/fakebuildapi/repository/FakeRepositoryModule.java
@@ -121,6 +121,8 @@ public Object moduleExtension(
       Dict<?, ?> tagClasses,
       String doc,
       Sequence<?> environ,
+      Boolean useOs,
+      Boolean useArch,
       StarlarkThread thread)
       throws EvalException {
     return new Object();

diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java
@@ -321,7 +321,8 @@ public void simpleExtension() throws Exception {
         "  for mod in ctx.modules:",
         "    for tag in mod.tags.tag:",
         "      data_repo(name=tag.name,data=tag.data)",
-        "ext = module_extension(implementation=_ext_impl, tag_classes={'tag':tag})");
+        "ext = module_extension(implementation=_ext_impl, tag_classes={'tag':tag}, "
+            + "use_os=True, use_arch=True)");
     scratch.file(workspaceRoot.getRelative("BUILD").getPathString());
     scratch.file(
         workspaceRoot.getRelative("data.bzl").getPathString(),

diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/StarlarkBazelModuleTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/StarlarkBazelModuleTest.java
@@ -62,7 +62,9 @@ private static ModuleExtension.Builder getBaseExtensionBuilder() {
         .setDoc("")
         .setLocation(Location.BUILTIN)
         .setImplementation(() -> "maven")
-        .setEnvVariables(ImmutableList.of());
+        .setEnvVariables(ImmutableList.of())
+        .setUseOs(false)
+        .setUseArch(false);
   }
 
   @Test