fix: improve names for conflicting params (#3894)

Author: stainless-app[bot]

resource_sharing/recipient.go

@@ -42,15 +42,15 @@ func NewRecipientService(opts ...option.RequestOption) (r *RecipientService) {
 func (r *RecipientService) New(ctx context.Context, shareID string, params RecipientNewParams, opts ...option.RequestOption) (res *RecipientNewResponse, err error) {
 	var env RecipientNewResponseEnvelope
 	opts = append(r.Options[:], opts...)
-	if params.AccountID1.Value == "" {
+	if params.PathAccountID.Value == "" {
 		err = errors.New("missing required account_id parameter")
 		return
 	}
 	if shareID == "" {
 		err = errors.New("missing required share_id parameter")
 		return
 	}
-	path := fmt.Sprintf("accounts/%s/shares/%s/recipients", params.AccountID1, shareID)
+	path := fmt.Sprintf("accounts/%s/shares/%s/recipients", params.PathAccountID, shareID)
 	err = requestconfig.ExecuteNewRequest(ctx, http.MethodPost, path, params, &env, opts...)
 	if err != nil {
 		return
@@ -363,9 +363,9 @@ func (r RecipientGetResponseAssociationStatus) IsKnown() bool {
 
 type RecipientNewParams struct {
 	// Account identifier.
-	AccountID1 param.Field[string] `path:"account_id,required"`
+	PathAccountID param.Field[string] `path:"account_id,required"`
 	// Account identifier.
-	AccountID2 param.Field[string] `json:"account_id"`
+	BodyAccountID param.Field[string] `json:"account_id"`
 	// Organization identifier.
 	OrganizationID param.Field[string] `json:"organization_id"`
 }

resource_sharing/recipient_test.go

@@ -31,8 +31,8 @@ func TestRecipientNewWithOptionalParams(t *testing.T) {
 		context.TODO(),
 		"3fd85f74b32742f1bff64a85009dda07",
 		resource_sharing.RecipientNewParams{
-			AccountID1:     cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"),
-			AccountID2:     cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"),
+			PathAccountID:  cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"),
+			BodyAccountID:  cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"),
 			OrganizationID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"),
 		},
 	)

zero_trust/organization.go

@@ -554,9 +554,9 @@ type OrganizationRevokeUsersParams struct {
 	// The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 	ZoneID param.Field[string] `path:"zone_id"`
 	// When set to `true`, all devices associated with the user will be revoked.
-	Devices1 param.Field[bool] `query:"devices"`
+	QueryDevices param.Field[bool] `query:"devices"`
 	// When set to `true`, all devices associated with the user will be revoked.
-	Devices2 param.Field[bool] `json:"devices"`
+	BodyDevices param.Field[bool] `json:"devices"`
 	// The uuid of the user to revoke.
 	UserUID param.Field[string] `json:"user_uid"`
 	// When set to `true`, the user will be required to re-authenticate to WARP for all

zero_trust/organization_test.go

@@ -145,8 +145,8 @@ func TestOrganizationRevokeUsersWithOptionalParams(t *testing.T) {
 	_, err := client.ZeroTrust.Organizations.RevokeUsers(context.TODO(), zero_trust.OrganizationRevokeUsersParams{
 		Email:             cloudflare.F("test@example.com"),
 		AccountID:         cloudflare.F("account_id"),
-		Devices1:          cloudflare.F(true),
-		Devices2:          cloudflare.F(true),
+		QueryDevices:      cloudflare.F(true),
+		BodyDevices:       cloudflare.F(true),
 		UserUID:           cloudflare.F("699d98642c564d2e855e9661899b7252"),
 		WARPSessionReauth: cloudflare.F(true),
 	})