Merge pull request #5 from maheshp/new_version

Bumping up to version 1.1.0
gocd · Mar 16, 2020 · 0a44472 · 0a44472
2 parents a4af601 + 67bd414
commit 0a44472
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ apply plugin: 'java'
 
 gocdPlugin {
   id = 'com.thoughtworks.gocd.secretmanager.vault'
-  pluginVersion = '1.0.1'
+  pluginVersion = '1.1.0'
   goCdVersion = '19.6.0'
   name = 'Vault secret manager plugin'
   description = 'The plugin allows to use hashicorp vault as secret manager for the GoCD server'

diff --git a/src/main/java/com/thoughtworks/gocd/secretmanager/vault/builders/VaultConfigBuilder.java b/src/main/java/com/thoughtworks/gocd/secretmanager/vault/builders/VaultConfigBuilder.java
@@ -20,7 +20,6 @@
 import com.bettercloud.vault.VaultConfig;
 import com.bettercloud.vault.VaultException;
 import com.thoughtworks.gocd.secretmanager.vault.models.SecretConfig;
-import org.apache.commons.lang3.StringUtils;
 
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 

diff --git a/...ava/com/thoughtworks/gocd/secretmanager/vault/builders/AppRoleVaultConfigBuilderTest.java b/...ava/com/thoughtworks/gocd/secretmanager/vault/builders/AppRoleVaultConfigBuilderTest.java
@@ -32,25 +32,37 @@ public class AppRoleVaultConfigBuilderTest {
     class configFrom {
         @Test
         void shouldBuildVaultConfigFromProvidedSecretConfig() throws VaultException {
-            SecretConfig secretConfig = secretConfigWith("https://foo.bar", "10", "10", "cert", "");
+            SecretConfig secretConfig = secretConfigWith("https://foo.bar", "10", "10", "cert", "", null);
 
             VaultConfig vaultConfig = new AppRoleVaultConfigBuilder().configFrom(secretConfig);
 
             assertThat(vaultConfig.getAddress()).isEqualTo(secretConfig.getVaultUrl());
             assertThat(vaultConfig.getReadTimeout()).isEqualTo(secretConfig.getReadTimeout());
             assertThat(vaultConfig.getOpenTimeout()).isEqualTo(secretConfig.getConnectionTimeout());
             assertThat(vaultConfig.getSslConfig().isVerify()).isTrue();
+            assertThat(vaultConfig.getNameSpace()).isNullOrEmpty();
+        }
+
+        @Test
+        void shouldUseNamespaceIfConfigured() throws VaultException {
+            SecretConfig secretConfig = secretConfigWith("https://foo.bar", "10", "10", "cert", "", "test");
+
+            VaultConfig vaultConfig = new AppRoleVaultConfigBuilder().configFrom(secretConfig);
+
+            assertThat(vaultConfig.getNameSpace()).isEqualTo(secretConfig.getNameSpace());
         }
     }
 
-    private SecretConfig secretConfigWith(String vaultUrl, String connectionTimeout, String readTimeout, String authMethod, String serverPem) {
+    private SecretConfig secretConfigWith(String vaultUrl, String connectionTimeout, String readTimeout, String authMethod,
+                                          String serverPem, String namespace) {
         Map<String, String> secretConfigMap = new HashMap<>();
 
         secretConfigMap.put("VaultUrl", vaultUrl);
         secretConfigMap.put("ConnectionTimeout", connectionTimeout);
         secretConfigMap.put("ReadTimeout", readTimeout);
         secretConfigMap.put("AuthMethod", authMethod);
         secretConfigMap.put("ServerPem", serverPem);
+        secretConfigMap.put("NameSpace", namespace);
 
         return SecretConfig.fromJSON(secretConfigMap);
     }

diff --git a/...t/java/com/thoughtworks/gocd/secretmanager/vault/builders/CertVaultConfigBuilderTest.java b/...t/java/com/thoughtworks/gocd/secretmanager/vault/builders/CertVaultConfigBuilderTest.java
@@ -32,25 +32,39 @@ public class CertVaultConfigBuilderTest {
     class configFrom {
         @Test
         void shouldBuildVaultConfigFromProvidedSecretConfig() throws VaultException {
-            SecretConfig secretConfig = secretConfigWith("https://foo.bar", "10", "10", "cert", "");
+            SecretConfig secretConfig = secretConfigWith("https://foo.bar", "10", "10",
+                    "cert", "", null);
 
-            VaultConfig vaultConfig = new TokenVaultConfigBuilder().configFrom(secretConfig);
+            VaultConfig vaultConfig = new CertVaultConfigBuilder().configFrom(secretConfig);
 
             assertThat(vaultConfig.getAddress()).isEqualTo(secretConfig.getVaultUrl());
             assertThat(vaultConfig.getReadTimeout()).isEqualTo(secretConfig.getReadTimeout());
             assertThat(vaultConfig.getOpenTimeout()).isEqualTo(secretConfig.getConnectionTimeout());
             assertThat(vaultConfig.getSslConfig().isVerify()).isTrue();
+            assertThat(vaultConfig.getNameSpace()).isNullOrEmpty();
+            assertThat(vaultConfig.getNameSpace()).isNullOrEmpty();
+        }
+
+        @Test
+        void shouldUseNamespaceIfConfigured() throws VaultException {
+            SecretConfig secretConfig = secretConfigWith("https://foo.bar", "10", "10", "cert", "", "test");
+
+            VaultConfig vaultConfig = new CertVaultConfigBuilder().configFrom(secretConfig);
+
+            assertThat(vaultConfig.getNameSpace()).isEqualTo(secretConfig.getNameSpace());
         }
     }
 
-    private SecretConfig secretConfigWith(String vaultUrl, String connectionTimeout, String readTimeout, String authMethod, String serverPem) {
+    private SecretConfig secretConfigWith(String vaultUrl, String connectionTimeout, String readTimeout, String authMethod,
+                                          String serverPem, String namespace) {
         Map<String, String> secretConfigMap = new HashMap<>();
 
         secretConfigMap.put("VaultUrl", vaultUrl);
         secretConfigMap.put("ConnectionTimeout", connectionTimeout);
         secretConfigMap.put("ReadTimeout", readTimeout);
         secretConfigMap.put("AuthMethod", authMethod);
         secretConfigMap.put("ServerPem", serverPem);
+        secretConfigMap.put("Namespace", namespace);
 
         return SecretConfig.fromJSON(secretConfigMap);
     }

diff --git a/.../java/com/thoughtworks/gocd/secretmanager/vault/builders/TokenVaultConfigBuilderTest.java b/.../java/com/thoughtworks/gocd/secretmanager/vault/builders/TokenVaultConfigBuilderTest.java
@@ -33,25 +33,37 @@ class TokenVaultConfigBuilderTest {
     class configFrom {
         @Test
         void shouldBuildVaultConfigFromProvidedSecretConfig() throws VaultException {
-            SecretConfig secretConfig = secretConfigWith("https://foo.bar", "10", "10", "token", "");
+            SecretConfig secretConfig = secretConfigWith("https://foo.bar", "10", "10", "token", "", null);
 
             VaultConfig vaultConfig = new TokenVaultConfigBuilder().configFrom(secretConfig);
 
             assertThat(vaultConfig.getAddress()).isEqualTo(secretConfig.getVaultUrl());
             assertThat(vaultConfig.getReadTimeout()).isEqualTo(secretConfig.getReadTimeout());
             assertThat(vaultConfig.getOpenTimeout()).isEqualTo(secretConfig.getConnectionTimeout());
             assertThat(vaultConfig.getSslConfig().isVerify()).isTrue();
+            assertThat(vaultConfig.getNameSpace()).isNullOrEmpty();
+        }
+
+        @Test
+        void shouldUseNamespaceIfConfigured() throws VaultException {
+            SecretConfig secretConfig = secretConfigWith("https://foo.bar", "10", "10", "cert", "", "test");
+
+            VaultConfig vaultConfig = new TokenVaultConfigBuilder().configFrom(secretConfig);
+
+            assertThat(vaultConfig.getNameSpace()).isEqualTo(secretConfig.getNameSpace());
         }
     }
 
-    private SecretConfig secretConfigWith(String vaultUrl, String connectionTimeout, String readTimeout, String authMethod, String serverPem) {
+    private SecretConfig secretConfigWith(String vaultUrl, String connectionTimeout, String readTimeout,
+                                          String authMethod, String serverPem, String namespace) {
         Map<String, String> secretConfigMap = new HashMap<>();
 
         secretConfigMap.put("VaultUrl", vaultUrl);
         secretConfigMap.put("ConnectionTimeout", connectionTimeout);
         secretConfigMap.put("ReadTimeout", readTimeout);
         secretConfigMap.put("AuthMethod", authMethod);
         secretConfigMap.put("ServerPem", serverPem);
+        secretConfigMap.put("Namespace", namespace);
 
         return SecretConfig.fromJSON(secretConfigMap);
     }