Joshd/sc 88868/reject requests for vm clusters with 1 nodes

cli/cmd/cluster_create.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"strings"
 	"time"
 
 	"github.com/moby/moby/pkg/namesgenerator"
@@ -18,8 +17,11 @@ func (r *runners) InitClusterCreate(parent *cobra.Command) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "create",
 		Short: "Create test clusters",
-		Long:  `Create test clusters`,
-		RunE:  r.createCluster,
+		Long: `Create test clusters.
+
+This is a beta feature, with some known limitations:
+https://docs.replicated.com/vendor/testing-how-to#limitations`,
+		RunE: r.createCluster,
 	}
 	parent.AddCommand(cmd)
 
@@ -78,11 +80,13 @@ func (r *runners) createAndWaitForCluster(opts kotsclient.CreateClusterOpts) (*t
 		return nil, errors.Wrap(err, "create cluster")
 	}
 
-	if ve != nil && len(ve.Errors) > 0 {
-		if len(ve.SupportedDistributions) > 0 {
-			_ = print.ClusterVersions("table", r.w, ve.SupportedDistributions)
+	if ve != nil && ve.Message != "" {
+		if ve.ValidationError != nil && len(ve.ValidationError.Errors) > 0 {
+			if len(ve.ValidationError.SupportedDistributions) > 0 {
+				_ = print.ClusterVersions("table", r.w, ve.ValidationError.SupportedDistributions)
+			}
 		}
-		return nil, fmt.Errorf("%s", errors.New(strings.Join(ve.Errors, ",")))
+		return nil, errors.New(ve.Message)
 	}
 
 	if opts.DryRun {

cli/cmd/cluster_ls.go

@@ -15,8 +15,8 @@ import (
 func (r *runners) InitClusterList(parent *cobra.Command) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "ls",
-		Short: "list test clusters",
-		Long:  `list test clusters`,
+		Short: "List test clusters",
+		Long:  `List test clusters`,
 		RunE:  r.listClusters,
 	}
 	parent.AddCommand(cmd)

cli/cmd/cluster_rm.go

@@ -11,11 +11,11 @@ import (
 func (r *runners) InitClusterRemove(parent *cobra.Command) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "rm ID [ID …]",
-		Short: "remove test clusters",
+		Short: "Remove test clusters",
 		Long: `Removes a cluster immediately.
 
 You can specify the --all flag to terminate all clusters.`,
-		RunE:         r.removeCluster,
+		RunE: r.removeCluster,
 	}
 	parent.AddCommand(cmd)
 

cli/cmd/cluster_versions.go

@@ -10,10 +10,10 @@ import (
 
 func (r *runners) InitClusterVersions(parent *cobra.Command) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:          "versions",
-		Short:        "list cluster versions",
-		Long:         `list cluster versions`,
-		RunE:         r.listClusterVersions,
+		Use:   "versions",
+		Short: "List cluster versions",
+		Long:  `List cluster versions`,
+		RunE:  r.listClusterVersions,
 	}
 	parent.AddCommand(cmd)
 

cli/print/clusters.go

@@ -17,8 +17,12 @@ var clustersTmplRowSrc = `{{ range . -}}
 var clustersTmplSrc = fmt.Sprintln(clustersTmplHeaderSrc) + clustersTmplRowSrc
 
 var clusterVersionsTmplSrc = `Supported Kubernetes distributions and versions are:
-DISTRIBUTION	VERSION	INSTANCE_TYPES
-{{ range $d := . -}}{{ $d.Name }}	{{ range $i, $v := $d.Versions -}}{{if $i}}, {{end}}{{ $v }}{{ end }}	{{ range $i, $it := $d.InstanceTypes -}}{{if $i}}, {{end}}{{ $it }}{{ end }}
+{{ range $d := . -}}
+DISTRIBUTION: {{ $d.Name }}
+• VERSIONS: {{ range $i, $v := $d.Versions -}}{{if $i}}, {{end}}{{ $v }}{{ end }}
+• INSTANCE TYPES: {{ range $i, $it := $d.InstanceTypes -}}{{if $i}}, {{end}}{{ $it }}{{ end }}
+• MAX NODES: {{ $d.NodesMax }}
+
 {{ end }}`
 
 var clustersTmpl = template.Must(template.New("clusters").Funcs(funcs).Parse(clustersTmplSrc))

pkg/kotsclient/cluster_create.go

@@ -1,9 +1,12 @@
 package kotsclient
 
 import (
+	"encoding/json"
+	"fmt"
 	"net/http"
-	"strings"
 
+	"github.com/pkg/errors"
+	"github.com/replicatedhq/replicated/pkg/platformclient"
 	"github.com/replicatedhq/replicated/pkg/types"
 )
 
@@ -34,12 +37,25 @@ type CreateClusterOpts struct {
 	DryRun                 bool
 }
 
+type CreateClusterErrorResponse struct {
+	Error CreateClusterErrorError `json:"Error"`
+}
+
+type CreateClusterErrorError struct {
+	Message         string                  `json:"message"`
+	MaxDiskGiB      int64                   `json:"maxDiskGiB,omitempty"`
+	MaxEKS          int64                   `json:"maxEKS,omitempty"`
+	MaxGKE          int64                   `json:"maxGKE,omitempty"`
+	MaxAKS          int64                   `json:"maxAKS,omitempty"`
+	ValidationError *ClusterValidationError `json:"validationError,omitempty"`
+}
+
 type ClusterValidationError struct {
 	Errors                 []string                `json:"errors"`
 	SupportedDistributions []*types.ClusterVersion `json:"supported_distributions"`
 }
 
-func (c *VendorV3Client) CreateCluster(opts CreateClusterOpts) (*types.Cluster, *ClusterValidationError, error) {
+func (c *VendorV3Client) CreateCluster(opts CreateClusterOpts) (*types.Cluster, *CreateClusterErrorError, error) {
 	req := CreateClusterRequest{
 		Name:                   opts.Name,
 		KubernetesDistribution: opts.KubernetesDistribution,
@@ -57,31 +73,35 @@ func (c *VendorV3Client) CreateCluster(opts CreateClusterOpts) (*types.Cluster,
 	return c.doCreateClusterRequest(req)
 }
 
-func (c *VendorV3Client) doCreateClusterRequest(req CreateClusterRequest) (*types.Cluster, *ClusterValidationError, error) {
+func (c *VendorV3Client) doCreateClusterRequest(req CreateClusterRequest) (*types.Cluster, *CreateClusterErrorError, error) {
 	resp := CreateClusterResponse{}
 	endpoint := "/v3/cluster"
 	err := c.DoJSON("POST", endpoint, http.StatusCreated, req, &resp)
 	if err != nil {
-		if strings.Contains(err.Error(), " 400: ") {
-			// to avoid a lot of brittle string parsing, we make the request again with
-			// a dry-run flag and expect to get the same result back
-			ve, _ := c.doCreateClusterDryRunRequest(req)
-			if ve != nil && len(ve.Errors) > 0 {
-				return nil, ve, nil
+		// if err is APIError and the status code is 400, then we have a validation error
+		// and we can return the validation error
+		if apiErr, ok := errors.Cause(err).(platformclient.APIError); ok {
+			if apiErr.StatusCode == http.StatusBadRequest {
+				veResp := &CreateClusterErrorResponse{}
+				if jsonErr := json.Unmarshal(apiErr.Body, veResp); jsonErr != nil {
+					return nil, nil, fmt.Errorf("unmarshal validation error response: %w", err)
+				}
+				return nil, &veResp.Error, nil
 			}
 		}
+
 		return nil, nil, err
 	}
 
 	return resp.Cluster, nil, nil
 }
 
-func (c *VendorV3Client) doCreateClusterDryRunRequest(req CreateClusterRequest) (*ClusterValidationError, error) {
-	resp := ClusterValidationError{}
+func (c *VendorV3Client) doCreateClusterDryRunRequest(req CreateClusterRequest) (*CreateClusterErrorError, error) {
+	resp := CreateClusterErrorResponse{}
 	endpoint := "/v3/cluster?dry-run=true"
 	err := c.DoJSON("POST", endpoint, http.StatusOK, req, &resp)
 	if err != nil {
 		return nil, err
 	}
-	return &resp, nil
+	return &resp.Error, nil
 }

pkg/kotsclient/cluster_upgrade.go

@@ -1,10 +1,12 @@
 package kotsclient
 
 import (
+	"encoding/json"
 	"fmt"
 	"net/http"
-	"strings"
 
+	"github.com/pkg/errors"
+	"github.com/replicatedhq/replicated/pkg/platformclient"
 	"github.com/replicatedhq/replicated/pkg/types"
 )
 
@@ -40,12 +42,15 @@ func (c *VendorV3Client) doUpgradeClusterRequest(clusterID string, req UpgradeCl
 	endpoint := fmt.Sprintf("/v3/cluster/%s/upgrade", clusterID)
 	err := c.DoJSON("POST", endpoint, http.StatusOK, req, &resp)
 	if err != nil {
-		if strings.Contains(err.Error(), " 400: ") {
-			// to avoid a lot of brittle string parsing, we make the request again with
-			// a dry-run flag and expect to get the same result back
-			ve, _ := c.doUpgradeClusterDryRunRequest(clusterID, req)
-			if ve != nil && len(ve.Errors) > 0 {
-				return nil, ve, nil
+		// if err is APIError and the status code is 400, then we have a validation error
+		// and we can return the validation error
+		if apiErr, ok := errors.Cause(err).(platformclient.APIError); ok {
+			if apiErr.StatusCode == http.StatusBadRequest {
+				veResp := &ClusterValidationError{}
+				if jsonErr := json.Unmarshal(apiErr.Body, veResp); jsonErr != nil {
+					return nil, nil, fmt.Errorf("unmarshal validation error response: %w", err)
+				}
+				return nil, veResp, nil
 			}
 		}
 		return nil, nil, err

pkg/kotsclient/release_compatibility.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/pkg/errors"
 	"github.com/replicatedhq/replicated/pkg/platformclient"
 	"github.com/replicatedhq/replicated/pkg/types"
 )
@@ -37,7 +38,7 @@ func (c *VendorV3Client) ReportReleaseCompatibility(appID string, sequence int64
 	path := fmt.Sprintf("/v3/app/%s/release/%v/compatibility", appID, sequence)
 	err := c.DoJSON("POST", path, http.StatusCreated, request, nil)
 	if err != nil {
-		if err, ok := err.(platformclient.APIError); ok && err.StatusCode == http.StatusBadRequest {
+		if err, ok := errors.Cause(err).(platformclient.APIError); ok && err.StatusCode == http.StatusBadRequest {
 			// parse the error response body
 			respBody := &ReportReleaseCompatibilityErrorResponseBody{}
 			if err := json.NewDecoder(bytes.NewReader(err.Body)).Decode(respBody); err != nil {

pkg/types/cluster.go

@@ -34,4 +34,5 @@ type ClusterVersion struct {
 	Name          string   `json:"short_name"`
 	Versions      []string `json:"versions"`
 	InstanceTypes []string `json:"instance_types"`
+	NodesMax      int      `json:"nodes_max"`
 }