Merge pull request #115 from astronomerio/feature/ability-to-select-a…

…ll-deployments

Add ability to fetch all deployments across all workspaces

auth/auth.go

@@ -57,6 +57,10 @@ func registryAuth() error {
 		return err
 	}
 
+	if c.Domain == "localhost" {
+		return nil
+	}
+
 	registry := "registry." + c.Domain
 	token := c.Token
 	err = docker.ExecLogin(registry, "user", token)

cmd/airflow.go

@@ -170,7 +170,7 @@ func airflowInit(cmd *cobra.Command, args []string) error {
 	emtpyDir := fileutil.IsEmptyDir(config.WorkingPath)
 	if !emtpyDir {
 		i, _ := input.InputConfirm(
-			fmt.Sprintf("%s \nYou are not in an empty directory, are you you want to initialize a project?", config.WorkingPath))
+			fmt.Sprintf("%s \nYou are not in an empty directory. Are you sure you want to initialize a project?", config.WorkingPath))
 
 		if !i {
 			fmt.Println("Cancelling project initialization...\n")
@@ -255,7 +255,6 @@ func airflowLogs(cmd *cobra.Command, args []string) error {
 	// Silence Usage as we have now validated command input
 	cmd.SilenceUsage = true
 
-
 	return airflow.Logs(config.WorkingPath, webserverLogs, schedulerLogs, followLogs)
 }
 

cmd/deployment.go

@@ -7,6 +7,8 @@ import (
 )
 
 var (
+	allDeployments bool
+
 	deploymentUpdateAttrs = []string{"label"}
 
 	deploymentRootCmd = &cobra.Command{
@@ -68,6 +70,7 @@ func init() {
 
 	// deployment list
 	deploymentRootCmd.AddCommand(deploymentListCmd)
+	deploymentListCmd.Flags().BoolVarP(&allDeployments, "all", "a", false, "Show deployments across all workspaces")
 
 	// deployment update
 	deploymentRootCmd.AddCommand(deploymentUpdateCmd)
@@ -81,7 +84,7 @@ func deploymentCreate(cmd *cobra.Command, args []string) error {
 	}
 
 	// Silence Usage as we have now validated command input
-	cmd.SilenceUsage = true	
+	cmd.SilenceUsage = true
 
 	return deployment.Create(args[0], ws)
 }
@@ -99,11 +102,16 @@ func deploymentList(cmd *cobra.Command, args []string) error {
 		return errors.Wrap(err, "failed to find a valid workspace")
 		// fmt.Println("Default workspace id not set, set default workspace id or pass a workspace in via the --workspace-id flag")
 	}
-
+
+	// Don't validate workspace if viewing all deployments
+	if allDeployments {
+		ws = ""
+	}
+
 	// Silence Usage as we have now validated command input
 	cmd.SilenceUsage = true
 
-	return deployment.List(ws)
+	return deployment.List(ws, allDeployments)
 }
 
 func deploymentUpdate(cmd *cobra.Command, args []string) error {
@@ -114,6 +122,6 @@ func deploymentUpdate(cmd *cobra.Command, args []string) error {
 
 	// Silence Usage as we have now validated command input
 	cmd.SilenceUsage = true
-	
+
 	return deployment.Update(args[0], argsMap)
 }

config/config.go

@@ -41,7 +41,6 @@ var (
 		CloudAPIPort:      newCfg("cloud.api.port", "443"),
 		CloudAPIToken:     newCfg("cloud.api.token", ""),
 		Context:           newCfg("context", ""),
-		LocalEnabled:      newCfg("local.enabled", ""),
 		LocalHouston:      newCfg("local.houston", ""),
 		LocalOrbit:        newCfg("local.orbit", ""),
 		PostgresUser:      newCfg("postgres.user", "postgres"),

config/context.go

@@ -168,9 +168,10 @@ func (c Context) SwitchContext() error {
 
 // GetAPIURL returns full Houston API Url for the provided Context
 func (c Context) GetAPIURL() string {
-	if len(CFG.LocalEnabled.GetString()) != 0 {
+	if c.Domain == "localhost" {
 		return CFG.LocalHouston.GetString()
 	}
+
 	return fmt.Sprintf(
 		"%s://houston.%s:%s/v1",
 		CFG.CloudAPIProtocol.GetString(),
@@ -181,9 +182,10 @@ func (c Context) GetAPIURL() string {
 
 // GetAppURL returns full Houston API Url for the provided Context
 func (c Context) GetAppURL() string {
-	if len(CFG.LocalEnabled.GetString()) != 0 {
+	if c.Domain == "localhost" {
 		return CFG.LocalOrbit.GetString()
 	}
+
 	return fmt.Sprintf(
 		"%s://app.%s",
 		CFG.CloudAPIProtocol.GetString(),

deployment/deployment.go

@@ -1,9 +1,10 @@
 package deployment
 
 import (
-	"errors"
 	"fmt"
 
+	"github.com/pkg/errors"
+
 	"github.com/astronomerio/astro-cli/config"
 	"github.com/astronomerio/astro-cli/houston"
 	"github.com/astronomerio/astro-cli/messages"
@@ -52,21 +53,34 @@ func Delete(uuid string) error {
 }
 
 // List all airflow deployments
-func List(ws string) error {
-	r := "  %-30s %-50s %-30s"
+func List(ws string, all bool) error {
+	var deployments []houston.Deployment
+	var err error
+
+	r := "  %-30s %-50s %-30s %-50s"
+	h := fmt.Sprintf(r, "NAME", "UUID", "RELEASE NAME", "WORKSPACE")
 	// colorFmt := "\033[33;m"
 	// colorTrm := "\033[0m"
 
-	deployments, err := api.GetDeployments(ws)
-	if err != nil {
-		return err
+	if all {
+		deployments, err = api.GetAllDeployments()
+		if err != nil {
+			return err
+		}
+	} else {
+		deployments, err = api.GetDeployments(ws)
+		if err != nil {
+			return err
+		}
 	}
 
-	h := fmt.Sprintf(r, "NAME", "UUID", "RELEASE NAME")
 	fmt.Println(h)
 
 	for _, d := range deployments {
-		fullStr := fmt.Sprintf(r, d.Label, d.Id, d.ReleaseName)
+		if all {
+			ws = d.Workspace.Uuid
+		}
+		fullStr := fmt.Sprintf(r, d.Label, d.Id, d.ReleaseName, ws)
 		fmt.Println(fullStr)
 	}
 	return nil

houston/houston.go

@@ -77,6 +77,29 @@ var (
 		type
 		label
 		releaseName
+		workspace {
+          uuid
+		}
+		deployInfo {
+			latest
+			next
+		}
+		version
+		createdAt
+		updatedAt
+	  }
+	}`
+
+	deploymentsGetAllRequest = `
+	query GetAllDeployments {
+	  deployments {
+		uuid
+		type
+		label
+		releaseName
+		workspace {
+			uuid
+		}
 		deployInfo {
 			latest
 			next
@@ -169,6 +192,18 @@ var (
 		}
 	}`
 
+	workspaceGetRequest = `
+	query GetWorkspaces {
+		workspaces(workspaceUuid:"%s") {
+			uuid
+			label
+			description
+			active
+			createdAt
+			updatedAt
+		}
+	}`
+
 	workspaceCreateRequest = `
 	mutation CreateWorkspace {
 		createWorkspace(
@@ -300,15 +335,15 @@ func (c *Client) QueryHouston(query string) (*HoustonResponse, error) {
 		Raw:  httpResponse,
 		Body: string(body),
 	}
-
 	decode := HoustonResponse{}
 	err = json.NewDecoder(strings.NewReader(response.Body)).Decode(&decode)
 	if err != nil {
 		return nil, errors.Wrap(err, "Failed to JSON decode Houston response")
 	}
 
+	// Houston Specific Errors
 	if decode.Errors != nil {
-		return nil, errors.New("failed to successfully decode response")
+		return nil, errors.New(decode.Errors[0].Message)
 	}
 
 	return &decode, nil
@@ -404,6 +439,19 @@ func (c *Client) DeleteWorkspace(uuid string) (*Workspace, error) {
 	return response.Data.DeleteWorkspace, nil
 }
 
+// GetAllDeployments will request all airflow deployments from Houston
+// Returns a []Deployment structure with deployment details
+func (c *Client) GetAllDeployments() ([]Deployment, error) {
+	request := deploymentsGetAllRequest
+
+	response, err := c.QueryHouston(request)
+	if err != nil {
+		return nil, errors.Wrap(err, "GetAllDeployments Failed")
+	}
+
+	return response.Data.GetDeployments, nil
+}
+
 // GetDeployments will request all airflow deployments from Houston
 // Returns a []Deployment structure with deployment details
 func (c *Client) GetDeployments(ws string) ([]Deployment, error) {
@@ -446,6 +494,19 @@ func (c *Client) GetAuthConfig() (*AuthConfig, error) {
 	return response.Data.GetAuthConfig, nil
 }
 
+// GetWorkspaceAll returns all available workspaces from houston API
+// Returns a slice of all Workspaces a user has access to
+func (c *Client) GetWorkspace(uuid string) (*Workspace, error) {
+	request := fmt.Sprintf(workspaceGetRequest, uuid)
+
+	response, err := c.QueryHouston(request)
+	if err != nil {
+		return nil, errors.Wrap(err, "GetWorkspace Failed")
+	}
+
+	return response.Data.GetWorkspace, nil
+}
+
 // GetWorkspaceAll returns all available workspaces from houston API
 // Returns a slice of all Workspaces a user has access to
 func (c *Client) GetWorkspaceAll() ([]Workspace, error) {
@@ -456,7 +517,7 @@ func (c *Client) GetWorkspaceAll() ([]Workspace, error) {
 		return nil, errors.Wrap(err, "GetWorkspaceAll Failed")
 	}
 
-	return response.Data.GetWorkspace, nil
+	return response.Data.GetWorkspaces, nil
 }
 
 // GetUserAll sends a request to Houston in order to fetch a slice of users

houston/types.go

@@ -14,7 +14,8 @@ type HoustonResponse struct {
 		GetDeployments      []Deployment `json:"deployments,omitempty"`
 		GetAuthConfig       *AuthConfig  `json:"authConfig,omitempty"`
 		GetUsers            []User       `json:"users,omitempty"`
-		GetWorkspace        []Workspace  `json:"workspaces,omitempty"`
+		GetWorkspace        *Workspace   `json:"workspace,omitempty"`
+		GetWorkspaces       []Workspace  `json:"workspaces,omitempty"`
 		UpdateDeployment    *Deployment  `json:"updateDeployment,omitempty"`
 		UpdateWorkspace     *Workspace   `json:"updateWorkspace,omitempty"`
 	} `json:"data"`
@@ -50,7 +51,7 @@ type Deployment struct {
 	ReleaseName    string         `json:"releaseName"`
 	Version        string         `json:"version"`
 	DeploymentInfo DeploymentInfo `json:"deployInfo"`
-	Workspace      string         `json:"workspace"`
+	Workspace      Workspace      `json:"workspace"`
 	CreatedAt      string         `json:"createdAt"`
 	UpdatedAt      string         `json:"updatedAt"`
 }
@@ -73,6 +74,7 @@ type Email struct {
 // Error defines struct of a houston response Error object
 type Error struct {
 	Message string `json:"message"`
+	Name    string `json:"name"`
 }
 
 // Status defines structure of a houston response StatusResponse object

workspace/workspace.go

@@ -1,9 +1,10 @@
 package workspace
 
 import (
-	"errors"
 	"fmt"
 
+	"github.com/pkg/errors"
+
 	"github.com/astronomerio/astro-cli/config"
 	"github.com/astronomerio/astro-cli/houston"
 	"github.com/astronomerio/astro-cli/messages"
@@ -84,6 +85,12 @@ func GetCurrentWorkspace() (string, error) {
 
 // Switch switches workspaces
 func Switch(uuid string) error {
+	// validate workspace
+	_, err := api.GetWorkspace(uuid)
+	if err != nil {
+		return errors.Wrap(err, "workspace uuid is not valid")
+	}
+
 	c, err := config.GetCurrentContext()
 	if err != nil {
 		return err