Skip to content

Commit 59a979e

Browse files
shs96cshs96c
committed
[bazel] Run buildifier. No-op change
1 parent 3d77488 commit 59a979e

17 files changed

Lines changed: 68 additions & 67 deletions

File tree

‎BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ alias(
2424

2525
alias(
2626
name = "selenium-server-standalone",
27-
actual = "//java/server/src/org/openqa/selenium/grid:selenium_server_deploy.jar"
27+
actual = "//java/server/src/org/openqa/selenium/grid:selenium_server_deploy.jar",
2828
)

‎WORKSPACE‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ load("@io_bazel_rules_k8s//k8s:k8s_go_deps.bzl", k8s_go_deps = "deps")
176176

177177
k8s_go_deps()
178178

179-
load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains")
179+
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
180180

181181
go_rules_dependencies()
182182

@@ -186,8 +186,8 @@ load("@io_bazel_rules_k8s//k8s:k8s.bzl", "k8s_defaults")
186186

187187
k8s_defaults(
188188
name = "k8s_dev",
189-
namespace = "selenium",
190-
kind = "deployment",
191189
cluster = "docker-desktop",
192190
image_chroot = "localhost:5000",
191+
kind = "deployment",
192+
namespace = "selenium",
193193
)

‎common/devtools/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
exports_files(
2-
srcs=[
2+
srcs = [
33
"browser_protocol.json",
44
"js_protocol.json",
55
],
6-
visibility=[
6+
visibility = [
77
"//java/client/src/org/openqa/selenium/devtools:__pkg__",
8-
"//py:__pkg__"
8+
"//py:__pkg__",
99
],
1010
)

‎common/private/selenium_test.bzl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ _BROWSERS = {
2020
"edgehtml": {
2121
"deps": ["//java/client/src/org/openqa/selenium/edgehtml"],
2222
"jvm_flags": ["-Dselenium.browser=edgehtml"] +
23-
select({
24-
"//common:windows": ["-Dselenium.skiptest=false"],
25-
"//conditions:default": ["-Dselenium.skiptest=true"],
26-
}),
23+
select({
24+
"//common:windows": ["-Dselenium.skiptest=false"],
25+
"//conditions:default": ["-Dselenium.skiptest=true"],
26+
}),
2727
"tags": _COMMON_TAGS + ["exclusive", "edgehtml"],
2828
},
2929
"firefox": {

‎deploys/docker/BUILD.bazel‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ container_layer(
5353
container_image(
5454
name = "grid-base",
5555
base = "@java_image_base//image",
56+
directory = "/app",
5657
layers = [
5758
":grid-binary",
5859
":passwd-layer",
5960
],
60-
directory = "/app",
6161
user = "seluser",
6262
workdir = "/app",
6363
)
@@ -146,7 +146,7 @@ container_layer(
146146
name = "one-shot",
147147
directory = "/opt/selenium",
148148
files = [
149-
"//java/server/src/org/openqa/selenium/grid/node/k8s"
149+
"//java/server/src/org/openqa/selenium/grid/node/k8s",
150150
],
151151
)
152152

@@ -161,6 +161,10 @@ container_layer(
161161
container_image(
162162
name = "chrome-node",
163163
base = "@chrome_standalone//image",
164+
entrypoint = [
165+
"/opt/selenium/bin/selenium.sh",
166+
"node",
167+
],
164168
layers = [
165169
":grid-binary",
166170
":one-shot",
@@ -171,10 +175,6 @@ container_image(
171175
"5900", # vnc,
172176
],
173177
user = "seluser",
174-
entrypoint = [
175-
"/opt/selenium/bin/selenium.sh",
176-
"node",
177-
],
178178
)
179179

180180
container_push(
@@ -188,6 +188,10 @@ container_push(
188188
container_image(
189189
name = "firefox-node",
190190
base = "@firefox_standalone//image",
191+
entrypoint = [
192+
"/opt/selenium/bin/selenium.sh",
193+
"node",
194+
],
191195
layers = [
192196
":grid-binary",
193197
":one-shot",
@@ -198,10 +202,6 @@ container_image(
198202
"5900", # vnc,
199203
],
200204
user = "seluser",
201-
entrypoint = [
202-
"/opt/selenium/bin/selenium.sh",
203-
"node",
204-
],
205205
)
206206

207207
container_push(

‎deploys/k8s/BUILD.bazel‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,48 +17,48 @@ k8s_objects(
1717

1818
k8s_dev(
1919
name = "distributor",
20-
template = "distributor.yaml",
2120
images = {
2221
"selenium/distributor:latest": "//deploys/docker:distributor-image",
2322
},
23+
template = "distributor.yaml",
2424
)
2525

2626
k8s_dev(
2727
name = "event-bus",
28-
template = "event-bus.yaml",
2928
images = {
3029
"selenium/event-bus:latest": "//deploys/docker:event-bus-image",
3130
},
31+
template = "event-bus.yaml",
3232
)
3333

3434
k8s_dev(
3535
name = "router",
36-
template = "router.yaml",
3736
images = {
3837
"selenium/router:latest": "//deploys/docker:router-image",
3938
},
39+
template = "router.yaml",
4040
)
4141

4242
k8s_dev(
4343
name = "session-map",
44-
template = "session-map.yaml",
4544
images = {
4645
"selenium/session-map:latest": "//deploys/docker:session-map-image",
47-
}
46+
},
47+
template = "session-map.yaml",
4848
)
4949

5050
k8s_dev(
5151
name = "firefox-node",
52-
template = "firefox-node.yaml",
5352
images = {
5453
"selenium/firefox-node:latest": "//deploys/docker:firefox-node",
5554
},
55+
template = "firefox-node.yaml",
5656
)
5757

5858
k8s_dev(
5959
name = "chrome-node",
60-
template = "chrome-node.yaml",
6160
images = {
6261
"selenium/chrome-node:latest": "//deploys/docker:chrome-node",
6362
},
63+
template = "chrome-node.yaml",
6464
)

‎java/client/src/org/openqa/selenium/devtools/BUILD.bazel‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ genrule(
7070
"//java/client/src/org/openqa/selenium/devtools:js_protocol",
7171
],
7272
outs = ["cdp.srcjar"],
73-
cmd="$(location :cdp-client-generator) $(location //java/client/src/org/openqa/selenium/devtools:js_protocol) $(location //java/client/src/org/openqa/selenium/devtools:browser_protocol) $@",
73+
cmd = "$(location :cdp-client-generator) $(location //java/client/src/org/openqa/selenium/devtools:js_protocol) $(location //java/client/src/org/openqa/selenium/devtools:browser_protocol) $@",
7474
tools = [
7575
":cdp-client-generator",
7676
],
@@ -90,13 +90,13 @@ java_library(
9090
)
9191

9292
copy_file(
93-
name="browser_protocol",
94-
src="//common/devtools:browser_protocol.json",
95-
out="browser_protocol.json",
93+
name = "browser_protocol",
94+
src = "//common/devtools:browser_protocol.json",
95+
out = "browser_protocol.json",
9696
)
9797

9898
copy_file(
99-
name="js_protocol",
100-
src="//common/devtools:js_protocol.json",
101-
out="js_protocol.json",
99+
name = "js_protocol",
100+
src = "//common/devtools:js_protocol.json",
101+
out = "js_protocol.json",
102102
)

‎java/client/src/org/openqa/selenium/remote/http/HttpMethod.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@
2020
public enum HttpMethod {
2121
DELETE,
2222
GET,
23-
POST
23+
POST,
24+
OPTIONS, // Maintain cardinal order for older code
2425
}

‎java/server/src/org/openqa/selenium/grid/distributor/httpd/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ java_library(
1616
"//java/server/src/org/openqa/selenium/grid/config",
1717
"//java/server/src/org/openqa/selenium/grid/data",
1818
"//java/server/src/org/openqa/selenium/grid/distributor",
19+
"//java/server/src/org/openqa/selenium/grid/distributor/config",
1920
"//java/server/src/org/openqa/selenium/grid/distributor/local",
2021
"//java/server/src/org/openqa/selenium/grid/log",
2122
"//java/server/src/org/openqa/selenium/grid/server",
2223
"//java/server/src/org/openqa/selenium/grid/sessionmap",
2324
"//java/server/src/org/openqa/selenium/grid/sessionmap/config",
2425
"//java/server/src/org/openqa/selenium/grid/web",
2526
"//java/server/src/org/openqa/selenium/netty/server",
26-
"//java/server/src/org/openqa/selenium/grid/distributor/config",
2727
artifact("com.beust:jcommander"),
2828
artifact("com.google.guava:guava"),
2929
],

‎java/server/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,15 @@ java_library(
1414
"//java/server/src/org/openqa/selenium/concurrent",
1515
"//java/server/src/org/openqa/selenium/events",
1616
"//java/server/src/org/openqa/selenium/grid/component",
17+
"//java/server/src/org/openqa/selenium/grid/config",
1718
"//java/server/src/org/openqa/selenium/grid/data",
1819
"//java/server/src/org/openqa/selenium/grid/distributor",
20+
"//java/server/src/org/openqa/selenium/grid/log",
1921
"//java/server/src/org/openqa/selenium/grid/node",
2022
"//java/server/src/org/openqa/selenium/grid/node/remote",
21-
"//java/server/src/org/openqa/selenium/grid/sessionmap",
22-
"//java/server/src/org/openqa/selenium/grid/config",
23-
"//java/server/src/org/openqa/selenium/grid/log",
2423
"//java/server/src/org/openqa/selenium/grid/server",
24+
"//java/server/src/org/openqa/selenium/grid/sessionmap",
2525
"//java/server/src/org/openqa/selenium/grid/sessionmap/config",
26-
2726
artifact("com.google.guava:guava"),
2827
],
2928
)

0 commit comments

Comments
 (0)