Move installer updates from internal to pkg

Signed-off-by: Miquel Sabaté Solà <[email protected]>

Author: mssola

cmd/suseconnect/suseconnect.go

@@ -24,6 +24,10 @@ var (
 	connectUsageText string
 )
 
+const (
+	outdatedRegProxy = "Your Registration Proxy server doesn't support this function. Please update and try again."
+)
+
 // singleStringFlag cannot be set more than once.
 // e.g. `cmd -p abc -p def` will give a parse error.
 type singleStringFlag struct {
@@ -331,16 +335,6 @@ func main() {
 	}
 }
 
-func maybeBrokenSMTError(opts *connect.Options) error {
-	// TODO(mssola): to be removed once we sort out the token callback
-	// for the `internal/connect` library.
-	if !connect.CFG.IsScc() && !connect.UpToDate() {
-		return fmt.Errorf("Your Registration Proxy server doesn't support this function. " +
-			"Please update it and try again.")
-	}
-	return nil
-}
-
 func exitOnError(err error, opts *connect.Options) {
 	if err == nil {
 		return
@@ -354,8 +348,8 @@ func exitOnError(err error, opts *connect.Options) {
 		os.Exit(64)
 	}
 	if je, ok := err.(connect.JSONError); ok {
-		if err := maybeBrokenSMTError(opts); err != nil {
-			fmt.Println(err)
+		if connect.IsOutdatedRegProxy(opts) {
+			fmt.Println(outdatedRegProxy)
 		} else {
 			fmt.Print("Error: Cannot parse response from server\n")
 			fmt.Println(je)
@@ -368,8 +362,8 @@ func exitOnError(err error, opts *connect.Options) {
 			fmt.Print("registered system was deleted in SUSE Customer Center. ")
 			fmt.Print("Check ", connect.CFG.BaseURL, " whether your system appears there. ")
 			fmt.Print("If it does not, please call SUSEConnect --cleanup and re-register this system.\n")
-		} else if err := maybeBrokenSMTError(opts); err != nil {
-			fmt.Println(err)
+		} else if connect.IsOutdatedRegProxy(opts) {
+			fmt.Println(outdatedRegProxy)
 		} else {
 			fmt.Println(ae)
 		}

internal/connect/api.go

@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"encoding/json"
 	"errors"
-	"net/http"
 	"os"
 
 	"github.com/SUSE/connect-ng/internal/collectors"
@@ -16,21 +15,6 @@ const (
 	UptimeLogFilePath = "/etc/zypp/suse-uptime.log"
 )
 
-func upToDate() bool {
-	// REVIST 404 case - see original
-	// Should fail in any case. 422 error means that the endpoint is there and working right
-	_, err := callHTTP("GET", "/connect/repositories/installer", nil, nil, authNone)
-	if err == nil {
-		return false
-	}
-	if ae, ok := err.(APIError); ok {
-		if ae.Code == http.StatusUnprocessableEntity {
-			return true
-		}
-	}
-	return false
-}
-
 // systemActivations returns a map keyed by "Identifier/Version/Arch"
 func systemActivations() (map[string]Activation, error) {
 	activeMap := make(map[string]Activation)
@@ -310,18 +294,6 @@ func offlineProductMigrations(installed []Product, target Product) ([]MigrationP
 	return migrations, nil
 }
 
-func installerUpdates(product Product) ([]zypper.Repository, error) {
-	repos := make([]zypper.Repository, 0)
-	resp, err := callHTTP("GET", "/connect/repositories/installer", nil, product.toQuery(), authNone)
-	if err != nil {
-		return repos, err
-	}
-	if err = json.Unmarshal(resp, &repos); err != nil {
-		return repos, JSONError{err}
-	}
-	return repos, nil
-}
-
 func setLabels(labels []Label) error {
 	var payload struct {
 		Labels []Label `json:"labels"`

internal/connect/client.go

@@ -3,12 +3,14 @@ package connect
 import (
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"os"
 	"path/filepath"
 
 	cred "github.com/SUSE/connect-ng/internal/credentials"
 	"github.com/SUSE/connect-ng/internal/util"
 	"github.com/SUSE/connect-ng/internal/zypper"
+	"github.com/SUSE/connect-ng/pkg/connection"
 	"github.com/SUSE/connect-ng/pkg/registration"
 )
 
@@ -320,10 +322,30 @@ func IsRegistered() bool {
 	return err == nil
 }
 
-// UpToDate Checks if API endpoint is up-to-date,
-// useful when dealing with RegistrationProxy errors
-func UpToDate() bool {
-	return upToDate()
+// Returns true if the current system is targetting an old registration proxy.
+func IsOutdatedRegProxy(opts *Options) bool {
+	// This is not a registration proxy, bail out.
+	if opts.IsScc() {
+		return false
+	}
+
+	// The trick is to check on an API endpoint which is not supported by SMT.
+	wrapper := New(opts)
+	req, err := wrapper.Connection.BuildRequest("GET", "/connect/repositories/installer", nil)
+	if err != nil {
+		return false
+	}
+
+	_, err = wrapper.Connection.Do(req)
+	if err == nil {
+		return false
+	}
+	if ae, ok := err.(*connection.ApiError); ok {
+		if ae.Code == http.StatusUnprocessableEntity {
+			return true
+		}
+	}
+	return true
 }
 
 // Print the given message plus some extra registration information that might
@@ -422,9 +444,25 @@ func DeregisterSystem() error {
 	return deregisterSystem()
 }
 
-// InstallerUpdates returns an array of Installer-Updates repositories for the given product
-func InstallerUpdates(product Product) ([]zypper.Repository, error) {
-	return installerUpdates(product)
+// Returns the zypper repositories for the installer updates endpoint.
+func InstallerUpdates(opts *Options, product Product) ([]zypper.Repository, error) {
+	repos := make([]zypper.Repository, 0)
+
+	wrapper := New(opts)
+	req, err := wrapper.Connection.BuildRequest("GET", "/connect/repositories/installer", nil)
+	if err != nil {
+		return repos, err
+	}
+	req = connection.AddQuery(req, product.toQuery())
+
+	resp, err := wrapper.Connection.Do(req)
+	if err != nil {
+		return repos, err
+	}
+	if err = json.Unmarshal(resp, &repos); err != nil {
+		return repos, JSONError{err}
+	}
+	return repos, nil
 }
 
 // SyncProducts synchronizes activated system products to the registration server

pkg/connection/query.go

@@ -0,0 +1,14 @@
+package connection
+
+import "net/http"
+
+// Adds the given request query to the existing HTTP request object.
+func AddQuery(req *http.Request, query map[string]string) *http.Request {
+	values := req.URL.Query()
+	for n, v := range query {
+		values.Add(n, v)
+	}
+	req.URL.RawQuery = values.Encode()
+
+	return req
+}

third_party/libsuseconnect/libsuseconnect.go

@@ -385,14 +385,14 @@ func reload_certificates() *C.char {
 
 //export list_installer_updates
 func list_installer_updates(clientParams, product *C.char) *C.char {
-	_ = loadConfig(C.GoString(clientParams))
+	opts := loadConfig(C.GoString(clientParams))
 
 	var productQuery connect.Product
 	err := json.Unmarshal([]byte(C.GoString(product)), &productQuery)
 	if err != nil {
 		return C.CString(errorToJSON(connect.JSONError{Err: err}))
 	}
-	repos, err := connect.InstallerUpdates(productQuery)
+	repos, err := connect.InstallerUpdates(opts, productQuery)
 	if err != nil {
 		return C.CString(errorToJSON(err))
 	}