Prevent Override with EnvVarSettings when using .Create() External Storage programatically

Author: ggallotti

common/src/main/java/com/genexus/util/GXService.java

@@ -6,8 +6,13 @@ public class GXService
 	private String type;
 	private String className;
 	private boolean allowMultiple;
+	private boolean allowOverrideWithEnvVarSettings;
 	private GXProperties properties;
-	
+
+	public GXService() {
+		this.allowOverrideWithEnvVarSettings = true;
+	}
+
 	public String getName()
 	{
 		return name;
@@ -42,12 +47,22 @@ public boolean getAllowMultiple()
 	{
 		return allowMultiple;
 	}
-	
+
 	public void setAllowMultiple(boolean allowMultiple)
 	{
 		this.allowMultiple = allowMultiple;
 	}
-	
+
+	public void setAllowOverrideWithEnvVarSettings(boolean allowOverride)
+	{
+		this.allowOverrideWithEnvVarSettings = allowOverride;
+	}
+
+	public boolean getAllowOverrideWithEnvVarSettings()
+	{
+		return allowOverrideWithEnvVarSettings;
+	}
+
 	public GXProperties getProperties()
 	{
 		return properties;

gxexternalproviders/src/main/java/com/genexus/db/driver/ExternalProviderBase.java

@@ -90,6 +90,10 @@ public String getPropertyValue(String propertyName, String alternativePropertyNa
 	}
 
 	private String readFromEnvVars(String propertyName, String alternativePropertyName) {
+		if (!service.getAllowOverrideWithEnvVarSettings()){
+			return null;
+		}
+
 		String value = System.getenv(resolvePropertyName(propertyName));
 		if (value == null){
 			value = System.getenv(alternativePropertyName);

java/src/main/java/com/genexus/configuration/ExternalStorage.java

@@ -37,7 +37,7 @@ public boolean create(String name, GXProperties properties, GXStorageProvider[]
 
 		if (isNullOrEmpty(name))
 		{
-			GXutil.ErrorToMessages("Unsopported", "Provider cannot be empty", messages[0]);
+			GXutil.ErrorToMessages("Unsupported", "Provider name cannot be empty", messages[0]);
 			return false;
 		}
 
@@ -49,6 +49,7 @@ public boolean create(String name, GXProperties properties, GXStorageProvider[]
 				providerService.setType(GXServices.STORAGE_SERVICE);
 				providerService.setName(name);
 				providerService.setAllowMultiple(false);
+				providerService.setAllowOverrideWithEnvVarSettings(false);
 				providerService.setProperties(new GXProperties());
 			}