feat(preflights): different messaging for ui and cli installs (#2300)

* feat(preflights): different messaging for ui and cli installs

* f

* Update host-preflight.yaml

* Update host-preflight.yaml

* f

---------

Co-authored-by: Alex Parker <7272359+ajp-io@users.noreply.github.com>

Author: emosbaugh

api/api.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/gorilla/mux"
 	"github.com/replicatedhq/embedded-cluster/api/controllers/auth"
@@ -238,6 +239,16 @@ func (a *API) RegisterRoutes(router *mux.Router) {
 	consoleRouter.HandleFunc("/available-network-interfaces", a.getListAvailableNetworkInterfaces).Methods("GET")
 }
 
+func (a *API) bindJSON(w http.ResponseWriter, r *http.Request, v any) error {
+	if err := json.NewDecoder(r.Body).Decode(v); err != nil {
+		a.logError(r, err, fmt.Sprintf("failed to decode %s %s request", strings.ToLower(r.Method), r.URL.Path))
+		a.jsonError(w, r, types.NewBadRequestError(err))
+		return err
+	}
+
+	return nil
+}
+
 func (a *API) json(w http.ResponseWriter, r *http.Request, code int, payload any) {
 	response, err := json.Marshal(payload)
 	if err != nil {
@@ -248,7 +259,7 @@ func (a *API) json(w http.ResponseWriter, r *http.Request, code int, payload any
 
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(code)
-	w.Write(response)
+	_, _ = w.Write(response)
 }
 
 func (a *API) jsonError(w http.ResponseWriter, r *http.Request, err error) {
@@ -266,7 +277,7 @@ func (a *API) jsonError(w http.ResponseWriter, r *http.Request, err error) {
 
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(apiErr.StatusCode)
-	w.Write(response)
+	_, _ = w.Write(response)
 }
 
 func (a *API) logError(r *http.Request, err error, args ...any) {

api/auth.go

@@ -1,7 +1,6 @@
 package api
 
 import (
-	"encoding/json"
 	"errors"
 	"net/http"
 	"strings"
@@ -53,10 +52,7 @@ func (a *API) authMiddleware(next http.Handler) http.Handler {
 //	@Router			/auth/login [post]
 func (a *API) postAuthLogin(w http.ResponseWriter, r *http.Request) {
 	var request types.AuthRequest
-	err := json.NewDecoder(r.Body).Decode(&request)
-	if err != nil {
-		a.logError(r, err, "failed to decode auth request")
-		a.jsonError(w, r, types.NewBadRequestError(err))
+	if err := a.bindJSON(w, r, &request); err != nil {
 		return
 	}
 

api/controllers/install/controller.go

@@ -21,7 +21,7 @@ type Controller interface {
 	GetInstallationConfig(ctx context.Context) (*types.InstallationConfig, error)
 	ConfigureInstallation(ctx context.Context, config *types.InstallationConfig) error
 	GetInstallationStatus(ctx context.Context) (*types.Status, error)
-	RunHostPreflights(ctx context.Context) error
+	RunHostPreflights(ctx context.Context, opts RunHostPreflightsOptions) error
 	GetHostPreflightStatus(ctx context.Context) (*types.Status, error)
 	GetHostPreflightOutput(ctx context.Context) (*types.HostPreflightsOutput, error)
 	GetHostPreflightTitles(ctx context.Context) ([]string, error)
@@ -31,6 +31,10 @@ type Controller interface {
 	GetStatus(ctx context.Context) (*types.Status, error)
 }
 
+type RunHostPreflightsOptions struct {
+	IsUI bool
+}
+
 var _ Controller = (*InstallController)(nil)
 
 type InstallController struct {

api/controllers/install/controller_test.go

@@ -321,7 +321,7 @@ func TestRunHostPreflights(t *testing.T) {
 			)
 			require.NoError(t, err)
 
-			err = controller.RunHostPreflights(t.Context())
+			err = controller.RunHostPreflights(t.Context(), RunHostPreflightsOptions{})
 
 			if tt.expectedErr {
 				assert.Error(t, err)

api/controllers/install/hostpreflight.go

@@ -10,7 +10,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/netutils"
 )
 
-func (c *InstallController) RunHostPreflights(ctx context.Context) error {
+func (c *InstallController) RunHostPreflights(ctx context.Context, opts RunHostPreflightsOptions) error {
 	// Get current installation config and add it to options
 	config, err := c.installationManager.GetConfig()
 	if err != nil {
@@ -28,6 +28,7 @@ func (c *InstallController) RunHostPreflights(ctx context.Context) error {
 		HostPreflightSpec:     c.releaseData.HostPreflights,
 		EmbeddedClusterConfig: c.releaseData.EmbeddedClusterConfig,
 		IsAirgap:              c.airgapBundle != "",
+		IsUI:                  opts.IsUI,
 	})
 	if err != nil {
 		return fmt.Errorf("failed to prepare host preflights: %w", err)