fix: site:list --upstream takes uuids, not names

The upstream command help text is wrong too.

pantheon-systems/terminus#2754

Author: deviantintegral

internal/commands/site.go

@@ -78,7 +78,7 @@ func init() {
 	siteListCmd.Flags().StringVar(&siteOrgFlag, "org", "", "Filter by organization")
 	siteListCmd.Flags().StringVar(&siteOwnerFlag, "owner", "", "Owner filter; \"me\" or user UUID")
 	siteListCmd.Flags().BoolVar(&siteTeamFlag, "team", false, "Filter sites of which the user is a team member")
-	siteListCmd.Flags().StringVar(&siteUpstreamFlag, "upstream", "", "Upstream name to filter")
+	siteListCmd.Flags().StringVar(&siteUpstreamFlag, "upstream", "", "Upstream UUID to filter")
 
 	siteCreateCmd.Flags().StringVar(&siteOrgFlag, "org", "", "Organization ID")
 	siteCreateCmd.Flags().StringVar(&siteRegionFlag, "region", "", "Preferred region")
@@ -282,7 +282,7 @@ func filterSites(sites []*models.Site, currentUserID string) []*models.Site {
 			}
 		}
 
-		// Apply --upstream filter
+		// Apply --upstream filter (UUID only)
 		if siteUpstreamFlag != "" {
 			upstreamMatch := false
 
@@ -299,11 +299,6 @@ func filterSites(sites []*models.Site, currentUserID string) []*models.Site {
 				}
 			}
 
-			// Also check against the upstream label
-			if site.UpstreamLabel == siteUpstreamFlag {
-				upstreamMatch = true
-			}
-
 			if !upstreamMatch {
 				continue
 			}

pkg/api/models/models.go

@@ -161,7 +161,8 @@ func (s *Site) UnmarshalJSON(data []byte) error {
 
 			// Format upstream as "id: url" to match PHP terminus
 			var upstreamID, upstreamURL string
-			if id, ok := upstreamMap["id"].(string); ok {
+			// The API returns product_id, not id
+			if id, ok := upstreamMap["product_id"].(string); ok {
 				upstreamID = id
 			}
 			if url, ok := upstreamMap["url"].(string); ok {

pkg/api/testdata/fixtures/site_list.json

@@ -8,11 +8,7 @@
     "organization": "",
     "service_level": "free",
     "plan_name": "Sandbox",
-    "upstream": {
-      "branch": "main",
-      "product_id": "bde48795-b16d-443f-af01-8b1790caa1af",
-      "url": "https://github.com/pantheon-upstreams/drupal-composer-managed.git"
-    },
+    "upstream": "bde48795-b16d-443f-af01-8b1790caa1af: https://github.com/pantheon-upstreams/drupal-composer-managed.git",
     "php_version": "72",
     "holder_type": "user",
     "holder_id": "9cbc8751-968b-4d4f-9d23-909aea390817",