fix(review): address code review findings across branch

salmonumbrella · claude · salmonumbrella · commit 9f4f4af668e3 · 2026-02-03T17:37:45.000-08:00
- Inline Drive query escape wrappers to use shared EscapeDriveQueryValue directly
- Add comprehensive unit tests for EscapeDriveQueryValue
- Fix CloudIdentity groups get to use UI layer instead of direct os.Stdout
- Remove duplicate splitCSVFields, use splitCSV from split_helpers.go
- Make adminCustomerID configurable via GOG_CUSTOMER_ID env var
- Add t.Parallel() safety comment to testutil_test.go
- Move cloudchannel stub from testutil_test.go to channel_test.go
- Fix batch.go channel close pattern with goroutine
- Document readValueOrFile file detection heuristic

Co-Authored-By: Claude Opus 4.5 &lt;noreply@anthropic.com&gt;
diff --git a/internal/cmd/admin_directory_helpers.go b/internal/cmd/admin_directory_helpers.go
@@ -1,3 +1,14 @@
 package cmd
 
-const adminCustomerID = "my_customer"
+import "os"
+
+// adminCustomerID returns the customer ID for Admin SDK calls.
+// Defaults to "my_customer" (the authenticated admin's domain) but
+// can be overridden via the GOG_CUSTOMER_ID environment variable
+// for multi-tenant administration.
+func adminCustomerID() string {
+	if id := os.Getenv("GOG_CUSTOMER_ID"); id != "" {
+		return id
+	}
+	return "my_customer"
+}
diff --git a/internal/cmd/admins.go b/internal/cmd/admins.go
@@ -36,7 +36,7 @@ func (c *AdminsListCmd) Run(ctx context.Context, flags *RootFlags) error {
 		return err
 	}
 
-	call := svc.RoleAssignments.List(adminCustomerID).MaxResults(c.Max)
+	call := svc.RoleAssignments.List(adminCustomerID()).MaxResults(c.Max)
 	if c.Page != "" {
 		call = call.PageToken(c.Page)
 	}
@@ -127,7 +127,7 @@ func (c *AdminsCreateCmd) Run(ctx context.Context, flags *RootFlags) error {
 		assignment.OrgUnitId = orgID
 	}
 
-	created, err := svc.RoleAssignments.Insert(adminCustomerID, assignment).Context(ctx).Do()
+	created, err := svc.RoleAssignments.Insert(adminCustomerID(), assignment).Context(ctx).Do()
 	if err != nil {
 		return fmt.Errorf("assign role %s to %s: %w", c.Role, c.User, err)
 	}
@@ -160,7 +160,7 @@ func (c *AdminsDeleteCmd) Run(ctx context.Context, flags *RootFlags) error {
 		return err
 	}
 
