Intro runtime env attrs (#286)

* removed secure connect url

* Introduced Runtime Env Attributes

Co-authored-by: Minal <[email protected]>

Author: kevalyaa

obevo-core/src/main/java/com/gs/obevo/api/appdata/Environment.java

@@ -15,7 +15,11 @@
  */
 package com.gs.obevo.api.appdata;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedHashSet;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 import com.gs.obevo.api.factory.PlatformConfiguration;
 import com.gs.obevo.api.platform.DeployerAppContext;
@@ -43,6 +47,7 @@ public class Environment<T extends Platform> {
     private T platform;
     private boolean cleanBuildAllowed = false;
     private ImmutableMap<String, String> tokens = Maps.immutable.empty();
+    private ImmutableMap<String, String> runtimeEnvAttrs = Maps.immutable.empty();
     private String defaultUserId;
     private String defaultPassword;
     @Deprecated
@@ -68,6 +73,7 @@ public void copyFieldsFrom(Environment<T> env) {
         this.platform = env.platform;
         this.cleanBuildAllowed = env.cleanBuildAllowed;
         this.tokens = env.tokens;
+        this.runtimeEnvAttrs = env.runtimeEnvAttrs;
         this.defaultUserId = env.defaultUserId;
         this.defaultPassword = env.defaultPassword;
         this.coreSourcePath = env.coreSourcePath;
@@ -137,6 +143,14 @@ public void setTokens(ImmutableMap<String, String> tokens) {
         this.tokens = tokens != null ? tokens : Maps.immutable.<String, String>empty();
     }
 
+    public ImmutableMap<String, String> getRuntimeEnvAttrs() {
+        return this.runtimeEnvAttrs;
+    }
+
+    public void setRuntimeEnvAttrs(ImmutableMap<String, String> runtimeEnvAttrs) {
+        this.runtimeEnvAttrs = runtimeEnvAttrs != null ? runtimeEnvAttrs : Maps.immutable.<String, String>empty();
+    }
+
     /**
      * The main source path that was used to invoke this environment deployment. Used in case the paths are read in via
      * configuration and need to be resolved by some other executor.

obevo-core/src/main/java/com/gs/obevo/api/factory/XmlFileConfigReader.java

@@ -119,7 +119,7 @@ private void postProcess(XMLConfiguration sysCfg) {
                 "includeSchemas",
                 "excludeSchemas"
         );
-        ImmutableSet<String> ignorableSysNodes = Sets.immutable.of("excludeSchemas", "includeSchemas", "schemaOverrides", "tokens");
+        ImmutableSet<String> ignorableSysNodes = Sets.immutable.of("excludeSchemas", "includeSchemas", "schemaOverrides", "tokens", "runtimeEnvAttrs");
         final ImmutableSet<String> ignorableEnvNodes = Sets.immutable.of("groups", "users");
         final ImmutableSet<String> ignorableEnvAttributes = Sets.immutable.of("sourceDirs", "acceptedExtensions", "dataDelimiter", "nullToken");
 

obevo-core/src/main/java/com/gs/obevo/impl/AbstractEnvironmentEnricher.java

@@ -130,6 +130,20 @@ public String valueOf(ImmutableHierarchicalConfiguration tok) {
                 });
         dbEnv.setTokens(tokens.toImmutable());
 
+        MutableMap<String, String> runtimeEnvAttrs = iterConfig(envCfg, "runtimeEnvAttrs.runtimeEnvAttr")
+                .toMap(new Function<ImmutableHierarchicalConfiguration, String>() {
+                    @Override
+                    public String valueOf(ImmutableHierarchicalConfiguration tok) {
+                        return tok.getString("key");
+                    }
+                }, new Function<ImmutableHierarchicalConfiguration, String>() {
+                    @Override
+                    public String valueOf(ImmutableHierarchicalConfiguration tok) {
+                        return tok.getString("value");
+                    }
+                });
+        dbEnv.setRuntimeEnvAttrs(runtimeEnvAttrs.toImmutable());
+
         dbEnv.setRollbackDetectionEnabled(envCfg.getBoolean("rollbackDetectionEnabled", true));
 
         Integer metadataLineReaderVersion = envCfg.getInteger("metadataLineReaderVersion", null);

obevo-db/src/main/java/com/gs/obevo/db/api/appdata/DbEnvironment.java

@@ -54,7 +54,6 @@ public class DbEnvironment extends Environment<DbPlatform> {
     private String dbDataSourceName;
     private String driverClassName;
     private String defaultTablespace;
-    private String secureConnectUrl;
 
     private ImmutableList<Group> groups = Lists.immutable.empty();
     private ImmutableList<User> users = Lists.immutable.empty();
@@ -107,7 +106,6 @@ public void copyFieldsFrom(Environment baseEnv) {
         this.reorgCheckEnabled = env.reorgCheckEnabled;
         this.csvVersion = env.csvVersion;
         this.extraEnvAttrs = env.extraEnvAttrs;
-        this.secureConnectUrl = env.secureConnectUrl;
     }
 
     @Override
@@ -492,12 +490,4 @@ public ImmutableList<Extension> getExtensions() {
     public void setExtensions(ImmutableList<Extension> extensions) {
         this.extensions = extensions;
     }
-    
-    public String getSecureConnectUrl() {
-        return secureConnectUrl;
-    }
-
-    public void setSecureConnectUrl(String secureConnectUrl) {
-        this.secureConnectUrl = secureConnectUrl;
-    }
 }

obevo-db/src/main/resources/deployer/xsd/system-config.xsd

@@ -80,6 +80,19 @@
                                                 </xs:sequence>
                                             </xs:complexType>
                                         </xs:element>
+                                        <xs:element name="runtimeEnvAttrs" minOccurs="0" maxOccurs="1">
+                                            <xs:complexType>
+                                                <xs:sequence>
+                                                    <xs:element name="runtimeEnvAttr" minOccurs="0"
+                                                        maxOccurs="unbounded">
+                                                        <xs:complexType>
+                                                            <xs:attribute name="key" type="xs:string" />
+                                                            <xs:attribute name="value" type="xs:string" />
+                                                        </xs:complexType>
+                                                    </xs:element>
+                                                </xs:sequence>
+                                            </xs:complexType>
+                                        </xs:element>
                                         <xs:element name="permissions" minOccurs="0" maxOccurs="1" type="permissions" />
                                     </xs:sequence>
                                     <xs:attribute name="name" type="xs:string" use="required" />

obevo-db/src/test/java/com/gs/obevo/db/api/factory/DbEnvironmentXmlEnricherTest.java

@@ -342,6 +342,8 @@ public String valueOf(PhysicalSchema physicalSchema) {
 
         assertEquals("val", env1.getTokens().get("key"));
         assertEquals("val2", env1.getTokens().get("key2"));
+        assertEquals("abc.com", env1.getRuntimeEnvAttrs().get("secureConnectUrl"));
+
 
         assertEquals(Lists.mutable.of(
                 FileRetrievalMode.FILE_SYSTEM.resolveSingleFileObject("src/test/resources/DbEnvironmentXmlEnricher")

obevo-db/src/test/resources/DbEnvironmentXmlEnricher/system-config.xml

@@ -108,6 +108,9 @@
                 <token key="key2" value="val2" />
                 <token key="myProcGroupToken" value="detokenizedProcGroup" />
             </tokens>
+            <runtimeEnvAttrs>
+                <runtimeEnvAttr key="secureConnectUrl" value="abc.com" />
+            </runtimeEnvAttrs>
             <auditTableSql>env specific
 
                 sql

obevo-db/src/test/resources/DbEnvironmentXmlEnricher/system-config.yaml

@@ -109,6 +109,10 @@ environments:
         key: key2
       - value: detokenizedProcGroup
         key: myProcGroupToken
+    runtimeEnvAttrs:
+      runtimeEnvAttr:
+      - value: abc.com
+        key: secureConnectUrl
     checksumDetectionEnabled: 'true'
     dbServer: dbServ
     defaultPassword: defPass