fix(cli): harden dry-run and live smoke tests

Author: steipete

CHANGELOG.md

@@ -17,6 +17,7 @@
 
 ### Fixed
 
+- CLI: make mutating dry-runs for contacts, Docs, Drive, Meet, and Slides stop before auth/API calls while still validating local inputs; harden live smoke tests for self-sharing, disabled Meet, Gmail filter labels, and forced batch deletes.
 - Auth: keep fresh OAuth saves working even when old file-keyring token entries are unreadable, and clarify that `--services all` means all user OAuth services while Workspace-only services use service accounts.
 - Gmail: reject off-palette `gmail labels style` colors locally instead of forwarding an opaque Gmail API error.
 - Drive: make `drive share --dry-run` stop before permission creation for user and domain shares, including `--notify`.

internal/cmd/contacts_crud.go

@@ -353,21 +353,38 @@ func anyFlagProvided(kctx *kong.Context, names ...string) bool {
 	return false
 }
 
+func flagValue[T any](set bool, value T) any {
+	if !set {
+		return nil
+	}
+	return value
+}
+
+func (c *ContactsUpdateCmd) validateFlagUpdateInputs(wantBirthday, wantCustom, wantRelation bool) error {
+	if wantCustom {
+		if _, _, err := parseCustomUserDefined(c.Custom, true); err != nil {
+			return usage(err.Error())
+		}
+	}
+	if wantRelation {
+		if _, _, err := parseRelations(c.Relation, true); err != nil {
+			return usage(err.Error())
+		}
+	}
+	if wantBirthday && strings.TrimSpace(c.Birthday) != "" {
+		if _, err := parseYYYYMMDD(strings.TrimSpace(c.Birthday)); err != nil {
+			return usage("invalid --birthday (expected YYYY-MM-DD)")
+		}
+	}
+	return nil
+}
+
 func (c *ContactsCreateCmd) Run(ctx context.Context, flags *RootFlags) error {
 	u := ui.FromContext(ctx)
-	account, err := requireAccount(flags)
-	if err != nil {
-		return err
-	}
 	if strings.TrimSpace(c.Given) == "" {
 		return usage("required: --given")
 	}
 
-	svc, err := newPeopleContactsService(ctx, account)
-	if err != nil {
-		return err
-	}
-
 	p := &people.Person{
 		Names: []*people.Name{{
 			GivenName:  strings.TrimSpace(c.Given),
@@ -421,6 +438,19 @@ func (c *ContactsCreateCmd) Run(ctx context.Context, flags *RootFlags) error {
 		}
 	}
 
+	if err := dryRunExit(ctx, flags, "contacts.create", map[string]any{"contact": p}); err != nil {
+		return err
+	}
+
+	account, err := requireAccount(flags)
+	if err != nil {
+		return err
+	}
+	svc, err := newPeopleContactsService(ctx, account)
+	if err != nil {
+		return err
+	}
+
 	created, err := svc.People.CreateContact(p).Do()
 	if err != nil {
 		return err
@@ -454,22 +484,55 @@ type ContactsUpdateCmd struct {
 	Notes    string `name:"notes" help:"Notes (stored as People API biography; empty clears)"`
 }
 
+type contactsUpdateFieldFlags struct {
+	given    bool
+	family   bool
+	email    bool
+	phone    bool
+	org      bool
+	title    bool
+	url      bool
+	note     bool
+	address  bool
+	gender   bool
+	birthday bool
+	notes    bool
+	custom   bool
+	relation bool
+}
+
+func contactsUpdateFieldFlagsFromKong(kctx *kong.Context) contactsUpdateFieldFlags {
+	return contactsUpdateFieldFlags{
+		given:    flagProvided(kctx, "given"),
+		family:   flagProvided(kctx, "family"),
+		email:    flagProvided(kctx, "email"),
+		phone:    flagProvided(kctx, "phone"),
+		org:      flagProvided(kctx, "org"),
+		title:    flagProvided(kctx, "title"),
+		url:      flagProvided(kctx, "url"),
+		note:     flagProvided(kctx, "note"),
+		address:  flagProvided(kctx, "address"),
+		gender:   flagProvided(kctx, "gender"),
+		birthday: flagProvided(kctx, "birthday"),
+		notes:    flagProvided(kctx, "notes"),
+		custom:   flagProvided(kctx, "custom"),
+		relation: flagProvided(kctx, "relation"),
+	}
+}
+
+func (w contactsUpdateFieldFlags) any() bool {
+	return w.given || w.family || w.email || w.phone || w.org || w.title ||
+		w.url || w.note || w.address || w.gender || w.birthday || w.notes ||
+		w.custom || w.relation
+}
+
 func (c *ContactsUpdateCmd) Run(ctx context.Context, kctx *kong.Context, flags *RootFlags) error {
 	u := ui.FromContext(ctx)
-	account, err := requireAccount(flags)
-	if err != nil {
-		return err
-	}
 	resourceName := strings.TrimSpace(c.ResourceName)
 	if !strings.HasPrefix(resourceName, "people/") {
 		return usage("resourceName must start with people/")
 	}
 
-	svc, err := newPeopleContactsService(ctx, account)
-	if err != nil {
-		return err
-	}
-
 	if strings.TrimSpace(c.FromFile) != "" {
 		if anyFlagProvided(kctx,
 			"given", "family", "email", "phone",
@@ -479,56 +542,101 @@ func (c *ContactsUpdateCmd) Run(ctx context.Context, kctx *kong.Context, flags *
 		) {
 			return usage("can't combine --from-file with other update flags")
 		}
+		if flags != nil && flags.DryRun {
+			inputPerson, updateFields, err := c.readUpdateJSONInput(resourceName)
+			if err != nil {
+				return err
+			}
+			if err := dryRunExit(ctx, flags, "contacts.update", map[string]any{
+				"resourceName": resourceName,
+				"from_file":    strings.TrimSpace(c.FromFile),
+				"updateFields": updateFields,
+				"contact":      inputPerson,
+			}); err != nil {
+				return err
+			}
+		}
+		account, err := requireAccount(flags)
+		if err != nil {
+			return err
+		}
+		svc, err := newPeopleContactsService(ctx, account)
+		if err != nil {
+			return err
+		}
 		return c.updateFromJSON(ctx, svc, resourceName, u)
 	}
 
+	want := contactsUpdateFieldFlagsFromKong(kctx)
+	if !want.any() {
+		return usage("no updates provided")
+	}
+	if err := c.validateFlagUpdateInputs(want.birthday, want.custom, want.relation); err != nil {
+		return err
+	}
+
+	if err := dryRunExit(ctx, flags, "contacts.update", map[string]any{
+		"resourceName": resourceName,
+		"fields": map[string]any{
+			"given":        flagValue(want.given, c.Given),
+			"family":       flagValue(want.family, c.Family),
+			"email":        flagValue(want.email, c.Email),
+			"phone":        flagValue(want.phone, c.Phone),
+			"organization": flagValue(want.org, c.Organization),
+			"title":        flagValue(want.title, c.Title),
+			"url":          flagValue(want.url, c.URL),
+			"note":         flagValue(want.note, c.Note),
+			"address":      flagValue(want.address, c.Address),
+			"gender":       flagValue(want.gender, c.Gender),
+			"birthday":     flagValue(want.birthday, c.Birthday),
+			"notes":        flagValue(want.notes, c.Notes),
+			"custom":       flagValue(want.custom, c.Custom),
+			"relation":     flagValue(want.relation, c.Relation),
+		},
+	}); err != nil {
+		return err
+	}
+
+	account, err := requireAccount(flags)
+	if err != nil {
+		return err
+	}
+	svc, err := newPeopleContactsService(ctx, account)
+	if err != nil {
+		return err
+	}
 	existing, err := svc.People.Get(resourceName).PersonFields(contactsUpdateReadMask).Do()
 	if err != nil {
 		return err
 	}
 
 	updateFields := make([]string, 0, 8)
 
-	wantGiven := flagProvided(kctx, "given")
-	wantFamily := flagProvided(kctx, "family")
-	wantEmail := flagProvided(kctx, "email")
-	wantPhone := flagProvided(kctx, "phone")
-	wantOrg := flagProvided(kctx, "org")
-	wantTitle := flagProvided(kctx, "title")
-	wantURL := flagProvided(kctx, "url")
-	wantNote := flagProvided(kctx, "note")
-	wantAddress := flagProvided(kctx, "address")
-	wantGender := flagProvided(kctx, "gender")
-	wantBirthday := flagProvided(kctx, "birthday")
-	wantNotes := flagProvided(kctx, "notes")
-	wantCustom := flagProvided(kctx, "custom")
-	wantRelation := flagProvided(kctx, "relation")
-
-	if wantGiven || wantFamily {
-		contactsApplyPersonName(existing, wantGiven, c.Given, wantFamily, c.Family)
+	if want.given || want.family {
+		contactsApplyPersonName(existing, want.given, c.Given, want.family, c.Family)
 		updateFields = append(updateFields, "names")
 	}
-	if wantEmail {
+	if want.email {
 		if strings.TrimSpace(c.Email) == "" {
 			existing.EmailAddresses = nil // will be forced to [] for patch
 		} else {
 			existing.EmailAddresses = []*people.EmailAddress{{Value: strings.TrimSpace(c.Email)}}
 		}
 		updateFields = append(updateFields, "emailAddresses")
 	}
-	if wantPhone {
+	if want.phone {
 		if strings.TrimSpace(c.Phone) == "" {
 			existing.PhoneNumbers = nil // will be forced to [] for patch
 		} else {
 			existing.PhoneNumbers = []*people.PhoneNumber{{Value: strings.TrimSpace(c.Phone)}}
 		}
 		updateFields = append(updateFields, "phoneNumbers")
 	}
-	if wantOrg || wantTitle {
-		contactsApplyPersonOrganization(existing, wantOrg, c.Organization, wantTitle, c.Title)
+	if want.org || want.title {
+		contactsApplyPersonOrganization(existing, want.org, c.Organization, want.title, c.Title)
 		updateFields = append(updateFields, "organizations")
 	}
-	if wantURL {
+	if want.url {
 		urls := contactsURLs(c.URL)
 		if len(urls) == 0 {
 			existing.Urls = nil
@@ -537,15 +645,15 @@ func (c *ContactsUpdateCmd) Run(ctx context.Context, kctx *kong.Context, flags *
 		}
 		updateFields = append(updateFields, "urls")
 	}
-	if wantNote {
+	if want.note {
 		if strings.TrimSpace(c.Note) == "" {
 			existing.Biographies = nil
 		} else {
 			existing.Biographies = []*people.Biography{{Value: strings.TrimSpace(c.Note)}}
 		}
 		updateFields = append(updateFields, "biographies")
 	}
-	if wantAddress {
+	if want.address {
 		addrs := contactsAddresses(c.Address)
 		if len(addrs) == 0 {
 			existing.Addresses = nil // will be forced to [] for patch
@@ -554,7 +662,7 @@ func (c *ContactsUpdateCmd) Run(ctx context.Context, kctx *kong.Context, flags *
 		}
 		updateFields = append(updateFields, "addresses")
 	}
-	if wantGender {
+	if want.gender {
 		genders := contactsGenders(c.Gender)
 		if len(genders) == 0 {
 			existing.Genders = nil // will be forced to [] for patch
@@ -563,7 +671,7 @@ func (c *ContactsUpdateCmd) Run(ctx context.Context, kctx *kong.Context, flags *
 		}
 		updateFields = append(updateFields, "genders")
 	}
-	if wantCustom {
+	if want.custom {
 		userDefined, clearAll, parseErr := parseCustomUserDefined(c.Custom, true)
 		if parseErr != nil {
 			return usage(parseErr.Error())
@@ -575,7 +683,7 @@ func (c *ContactsUpdateCmd) Run(ctx context.Context, kctx *kong.Context, flags *
 		}
 		updateFields = append(updateFields, "userDefined")
 	}
-	if wantRelation {
+	if want.relation {
 		relations, clearAll, parseErr := parseRelations(c.Relation, true)
 		if parseErr != nil {
 			return usage(parseErr.Error())
@@ -588,7 +696,7 @@ func (c *ContactsUpdateCmd) Run(ctx context.Context, kctx *kong.Context, flags *
 		updateFields = append(updateFields, "relations")
 	}
 
-	if wantBirthday {
+	if want.birthday {
 		if strings.TrimSpace(c.Birthday) == "" {
 			existing.Birthdays = nil // will be forced to [] for patch
 		} else {
@@ -604,7 +712,7 @@ func (c *ContactsUpdateCmd) Run(ctx context.Context, kctx *kong.Context, flags *
 		updateFields = append(updateFields, "birthdays")
 	}
 
-	if wantNotes {
+	if want.notes {
 		if strings.TrimSpace(c.Notes) == "" {
 			existing.Biographies = nil // will be forced to [] for patch
 		} else {

internal/cmd/contacts_update_json.go

@@ -339,30 +339,43 @@ func contactsUpdateMaskFromKeys(keys map[string]json.RawMessage) ([]string, erro
 	return update, nil
 }
 
-func (c *ContactsUpdateCmd) updateFromJSON(ctx context.Context, svc *people.Service, resourceName string, u *ui.UI) error {
+func (c *ContactsUpdateCmd) readUpdateJSONInput(resourceName string) (*people.Person, []string, error) {
 	reader, closeFn, err := openFileOrStdin(strings.TrimSpace(c.FromFile))
 	if err != nil {
-		return err
+		return nil, nil, err
 	}
 	if closeFn != nil {
 		defer closeFn()
 	}
 	data, err := io.ReadAll(reader)
 	if err != nil {
-		return fmt.Errorf("read JSON: %w", err)
+		return nil, nil, fmt.Errorf("read JSON: %w", err)
 	}
 
 	inputPerson, presentKeys, err := parseContactsUpdateJSON(data)
 	if err != nil {
-		return err
+		return nil, nil, err
 	}
 
 	updateFields, err := contactsUpdateMaskFromKeys(presentKeys)
 	if err != nil {
-		return err
+		return nil, nil, err
 	}
 	if len(updateFields) == 0 {
-		return usage("no updatable fields found in JSON (needs one of updatePersonFields fields like urls, biographies, ...)")
+		return nil, nil, usage("no updatable fields found in JSON (needs one of updatePersonFields fields like urls, biographies, ...)")
+	}
+
+	if strings.TrimSpace(inputPerson.ResourceName) != "" && strings.TrimSpace(inputPerson.ResourceName) != resourceName {
+		return nil, nil, usage("resourceName in JSON does not match CLI argument")
+	}
+
+	return inputPerson, updateFields, nil
+}
+
+func (c *ContactsUpdateCmd) updateFromJSON(ctx context.Context, svc *people.Service, resourceName string, u *ui.UI) error {
+	inputPerson, updateFields, err := c.readUpdateJSONInput(resourceName)
+	if err != nil {
+		return err
 	}
 
 	// Fetch current metadata/etag (required by updateContact).
@@ -378,10 +391,6 @@ func (c *ContactsUpdateCmd) updateFromJSON(ctx context.Context, svc *people.Serv
 		return usage("etag mismatch (contact changed). Re-run `gog contacts get ... --json`, re-apply edits, retry (or pass --ignore-etag).")
 	}
 
-	if strings.TrimSpace(inputPerson.ResourceName) != "" && strings.TrimSpace(inputPerson.ResourceName) != resourceName {
-		return usage("resourceName in JSON does not match CLI argument")
-	}
-
 	// Enforce resourceName and required metadata.
 	inputPerson.ResourceName = resourceName
 	inputPerson.Metadata = cur.Metadata