[Build] Format build files

quehanwei · Oct 2, 2020 · 4f4c14e · 4f4c14e
1 parent eb38212
commit 4f4c14e
Show file tree

Hide file tree

Showing 15 changed files with 220 additions and 208 deletions.
diff --git a/common/private/zip_file.bzl b/common/private/zip_file.bzl
@@ -1,11 +1,10 @@
-
 def _expand(files, ex):
     expanded = []
     for f in files:
-      more_f = ex.expand(f)
-      for mf in more_f:
-          if not mf.is_directory:
-            expanded.append("%s=%s" % (mf.short_path, mf.path))
+        more_f = ex.expand(f)
+        for mf in more_f:
+            if not mf.is_directory:
+                expanded.append("%s=%s" % (mf.short_path, mf.path))
 
     return expanded
 
@@ -16,7 +15,7 @@ def _zip_file_impl(ctx):
     args = ctx.actions.args()
     args.add_all(["Cc", output])
 
-    args.add_all([ctx.files.srcs], map_each=_expand)
+    args.add_all([ctx.files.srcs], map_each = _expand)
 
     ctx.actions.run(
         executable = ctx.executable._zip,
@@ -32,17 +31,17 @@ def _zip_file_impl(ctx):
 zip_file = rule(
     _zip_file_impl,
     attrs = {
-      "extension": attr.string(
-          default = "zip",
-      ),
-      "srcs": attr.label_list(
-          allow_empty = True,
-          allow_files = True,
-      ),
-      "_zip": attr.label(
-          default = "@bazel_tools//tools/zip:zipper",
-          executable = True,
-          cfg = "host",
-      ),
+        "extension": attr.string(
+            default = "zip",
+        ),
+        "srcs": attr.label_list(
+            allow_empty = True,
+            allow_files = True,
+        ),
+        "_zip": attr.label(
+            default = "@bazel_tools//tools/zip:zipper",
+            executable = True,
+            cfg = "host",
+        ),
     },
 )
diff --git a/java/client/test/org/openqa/selenium/devtools/BUILD.bazel b/java/client/test/org/openqa/selenium/devtools/BUILD.bazel
@@ -17,7 +17,7 @@ java_selenium_test_suite(
         "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/remote",
         "//java/client/src/org/openqa/selenium/support",
-        "//java/client/test/org/openqa/selenium/environment:environment",
+        "//java/client/test/org/openqa/selenium/environment",
         "//java/client/test/org/openqa/selenium/testing:annotations",
         "//java/client/test/org/openqa/selenium/testing:test-base",
         artifact("com.google.guava:guava"),

diff --git a/java/client/test/org/openqa/selenium/os/BUILD.bazel b/java/client/test/org/openqa/selenium/os/BUILD.bazel
@@ -6,7 +6,7 @@ java_test_suite(
     size = "small",
     srcs = glob(["*Test.java"]),
     data = [
-        ":echo"
+        ":echo",
     ],
     deps = [
         "//java/client/src/org/openqa/selenium:core",
@@ -20,8 +20,8 @@ java_test_suite(
 
 java_binary(
     name = "echo",
-    main_class = "org.openqa.selenium.os.Echo",
     srcs = [
         "Echo.java",
     ],
+    main_class = "org.openqa.selenium.os.Echo",
 )
diff --git a/java/private/test.bzl b/java/private/test.bzl
@@ -109,16 +109,16 @@ def java_test_suite(
             )
 
     if name in srcs:
-      native.test_suite(
-          name = "%s-suite" % name,
-          tests = tests,
-          tags = ["manual"] + tags,
-          visibility = visibility,
-      )
+        native.test_suite(
+            name = "%s-suite" % name,
+            tests = tests,
+            tags = ["manual"] + tags,
+            visibility = visibility,
+        )
     else:
         native.test_suite(
-          name = name,
-          tests = tests,
-          tags = ["manual"] + tags,
-          visibility = visibility,
+            name = name,
+            tests = tests,
+            tags = ["manual"] + tags,
+            visibility = visibility,
         )
diff --git a/java/server/src/org/openqa/selenium/grid/security/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/security/BUILD.bazel
@@ -1,13 +1,13 @@
 java_library(
     name = "security",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
+        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium:core",
         "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/remote/http",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
-        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
-    ]
 )
diff --git a/java/server/src/org/openqa/selenium/grid/sessionqueue/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/sessionqueue/BUILD.bazel
@@ -15,10 +15,10 @@ java_library(
         "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/remote",
         "//java/client/src/org/openqa/selenium/remote/http",
-        "//java/server/src/org/openqa/selenium/grid/data",
-        "//java/server/src/org/openqa/selenium/status",
         "//java/server/src/org/openqa/selenium/events",
+        "//java/server/src/org/openqa/selenium/grid/data",
         "//java/server/src/org/openqa/selenium/grid/log",
+        "//java/server/src/org/openqa/selenium/status",
         artifact("com.google.guava:guava"),
     ],
-)
+)
diff --git a/java/server/src/org/openqa/selenium/grid/sessionqueue/httpd/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/sessionqueue/httpd/BUILD.bazel
@@ -16,8 +16,8 @@ java_library(
         "//java/server/src/org/openqa/selenium/grid/config",
         "//java/server/src/org/openqa/selenium/grid/server",
         "//java/server/src/org/openqa/selenium/grid/sessionqueue",
-        "//java/server/src/org/openqa/selenium/grid/sessionqueue/local",
         "//java/server/src/org/openqa/selenium/grid/sessionqueue/config",
+        "//java/server/src/org/openqa/selenium/grid/sessionqueue/local",
         "//java/server/src/org/openqa/selenium/netty/server",
         artifact("com.beust:jcommander"),
         artifact("com.google.guava:guava"),

diff --git a/java/server/src/org/openqa/selenium/grid/sessionqueue/local/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/sessionqueue/local/BUILD.bazel
@@ -1,10 +1,11 @@
 load("@rules_jvm_external//:defs.bzl", "artifact")
+
 java_library(
     name = "local",
     srcs = glob(["*.java"]),
     visibility = [
-        "//java/server/src/org/openqa/selenium/grid/commands:__pkg__",
         "//java/server/src/org/openqa/selenium/grid:__subpackages__",
+        "//java/server/src/org/openqa/selenium/grid/commands:__pkg__",
         "//java/server/test/org/openqa/selenium/grid:__subpackages__",
     ],
     deps = [
@@ -16,6 +17,6 @@ java_library(
         "//java/server/src/org/openqa/selenium/grid/server",
         "//java/server/src/org/openqa/selenium/grid/sessionqueue",
         "//java/server/src/org/openqa/selenium/grid/sessionqueue/config",
-         artifact("com.google.guava:guava"),
+        artifact("com.google.guava:guava"),
     ],
 )
diff --git a/java/server/src/org/openqa/selenium/grid/sessionqueue/remote/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/sessionqueue/remote/BUILD.bazel
@@ -1,22 +1,22 @@
 load("@rules_jvm_external//:defs.bzl", "artifact")
+
 java_library(
     name = "remote",
     srcs = glob(["*.java"]),
     visibility = [
         "//java/server/src/org/openqa/selenium/grid:__subpackages__",
-        "//java/server/test/org/openqa/selenium/grid/sessionqueue:__pkg__",
         "//java/server/test/org/openqa/selenium/grid/router:__pkg__",
+        "//java/server/test/org/openqa/selenium/grid/sessionqueue:__pkg__",
     ],
     deps = [
-          "//java/client/src/org/openqa/selenium/remote",
-          "//java/server/src/org/openqa/selenium/grid/config",
-          "//java/server/src/org/openqa/selenium/grid/data",
-          "//java/server/src/org/openqa/selenium/grid/log",
-          "//java/server/src/org/openqa/selenium/grid/server",
-          "//java/server/src/org/openqa/selenium/grid/sessionqueue",
-          "//java/server/src/org/openqa/selenium/grid/sessionqueue/config",
-          "//java/server/src/org/openqa/selenium/grid/web",
-          artifact("com.google.guava:guava"),
+        "//java/client/src/org/openqa/selenium/remote",
+        "//java/server/src/org/openqa/selenium/grid/config",
+        "//java/server/src/org/openqa/selenium/grid/data",
+        "//java/server/src/org/openqa/selenium/grid/log",
+        "//java/server/src/org/openqa/selenium/grid/server",
+        "//java/server/src/org/openqa/selenium/grid/sessionqueue",
+        "//java/server/src/org/openqa/selenium/grid/sessionqueue/config",
+        "//java/server/src/org/openqa/selenium/grid/web",
+        artifact("com.google.guava:guava"),
     ],
 )
-
diff --git a/java/server/test/org/openqa/selenium/events/BUILD.bazel b/java/server/test/org/openqa/selenium/events/BUILD.bazel
@@ -14,5 +14,5 @@ java_test_suite(
         artifact("junit:junit"),
         artifact("org.assertj:assertj-core"),
         artifact("org.zeromq:jeromq"),
-    ]
+    ],
 )
diff --git a/java/server/test/org/openqa/selenium/grid/sessionqueue/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/sessionqueue/BUILD.bazel
@@ -6,6 +6,7 @@ java_test_suite(
     size = "small",
     srcs = glob(["*Test.java"]),
     deps = [
+        "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/remote",
         "//java/client/src/org/openqa/selenium/support",
         "//java/client/test/org/openqa/selenium/remote/tracing:tracing-support",
@@ -16,7 +17,6 @@ java_test_suite(
         "//java/server/src/org/openqa/selenium/grid/sessionqueue/local",
         "//java/server/src/org/openqa/selenium/grid/sessionqueue/remote",
         "//java/server/test/org/openqa/selenium/grid/testing",
-        "//java/client/src/org/openqa/selenium/json",
         artifact("junit:junit"),
         artifact("io.opentelemetry:opentelemetry-api"),
         artifact("org.assertj:assertj-core"),

diff --git a/java/server/test/org/openqa/selenium/grid/web/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/web/BUILD.bazel
@@ -5,12 +5,12 @@ java_test_suite(
     name = "SmallTests",
     size = "small",
     srcs = glob(["*Test.java"]),
-    tags = [
-        "no-sandbox",
-    ],
     resources = [
         "packaged-file.txt",
     ],
+    tags = [
+        "no-sandbox",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/remote",

diff --git a/javascript/grid-ui/BUILD.bazel b/javascript/grid-ui/BUILD.bazel
@@ -70,11 +70,11 @@ react_scripts(
 
 zip_file(
     name = "react_jar",
-    extension = "jar",
     srcs = [
         ":build",
     ],
+    extension = "jar",
     visibility = [
         "//java/server/src/org/openqa/selenium/grid:__pkg__",
-    ]
+    ],
 )
diff --git a/javascript/node/selenium-webdriver/BUILD.bazel b/javascript/node/selenium-webdriver/BUILD.bazel
@@ -2,7 +2,12 @@ load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary", "pkg_npm")
 load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
 load("//common:defs.bzl", "copy_file")
 
-BROWSER_VERSIONS = ['v84', 'v85', 'v86']
+BROWSER_VERSIONS = [
+    "v84",
+    "v85",
+    "v86",
+]
+
 SRC_FILES = [
     "CHANGES.md",
     "README.md",
@@ -96,33 +101,37 @@ genrule(
 [copy_file(
     name = "browser_protocol_" + n,
     src = "//common/devtools/chromium/" + n + ":browser_protocol.json",
-    out = "devtools/generator/" + n + "/browser_protocol.json") for n in BROWSER_VERSIONS ]
+    out = "devtools/generator/" + n + "/browser_protocol.json",
+) for n in BROWSER_VERSIONS]
 
 [copy_file(
     name = "js_protocol_" + n,
     src = "//common/devtools/chromium/" + n + ":js_protocol.json",
-    out = "devtools/generator/" + n + "/js_protocol.json") for n in BROWSER_VERSIONS ]
+    out = "devtools/generator/" + n + "/js_protocol.json",
+) for n in BROWSER_VERSIONS]
 
 [nodejs_binary(
-     name = "cdp-srcs-generator-" + n,
-     data = [
-         ":browser_protocol_" + n,
-         ":js_protocol_" + n,
-     ],
-     entry_point = "devtools/generator/protocol-dts-generator.js") for n in BROWSER_VERSIONS ]
+    name = "cdp-srcs-generator-" + n,
+    data = [
+        ":browser_protocol_" + n,
+        ":js_protocol_" + n,
+    ],
+    entry_point = "devtools/generator/protocol-dts-generator.js",
+) for n in BROWSER_VERSIONS]
 
 [genrule(
-     name = "create-cdp-srcs-" + n,
-     srcs = [
-         ":browser_protocol_" + n,
-         ":js_protocol_" + n,
-     ],
-     outs = [
-         "devtools/generator/" + n + "/protocol.d.js",
-         "devtools/generator/" + n + "/protocol-mapping.d.js",
-         "devtools/generator/" + n + "/protocol-proxy-api.d.js",
-     ],
-     cmd = "$(location :cdp-srcs-generator-" + n + ") $(location :browser_protocol_" + n + ") $(location :js_protocol_"+ n + ") $(OUTS)",
-     tools = [
-         ":cdp-srcs-generator-" + n,
-     ]) for n in BROWSER_VERSIONS ]
+    name = "create-cdp-srcs-" + n,
+    srcs = [
+        ":browser_protocol_" + n,
+        ":js_protocol_" + n,
+    ],
+    outs = [
+        "devtools/generator/" + n + "/protocol.d.js",
+        "devtools/generator/" + n + "/protocol-mapping.d.js",
+        "devtools/generator/" + n + "/protocol-proxy-api.d.js",
+    ],
+    cmd = "$(location :cdp-srcs-generator-" + n + ") $(location :browser_protocol_" + n + ") $(location :js_protocol_" + n + ") $(OUTS)",
+    tools = [
+        ":cdp-srcs-generator-" + n,
+    ],
+) for n in BROWSER_VERSIONS]