Merge pull request #385 from gocd/trim-cert-to-null

Treat blank CA Cert data as not set
gocd · Jan 6, 2024 · 1734c76 · 1734c76
2 parents e73f7d1 + a8499d5
commit 1734c76
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/cd/go/contrib/elasticagent/PluginSettings.java b/src/main/java/cd/go/contrib/elasticagent/PluginSettings.java
@@ -108,7 +108,7 @@ public String getClusterUrl() {
     }
 
     public String getCaCertData() {
-        return clusterCACertData;
+        return isBlank(clusterCACertData) ? null : clusterCACertData;
     }
 
     public Integer getClusterRequestTimeout() {

diff --git a/src/test/java/cd/go/contrib/elasticagent/PluginSettingsTest.java b/src/test/java/cd/go/contrib/elasticagent/PluginSettingsTest.java
@@ -98,4 +98,14 @@ public void shouldConsiderBlankStringAsNull() {
 
         assertThat(pluginSettings.getNamespace()).isEqualTo("default");
     }
+
+    @Test
+    public void shouldConsiderBlankCertAsNull() {
+        final Map<String, Object> pluginSettingsMap = new HashMap<>();
+        pluginSettingsMap.put("kubernetes_cluster_ca_cert", "   ");
+
+        PluginSettings pluginSettings = PluginSettings.fromJSON(new Gson().toJson(pluginSettingsMap));
+
+        assertThat(pluginSettings.getCaCertData()).isNull();
+    }
 }