-	if err := svc.RoleAssignments.Delete(adminCustomerID, c.AssignmentID).Context(ctx).Do(); err != nil {
+	if err := svc.RoleAssignments.Delete(adminCustomerID(), c.AssignmentID).Context(ctx).Do(); err != nil {
 		return fmt.Errorf("delete admin assignment %s: %w", c.AssignmentID, err)
 	}
 
@@ -199,7 +199,7 @@ func resolveUserID(ctx context.Context, svc *admin.Service, user string) (string
 }
 
 func resolveOrgUnitID(ctx context.Context, svc *admin.Service, path string) (string, error) {
-	ou, err := svc.Orgunits.Get(adminCustomerID, path).Context(ctx).Do()
+	ou, err := svc.Orgunits.Get(adminCustomerID(), path).Context(ctx).Do()
 	if err != nil {
 		return "", fmt.Errorf("resolve org unit %s: %w", path, err)
 	}
diff --git a/internal/cmd/batch.go b/internal/cmd/batch.go
@@ -73,8 +73,7 @@ func (c *BatchCmd) Run(ctx context.Context, flags *RootFlags) error {
 		tasks <- task
 	}
 	close(tasks)
-	wg.Wait()
-	close(results)
+	go func() { wg.Wait(); close(results) }()
 
 	failed := 0
 	for err := range results {
diff --git a/internal/cmd/channel_test.go b/internal/cmd/channel_test.go
@@ -4,14 +4,32 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+	"net/http/httptest"
 	"strings"
 	"testing"
 
 	"google.golang.org/api/cloudchannel/v1"
+	"google.golang.org/api/option"
 
 	"github.com/steipete/gogcli/internal/outfmt"
 )
 
+func newCloudChannelServiceStub(t *testing.T, handler http.HandlerFunc) (*cloudchannel.Service, func()) {
+	t.Helper()
+
+	srv := httptest.NewServer(handler)
+	svc, err := cloudchannel.NewService(context.Background(),
+		option.WithoutAuthentication(),
+		option.WithHTTPClient(srv.Client()),
+		option.WithEndpoint(srv.URL+"/"),
+	)
+	if err != nil {
+		srv.Close()
+		t.Fatalf("NewService: %v", err)
+	}
+	return svc, srv.Close
+}
+
 func stubCloudChannelService(t *testing.T, svc *cloudchannel.Service) {
 	t.Helper()
 	orig := newCloudChannelService
diff --git a/internal/cmd/cloudidentity.go b/internal/cmd/cloudidentity.go
@@ -133,23 +133,24 @@ func (c *CloudIdentityGroupsGetCmd) Run(ctx context.Context, flags *RootFlags) e
 		return outfmt.WriteJSON(os.Stdout, group)
 	}
 
-	fmt.Fprintf(os.Stdout, "Name:        %s\n", group.Name)
+	u := ui.FromContext(ctx)
+	u.Out().Printf("Name:        %s\n", group.Name)
 	if group.GroupKey != nil {
-		fmt.Fprintf(os.Stdout, "Email:       %s\n", group.GroupKey.Id)
+		u.Out().Printf("Email:       %s\n", group.GroupKey.Id)
 	}
 	if group.DisplayName != "" {
-		fmt.Fprintf(os.Stdout, "Display Name: %s\n", group.DisplayName)
+		u.Out().Printf("Display Name: %s\n", group.DisplayName)
 	}
 	if group.Parent != "" {
-		fmt.Fprintf(os.Stdout, "Parent:      %s\n", group.Parent)
+		u.Out().Printf("Parent:      %s\n", group.Parent)
 	}
 	if len(group.Labels) > 0 {
 		labels := make([]string, 0, len(group.Labels))
 		for key := range group.Labels {
 			labels = append(labels, key)
 		}
 		sort.Strings(labels)
-		fmt.Fprintf(os.Stdout, "Labels:      %s\n", strings.Join(labels, ", "))
+		u.Out().Printf("Labels:      %s\n", strings.Join(labels, ", "))
 	}
 	return nil
 }
diff --git a/internal/cmd/csv.go b/internal/cmd/csv.go
@@ -38,7 +38,7 @@ func (c *CSVCmd) Run(ctx context.Context, flags *RootFlags) error {
 		return err
 	}
 
-	fields := splitCSVFields(c.Fields)
+	fields := splitCSV(c.Fields)
 	processed := 0
 	failed := 0
 
@@ -80,18 +80,3 @@ func (c *CSVCmd) Run(ctx context.Context, flags *RootFlags) error {
 	}
 	return nil
 }
-
-func splitCSVFields(input string) []string {
-	trimmed := strings.TrimSpace(input)
-	if trimmed == "" {
-		return nil
-	}
-	parts := strings.Split(trimmed, ",")
-	out := make([]string, 0, len(parts))
-	for _, part := range parts {
-		if value := strings.TrimSpace(part); value != "" {
-			out = append(out, value)
-		}
-	}
-	return out
-}
diff --git a/internal/cmd/domains_aliases.go b/internal/cmd/domains_aliases.go
@@ -25,7 +25,7 @@ func (c *DomainsAliasesListCmd) Run(ctx context.Context, flags *RootFlags) error
 		return err
 	}
 
-	resp, err := svc.DomainAliases.List(adminCustomerID).Context(ctx).Do()
+	resp, err := svc.DomainAliases.List(adminCustomerID()).Context(ctx).Do()
 	if err != nil {
 		return fmt.Errorf("list domain aliases: %w", err)
 	}
@@ -77,7 +77,7 @@ func (c *DomainsAliasesCreateCmd) Run(ctx context.Context, flags *RootFlags) err
 		DomainAliasName:  c.Alias,
 		ParentDomainName: c.Parent,
 	}
