Align status command with platform tagging model

- Filter costs by `team` tag instead of non-existent `service` tag
- Filter ECS services by `{team}-` prefix instead of loose string match
- Read team/service from app.yaml when run from a service repo
- Replace --project flag with --team and --service flags

Author: Alexanderamiri

cmd/status.go

@@ -3,92 +3,115 @@ package cmd
 import (
 	"context"
 	"fmt"
-	"os/exec"
+	"os"
 	"strings"
 
 	"github.com/javaBin/javabin-cli/internal/aws"
-	"github.com/javaBin/javabin-cli/internal/config"
 	"github.com/spf13/cobra"
+	"gopkg.in/yaml.v3"
 )
 
-var projectFlag string
+var teamFlag string
+var serviceFlag string
 
 var statusCmd = &cobra.Command{
 	Use:   "status",
-	Short: "Show project status (costs, services, deployments)",
-	RunE:  runStatus,
+	Short: "Show team costs and ECS service status",
+	Long: `Show month-to-date AWS costs for a team and ECS service status.
+
+Flags --team and --service override auto-detection. If run from a directory
+with an app.yaml, team and service name are read from it automatically.`,
+	RunE: runStatus,
 }
 
 func init() {
-	statusCmd.Flags().StringVar(&projectFlag, "project", "", "Project name (inferred from git remote if not set)")
+	statusCmd.Flags().StringVar(&teamFlag, "team", "", "Team name (reads from app.yaml if not set)")
+	statusCmd.Flags().StringVar(&serviceFlag, "service", "", "Service name (reads from app.yaml if not set)")
+}
+
+type appYaml struct {
+	Name string `yaml:"name"`
+	Team string `yaml:"team"`
+}
+
+func readAppYaml() *appYaml {
+	data, err := os.ReadFile("app.yaml")
+	if err != nil {
+		return nil
+	}
+	var app appYaml
+	if err := yaml.Unmarshal(data, &app); err != nil {
+		return nil
+	}
+	return &app
 }
 
 func runStatus(cmd *cobra.Command, args []string) error {
-	project := projectFlag
-	if project == "" {
-		project = inferProject()
+	team := teamFlag
+	service := serviceFlag
+
+	if team == "" || service == "" {
+		if app := readAppYaml(); app != nil {
+			if team == "" {
+				team = app.Team
+			}
+			if service == "" {
+				service = app.Name
+			}
+		}
+	}
+
+	if team == "" {
+		return fmt.Errorf("could not determine team — use --team flag or run from a directory with app.yaml")
 	}
-	if project == "" {
-		return fmt.Errorf("could not infer project name — use --project flag or run from a javaBin repo")
+
+	fmt.Printf("Team: %s\n", team)
+	if service != "" {
+		fmt.Printf("Service: %s\n", service)
 	}
+	fmt.Println()
 
-	fmt.Printf("Project: %s\n\n", project)
 	ctx := context.Background()
-
 	cfg, err := aws.LoadConfig(ctx)
 	if err != nil {
 		return fmt.Errorf("AWS credentials not configured: %w", err)
 	}
 
 	// Cost this month
 	fmt.Println("--- Costs (month-to-date) ---")
-	cost, err := aws.GetMonthlyCost(ctx, cfg, project)
+	cost, err := aws.GetTeamMonthlyCost(ctx, cfg, team)
 	if err != nil {
 		fmt.Printf("  Could not fetch costs: %v\n", err)
 	} else {
-		fmt.Printf("  Spend: $%.2f\n", cost)
+		fmt.Printf("  Team spend: $%.2f\n", cost)
 	}
 
 	// ECS services
 	fmt.Println("\n--- ECS Services ---")
 	services, err := aws.ListServices(ctx, cfg, "javabin-platform")
 	if err != nil {
 		fmt.Printf("  Could not list services: %v\n", err)
-	} else if len(services) == 0 {
-		fmt.Println("  No running services")
 	} else {
+		prefix := team + "-"
+		found := false
 		for _, svc := range services {
-			if strings.Contains(svc.Name, project) {
-				fmt.Printf("  %s  running=%d desired=%d\n", svc.Name, svc.RunningCount, svc.DesiredCount)
+			if !strings.HasPrefix(svc.Name, prefix) {
+				continue
+			}
+			if service != "" && svc.Name != prefix+service {
+				continue
+			}
+			fmt.Printf("  %s  running=%d desired=%d\n", svc.Name, svc.RunningCount, svc.DesiredCount)
+			found = true
+		}
+		if !found {
+			if service != "" {
+				fmt.Printf("  No services matching %s%s\n", prefix, service)
+			} else {
+				fmt.Printf("  No services matching %s*\n", prefix)
 			}
 		}
 	}
 
-	// TODO: Last 5 deployments (requires ECS describe-services with deployments)
-	// TODO: Untagged resources (requires Config or resource group tagging API)
-
-	_ = config.EnsureConfigDir()
 	return nil
 }
-
-func inferProject() string {
-	out, err := exec.Command("git", "remote", "get-url", "origin").Output()
-	if err != nil {
-		return ""
-	}
-	url := strings.TrimSpace(string(out))
-	// Handle both HTTPS and SSH URLs
-	// https://github.com/javaBin/moresleep.git -> moresleep
-	// git@github.com:javaBin/moresleep.git -> moresleep
-	for _, prefix := range []string{
-		"https://github.com/javaBin/",
-		"git@github.com:javaBin/",
-	} {
-		if strings.HasPrefix(url, prefix) {
-			name := strings.TrimPrefix(url, prefix)
-			name = strings.TrimSuffix(name, ".git")
-			return name
-		}
-	}
-	return ""
-}

go.mod

@@ -25,4 +25,5 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -48,4 +48,5 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/aws/aws.go

@@ -39,8 +39,8 @@ func GetCallerIdentity(ctx context.Context, cfg aws.Config) (*CallerIdentity, er
 	}, nil
 }
 
-// GetMonthlyCost returns month-to-date cost for a project tag.
-func GetMonthlyCost(ctx context.Context, cfg aws.Config, project string) (float64, error) {
+// GetTeamMonthlyCost returns month-to-date cost for a team tag.
+func GetTeamMonthlyCost(ctx context.Context, cfg aws.Config, team string) (float64, error) {
 	client := costexplorer.NewFromConfig(cfg, func(o *costexplorer.Options) {
 		o.Region = "us-east-1" // Cost Explorer is global
 	})
@@ -57,8 +57,8 @@ func GetMonthlyCost(ctx context.Context, cfg aws.Config, project string) (float6
 		Metrics:     []string{"UnblendedCost"},
 		Filter: &cetypes.Expression{
 			Tags: &cetypes.TagValues{
-				Key:    aws.String("service"),
-				Values: []string{project},
+				Key:    aws.String("team"),
+				Values: []string{team},
 			},
 		},
 	})