refactor error to be checked in logs

Author: jackwrfuller

cmd/logs.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -82,9 +83,13 @@ func getSSHHostPort(environmentName string, debug bool) (string, string, string,
 	username := fmt.Sprintf("%s-%s", cmdProjectName, environmentName)
 
 	// check all the environments for this project
-	for _, env := range project.Environments {
+	found := false
+	names := make([]string, len(project.Environments))
+	for i, env := range project.Environments {
+		names[i] = env.Name
 		// if the env name matches the requested or computed environment then check if the deploytarget supports regional ssh endpoints
 		if env.OpenshiftProjectName == namespace.GenerateNamespaceName("", cmdProjectEnvironment, cmdProjectName, "", "", false) || env.Name == environmentName || env.Name == cmdProjectEnvironment {
+			found = true
 			// if the deploytarget supports regional endpoints, then set these as the host and port for ssh
 			if env.DeployTarget.SSHHost != "" && env.DeployTarget.SSHPort != "" {
 				sshHost = env.DeployTarget.SSHHost
@@ -95,6 +100,11 @@ func getSSHHostPort(environmentName string, debug bool) (string, string, string,
 			username = env.OpenshiftProjectName
 		}
 	}
+
+	if !found {
+		return sshHost, sshPort, username, portal, fmt.Errorf("invalid environment for project %s: %s. Valid options are %s.\n", cmdProjectName, environmentName, strings.Join(names, ", "))
+	}
+
 	return sshHost, sshPort, username, portal, nil
 }
 

cmd/shared.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"context"
 	"fmt"
 	"os"
 	"strconv"
@@ -10,8 +9,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/uselagoon/lagoon-cli/pkg/output"
-	lclient "github.com/uselagoon/machinery/api/lagoon/client"
-	"github.com/uselagoon/machinery/api/schema"
 )
 
 // config vars
@@ -129,31 +126,3 @@ func quotaCheck(quota int) string {
 	}
 	return quotaRoute
 }
-
-func environmentCheck(project string, environment string, debug bool) error {
-
-	current := lagoonCLIConfig.Current
-	token := lagoonCLIConfig.Lagoons[current].Token
-	lc := lclient.New(
-		lagoonCLIConfig.Lagoons[current].GraphQL,
-		lagoonCLIVersion,
-		lagoonCLIConfig.Lagoons[current].Version,
-		&token,
-		debug)
-	
-	var environments []schema.Environment	
-	err := lc.EnvironmentsByProjectName(context.TODO(), project, &environments)
-	if err != nil {
-		return err
-	}
-
-	names := make([]string, len(environments))
-	for i, e := range environments {
-		names[i] = e.AddEnvironmentInput.Name
-		if environment == names[i] {
-			return nil
-		}
-	}
-	
-	return fmt.Errorf("invalid environment for project %s: %s. Valid options are %s.\n", project, environment, strings.Join(names, ", "))
-}

cmd/ssh.go

@@ -26,10 +26,6 @@ var sshEnvCmd = &cobra.Command{
 			return err
 		}
 		debug, err := cmd.Flags().GetBool("debug")
-		if err != nil {
-			return nil
-		}
-		err = environmentCheck(cmdProjectName, cmdProjectEnvironment, debug)
 		if err != nil {
 			return err
 		}