[grid] Enhancing stereotype in Dynamic Grid

diemol · diemol · commit f3316d9bff95 · 2023-05-15T13:01:51.000+02:00
This is useful when managed remote downloads are enabled. Fixes #12034
diff --git a/java/src/org/openqa/selenium/grid/node/config/NodeOptions.java b/java/src/org/openqa/selenium/grid/node/config/NodeOptions.java
@@ -626,7 +626,7 @@ private int getDriverMaxSessions(WebDriverInfo info, int desiredMaxSessions) {
     return Math.min(info.getMaximumSimultaneousSessions(), desiredMaxSessions);
   }
 
-  private Capabilities enhanceStereotype(Capabilities capabilities) {
+  public Capabilities enhanceStereotype(Capabilities capabilities) {
     if (capabilities.getPlatformName() == null) {
       capabilities = new PersistentCapabilities(capabilities)
         .setCapability("platformName", CURRENT_PLATFORM);
diff --git a/java/src/org/openqa/selenium/grid/node/docker/BUILD.bazel b/java/src/org/openqa/selenium/grid/node/docker/BUILD.bazel
@@ -16,6 +16,7 @@ java_library(
         "//java/src/org/openqa/selenium/grid/config",
         "//java/src/org/openqa/selenium/grid/data",
         "//java/src/org/openqa/selenium/grid/node",
+        "//java/src/org/openqa/selenium/grid/node/config",
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/remote",
         "//java/src/org/openqa/selenium/support",
diff --git a/java/src/org/openqa/selenium/grid/node/docker/DockerOptions.java b/java/src/org/openqa/selenium/grid/node/docker/DockerOptions.java
@@ -36,6 +36,7 @@
 import org.openqa.selenium.grid.config.Config;
 import org.openqa.selenium.grid.config.ConfigException;
 import org.openqa.selenium.grid.node.SessionFactory;
+import org.openqa.selenium.grid.node.config.NodeOptions;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.json.Json;
 import org.openqa.selenium.net.HostIdentifier;
@@ -124,7 +125,7 @@ private boolean isEnabled(Docker docker) {
   public Map<Capabilities, Collection<SessionFactory>> getDockerSessionFactories(
     Tracer tracer,
     HttpClient.Factory clientFactory,
-    Duration sessionTimeout) {
+    NodeOptions options) {
 
     HttpClient client = clientFactory.createClient(
       ClientConfig.defaultConfig().baseUri(getDockerUri()));
@@ -144,7 +145,7 @@ public Map<Capabilities, Collection<SessionFactory>> getDockerSessionFactories(
       if (i == allConfigs.size()) {
         throw new DockerException("Unable to find JSON config");
       }
-      Capabilities stereotype = JSON.toType(allConfigs.get(i), Capabilities.class);
+      Capabilities stereotype = options.enhanceStereotype(JSON.toType(allConfigs.get(i), Capabilities.class));
 
       kinds.put(imageName, stereotype);
     }
@@ -176,7 +177,7 @@ public Map<Capabilities, Collection<SessionFactory>> getDockerSessionFactories(
           new DockerSessionFactory(
             tracer,
             clientFactory,
-            sessionTimeout,
+            options.getSessionTimeout(),
             docker,
             getDockerUri(),
             image,
diff --git a/java/src/org/openqa/selenium/grid/node/local/LocalNodeFactory.java b/java/src/org/openqa/selenium/grid/node/local/LocalNodeFactory.java
@@ -83,7 +83,7 @@ public static Node create(Config config) {
       .forEach((caps, factories) -> factories.forEach(factory -> builder.add(caps, factory)));
 
     if (config.getAll("docker", "configs").isPresent()) {
-      new DockerOptions(config).getDockerSessionFactories(tracer, clientFactory, sessionTimeout)
+      new DockerOptions(config).getDockerSessionFactories(tracer, clientFactory, nodeOptions)
         .forEach((caps, factories) -> factories.forEach(factory -> builder.add(caps, factory)));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -626,7 +626,7 @@ private int getDriverMaxSessions(WebDriverInfo info, int desiredMaxSessions) {`
`626`	`626`	`return Math.min(info.getMaximumSimultaneousSessions(), desiredMaxSessions);`
`627`	`627`	`}`
`628`	`628`
`629`		`- private Capabilities enhanceStereotype(Capabilities capabilities) {`
	`629`	`+ public Capabilities enhanceStereotype(Capabilities capabilities) {`
`630`	`630`	`if (capabilities.getPlatformName() == null) {`
`631`	`631`	`capabilities = new PersistentCapabilities(capabilities)`
`632`	`632`	`.setCapability("platformName", CURRENT_PLATFORM);`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public static Node create(Config config) {`
`83`	`83`	`.forEach((caps, factories) -> factories.forEach(factory -> builder.add(caps, factory)));`
`84`	`84`
`85`	`85`	`if (config.getAll("docker", "configs").isPresent()) {`
`86`		`- new DockerOptions(config).getDockerSessionFactories(tracer, clientFactory, sessionTimeout)`
	`86`	`+ new DockerOptions(config).getDockerSessionFactories(tracer, clientFactory, nodeOptions)`
`87`	`87`	`.forEach((caps, factories) -> factories.forEach(factory -> builder.add(caps, factory)));`
`88`	`88`	`}`
`89`	`89`