[brooklyn-server] branch master updated: Added proper symbol removal and edited tests to make sure it works as intended.

[iu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

iuliana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git


The following commit(s) were added to refs/heads/master by this push:
     new f1628801ea Added proper symbol removal and edited tests to make sure it works as intended.
     new 7559ea0848 Merge pull request #1333 from iuliana/fix/proper-symbol-removal
f1628801ea is described below

commit f1628801ea65f1a6b6cb003cf9662d437eae3c23
Author: iuliana <iu...@cloudsoft.io>
AuthorDate: Tue Jul 5 14:09:19 2022 +0100

    Added proper symbol removal and edited tests to make sure it works as intended.
---
 .../org/apache/brooklyn/tasks/kubectl/ContainerTaskFactory.java     | 6 ++----
 .../java/org/apache/brooklyn/tasks/kubectl/ContainerSensorTest.java | 2 +-
 .../java/org/apache/brooklyn/tasks/kubectl/ContainerTaskTest.java   | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskFactory.java b/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskFactory.java
index 69ea212065..7e9a5910df 100644
--- a/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskFactory.java
+++ b/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskFactory.java
@@ -68,10 +68,8 @@ public class ContainerTaskFactory<T extends ContainerTaskFactory<T,RET>,RET>  im
 
         final String containerName = (Strings.isBlank(containerNameFromCfg)
                 ? ( (Strings.isNonBlank(this.tag) ? this.tag + "-" : "").concat(cleanImageName).concat("-").concat(Strings.makeRandomId(10)))
-                : containerNameFromCfg).replace(" ", "-")
-                .replace("/", "-")
-                .replace("_", "-")
-                .replaceAll("[^a-z0-9-]", "") // remove other symbols
+                : containerNameFromCfg)
+                .replaceAll("[^A-Za-z0-9-]", "") // remove all symbols
                 .toLowerCase();
 
         final String jobYamlLocation =  new JobBuilder()
diff --git a/software/base/src/test/java/org/apache/brooklyn/tasks/kubectl/ContainerSensorTest.java b/software/base/src/test/java/org/apache/brooklyn/tasks/kubectl/ContainerSensorTest.java
index 638cb44a85..64a2f5f1c7 100644
--- a/software/base/src/test/java/org/apache/brooklyn/tasks/kubectl/ContainerSensorTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/tasks/kubectl/ContainerSensorTest.java
@@ -111,7 +111,7 @@ public class ContainerSensorTest extends BrooklynAppUnitTestSupport {
     @Test
     public void testTfVersionSensor() {
         ConfigBag parameters = ConfigBag.newInstance(ImmutableMap.of(
-                ContainerCommons.CONTAINER_IMAGE, "hashicorp/terraform",
+                ContainerCommons.CONTAINER_IMAGE, "hashicorp/terraform:1.3.0-alpha20220622",
                 ContainerCommons.COMMANDS, ImmutableList.of("terraform", "version" ),
                 ContainerSensor.SENSOR_PERIOD, "1s",
                 ContainerSensor.SENSOR_NAME, "tf-version-sensor"));
diff --git a/software/base/src/test/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskTest.java b/software/base/src/test/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskTest.java
index 6786ca7043..54796537e9 100644
--- a/software/base/src/test/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskTest.java
@@ -103,6 +103,7 @@ public class ContainerTaskTest extends BrooklynAppUnitTestSupport {
         configBag.put("name", "test-container-task");
         configBag.put("image", "perl");
         configBag.put("commands", commands);
+        configBag.put("timeout", "1m");
 
         Task<String> containerTask =  new ContainerTaskFactory.ConcreteContainerTaskFactory<String>()
                 .summary("Running docker task")