Fix an issue in pulp_settings defining tuples

fixes: #1122
pulp · Oct 25, 2023 · 42e3392 · 42e3392
1 parent ae40338
commit 42e3392
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGES/1122.bugfix b/CHANGES/1122.bugfix
@@ -0,0 +1 @@
+Fixed an error in wrong definition of tuples in `settings.py`.
diff --git a/controllers/repo_manager/secret.go b/controllers/repo_manager/secret.go
@@ -19,6 +19,7 @@ package repo_manager
 import (
 	"encoding/json"
 	"fmt"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -421,7 +422,13 @@ func addCustomPulpSettings(pulp *repomanagerpulpprojectorgv1beta2.Pulp, pulpSett
 			convertToString := cases.Title(language.English, cases.Compact).String(strconv.FormatBool(settingsJson[k].(bool)))
 			convertedSettings = convertedSettings + fmt.Sprintf("%v = %v\n", strings.ToUpper(k), convertToString)
 		default:
-			convertedSettings = convertedSettings + fmt.Sprintf("%v = \"%v\"\n", strings.ToUpper(k), settingsJson[k])
+			// if it is a tuple, we should not parse it as a string (do not add the quotes)
+			r, _ := regexp.Compile(`\(.*\)`)
+			if r.MatchString(settingsJson[k].(string)) {
+				convertedSettings = convertedSettings + fmt.Sprintf("%v = %v\n", strings.ToUpper(k), settingsJson[k])
+			} else {
+				convertedSettings = convertedSettings + fmt.Sprintf("%v = \"%v\"\n", strings.ToUpper(k), settingsJson[k])
+			}
 		}
 	}
 

diff --git a/main.go b/main.go
@@ -170,7 +170,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	setupLog.Info("pulp-operator version: 1.0.0-beta.3")
+	setupLog.Info("pulp-operator version: 1.0.1-beta.3")
 	setupLog.Info("starting manager")
 	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
 		setupLog.Error(err, "problem running manager")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed an error in wrong definition of tuples in `settings.py`.