lint + cost

cmd/preview.go

@@ -38,20 +38,22 @@ func NewCmdPreview() *cobra.Command {
 	previewInitCmd.Flags().StringVarP(&previewInitParamsPath, "output", "o", "./preview.json", "Output path for preview environment params file. This file supports bash interpolation and can be manually edited or programatically modified during CI.")
 
 	previewDeployCmd := &cobra.Command{
-		Use:   "deploy",
-		Short: "Deploys a preview environment in your project",
-		Long:  helpdocs.MustRender("preview/deploy"),
-		RunE:  runPreviewDeploy,
+		Use:     "deploy",
+		Aliases: []string{"apply"},
+		Short:   "Deploys a preview environment in your project",
+		Long:    helpdocs.MustRender("preview/deploy"),
+		RunE:    runPreviewDeploy,
 	}
 	previewDeployCmd.Flags().StringVarP(&previewInitParamsPath, "params", "p", previewInitParamsPath, "Path to preview environment configuration file. This file supports bash interpolation.")
 	previewDeployCmd.Flags().StringVarP(&previewDeployCiContextPath, "ci-context", "c", previewDeployCiContextPath, "Path to GitHub Actions event.json")
 
 	previewDecommissionCmd := &cobra.Command{
-		Use:   "decommission $projectTargetSlug",
-		Short: "Decommissions a preview environment in your project",
-		Long:  helpdocs.MustRender("preview/decommission"),
-		RunE:  runPreviewDecommission,
-		Args:  cobra.ExactArgs(1),
+		Use:     "decommission $projectTargetSlug",
+		Aliases: []string{"destroy"},
+		Short:   "Decommissions a preview environment in your project",
+		Long:    helpdocs.MustRender("preview/decommission"),
+		RunE:    runPreviewDecommission,
+		Args:    cobra.ExactArgs(1),
 	}
 
 	previewCmd.AddCommand(previewInitCmd)

cmd/project.go

@@ -44,10 +44,10 @@ func runProjList(cmd *cobra.Command, args []string) error {
 	projects, err := api.ListProjects(client, config.OrgID)
 
 	w := tabwriter.NewWriter(os.Stdout, 10, 1, 5, ' ', 0)
-	fmt.Fprintln(w, "ID\tNAME\tSLUG")
+	fmt.Fprintln(w, "SLUG\tNAME\tMONTHLY\tDAILY")
 
-	for _, project := range *projects {
-		line := fmt.Sprintf("%s\t%s\t%s", project.ID, project.Name, project.Slug)
+	for _, project := range projects {
+		line := fmt.Sprintf("%s\t%s\t%.2f\t%.2f", project.Slug, project.Name, project.MonthlyAverageCost, project.DailyAverageCost)
 		fmt.Fprintln(w, line)
 	}
 

pkg/api/genqlient.graphql

@@ -10,7 +10,23 @@ query getArtifactsByType($organizationId: ID!, $artifactType: String!) {
 
 query projects($organizationId: ID!){
   projects(organizationId: $organizationId){
-    id, name, defaultParams, slug, description
+    name
+    id
+    slug
+    description
+    defaultParams
+    cost{
+      monthly{
+        average{
+          amount
+        }
+      }
+      daily{
+        average{
+          amount
+        }
+      }
+    }
   }
 }
 

pkg/api/preview_config.go

@@ -7,7 +7,7 @@ type PreviewConfig struct {
 }
 
 type PreviewPackage struct {
-	Params           map[string]interface{} `json:"params"`
+	Params           map[string]interface{} `json:"params,omitempty"`
 	Secrets          []Secret               `json:"secrets,omitempty"`
 	RemoteReferences []RemoteRef            `json:"remoteReferences,omitempty"`
 }

pkg/api/project.go

@@ -9,11 +9,13 @@ import (
 )
 
 type Project struct {
-	ID            string
-	Name          string
-	Slug          string
-	Description   string
-	DefaultParams map[string]interface{}
+	ID                 string
+	Name               string
+	Slug               string
+	Description        string
+	DefaultParams      map[string]interface{}
+	MonthlyAverageCost float64
+	DailyAverageCost   float64
 }
 
 func GetProject(client graphql.Client, orgID string, idOrSlug string) (*Project, error) {
@@ -34,23 +36,25 @@ func (p *getProjectByIdProject) toProject() *Project {
 
 func (p *projectsProjectsProject) toProject() Project {
 	return Project{
-		ID:            p.Id,
-		Slug:          p.Slug,
-		Name:          p.Name,
-		Description:   p.Description,
-		DefaultParams: p.DefaultParams,
+		ID:                 p.Id,
+		Slug:               p.Slug,
+		Name:               p.Name,
+		Description:        p.Description,
+		DefaultParams:      p.DefaultParams,
+		MonthlyAverageCost: p.Cost.Monthly.Average.Amount,
+		DailyAverageCost:   p.Cost.Daily.Average.Amount,
 	}
 }
 
-func ListProjects(client graphql.Client, orgID string) (*[]Project, error) {
+func ListProjects(client graphql.Client, orgID string) ([]Project, error) {
 	response, err := projects(context.Background(), client, orgID)
 	records := []Project{}
 
 	for _, prj := range response.Projects {
 		records = append(records, prj.toProject())
 	}
 
-	return &records, err
+	return records, err
 }
 
 func (p *Project) GetDefaultParams() map[string]PreviewPackage {

pkg/api/project_test.go

@@ -57,7 +57,7 @@ func TestListProjects(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	got := len(*projects)
+	got := len(projects)
 
 	want := 2