#29 Improve BuildSenzingEngineConfigurationJson

senzing-garage · Aug 18, 2023 · dc29b16 · dc29b16
1 parent 241d2f8
commit dc29b16
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/engineconfiguration/engineconfiguration.go b/engineconfiguration/engineconfiguration.go
@@ -13,13 +13,21 @@ func BuildSenzingEngineConfigurationJson(ctx context.Context, aViper *viper.Vipe
 	var err error = nil
 	result := aViper.GetString(option.EngineConfigurationJson.Arg)
 	if len(result) == 0 {
-		options := map[string]string{
-			"configPath":          aViper.GetString(option.ConfigPath.Arg),
-			"databaseUrl":         aViper.GetString(option.DatabaseUrl.Arg),
-			"licenseStringBase64": aViper.GetString(option.LicenseStringBase64.Arg),
-			"resourcePath":        aViper.GetString(option.ResourcePath.Arg),
-			"senzingDirectory":    aViper.GetString(option.SenzingDirectory.Arg),
-			"supportPath":         aViper.GetString(option.SupportPath.Arg),
+		optionsList := map[string]option.ContextVariable{
+			"configPath":          option.ConfigPath,
+			"databaseUrl":         option.DatabaseUrl,
+			"licenseStringBase64": option.LicenseStringBase64,
+			"resourcePath":        option.ResourcePath,
+			"senzingDirectory":    option.SenzingDirectory,
+			"supportPath":         option.SupportPath,
+		}
+		options := map[string]string{}
+		for key, contextVariable := range optionsList {
+			if aViper.IsSet(contextVariable.Arg) {
+				if aViper.GetString(contextVariable.Arg) != contextVariable.Default {
+					options[key] = aViper.GetString(contextVariable.Arg)
+				}
+			}
 		}
 		result, err = g2engineconfigurationjson.BuildSimpleSystemConfigurationJsonUsingMap(options)
 	}

diff --git a/engineconfiguration/engineconfiguration_test.go b/engineconfiguration/engineconfiguration_test.go
@@ -19,7 +19,7 @@ func TestBuildSenzingEngineConfigurationJson(test *testing.T) {
 
 	var contextVariables = []option.ContextVariable{
 		option.ConfigPath.SetDefault("/tmp/ConfigPath"),
-		option.DatabaseUrl,
+		option.DatabaseUrl.SetDefault("sqlite3://na:na@/tmp/sqlite/G2C.db"),
 		option.LicenseStringBase64.SetDefault("ABCD12134"),
 		option.ResourcePath.SetDefault("/tmp/ResourcePath"),
 		option.SenzingDirectory,
@@ -38,5 +38,4 @@ func TestBuildSenzingEngineConfigurationJson(test *testing.T) {
 	if err != nil {
 		panic(err)
 	}
-
 }