-	created, err := svc.DomainAliases.Insert(adminCustomerID, req).Context(ctx).Do()
+	created, err := svc.DomainAliases.Insert(adminCustomerID(), req).Context(ctx).Do()
 	if err != nil {
 		return fmt.Errorf("create domain alias %s: %w", c.Alias, err)
 	}
@@ -110,7 +110,7 @@ func (c *DomainsAliasesDeleteCmd) Run(ctx context.Context, flags *RootFlags) err
 		return err
 	}
 
-	if err := svc.DomainAliases.Delete(adminCustomerID, c.Alias).Context(ctx).Do(); err != nil {
+	if err := svc.DomainAliases.Delete(adminCustomerID(), c.Alias).Context(ctx).Do(); err != nil {
 		return fmt.Errorf("delete domain alias %s: %w", c.Alias, err)
 	}
 
diff --git a/internal/cmd/domains_create.go b/internal/cmd/domains_create.go
@@ -28,7 +28,7 @@ func (c *DomainsCreateCmd) Run(ctx context.Context, flags *RootFlags) error {
 	}
 
 	req := &admin.Domains{DomainName: c.Domain}
-	created, err := svc.Domains.Insert(adminCustomerID, req).Context(ctx).Do()
+	created, err := svc.Domains.Insert(adminCustomerID(), req).Context(ctx).Do()
 	if err != nil {
 		return fmt.Errorf("create domain %s: %w", c.Domain, err)
 	}
diff --git a/internal/cmd/domains_delete.go b/internal/cmd/domains_delete.go
@@ -27,7 +27,7 @@ func (c *DomainsDeleteCmd) Run(ctx context.Context, flags *RootFlags) error {
 		return err
 	}
 
-	if err := svc.Domains.Delete(adminCustomerID, c.Domain).Context(ctx).Do(); err != nil {
+	if err := svc.Domains.Delete(adminCustomerID(), c.Domain).Context(ctx).Do(); err != nil {
 		return fmt.Errorf("delete domain %s: %w", c.Domain, err)
 	}
 
diff --git a/internal/cmd/domains_get.go b/internal/cmd/domains_get.go
@@ -25,7 +25,7 @@ func (c *DomainsGetCmd) Run(ctx context.Context, flags *RootFlags) error {
 		return err
 	}
 
-	domain, err := svc.Domains.Get(adminCustomerID, c.Domain).Context(ctx).Do()
+	domain, err := svc.Domains.Get(adminCustomerID(), c.Domain).Context(ctx).Do()
 	if err != nil {
 		return fmt.Errorf("get domain %s: %w", c.Domain, err)
 	}
diff --git a/internal/cmd/domains_list.go b/internal/cmd/domains_list.go
@@ -25,7 +25,7 @@ func (c *DomainsListCmd) Run(ctx context.Context, flags *RootFlags) error {
 		return err
 	}
 
-	resp, err := svc.Domains.List(adminCustomerID).Context(ctx).Do()
+	resp, err := svc.Domains.List(adminCustomerID()).Context(ctx).Do()
 	if err != nil {
 		return fmt.Errorf("list domains: %w", err)
 	}
diff --git a/internal/cmd/drive.go b/internal/cmd/drive.go
@@ -815,14 +815,10 @@ func buildDriveListQuery(folderID string, userQuery string) string {
 }
 
 func buildDriveSearchQuery(text string) string {
-	q := fmt.Sprintf("fullText contains '%s'", escapeDriveQueryString(text))
+	q := fmt.Sprintf("fullText contains '%s'", googleapi.EscapeDriveQueryValue(text))
 	return q + " and trashed = false"
 }
 
-func escapeDriveQueryString(s string) string {
-	return googleapi.EscapeDriveQueryValue(s)
-}
-
 func driveType(mimeType string) string {
 	if mimeType == "application/vnd.google-apps.folder" {
 		return "folder"
diff --git a/internal/cmd/drive_test.go b/internal/cmd/drive_test.go
@@ -1,6 +1,10 @@
 package cmd
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/steipete/gogcli/internal/googleapi"
+)
 
 func TestBuildDriveListQuery(t *testing.T) {
 	t.Run("adds parent and trashed", func(t *testing.T) {
@@ -33,7 +37,7 @@ func TestBuildDriveSearchQuery(t *testing.T) {
 }
 
 func TestEscapeDriveQueryString(t *testing.T) {
-	got := escapeDriveQueryString("a'b")
+	got := googleapi.EscapeDriveQueryValue("a'b")
 	if got != "a\\'b" {
 		t.Fatalf("unexpected: %q", got)
 	}
diff --git a/internal/cmd/licenses.go b/internal/cmd/licenses.go
@@ -47,7 +47,7 @@ func (c *LicensesListCmd) Run(ctx context.Context, flags *RootFlags) error {
 		return err
 	}
 
-	customer := adminCustomerID
+	customer := adminCustomerID()
 	var resp *licensing.LicenseAssignmentList
 	if strings.TrimSpace(c.SKU) != "" {
 		call := svc.LicenseAssignments.ListForProductAndSku(product, c.SKU, customer)
diff --git a/internal/cmd/orgunits_create.go b/internal/cmd/orgunits_create.go
@@ -41,7 +41,7 @@ func (c *OrgunitsCreateCmd) Run(ctx context.Context, flags *RootFlags) error {
 		Description:       c.Description,
 	}
 
-	created, err := svc.Orgunits.Insert(adminCustomerID, org).Context(ctx).Do()
+	created, err := svc.Orgunits.Insert(adminCustomerID(), org).Context(ctx).Do()
 	if err != nil {
 		return fmt.Errorf("create org unit: %w", err)
 	}
diff --git a/internal/cmd/orgunits_delete.go b/internal/cmd/orgunits_delete.go
@@ -27,7 +27,7 @@ func (c *OrgunitsDeleteCmd) Run(ctx context.Context, flags *RootFlags) error {
 		return err
 	}
 
-	if err := svc.Orgunits.Delete(adminCustomerID, c.Path).Context(ctx).Do(); err != nil {
+	if err := svc.Orgunits.Delete(adminCustomerID(), c.Path).Context(ctx).Do(); err != nil {
 		return fmt.Errorf("delete org unit %s: %w", c.Path, err)
 	}
 
diff --git a/internal/cmd/orgunits_get.go b/internal/cmd/orgunits_get.go
@@ -25,7 +25,7 @@ func (c *OrgunitsGetCmd) Run(ctx context.Context, flags *RootFlags) error {
 		return err
 	}
 
-	ou, err := svc.Orgunits.Get(adminCustomerID, c.Path).Context(ctx).Do()
+	ou, err := svc.Orgunits.Get(adminCustomerID(), c.Path).Context(ctx).Do()
 	if err != nil {
 		return fmt.Errorf("get org unit %s: %w", c.Path, err)
 	}
diff --git a/internal/cmd/orgunits_list.go b/internal/cmd/orgunits_list.go
@@ -33,7 +33,7 @@ func (c *OrgunitsListCmd) Run(ctx context.Context, flags *RootFlags) error {
 		parent = "/"
 	}
 
-	resp, err := svc.Orgunits.List(adminCustomerID).
+	resp, err := svc.Orgunits.List(adminCustomerID()).
 		OrgUnitPath(parent).
 		Type(c.Type).
 		Context(ctx).
diff --git a/internal/cmd/orgunits_update.go b/internal/cmd/orgunits_update.go
@@ -53,7 +53,7 @@ func (c *OrgunitsUpdateCmd) Run(ctx context.Context, flags *RootFlags) error {
 		return err
 	}
 
-	updated, err := svc.Orgunits.Update(adminCustomerID, c.Path, org).Context(ctx).Do()
+	updated, err := svc.Orgunits.Update(adminCustomerID(), c.Path, org).Context(ctx).Do()
 	if err != nil {
 		return fmt.Errorf("update org unit %s: %w", c.Path, err)
 	}
diff --git a/internal/cmd/printers.go b/internal/cmd/printers.go
@@ -273,13 +273,13 @@ func (c *PrintersDeleteCmd) Run(ctx context.Context, flags *RootFlags) error {
 }
 
 func printerParent() string {
-	return fmt.Sprintf("customers/%s", adminCustomerID)
+	return fmt.Sprintf("customers/%s", adminCustomerID())
 }
 
 func printerResourceName(id string) string {
 	id = strings.TrimSpace(id)
 	if strings.HasPrefix(id, "customers/") {
 		return id
 	}
-	return fmt.Sprintf("customers/%s/chrome/printers/%s", adminCustomerID, id)
+	return fmt.Sprintf("customers/%s/chrome/printers/%s", adminCustomerID(), id)
 }
diff --git a/internal/cmd/reports.go b/internal/cmd/reports.go
@@ -278,7 +278,7 @@ func runUsageReport(ctx context.Context, flags *RootFlags, application, date, pa
 
 	date = reportDate(date)
 
-	call := svc.CustomerUsageReports.Get(date).CustomerId(adminCustomerID)
+	call := svc.CustomerUsageReports.Get(date).CustomerId(adminCustomerID())
 	params := strings.TrimSpace(parameters)
 	if params == "" {
 		params = application
diff --git a/internal/cmd/resources_buildings.go b/internal/cmd/resources_buildings.go
@@ -37,7 +37,7 @@ func (c *ResourcesBuildingsListCmd) Run(ctx context.Context, flags *RootFlags) e
 		return err
 	}
 
-	call := svc.Resources.Buildings.List(adminCustomerID)
+	call := svc.Resources.Buildings.List(adminCustomerID())
 	if c.Max > 0 {
 		call = call.MaxResults(c.Max)
 	}
@@ -98,7 +98,7 @@ func (c *ResourcesBuildingsGetCmd) Run(ctx context.Context, flags *RootFlags) er
 		return err
 	}
 
-	building, err := svc.Resources.Buildings.Get(adminCustomerID, buildingID).Context(ctx).Do()
+	building, err := svc.Resources.Buildings.Get(adminCustomerID(), buildingID).Context(ctx).Do()
 	if err != nil {
 		return fmt.Errorf("get building %s: %w", buildingID, err)
 	}
@@ -149,7 +149,7 @@ func (c *ResourcesBuildingsCreateCmd) Run(ctx context.Context, flags *RootFlags)
 		building.FloorNames = floors
 	}
 
-	created, err := svc.Resources.Buildings.Insert(adminCustomerID, building).Context(ctx).Do()
+	created, err := svc.Resources.Buildings.Insert(adminCustomerID(), building).Context(ctx).Do()
 	if err != nil {
 		return fmt.Errorf("create building %s: %w", name, err)
 	}
@@ -197,7 +197,7 @@ func (c *ResourcesBuildingsUpdateCmd) Run(ctx context.Context, flags *RootFlags)
 		patch.Description = strings.TrimSpace(*c.Description)
 	}
 
-	updated, err := svc.Resources.Buildings.Patch(adminCustomerID, buildingID, patch).Context(ctx).Do()
+	updated, err := svc.Resources.Buildings.Patch(adminCustomerID(), buildingID, patch).Context(ctx).Do()
 	if err != nil {
 		return fmt.Errorf("update building %s: %w", buildingID, err)
 	}
@@ -235,7 +235,7 @@ func (c *ResourcesBuildingsDeleteCmd) Run(ctx context.Context, flags *RootFlags)
 		return err
 	}
 
-	if err := svc.Resources.Buildings.Delete(adminCustomerID, buildingID).Context(ctx).Do(); err != nil {
+	if err := svc.Resources.Buildings.Delete(adminCustomerID(), buildingID).Context(ctx).Do(); err != nil {
 		return fmt.Errorf("delete building %s: %w", buildingID, err)
 	}
 
diff --git a/internal/cmd/resources_calendars.go b/internal/cmd/resources_calendars.go
diff --git a/internal/cmd/resources_features.go b/internal/cmd/resources_features.go
diff --git a/internal/cmd/roles.go b/internal/cmd/roles.go
diff --git a/internal/cmd/schemas.go b/internal/cmd/schemas.go
diff --git a/internal/cmd/sso.go b/internal/cmd/sso.go
diff --git a/internal/cmd/tasks_helpers_test.go b/internal/cmd/tasks_helpers_test.go
diff --git a/internal/cmd/testutil_test.go b/internal/cmd/testutil_test.go
diff --git a/internal/cmd/transfer.go b/internal/cmd/transfer.go
diff --git a/internal/googleapi/drive_test.go b/internal/googleapi/drive_test.go
diff --git a/internal/todrive/writer.go b/internal/todrive/writer.go

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func (c AdminsListCmd) Run(ctx context.Context, flags RootFlags) error {`
`36`	`36`	`return err`
`37`	`37`	`}`
`38`	`38`
`39`		`- call := svc.RoleAssignments.List(adminCustomerID).MaxResults(c.Max)`
	`39`	`+ call := svc.RoleAssignments.List(adminCustomerID()).MaxResults(c.Max)`
`40`	`40`	`if c.Page != "" {`
`41`	`41`	`call = call.PageToken(c.Page)`
`42`	`42`	`}`
`@@ -127,7 +127,7 @@ func (c AdminsCreateCmd) Run(ctx context.Context, flags RootFlags) error {`
`127`	`127`	`assignment.OrgUnitId = orgID`
`128`	`128`	`}`
`129`	`129`
`130`		`- created, err := svc.RoleAssignments.Insert(adminCustomerID, assignment).Context(ctx).Do()`
	`130`	`+ created, err := svc.RoleAssignments.Insert(adminCustomerID(), assignment).Context(ctx).Do()`
`131`	`131`	`if err != nil {`
`132`	`132`	`return fmt.Errorf("assign role %s to %s: %w", c.Role, c.User, err)`
`133`	`133`	`}`
`@@ -160,7 +160,7 @@ func (c AdminsDeleteCmd) Run(ctx context.Context, flags RootFlags) error {`
`160`	`160`	`return err`
`161`	`161`	`}`
`162`	`162`
`163`		`- if err := svc.RoleAssignments.Delete(adminCustomerID, c.AssignmentID).Context(ctx).Do(); err != nil {`
	`163`	`+ if err := svc.RoleAssignments.Delete(adminCustomerID(), c.AssignmentID).Context(ctx).Do(); err != nil {`
`164`	`164`	`return fmt.Errorf("delete admin assignment %s: %w", c.AssignmentID, err)`
`165`	`165`	`}`
`166`	`166`
`@@ -199,7 +199,7 @@ func resolveUserID(ctx context.Context, svc *admin.Service, user string) (string`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`func resolveOrgUnitID(ctx context.Context, svc *admin.Service, path string) (string, error) {`
`202`		`- ou, err := svc.Orgunits.Get(adminCustomerID, path).Context(ctx).Do()`
	`202`	`+ ou, err := svc.Orgunits.Get(adminCustomerID(), path).Context(ctx).Do()`
`203`	`203`	`if err != nil {`
`204`	`204`	`return "", fmt.Errorf("resolve org unit %s: %w", path, err)`
`205`	`205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,7 @@ func (c BatchCmd) Run(ctx context.Context, flags RootFlags) error {`
`73`	`73`	`tasks <- task`
`74`	`74`	`}`
`75`	`75`	`close(tasks)`
`76`		`- wg.Wait()`
`77`		`- close(results)`
	`76`	`+ go func() { wg.Wait(); close(results) }()`
`78`	`77`
`79`	`78`	`failed := 0`
`80`	`79`	`for err := range results {`
Original file line number	Diff line number	Diff line change
`@@ -133,23 +133,24 @@ func (c CloudIdentityGroupsGetCmd) Run(ctx context.Context, flags RootFlags) e`
`133`	`133`	`return outfmt.WriteJSON(os.Stdout, group)`
`134`	`134`	`}`
`135`	`135`
`136`		`- fmt.Fprintf(os.Stdout, "Name: %s\n", group.Name)`
	`136`	`+ u := ui.FromContext(ctx)`
	`137`	`+ u.Out().Printf("Name: %s\n", group.Name)`
`137`	`138`	`if group.GroupKey != nil {`
`138`		`- fmt.Fprintf(os.Stdout, "Email: %s\n", group.GroupKey.Id)`
	`139`	`+ u.Out().Printf("Email: %s\n", group.GroupKey.Id)`
`139`	`140`	`}`
`140`	`141`	`if group.DisplayName != "" {`
`141`		`- fmt.Fprintf(os.Stdout, "Display Name: %s\n", group.DisplayName)`
	`142`	`+ u.Out().Printf("Display Name: %s\n", group.DisplayName)`
`142`	`143`	`}`
`143`	`144`	`if group.Parent != "" {`
`144`		`- fmt.Fprintf(os.Stdout, "Parent: %s\n", group.Parent)`
	`145`	`+ u.Out().Printf("Parent: %s\n", group.Parent)`
`145`	`146`	`}`
`146`	`147`	`if len(group.Labels) > 0 {`
`147`	`148`	`labels := make([]string, 0, len(group.Labels))`
`148`	`149`	`for key := range group.Labels {`
`149`	`150`	`labels = append(labels, key)`
`150`	`151`	`}`
`151`	`152`	`sort.Strings(labels)`
`152`		`- fmt.Fprintf(os.Stdout, "Labels: %s\n", strings.Join(labels, ", "))`
	`153`	`+ u.Out().Printf("Labels: %s\n", strings.Join(labels, ", "))`
`153`	`154`	`}`
`154`	`155`	`return nil`
`155`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func (c DomainsAliasesListCmd) Run(ctx context.Context, flags RootFlags) error`
`25`	`25`	`return err`
`26`	`26`	`}`
`27`	`27`
`28`		`- resp, err := svc.DomainAliases.List(adminCustomerID).Context(ctx).Do()`
	`28`	`+ resp, err := svc.DomainAliases.List(adminCustomerID()).Context(ctx).Do()`
`29`	`29`	`if err != nil {`
`30`	`30`	`return fmt.Errorf("list domain aliases: %w", err)`
`31`	`31`	`}`
`@@ -77,7 +77,7 @@ func (c DomainsAliasesCreateCmd) Run(ctx context.Context, flags RootFlags) err`
`77`	`77`	`DomainAliasName: c.Alias,`
`78`	`78`	`ParentDomainName: c.Parent,`
`79`	`79`	`}`
`80`		`- created, err := svc.DomainAliases.Insert(adminCustomerID, req).Context(ctx).Do()`
	`80`	`+ created, err := svc.DomainAliases.Insert(adminCustomerID(), req).Context(ctx).Do()`
`81`	`81`	`if err != nil {`
`82`	`82`	`return fmt.Errorf("create domain alias %s: %w", c.Alias, err)`
`83`	`83`	`}`
`@@ -110,7 +110,7 @@ func (c DomainsAliasesDeleteCmd) Run(ctx context.Context, flags RootFlags) err`
`110`	`110`	`return err`
`111`	`111`	`}`
`112`	`112`
`113`		`- if err := svc.DomainAliases.Delete(adminCustomerID, c.Alias).Context(ctx).Do(); err != nil {`
	`113`	`+ if err := svc.DomainAliases.Delete(adminCustomerID(), c.Alias).Context(ctx).Do(); err != nil {`
`114`	`114`	`return fmt.Errorf("delete domain alias %s: %w", c.Alias, err)`
`115`	`115`	`}`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func (c DomainsCreateCmd) Run(ctx context.Context, flags RootFlags) error {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`req := &admin.Domains{DomainName: c.Domain}`
`31`		`- created, err := svc.Domains.Insert(adminCustomerID, req).Context(ctx).Do()`
	`31`	`+ created, err := svc.Domains.Insert(adminCustomerID(), req).Context(ctx).Do()`
`32`	`32`	`if err != nil {`
`33`	`33`	`return fmt.Errorf("create domain %s: %w", c.Domain, err)`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func (c DomainsDeleteCmd) Run(ctx context.Context, flags RootFlags) error {`
`27`	`27`	`return err`
`28`	`28`	`}`
`29`	`29`
`30`		`- if err := svc.Domains.Delete(adminCustomerID, c.Domain).Context(ctx).Do(); err != nil {`
	`30`	`+ if err := svc.Domains.Delete(adminCustomerID(), c.Domain).Context(ctx).Do(); err != nil {`
`31`	`31`	`return fmt.Errorf("delete domain %s: %w", c.Domain, err)`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func (c DomainsGetCmd) Run(ctx context.Context, flags RootFlags) error {`
`25`	`25`	`return err`
`26`	`26`	`}`
`27`	`27`
`28`		`- domain, err := svc.Domains.Get(adminCustomerID, c.Domain).Context(ctx).Do()`
	`28`	`+ domain, err := svc.Domains.Get(adminCustomerID(), c.Domain).Context(ctx).Do()`
`29`	`29`	`if err != nil {`
`30`	`30`	`return fmt.Errorf("get domain %s: %w", c.Domain, err)`
`31`	`31`	`}`