Restore back libsuseconnect with the new Options

Fixes: 61e2f5a ("cmd: Remove any usage of the 'CFG' global variable")
Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>

Author: mssola

Makefile

@@ -56,8 +56,7 @@ build: clean out internal/connect/version.txt
 	$(GO) build $(GOFLAGS) $(BINFLAGS) $(OUT) github.com/SUSE/connect-ng/cmd/suse-uptime-tracker
 	$(GO) build $(GOFLAGS) $(BINFLAGS) $(OUT) github.com/SUSE/connect-ng/cmd/public-api-demo
 	$(GO) build $(GOFLAGS) $(BINFLAGS) $(OUT) github.com/SUSE/connect-ng/cmd/validate-offline-certificate
-	# TODO(mssola): skipped for now. Do we actually need this?
-	#$(GO) build $(GOFLAGS) $(SOFLAGS) $(OUT) github.com/SUSE/connect-ng/third_party/libsuseconnect
+	$(GO) build $(GOFLAGS) $(SOFLAGS) $(OUT) github.com/SUSE/connect-ng/third_party/libsuseconnect
 
 # This "arm" means ARM64v8 little endian, the one being delivered currently on
 # OBS.

third_party/libsuseconnect/libsuseconnect.go

@@ -63,7 +63,7 @@ func free_string(str *C.char) {
 
 //export announce_system
 func announce_system(clientParams, distroTarget *C.char) *C.char {
-	loadConfig(C.GoString(clientParams))
+	_ = loadConfig(C.GoString(clientParams))
 
 	login, password, err := connect.AnnounceSystem(C.GoString(distroTarget), "", false)
 	if err != nil {
@@ -80,7 +80,7 @@ func announce_system(clientParams, distroTarget *C.char) *C.char {
 
 //export update_system
 func update_system(clientParams, distroTarget *C.char) *C.char {
-	loadConfig(C.GoString(clientParams))
+	_ = loadConfig(C.GoString(clientParams))
 
 	if err := connect.UpdateSystem(C.GoString(distroTarget), "", false, false); err != nil {
 		return C.CString(errorToJSON(err))
@@ -91,7 +91,7 @@ func update_system(clientParams, distroTarget *C.char) *C.char {
 
 //export deactivate_system
 func deactivate_system(clientParams *C.char) *C.char {
-	loadConfig(C.GoString(clientParams))
+	_ = loadConfig(C.GoString(clientParams))
 
 	err := connect.DeregisterSystem()
 	if err != nil {
@@ -137,7 +137,7 @@ func curlrc_credentials() *C.char {
 
 //export show_product
 func show_product(clientParams, product *C.char) *C.char {
-	loadConfig(C.GoString(clientParams))
+	_ = loadConfig(C.GoString(clientParams))
 
 	var productQuery connect.Product
 	err := json.Unmarshal([]byte(C.GoString(product)), &productQuery)
@@ -157,7 +157,7 @@ func show_product(clientParams, product *C.char) *C.char {
 
 //export activate_product
 func activate_product(clientParams, product, email *C.char) *C.char {
-	loadConfig(C.GoString(clientParams))
+	_ = loadConfig(C.GoString(clientParams))
 
 	var p connect.Product
 	err := json.Unmarshal([]byte(C.GoString(product)), &p)
@@ -177,7 +177,7 @@ func activate_product(clientParams, product, email *C.char) *C.char {
 
 //export activated_products
 func activated_products(clientParams *C.char) *C.char {
-	loadConfig(C.GoString(clientParams))
+	_ = loadConfig(C.GoString(clientParams))
 
 	products, err := connect.ActivatedProducts()
 	if err != nil {
@@ -192,7 +192,7 @@ func activated_products(clientParams *C.char) *C.char {
 
 //export deactivate_product
 func deactivate_product(clientParams, product *C.char) *C.char {
-	loadConfig(C.GoString(clientParams))
+	_ = loadConfig(C.GoString(clientParams))
 
 	var p connect.Product
 	err := json.Unmarshal([]byte(C.GoString(product)), &p)
@@ -212,10 +212,8 @@ func deactivate_product(clientParams, product *C.char) *C.char {
 
 //export get_config
 func get_config(path *C.char) *C.char {
-	c := connect.NewConfig()
-	c.Path = C.GoString(path)
-	c.Load()
-	jsn, err := json.Marshal(c)
+	opts, _ := connect.ReadFromConfiguration(C.GoString(path))
+	jsn, err := json.Marshal(opts)
 	if err != nil {
 		return C.CString(errorToJSON(err))
 	}
@@ -224,15 +222,16 @@ func get_config(path *C.char) *C.char {
 
 //export write_config
 func write_config(clientParams *C.char) *C.char {
-	loadConfig(C.GoString(clientParams))
-	err := connect.CFG.Save()
+	opts := loadConfig(C.GoString(clientParams))
+
+	err := opts.SaveAsConfiguration()
 	if err != nil {
 		return C.CString(errorToJSON(err))
 	}
 	return C.CString("{}")
 }
 
-func loadConfig(clientParams string) {
+func loadConfig(clientParams string) *connect.Options {
 	// unmarshal extra config fields only for local use
 	var extConfig struct {
 		Debug string `json:"debug"`
@@ -242,8 +241,16 @@ func loadConfig(clientParams string) {
 	if v, _ := strconv.ParseBool(extConfig.Debug); v {
 		util.Debug.SetOutput(callbackWriter{llDebug})
 	}
-	connect.CFG.Load()
-	connect.CFG.MergeJSON(clientParams)
+
+	// Read the options from the default configuration path and merge the
+	// provided clientParams into as well.
+	opts, _ := connect.ReadFromConfiguration(connect.DefaultConfigPath)
+	_ = json.Unmarshal([]byte(clientParams), opts)
+
+	// TODO(mssola): to be removed by the end of RR4.
+	connect.CFG = opts
+
+	return opts
 }
 
 func certToPEM(cert *x509.Certificate) string {
@@ -340,7 +347,10 @@ func errorToJSON(err error) string {
 
 //export getstatus
 func getstatus(format *C.char) *C.char {
-	connect.CFG.Load()
+	opts, _ := connect.ReadFromConfiguration(connect.DefaultConfigPath)
+	// TODO(mssola): to be removed by the end of RR4.
+	connect.CFG = opts
+
 	gFormat := C.GoString(format)
 	output, err := connect.GetProductStatuses(gFormat)
 	if err != nil {
@@ -369,7 +379,7 @@ func reload_certificates() *C.char {
 
 //export list_installer_updates
 func list_installer_updates(clientParams, product *C.char) *C.char {
-	loadConfig(C.GoString(clientParams))
+	_ = loadConfig(C.GoString(clientParams))
 
 	var productQuery connect.Product
 	err := json.Unmarshal([]byte(C.GoString(product)), &productQuery)
@@ -389,7 +399,7 @@ func list_installer_updates(clientParams, product *C.char) *C.char {
 
 //export system_migrations
 func system_migrations(clientParams, products *C.char) *C.char {
-	loadConfig(C.GoString(clientParams))
+	_ = loadConfig(C.GoString(clientParams))
 
 	installed := make([]connect.Product, 0)
 	err := json.Unmarshal([]byte(C.GoString(products)), &installed)
@@ -409,7 +419,7 @@ func system_migrations(clientParams, products *C.char) *C.char {
 
 //export offline_system_migrations
 func offline_system_migrations(clientParams, products, targetBaseProduct *C.char) *C.char {
-	loadConfig(C.GoString(clientParams))
+	_ = loadConfig(C.GoString(clientParams))
 
 	installed := make([]connect.Product, 0)
 	err := json.Unmarshal([]byte(C.GoString(products)), &installed)
@@ -433,7 +443,7 @@ func offline_system_migrations(clientParams, products, targetBaseProduct *C.char
 
 //export upgrade_product
 func upgrade_product(clientParams, product *C.char) *C.char {
-	loadConfig(C.GoString(clientParams))
+	_ = loadConfig(C.GoString(clientParams))
 
 	var prod connect.Product
 	err := json.Unmarshal([]byte(C.GoString(product)), &prod)
@@ -453,7 +463,7 @@ func upgrade_product(clientParams, product *C.char) *C.char {
 
 //export synchronize
 func synchronize(clientParams, products *C.char) *C.char {
-	loadConfig(C.GoString(clientParams))
+	_ = loadConfig(C.GoString(clientParams))
 
 	prods := make([]connect.Product, 0)
 	err := json.Unmarshal([]byte(C.GoString(products)), &prods)
@@ -473,7 +483,7 @@ func synchronize(clientParams, products *C.char) *C.char {
 
 //export system_activations
 func system_activations(clientParams *C.char) *C.char {
-	loadConfig(C.GoString(clientParams))
+	_ = loadConfig(C.GoString(clientParams))
 
 	// converting from map to list as expected by Ruby clients
 	actList := make([]connect.Activation, 0)
@@ -493,7 +503,7 @@ func system_activations(clientParams *C.char) *C.char {
 
 //export search_package
 func search_package(clientParams, product, query *C.char) *C.char {
-	loadConfig(C.GoString(clientParams))
+	_ = loadConfig(C.GoString(clientParams))
 
 	var p connect.Product
 	err := json.Unmarshal([]byte(C.GoString(product)), &p)