diff --git a/accounts/member.go b/accounts/member.go index 6143a705171..950e329bd86 100644 --- a/accounts/member.go +++ b/accounts/member.go @@ -84,10 +84,10 @@ func (r *MemberService) ListAutoPaging(ctx context.Context, params MemberListPar } // Remove a member from an account. -func (r *MemberService) Delete(ctx context.Context, memberID string, params MemberDeleteParams, opts ...option.RequestOption) (res *MemberDeleteResponse, err error) { +func (r *MemberService) Delete(ctx context.Context, memberID string, body MemberDeleteParams, opts ...option.RequestOption) (res *MemberDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env MemberDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%v/members/%s", params.AccountID, memberID) + path := fmt.Sprintf("accounts/%v/members/%s", body.AccountID, memberID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -519,11 +519,6 @@ func (r MemberListParamsStatus) IsKnown() bool { type MemberDeleteParams struct { AccountID param.Field[interface{}] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r MemberDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type MemberDeleteResponseEnvelope struct { diff --git a/accounts/member_test.go b/accounts/member_test.go index f5ddc86ec77..8052d0be662 100644 --- a/accounts/member_test.go +++ b/accounts/member_test.go @@ -133,7 +133,6 @@ func TestMemberDelete(t *testing.T) { "4536bcfad5faccb111b47003c79917fa", accounts.MemberDeleteParams{ AccountID: cloudflare.F[any](map[string]interface{}{}), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/addressing/addressmap.go b/addressing/addressmap.go index 3655b59b763..c553728bdcf 100644 --- a/addressing/addressmap.go +++ b/addressing/addressmap.go @@ -77,10 +77,10 @@ func (r *AddressMapService) ListAutoPaging(ctx context.Context, query AddressMap // Delete a particular address map owned by the account. An Address Map must be // disabled before it can be deleted. -func (r *AddressMapService) Delete(ctx context.Context, addressMapID string, params AddressMapDeleteParams, opts ...option.RequestOption) (res *[]AddressMapDeleteResponse, err error) { +func (r *AddressMapService) Delete(ctx context.Context, addressMapID string, body AddressMapDeleteParams, opts ...option.RequestOption) (res *[]AddressMapDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env AddressMapDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/addressing/address_maps/%s", params.AccountID, addressMapID) + path := fmt.Sprintf("accounts/%s/addressing/address_maps/%s", body.AccountID, addressMapID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -483,11 +483,6 @@ type AddressMapListParams struct { type AddressMapDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r AddressMapDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type AddressMapDeleteResponseEnvelope struct { diff --git a/addressing/addressmap_test.go b/addressing/addressmap_test.go index 301c5faef90..dce9f55ef0f 100644 --- a/addressing/addressmap_test.go +++ b/addressing/addressmap_test.go @@ -87,7 +87,6 @@ func TestAddressMapDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", addressing.AddressMapDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/addressing/addressmapaccount.go b/addressing/addressmapaccount.go index 2ab86460176..163abe8b4b4 100644 --- a/addressing/addressmapaccount.go +++ b/addressing/addressmapaccount.go @@ -46,10 +46,10 @@ func (r *AddressMapAccountService) Update(ctx context.Context, addressMapID stri } // Remove an account as a member of a particular address map. -func (r *AddressMapAccountService) Delete(ctx context.Context, addressMapID string, params AddressMapAccountDeleteParams, opts ...option.RequestOption) (res *[]AddressMapAccountDeleteResponse, err error) { +func (r *AddressMapAccountService) Delete(ctx context.Context, addressMapID string, body AddressMapAccountDeleteParams, opts ...option.RequestOption) (res *[]AddressMapAccountDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env AddressMapAccountDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/addressing/address_maps/%s/accounts/%s", params.AccountID, addressMapID, params.AccountID) + path := fmt.Sprintf("accounts/%s/addressing/address_maps/%s/accounts/%s", body.AccountID, addressMapID, body.AccountID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -151,11 +151,6 @@ func (r addressMapAccountUpdateResponseEnvelopeResultInfoJSON) RawJSON() string type AddressMapAccountDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r AddressMapAccountDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type AddressMapAccountDeleteResponseEnvelope struct { diff --git a/addressing/addressmapaccount_test.go b/addressing/addressmapaccount_test.go index 697d6f70988..b13dad1f48b 100644 --- a/addressing/addressmapaccount_test.go +++ b/addressing/addressmapaccount_test.go @@ -64,7 +64,6 @@ func TestAddressMapAccountDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", addressing.AddressMapAccountDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/addressing/addressmapip.go b/addressing/addressmapip.go index b9ac5a9d040..16ac5eb17c8 100644 --- a/addressing/addressmapip.go +++ b/addressing/addressmapip.go @@ -46,10 +46,10 @@ func (r *AddressMapIPService) Update(ctx context.Context, addressMapID string, i } // Remove an IP from a particular address map. -func (r *AddressMapIPService) Delete(ctx context.Context, addressMapID string, ipAddress string, params AddressMapIPDeleteParams, opts ...option.RequestOption) (res *[]AddressMapIPDeleteResponse, err error) { +func (r *AddressMapIPService) Delete(ctx context.Context, addressMapID string, ipAddress string, body AddressMapIPDeleteParams, opts ...option.RequestOption) (res *[]AddressMapIPDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env AddressMapIPDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/addressing/address_maps/%s/ips/%s", params.AccountID, addressMapID, ipAddress) + path := fmt.Sprintf("accounts/%s/addressing/address_maps/%s/ips/%s", body.AccountID, addressMapID, ipAddress) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -151,11 +151,6 @@ func (r addressMapIPUpdateResponseEnvelopeResultInfoJSON) RawJSON() string { type AddressMapIPDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r AddressMapIPDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type AddressMapIPDeleteResponseEnvelope struct { diff --git a/addressing/addressmapip_test.go b/addressing/addressmapip_test.go index 4f0c3ebe7d3..8b83306c143 100644 --- a/addressing/addressmapip_test.go +++ b/addressing/addressmapip_test.go @@ -66,7 +66,6 @@ func TestAddressMapIPDelete(t *testing.T) { "192.0.2.1", addressing.AddressMapIPDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/addressing/addressmapzone.go b/addressing/addressmapzone.go index ab7b8f9cfbd..af09239319c 100644 --- a/addressing/addressmapzone.go +++ b/addressing/addressmapzone.go @@ -46,10 +46,10 @@ func (r *AddressMapZoneService) Update(ctx context.Context, addressMapID string, } // Remove a zone as a member of a particular address map. -func (r *AddressMapZoneService) Delete(ctx context.Context, addressMapID string, params AddressMapZoneDeleteParams, opts ...option.RequestOption) (res *[]AddressMapZoneDeleteResponse, err error) { +func (r *AddressMapZoneService) Delete(ctx context.Context, addressMapID string, body AddressMapZoneDeleteParams, opts ...option.RequestOption) (res *[]AddressMapZoneDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env AddressMapZoneDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/addressing/address_maps/%s/zones/%s", params.AccountID, addressMapID, params.ZoneID) + path := fmt.Sprintf("accounts/%s/addressing/address_maps/%s/zones/%s", body.AccountID, addressMapID, body.ZoneID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -155,11 +155,6 @@ type AddressMapZoneDeleteParams struct { ZoneID param.Field[string] `path:"zone_id,required"` // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r AddressMapZoneDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type AddressMapZoneDeleteResponseEnvelope struct { diff --git a/addressing/addressmapzone_test.go b/addressing/addressmapzone_test.go index 4268fa43c9d..b01d8162bea 100644 --- a/addressing/addressmapzone_test.go +++ b/addressing/addressmapzone_test.go @@ -66,7 +66,6 @@ func TestAddressMapZoneDelete(t *testing.T) { addressing.AddressMapZoneDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/addressing/prefix.go b/addressing/prefix.go index 4977ca211ca..ea500057f6e 100644 --- a/addressing/prefix.go +++ b/addressing/prefix.go @@ -74,10 +74,10 @@ func (r *PrefixService) ListAutoPaging(ctx context.Context, query PrefixListPara } // Delete an unapproved prefix owned by the account. -func (r *PrefixService) Delete(ctx context.Context, prefixID string, params PrefixDeleteParams, opts ...option.RequestOption) (res *[]PrefixDeleteResponse, err error) { +func (r *PrefixService) Delete(ctx context.Context, prefixID string, body PrefixDeleteParams, opts ...option.RequestOption) (res *[]PrefixDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env PrefixDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/addressing/prefixes/%s", params.AccountID, prefixID) + path := fmt.Sprintf("accounts/%s/addressing/prefixes/%s", body.AccountID, prefixID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -239,11 +239,6 @@ type PrefixListParams struct { type PrefixDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r PrefixDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type PrefixDeleteResponseEnvelope struct { diff --git a/addressing/prefix_test.go b/addressing/prefix_test.go index 7cee67a6a5d..bf7ee843c81 100644 --- a/addressing/prefix_test.go +++ b/addressing/prefix_test.go @@ -88,7 +88,6 @@ func TestPrefixDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", addressing.PrefixDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/addressing/prefixdelegation.go b/addressing/prefixdelegation.go index cfed1b68bd9..687dfabbb3b 100644 --- a/addressing/prefixdelegation.go +++ b/addressing/prefixdelegation.go @@ -71,10 +71,10 @@ func (r *PrefixDelegationService) ListAutoPaging(ctx context.Context, prefixID s } // Delete an account delegation for a given IP prefix. -func (r *PrefixDelegationService) Delete(ctx context.Context, prefixID string, delegationID string, params PrefixDelegationDeleteParams, opts ...option.RequestOption) (res *PrefixDelegationDeleteResponse, err error) { +func (r *PrefixDelegationService) Delete(ctx context.Context, prefixID string, delegationID string, body PrefixDelegationDeleteParams, opts ...option.RequestOption) (res *PrefixDelegationDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env PrefixDelegationDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/addressing/prefixes/%s/delegations/%s", params.AccountID, prefixID, delegationID) + path := fmt.Sprintf("accounts/%s/addressing/prefixes/%s/delegations/%s", body.AccountID, prefixID, delegationID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -203,11 +203,6 @@ type PrefixDelegationListParams struct { type PrefixDelegationDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r PrefixDelegationDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type PrefixDelegationDeleteResponseEnvelope struct { diff --git a/addressing/prefixdelegation_test.go b/addressing/prefixdelegation_test.go index 670d919c955..c5a207a9e1a 100644 --- a/addressing/prefixdelegation_test.go +++ b/addressing/prefixdelegation_test.go @@ -96,7 +96,6 @@ func TestPrefixDelegationDelete(t *testing.T) { "d933b1530bc56c9953cf8ce166da8004", addressing.PrefixDelegationDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/api.md b/api.md index 96fabe589c1..fc990f01d0f 100644 --- a/api.md +++ b/api.md @@ -48,7 +48,7 @@ Methods: - client.Accounts.Members.New(ctx context.Context, params accounts.MemberNewParams) (accounts.UserWithInviteCode, error) - client.Accounts.Members.Update(ctx context.Context, memberID string, params accounts.MemberUpdateParams) (shared.Member, error) - client.Accounts.Members.List(ctx context.Context, params accounts.MemberListParams) (pagination.V4PagePaginationArray[accounts.MemberListResponse], error) -- client.Accounts.Members.Delete(ctx context.Context, memberID string, params accounts.MemberDeleteParams) (accounts.MemberDeleteResponse, error) +- client.Accounts.Members.Delete(ctx context.Context, memberID string, body accounts.MemberDeleteParams) (accounts.MemberDeleteResponse, error) - client.Accounts.Members.Get(ctx context.Context, memberID string, query accounts.MemberGetParams) (shared.Member, error) ## Roles @@ -75,7 +75,7 @@ Methods: - client.OriginCACertificates.New(ctx context.Context, body origin_ca_certificates.OriginCACertificateNewParams) (origin_ca_certificates.OriginCACertificateNewResponseUnion, error) - client.OriginCACertificates.List(ctx context.Context, query origin_ca_certificates.OriginCACertificateListParams) (pagination.SinglePage[origin_ca_certificates.OriginCACertificate], error) -- client.OriginCACertificates.Delete(ctx context.Context, certificateID string, body origin_ca_certificates.OriginCACertificateDeleteParams) (origin_ca_certificates.OriginCACertificateDeleteResponse, error) +- client.OriginCACertificates.Delete(ctx context.Context, certificateID string) (origin_ca_certificates.OriginCACertificateDeleteResponse, error) - client.OriginCACertificates.Get(ctx context.Context, certificateID string) (origin_ca_certificates.OriginCACertificateGetResponseUnion, error) # IPs @@ -103,7 +103,7 @@ Methods: - client.Memberships.Update(ctx context.Context, membershipID string, body memberships.MembershipUpdateParams) (memberships.MembershipUpdateResponseUnion, error) - client.Memberships.List(ctx context.Context, query memberships.MembershipListParams) (pagination.V4PagePaginationArray[memberships.Membership], error) -- client.Memberships.Delete(ctx context.Context, membershipID string, body memberships.MembershipDeleteParams) (memberships.MembershipDeleteResponse, error) +- client.Memberships.Delete(ctx context.Context, membershipID string) (memberships.MembershipDeleteResponse, error) - client.Memberships.Get(ctx context.Context, membershipID string) (memberships.MembershipGetResponseUnion, error) # User @@ -171,7 +171,7 @@ Response Types: Methods: - client.User.Organizations.List(ctx context.Context, query user.OrganizationListParams) (pagination.V4PagePaginationArray[user.Organization], error) -- client.User.Organizations.Delete(ctx context.Context, organizationID string, body user.OrganizationDeleteParams) (user.OrganizationDeleteResponse, error) +- client.User.Organizations.Delete(ctx context.Context, organizationID string) (user.OrganizationDeleteResponse, error) - client.User.Organizations.Get(ctx context.Context, organizationID string) (user.OrganizationGetResponseUnion, error) ## Subscriptions @@ -196,7 +196,7 @@ Response Types: Methods: - client.User.Subscriptions.Update(ctx context.Context, identifier string, body user.SubscriptionUpdateParams) (user.SubscriptionUpdateResponseUnion, error) -- client.User.Subscriptions.Delete(ctx context.Context, identifier string, body user.SubscriptionDeleteParams) (user.SubscriptionDeleteResponse, error) +- client.User.Subscriptions.Delete(ctx context.Context, identifier string) (user.SubscriptionDeleteResponse, error) - client.User.Subscriptions.Edit(ctx context.Context, identifier string, body user.SubscriptionEditParams) (user.SubscriptionEditResponseUnion, error) - client.User.Subscriptions.Get(ctx context.Context) ([]user.Subscription, error) @@ -222,7 +222,7 @@ Methods: - client.User.Tokens.New(ctx context.Context, body user.TokenNewParams) (user.TokenNewResponse, error) - client.User.Tokens.Update(ctx context.Context, tokenID interface{}, body user.TokenUpdateParams) (user.TokenUpdateResponseUnion, error) - client.User.Tokens.List(ctx context.Context, query user.TokenListParams) (pagination.V4PagePaginationArray[user.TokenListResponse], error) -- client.User.Tokens.Delete(ctx context.Context, tokenID interface{}, body user.TokenDeleteParams) (user.TokenDeleteResponse, error) +- client.User.Tokens.Delete(ctx context.Context, tokenID interface{}) (user.TokenDeleteResponse, error) - client.User.Tokens.Get(ctx context.Context, tokenID interface{}) (user.TokenGetResponseUnion, error) - client.User.Tokens.Verify(ctx context.Context) (user.TokenVerifyResponse, error) @@ -968,7 +968,7 @@ Methods: - client.LoadBalancers.New(ctx context.Context, params load_balancers.LoadBalancerNewParams) (load_balancers.LoadBalancer, error) - client.LoadBalancers.Update(ctx context.Context, loadBalancerID string, params load_balancers.LoadBalancerUpdateParams) (load_balancers.LoadBalancer, error) - client.LoadBalancers.List(ctx context.Context, query load_balancers.LoadBalancerListParams) (pagination.SinglePage[load_balancers.LoadBalancer], error) -- client.LoadBalancers.Delete(ctx context.Context, loadBalancerID string, params load_balancers.LoadBalancerDeleteParams) (load_balancers.LoadBalancerDeleteResponse, error) +- client.LoadBalancers.Delete(ctx context.Context, loadBalancerID string, body load_balancers.LoadBalancerDeleteParams) (load_balancers.LoadBalancerDeleteResponse, error) - client.LoadBalancers.Edit(ctx context.Context, loadBalancerID string, params load_balancers.LoadBalancerEditParams) (load_balancers.LoadBalancer, error) - client.LoadBalancers.Get(ctx context.Context, loadBalancerID string, query load_balancers.LoadBalancerGetParams) (load_balancers.LoadBalancer, error) @@ -984,7 +984,7 @@ Methods: - client.LoadBalancers.Monitors.New(ctx context.Context, params load_balancers.MonitorNewParams) (load_balancers.Monitor, error) - client.LoadBalancers.Monitors.Update(ctx context.Context, monitorID string, params load_balancers.MonitorUpdateParams) (load_balancers.Monitor, error) - client.LoadBalancers.Monitors.List(ctx context.Context, query load_balancers.MonitorListParams) (pagination.SinglePage[load_balancers.Monitor], error) -- client.LoadBalancers.Monitors.Delete(ctx context.Context, monitorID string, params load_balancers.MonitorDeleteParams) (load_balancers.MonitorDeleteResponse, error) +- client.LoadBalancers.Monitors.Delete(ctx context.Context, monitorID string, body load_balancers.MonitorDeleteParams) (load_balancers.MonitorDeleteResponse, error) - client.LoadBalancers.Monitors.Edit(ctx context.Context, monitorID string, params load_balancers.MonitorEditParams) (load_balancers.Monitor, error) - client.LoadBalancers.Monitors.Get(ctx context.Context, monitorID string, query load_balancers.MonitorGetParams) (load_balancers.Monitor, error) @@ -1020,7 +1020,7 @@ Methods: - client.LoadBalancers.Pools.New(ctx context.Context, params load_balancers.PoolNewParams) (load_balancers.Pool, error) - client.LoadBalancers.Pools.Update(ctx context.Context, poolID string, params load_balancers.PoolUpdateParams) (load_balancers.Pool, error) - client.LoadBalancers.Pools.List(ctx context.Context, params load_balancers.PoolListParams) (pagination.SinglePage[load_balancers.Pool], error) -- client.LoadBalancers.Pools.Delete(ctx context.Context, poolID string, params load_balancers.PoolDeleteParams) (load_balancers.PoolDeleteResponse, error) +- client.LoadBalancers.Pools.Delete(ctx context.Context, poolID string, body load_balancers.PoolDeleteParams) (load_balancers.PoolDeleteResponse, error) - client.LoadBalancers.Pools.Edit(ctx context.Context, poolID string, params load_balancers.PoolEditParams) (load_balancers.Pool, error) - client.LoadBalancers.Pools.Get(ctx context.Context, poolID string, query load_balancers.PoolGetParams) (load_balancers.Pool, error) @@ -1116,7 +1116,7 @@ Response Types: Methods: -- client.Cache.SmartTieredCache.Delete(ctx context.Context, params cache.SmartTieredCacheDeleteParams) (cache.SmartTieredCacheDeleteResponseUnion, error) +- client.Cache.SmartTieredCache.Delete(ctx context.Context, body cache.SmartTieredCacheDeleteParams) (cache.SmartTieredCacheDeleteResponseUnion, error) - client.Cache.SmartTieredCache.Edit(ctx context.Context, params cache.SmartTieredCacheEditParams) (cache.SmartTieredCacheEditResponseUnion, error) - client.Cache.SmartTieredCache.Get(ctx context.Context, query cache.SmartTieredCacheGetParams) (cache.SmartTieredCacheGetResponseUnion, error) @@ -1131,7 +1131,7 @@ Response Types: Methods: -- client.Cache.Variants.Delete(ctx context.Context, params cache.VariantDeleteParams) (cache.CacheVariant, error) +- client.Cache.Variants.Delete(ctx context.Context, body cache.VariantDeleteParams) (cache.CacheVariant, error) - client.Cache.Variants.Edit(ctx context.Context, params cache.VariantEditParams) (cache.VariantEditResponse, error) - client.Cache.Variants.Get(ctx context.Context, query cache.VariantGetParams) (cache.VariantGetResponse, error) @@ -1177,7 +1177,7 @@ Response Types: Methods: - client.SSL.CertificatePacks.List(ctx context.Context, params ssl.CertificatePackListParams) (pagination.SinglePage[ssl.CertificatePackListResponse], error) -- client.SSL.CertificatePacks.Delete(ctx context.Context, certificatePackID string, params ssl.CertificatePackDeleteParams) (ssl.CertificatePackDeleteResponse, error) +- client.SSL.CertificatePacks.Delete(ctx context.Context, certificatePackID string, body ssl.CertificatePackDeleteParams) (ssl.CertificatePackDeleteResponse, error) - client.SSL.CertificatePacks.Edit(ctx context.Context, certificatePackID string, params ssl.CertificatePackEditParams) (ssl.CertificatePackEditResponse, error) - client.SSL.CertificatePacks.Get(ctx context.Context, certificatePackID string, query ssl.CertificatePackGetParams) (ssl.CertificatePackGetResponseUnion, error) @@ -1254,7 +1254,7 @@ Methods: - client.Subscriptions.New(ctx context.Context, identifier string, body subscriptions.SubscriptionNewParams) (subscriptions.SubscriptionNewResponseUnion, error) - client.Subscriptions.Update(ctx context.Context, accountIdentifier string, subscriptionIdentifier string, body subscriptions.SubscriptionUpdateParams) (subscriptions.SubscriptionUpdateResponseUnion, error) - client.Subscriptions.List(ctx context.Context, accountIdentifier string) (pagination.SinglePage[user.Subscription], error) -- client.Subscriptions.Delete(ctx context.Context, accountIdentifier string, subscriptionIdentifier string, body subscriptions.SubscriptionDeleteParams) (subscriptions.SubscriptionDeleteResponse, error) +- client.Subscriptions.Delete(ctx context.Context, accountIdentifier string, subscriptionIdentifier string) (subscriptions.SubscriptionDeleteResponse, error) - client.Subscriptions.Get(ctx context.Context, identifier string) (subscriptions.SubscriptionGetResponseUnion, error) # ACM @@ -1371,7 +1371,7 @@ Methods: - client.CustomCertificates.New(ctx context.Context, params custom_certificates.CustomCertificateNewParams) (custom_certificates.CustomCertificateNewResponseUnion, error) - client.CustomCertificates.List(ctx context.Context, params custom_certificates.CustomCertificateListParams) (pagination.V4PagePaginationArray[custom_certificates.CustomCertificate], error) -- client.CustomCertificates.Delete(ctx context.Context, customCertificateID string, params custom_certificates.CustomCertificateDeleteParams) (custom_certificates.CustomCertificateDeleteResponse, error) +- client.CustomCertificates.Delete(ctx context.Context, customCertificateID string, body custom_certificates.CustomCertificateDeleteParams) (custom_certificates.CustomCertificateDeleteResponse, error) - client.CustomCertificates.Edit(ctx context.Context, customCertificateID string, params custom_certificates.CustomCertificateEditParams) (custom_certificates.CustomCertificateEditResponseUnion, error) - client.CustomCertificates.Get(ctx context.Context, customCertificateID string, query custom_certificates.CustomCertificateGetParams) (custom_certificates.CustomCertificateGetResponseUnion, error) @@ -1404,7 +1404,7 @@ Methods: - client.CustomHostnames.New(ctx context.Context, params custom_hostnames.CustomHostnameNewParams) (custom_hostnames.CustomHostnameNewResponse, error) - client.CustomHostnames.List(ctx context.Context, params custom_hostnames.CustomHostnameListParams) (pagination.V4PagePaginationArray[custom_hostnames.CustomHostnameListResponse], error) -- client.CustomHostnames.Delete(ctx context.Context, customHostnameID string, params custom_hostnames.CustomHostnameDeleteParams) (custom_hostnames.CustomHostnameDeleteResponse, error) +- client.CustomHostnames.Delete(ctx context.Context, customHostnameID string, body custom_hostnames.CustomHostnameDeleteParams) (custom_hostnames.CustomHostnameDeleteResponse, error) - client.CustomHostnames.Edit(ctx context.Context, customHostnameID string, params custom_hostnames.CustomHostnameEditParams) (custom_hostnames.CustomHostnameEditResponse, error) - client.CustomHostnames.Get(ctx context.Context, customHostnameID string, query custom_hostnames.CustomHostnameGetParams) (custom_hostnames.CustomHostnameGetResponse, error) @@ -1419,7 +1419,7 @@ Response Types: Methods: - client.CustomHostnames.FallbackOrigin.Update(ctx context.Context, params custom_hostnames.FallbackOriginUpdateParams) (custom_hostnames.FallbackOriginUpdateResponseUnion, error) -- client.CustomHostnames.FallbackOrigin.Delete(ctx context.Context, params custom_hostnames.FallbackOriginDeleteParams) (custom_hostnames.FallbackOriginDeleteResponseUnion, error) +- client.CustomHostnames.FallbackOrigin.Delete(ctx context.Context, body custom_hostnames.FallbackOriginDeleteParams) (custom_hostnames.FallbackOriginDeleteResponseUnion, error) - client.CustomHostnames.FallbackOrigin.Get(ctx context.Context, query custom_hostnames.FallbackOriginGetParams) (custom_hostnames.FallbackOriginGetResponseUnion, error) # CustomNameservers @@ -1432,7 +1432,7 @@ Response Types: Methods: - client.CustomNameservers.New(ctx context.Context, params custom_nameservers.CustomNameserverNewParams) (custom_nameservers.CustomNameserver, error) -- client.CustomNameservers.Delete(ctx context.Context, customNSID string, params custom_nameservers.CustomNameserverDeleteParams) (custom_nameservers.CustomNameserverDeleteResponseUnion, error) +- client.CustomNameservers.Delete(ctx context.Context, customNSID string, body custom_nameservers.CustomNameserverDeleteParams) (custom_nameservers.CustomNameserverDeleteResponseUnion, error) - client.CustomNameservers.Availabilty(ctx context.Context, query custom_nameservers.CustomNameserverAvailabiltyParams) ([]string, error) - client.CustomNameservers.Get(ctx context.Context, query custom_nameservers.CustomNameserverGetParams) ([]custom_nameservers.CustomNameserver, error) - client.CustomNameservers.Verify(ctx context.Context, params custom_nameservers.CustomNameserverVerifyParams) ([]custom_nameservers.CustomNameserver, error) @@ -1509,7 +1509,7 @@ Methods: - client.DNS.Records.New(ctx context.Context, params dns.RecordNewParams) (dns.Record, error) - client.DNS.Records.Update(ctx context.Context, dnsRecordID string, params dns.RecordUpdateParams) (dns.Record, error) - client.DNS.Records.List(ctx context.Context, params dns.RecordListParams) (pagination.V4PagePaginationArray[dns.Record], error) -- client.DNS.Records.Delete(ctx context.Context, dnsRecordID string, params dns.RecordDeleteParams) (dns.RecordDeleteResponse, error) +- client.DNS.Records.Delete(ctx context.Context, dnsRecordID string, body dns.RecordDeleteParams) (dns.RecordDeleteResponse, error) - client.DNS.Records.Edit(ctx context.Context, dnsRecordID string, params dns.RecordEditParams) (dns.Record, error) - client.DNS.Records.Export(ctx context.Context, query dns.RecordExportParams) (string, error) - client.DNS.Records.Get(ctx context.Context, dnsRecordID string, query dns.RecordGetParams) (dns.Record, error) @@ -1559,7 +1559,7 @@ Methods: - client.DNS.Firewall.New(ctx context.Context, params dns.FirewallNewParams) (dns.Firewall, error) - client.DNS.Firewall.List(ctx context.Context, params dns.FirewallListParams) (pagination.V4PagePaginationArray[dns.Firewall], error) -- client.DNS.Firewall.Delete(ctx context.Context, dnsFirewallID string, params dns.FirewallDeleteParams) (dns.FirewallDeleteResponse, error) +- client.DNS.Firewall.Delete(ctx context.Context, dnsFirewallID string, body dns.FirewallDeleteParams) (dns.FirewallDeleteResponse, error) - client.DNS.Firewall.Edit(ctx context.Context, dnsFirewallID string, params dns.FirewallEditParams) (dns.Firewall, error) - client.DNS.Firewall.Get(ctx context.Context, dnsFirewallID string, query dns.FirewallGetParams) (dns.Firewall, error) @@ -1586,7 +1586,7 @@ Response Types: Methods: -- client.DNSSEC.Delete(ctx context.Context, params dnssec.DNSSECDeleteParams) (dnssec.DNSSECDeleteResponseUnion, error) +- client.DNSSEC.Delete(ctx context.Context, body dnssec.DNSSECDeleteParams) (dnssec.DNSSECDeleteResponseUnion, error) - client.DNSSEC.Edit(ctx context.Context, params dnssec.DNSSECEditParams) (dnssec.DNSSEC, error) - client.DNSSEC.Get(ctx context.Context, query dnssec.DNSSECGetParams) (dnssec.DNSSEC, error) @@ -1676,7 +1676,7 @@ Methods: - client.Filters.New(ctx context.Context, zoneIdentifier string, body filters.FilterNewParams) ([]filters.FirewallFilter, error) - client.Filters.Update(ctx context.Context, zoneIdentifier string, id string, body filters.FilterUpdateParams) (filters.FirewallFilter, error) - client.Filters.List(ctx context.Context, zoneIdentifier string, query filters.FilterListParams) (pagination.V4PagePaginationArray[filters.FirewallFilter], error) -- client.Filters.Delete(ctx context.Context, zoneIdentifier string, id string, body filters.FilterDeleteParams) (filters.FirewallFilter, error) +- client.Filters.Delete(ctx context.Context, zoneIdentifier string, id string) (filters.FirewallFilter, error) - client.Filters.Get(ctx context.Context, zoneIdentifier string, id string) (filters.FirewallFilter, error) # Firewall @@ -1697,7 +1697,7 @@ Methods: - client.Firewall.Lockdowns.New(ctx context.Context, zoneIdentifier string, body firewall.LockdownNewParams) (firewall.Lockdown, error) - client.Firewall.Lockdowns.Update(ctx context.Context, zoneIdentifier string, id string, body firewall.LockdownUpdateParams) (firewall.Lockdown, error) - client.Firewall.Lockdowns.List(ctx context.Context, zoneIdentifier string, query firewall.LockdownListParams) (pagination.V4PagePaginationArray[firewall.Lockdown], error) -- client.Firewall.Lockdowns.Delete(ctx context.Context, zoneIdentifier string, id string, body firewall.LockdownDeleteParams) (firewall.LockdownDeleteResponse, error) +- client.Firewall.Lockdowns.Delete(ctx context.Context, zoneIdentifier string, id string) (firewall.LockdownDeleteResponse, error) - client.Firewall.Lockdowns.Get(ctx context.Context, zoneIdentifier string, id string) (firewall.Lockdown, error) ## Rules @@ -1713,7 +1713,7 @@ Methods: - client.Firewall.Rules.New(ctx context.Context, zoneIdentifier string, body firewall.RuleNewParams) ([]firewall.FirewallRule, error) - client.Firewall.Rules.Update(ctx context.Context, zoneIdentifier string, id string, body firewall.RuleUpdateParams) (firewall.FirewallRule, error) - client.Firewall.Rules.List(ctx context.Context, zoneIdentifier string, query firewall.RuleListParams) (pagination.V4PagePaginationArray[firewall.FirewallRule], error) -- client.Firewall.Rules.Delete(ctx context.Context, zoneIdentifier string, id string, body firewall.RuleDeleteParams) (firewall.FirewallRule, error) +- client.Firewall.Rules.Delete(ctx context.Context, zoneIdentifier string, id string) (firewall.FirewallRule, error) - client.Firewall.Rules.Edit(ctx context.Context, zoneIdentifier string, id string, body firewall.RuleEditParams) ([]firewall.FirewallRule, error) - client.Firewall.Rules.Get(ctx context.Context, zoneIdentifier string, params firewall.RuleGetParams) (firewall.FirewallRule, error) @@ -1739,7 +1739,7 @@ Methods: - client.Firewall.AccessRules.New(ctx context.Context, params firewall.AccessRuleNewParams) (firewall.AccessRuleNewResponseUnion, error) - client.Firewall.AccessRules.List(ctx context.Context, params firewall.AccessRuleListParams) (pagination.V4PagePaginationArray[firewall.AccessRuleListResponse], error) -- client.Firewall.AccessRules.Delete(ctx context.Context, identifier interface{}, params firewall.AccessRuleDeleteParams) (firewall.AccessRuleDeleteResponse, error) +- client.Firewall.AccessRules.Delete(ctx context.Context, identifier interface{}, body firewall.AccessRuleDeleteParams) (firewall.AccessRuleDeleteResponse, error) - client.Firewall.AccessRules.Edit(ctx context.Context, identifier interface{}, params firewall.AccessRuleEditParams) (firewall.AccessRuleEditResponseUnion, error) - client.Firewall.AccessRules.Get(ctx context.Context, identifier interface{}, query firewall.AccessRuleGetParams) (firewall.AccessRuleGetResponseUnion, error) @@ -1758,7 +1758,7 @@ Methods: - client.Firewall.UARules.New(ctx context.Context, zoneIdentifier string, body firewall.UARuleNewParams) (firewall.UARuleNewResponseUnion, error) - client.Firewall.UARules.Update(ctx context.Context, zoneIdentifier string, id string, body firewall.UARuleUpdateParams) (firewall.UARuleUpdateResponseUnion, error) - client.Firewall.UARules.List(ctx context.Context, zoneIdentifier string, query firewall.UARuleListParams) (pagination.V4PagePaginationArray[firewall.UARuleListResponse], error) -- client.Firewall.UARules.Delete(ctx context.Context, zoneIdentifier string, id string, body firewall.UARuleDeleteParams) (firewall.UARuleDeleteResponse, error) +- client.Firewall.UARules.Delete(ctx context.Context, zoneIdentifier string, id string) (firewall.UARuleDeleteResponse, error) - client.Firewall.UARules.Get(ctx context.Context, zoneIdentifier string, id string) (firewall.UARuleGetResponseUnion, error) ## WAF @@ -1778,7 +1778,7 @@ Methods: - client.Firewall.WAF.Overrides.New(ctx context.Context, zoneIdentifier string, body firewall.WAFOverrideNewParams) (firewall.Override, error) - client.Firewall.WAF.Overrides.Update(ctx context.Context, zoneIdentifier string, id string, body firewall.WAFOverrideUpdateParams) (firewall.Override, error) - client.Firewall.WAF.Overrides.List(ctx context.Context, zoneIdentifier string, query firewall.WAFOverrideListParams) (pagination.V4PagePaginationArray[firewall.Override], error) -- client.Firewall.WAF.Overrides.Delete(ctx context.Context, zoneIdentifier string, id string, body firewall.WAFOverrideDeleteParams) (firewall.WAFOverrideDeleteResponse, error) +- client.Firewall.WAF.Overrides.Delete(ctx context.Context, zoneIdentifier string, id string) (firewall.WAFOverrideDeleteResponse, error) - client.Firewall.WAF.Overrides.Get(ctx context.Context, zoneIdentifier string, id string) (firewall.Override, error) ### Packages @@ -1845,7 +1845,7 @@ Methods: - client.Healthchecks.New(ctx context.Context, params healthchecks.HealthcheckNewParams) (healthchecks.Healthcheck, error) - client.Healthchecks.Update(ctx context.Context, healthcheckID string, params healthchecks.HealthcheckUpdateParams) (healthchecks.Healthcheck, error) - client.Healthchecks.List(ctx context.Context, params healthchecks.HealthcheckListParams) (pagination.SinglePage[healthchecks.Healthcheck], error) -- client.Healthchecks.Delete(ctx context.Context, healthcheckID string, params healthchecks.HealthcheckDeleteParams) (healthchecks.HealthcheckDeleteResponse, error) +- client.Healthchecks.Delete(ctx context.Context, healthcheckID string, body healthchecks.HealthcheckDeleteParams) (healthchecks.HealthcheckDeleteResponse, error) - client.Healthchecks.Edit(ctx context.Context, healthcheckID string, params healthchecks.HealthcheckEditParams) (healthchecks.Healthcheck, error) - client.Healthchecks.Get(ctx context.Context, healthcheckID string, query healthchecks.HealthcheckGetParams) (healthchecks.Healthcheck, error) @@ -1858,7 +1858,7 @@ Response Types: Methods: - client.Healthchecks.Previews.New(ctx context.Context, params healthchecks.PreviewNewParams) (healthchecks.Healthcheck, error) -- client.Healthchecks.Previews.Delete(ctx context.Context, healthcheckID string, params healthchecks.PreviewDeleteParams) (healthchecks.PreviewDeleteResponse, error) +- client.Healthchecks.Previews.Delete(ctx context.Context, healthcheckID string, body healthchecks.PreviewDeleteParams) (healthchecks.PreviewDeleteResponse, error) - client.Healthchecks.Previews.Get(ctx context.Context, healthcheckID string, query healthchecks.PreviewGetParams) (healthchecks.Healthcheck, error) # KeylessCertificates @@ -1877,7 +1877,7 @@ Methods: - client.KeylessCertificates.New(ctx context.Context, params keyless_certificates.KeylessCertificateNewParams) (keyless_certificates.KeylessCertificate, error) - client.KeylessCertificates.List(ctx context.Context, query keyless_certificates.KeylessCertificateListParams) (pagination.SinglePage[keyless_certificates.KeylessCertificate], error) -- client.KeylessCertificates.Delete(ctx context.Context, keylessCertificateID string, params keyless_certificates.KeylessCertificateDeleteParams) (keyless_certificates.KeylessCertificateDeleteResponse, error) +- client.KeylessCertificates.Delete(ctx context.Context, keylessCertificateID string, body keyless_certificates.KeylessCertificateDeleteParams) (keyless_certificates.KeylessCertificateDeleteResponse, error) - client.KeylessCertificates.Edit(ctx context.Context, keylessCertificateID string, params keyless_certificates.KeylessCertificateEditParams) (keyless_certificates.KeylessCertificate, error) - client.KeylessCertificates.Get(ctx context.Context, keylessCertificateID string, query keyless_certificates.KeylessCertificateGetParams) (keyless_certificates.KeylessCertificate, error) @@ -1929,7 +1929,7 @@ Methods: - client.Logpush.Jobs.New(ctx context.Context, params logpush.JobNewParams) (logpush.LogpushJob, error) - client.Logpush.Jobs.Update(ctx context.Context, jobID int64, params logpush.JobUpdateParams) (logpush.LogpushJob, error) - client.Logpush.Jobs.List(ctx context.Context, query logpush.JobListParams) (pagination.SinglePage[logpush.LogpushJob], error) -- client.Logpush.Jobs.Delete(ctx context.Context, jobID int64, params logpush.JobDeleteParams) (logpush.JobDeleteResponse, error) +- client.Logpush.Jobs.Delete(ctx context.Context, jobID int64, body logpush.JobDeleteParams) (logpush.JobDeleteResponse, error) - client.Logpush.Jobs.Get(ctx context.Context, jobID int64, query logpush.JobGetParams) (logpush.LogpushJob, error) ## Ownership @@ -1990,7 +1990,7 @@ Response Types: Methods: - client.Logs.Control.Cmb.Config.New(ctx context.Context, params logs.ControlCmbConfigNewParams) (logs.CmbConfig, error) -- client.Logs.Control.Cmb.Config.Delete(ctx context.Context, params logs.ControlCmbConfigDeleteParams) (logs.ControlCmbConfigDeleteResponse, error) +- client.Logs.Control.Cmb.Config.Delete(ctx context.Context, body logs.ControlCmbConfigDeleteParams) (logs.ControlCmbConfigDeleteResponse, error) - client.Logs.Control.Cmb.Config.Get(ctx context.Context, query logs.ControlCmbConfigGetParams) (logs.CmbConfig, error) ## RayID @@ -2036,7 +2036,7 @@ Methods: - client.OriginTLSClientAuth.New(ctx context.Context, params origin_tls_client_auth.OriginTLSClientAuthNewParams) (origin_tls_client_auth.OriginTLSClientAuthNewResponseUnion, error) - client.OriginTLSClientAuth.List(ctx context.Context, query origin_tls_client_auth.OriginTLSClientAuthListParams) (pagination.SinglePage[origin_tls_client_auth.ZoneAuthenticatedOriginPull], error) -- client.OriginTLSClientAuth.Delete(ctx context.Context, certificateID string, params origin_tls_client_auth.OriginTLSClientAuthDeleteParams) (origin_tls_client_auth.OriginTLSClientAuthDeleteResponseUnion, error) +- client.OriginTLSClientAuth.Delete(ctx context.Context, certificateID string, body origin_tls_client_auth.OriginTLSClientAuthDeleteParams) (origin_tls_client_auth.OriginTLSClientAuthDeleteResponseUnion, error) - client.OriginTLSClientAuth.Get(ctx context.Context, certificateID string, query origin_tls_client_auth.OriginTLSClientAuthGetParams) (origin_tls_client_auth.OriginTLSClientAuthGetResponseUnion, error) ## Hostnames @@ -2062,7 +2062,7 @@ Methods: - client.OriginTLSClientAuth.Hostnames.Certificates.New(ctx context.Context, params origin_tls_client_auth.HostnameCertificateNewParams) (origin_tls_client_auth.HostnameCertificateNewResponse, error) - client.OriginTLSClientAuth.Hostnames.Certificates.List(ctx context.Context, query origin_tls_client_auth.HostnameCertificateListParams) (pagination.SinglePage[origin_tls_client_auth.AuthenticatedOriginPull], error) -- client.OriginTLSClientAuth.Hostnames.Certificates.Delete(ctx context.Context, certificateID string, params origin_tls_client_auth.HostnameCertificateDeleteParams) (origin_tls_client_auth.HostnameCertificateDeleteResponse, error) +- client.OriginTLSClientAuth.Hostnames.Certificates.Delete(ctx context.Context, certificateID string, body origin_tls_client_auth.HostnameCertificateDeleteParams) (origin_tls_client_auth.HostnameCertificateDeleteResponse, error) - client.OriginTLSClientAuth.Hostnames.Certificates.Get(ctx context.Context, certificateID string, query origin_tls_client_auth.HostnameCertificateGetParams) (origin_tls_client_auth.HostnameCertificateGetResponse, error) ## Settings @@ -2100,7 +2100,7 @@ Methods: - client.Pagerules.New(ctx context.Context, params pagerules.PageruleNewParams) (pagerules.PageruleNewResponseUnion, error) - client.Pagerules.Update(ctx context.Context, pageruleID string, params pagerules.PageruleUpdateParams) (pagerules.PageruleUpdateResponseUnion, error) - client.Pagerules.List(ctx context.Context, params pagerules.PageruleListParams) ([]pagerules.PageRule, error) -- client.Pagerules.Delete(ctx context.Context, pageruleID string, params pagerules.PageruleDeleteParams) (pagerules.PageruleDeleteResponse, error) +- client.Pagerules.Delete(ctx context.Context, pageruleID string, body pagerules.PageruleDeleteParams) (pagerules.PageruleDeleteResponse, error) - client.Pagerules.Edit(ctx context.Context, pageruleID string, params pagerules.PageruleEditParams) (pagerules.PageruleEditResponseUnion, error) - client.Pagerules.Get(ctx context.Context, pageruleID string, query pagerules.PageruleGetParams) (pagerules.PageruleGetResponseUnion, error) @@ -2130,7 +2130,7 @@ Methods: - client.RateLimits.New(ctx context.Context, zoneIdentifier string, body rate_limits.RateLimitNewParams) (rate_limits.RateLimitNewResponseUnion, error) - client.RateLimits.List(ctx context.Context, zoneIdentifier string, query rate_limits.RateLimitListParams) (pagination.V4PagePaginationArray[rate_limits.RateLimit], error) -- client.RateLimits.Delete(ctx context.Context, zoneIdentifier string, id string, body rate_limits.RateLimitDeleteParams) (rate_limits.RateLimitDeleteResponse, error) +- client.RateLimits.Delete(ctx context.Context, zoneIdentifier string, id string) (rate_limits.RateLimitDeleteResponse, error) - client.RateLimits.Edit(ctx context.Context, zoneIdentifier string, id string, body rate_limits.RateLimitEditParams) (rate_limits.RateLimitEditResponseUnion, error) - client.RateLimits.Get(ctx context.Context, zoneIdentifier string, id string) (rate_limits.RateLimitGetResponseUnion, error) @@ -2159,7 +2159,7 @@ Methods: - client.SecondaryDNS.Incoming.New(ctx context.Context, params secondary_dns.IncomingNewParams) (secondary_dns.IncomingNewResponse, error) - client.SecondaryDNS.Incoming.Update(ctx context.Context, params secondary_dns.IncomingUpdateParams) (secondary_dns.IncomingUpdateResponse, error) -- client.SecondaryDNS.Incoming.Delete(ctx context.Context, params secondary_dns.IncomingDeleteParams) (secondary_dns.IncomingDeleteResponse, error) +- client.SecondaryDNS.Incoming.Delete(ctx context.Context, body secondary_dns.IncomingDeleteParams) (secondary_dns.IncomingDeleteResponse, error) - client.SecondaryDNS.Incoming.Get(ctx context.Context, query secondary_dns.IncomingGetParams) (secondary_dns.IncomingGetResponse, error) ## Outgoing @@ -2177,7 +2177,7 @@ Methods: - client.SecondaryDNS.Outgoing.New(ctx context.Context, params secondary_dns.OutgoingNewParams) (secondary_dns.OutgoingNewResponse, error) - client.SecondaryDNS.Outgoing.Update(ctx context.Context, params secondary_dns.OutgoingUpdateParams) (secondary_dns.OutgoingUpdateResponse, error) -- client.SecondaryDNS.Outgoing.Delete(ctx context.Context, params secondary_dns.OutgoingDeleteParams) (secondary_dns.OutgoingDeleteResponse, error) +- client.SecondaryDNS.Outgoing.Delete(ctx context.Context, body secondary_dns.OutgoingDeleteParams) (secondary_dns.OutgoingDeleteResponse, error) - client.SecondaryDNS.Outgoing.Disable(ctx context.Context, params secondary_dns.OutgoingDisableParams) (secondary_dns.DisableTransfer, error) - client.SecondaryDNS.Outgoing.Enable(ctx context.Context, params secondary_dns.OutgoingEnableParams) (secondary_dns.EnableTransfer, error) - client.SecondaryDNS.Outgoing.ForceNotify(ctx context.Context, params secondary_dns.OutgoingForceNotifyParams) (string, error) @@ -2205,7 +2205,7 @@ Methods: - client.SecondaryDNS.ACLs.New(ctx context.Context, params secondary_dns.ACLNewParams) (secondary_dns.ACL, error) - client.SecondaryDNS.ACLs.Update(ctx context.Context, aclID string, params secondary_dns.ACLUpdateParams) (secondary_dns.ACL, error) - client.SecondaryDNS.ACLs.List(ctx context.Context, query secondary_dns.ACLListParams) (pagination.SinglePage[secondary_dns.ACL], error) -- client.SecondaryDNS.ACLs.Delete(ctx context.Context, aclID string, params secondary_dns.ACLDeleteParams) (secondary_dns.ACLDeleteResponse, error) +- client.SecondaryDNS.ACLs.Delete(ctx context.Context, aclID string, body secondary_dns.ACLDeleteParams) (secondary_dns.ACLDeleteResponse, error) - client.SecondaryDNS.ACLs.Get(ctx context.Context, aclID string, query secondary_dns.ACLGetParams) (secondary_dns.ACL, error) ## Peers @@ -2224,7 +2224,7 @@ Methods: - client.SecondaryDNS.Peers.New(ctx context.Context, params secondary_dns.PeerNewParams) (secondary_dns.Peer, error) - client.SecondaryDNS.Peers.Update(ctx context.Context, peerID string, params secondary_dns.PeerUpdateParams) (secondary_dns.Peer, error) - client.SecondaryDNS.Peers.List(ctx context.Context, query secondary_dns.PeerListParams) (pagination.SinglePage[secondary_dns.Peer], error) -- client.SecondaryDNS.Peers.Delete(ctx context.Context, peerID string, params secondary_dns.PeerDeleteParams) (secondary_dns.PeerDeleteResponse, error) +- client.SecondaryDNS.Peers.Delete(ctx context.Context, peerID string, body secondary_dns.PeerDeleteParams) (secondary_dns.PeerDeleteResponse, error) - client.SecondaryDNS.Peers.Get(ctx context.Context, peerID string, query secondary_dns.PeerGetParams) (secondary_dns.Peer, error) ## TSIGs @@ -2243,7 +2243,7 @@ Methods: - client.SecondaryDNS.TSIGs.New(ctx context.Context, params secondary_dns.TSIGNewParams) (secondary_dns.TSIG, error) - client.SecondaryDNS.TSIGs.Update(ctx context.Context, tsigID string, params secondary_dns.TSIGUpdateParams) (secondary_dns.TSIG, error) - client.SecondaryDNS.TSIGs.List(ctx context.Context, query secondary_dns.TSIGListParams) (pagination.SinglePage[secondary_dns.TSIG], error) -- client.SecondaryDNS.TSIGs.Delete(ctx context.Context, tsigID string, params secondary_dns.TSIGDeleteParams) (secondary_dns.TSIGDeleteResponse, error) +- client.SecondaryDNS.TSIGs.Delete(ctx context.Context, tsigID string, body secondary_dns.TSIGDeleteParams) (secondary_dns.TSIGDeleteResponse, error) - client.SecondaryDNS.TSIGs.Get(ctx context.Context, tsigID string, query secondary_dns.TSIGGetParams) (secondary_dns.TSIG, error) # WaitingRooms @@ -2266,7 +2266,7 @@ Methods: - client.WaitingRooms.New(ctx context.Context, params waiting_rooms.WaitingRoomNewParams) (waiting_rooms.WaitingRoom, error) - client.WaitingRooms.Update(ctx context.Context, waitingRoomID string, params waiting_rooms.WaitingRoomUpdateParams) (waiting_rooms.WaitingRoom, error) - client.WaitingRooms.List(ctx context.Context, params waiting_rooms.WaitingRoomListParams) (pagination.SinglePage[waiting_rooms.WaitingRoom], error) -- client.WaitingRooms.Delete(ctx context.Context, waitingRoomID string, params waiting_rooms.WaitingRoomDeleteParams) (waiting_rooms.WaitingRoomDeleteResponse, error) +- client.WaitingRooms.Delete(ctx context.Context, waitingRoomID string, body waiting_rooms.WaitingRoomDeleteParams) (waiting_rooms.WaitingRoomDeleteResponse, error) - client.WaitingRooms.Edit(ctx context.Context, waitingRoomID string, params waiting_rooms.WaitingRoomEditParams) (waiting_rooms.WaitingRoom, error) - client.WaitingRooms.Get(ctx context.Context, waitingRoomID string, query waiting_rooms.WaitingRoomGetParams) (waiting_rooms.WaitingRoom, error) @@ -2292,7 +2292,7 @@ Methods: - client.WaitingRooms.Events.New(ctx context.Context, waitingRoomID string, params waiting_rooms.EventNewParams) (waiting_rooms.Event, error) - client.WaitingRooms.Events.Update(ctx context.Context, waitingRoomID string, eventID string, params waiting_rooms.EventUpdateParams) (waiting_rooms.Event, error) - client.WaitingRooms.Events.List(ctx context.Context, waitingRoomID string, params waiting_rooms.EventListParams) (pagination.SinglePage[waiting_rooms.Event], error) -- client.WaitingRooms.Events.Delete(ctx context.Context, waitingRoomID string, eventID string, params waiting_rooms.EventDeleteParams) (waiting_rooms.EventDeleteResponse, error) +- client.WaitingRooms.Events.Delete(ctx context.Context, waitingRoomID string, eventID string, body waiting_rooms.EventDeleteParams) (waiting_rooms.EventDeleteResponse, error) - client.WaitingRooms.Events.Edit(ctx context.Context, waitingRoomID string, eventID string, params waiting_rooms.EventEditParams) (waiting_rooms.Event, error) - client.WaitingRooms.Events.Get(ctx context.Context, waitingRoomID string, eventID string, query waiting_rooms.EventGetParams) (waiting_rooms.Event, error) @@ -2321,7 +2321,7 @@ Methods: - client.WaitingRooms.Rules.New(ctx context.Context, waitingRoomID string, params waiting_rooms.RuleNewParams) ([]waiting_rooms.WaitingRoomRule, error) - client.WaitingRooms.Rules.Update(ctx context.Context, waitingRoomID string, params waiting_rooms.RuleUpdateParams) ([]waiting_rooms.WaitingRoomRule, error) - client.WaitingRooms.Rules.List(ctx context.Context, waitingRoomID string, query waiting_rooms.RuleListParams) (pagination.SinglePage[waiting_rooms.WaitingRoomRule], error) -- client.WaitingRooms.Rules.Delete(ctx context.Context, waitingRoomID string, ruleID string, params waiting_rooms.RuleDeleteParams) ([]waiting_rooms.WaitingRoomRule, error) +- client.WaitingRooms.Rules.Delete(ctx context.Context, waitingRoomID string, ruleID string, body waiting_rooms.RuleDeleteParams) ([]waiting_rooms.WaitingRoomRule, error) - client.WaitingRooms.Rules.Edit(ctx context.Context, waitingRoomID string, ruleID string, params waiting_rooms.RuleEditParams) ([]waiting_rooms.WaitingRoomRule, error) ## Statuses @@ -2361,7 +2361,7 @@ Methods: - client.Web3.Hostnames.New(ctx context.Context, zoneIdentifier string, body web3.HostnameNewParams) (web3.Hostname, error) - client.Web3.Hostnames.List(ctx context.Context, zoneIdentifier string) (pagination.SinglePage[web3.Hostname], error) -- client.Web3.Hostnames.Delete(ctx context.Context, zoneIdentifier string, identifier string, body web3.HostnameDeleteParams) (web3.HostnameDeleteResponse, error) +- client.Web3.Hostnames.Delete(ctx context.Context, zoneIdentifier string, identifier string) (web3.HostnameDeleteResponse, error) - client.Web3.Hostnames.Edit(ctx context.Context, zoneIdentifier string, identifier string, body web3.HostnameEditParams) (web3.Hostname, error) - client.Web3.Hostnames.Get(ctx context.Context, zoneIdentifier string, identifier string) (web3.Hostname, error) @@ -2393,7 +2393,7 @@ Methods: - client.Web3.Hostnames.IPFSUniversalPaths.ContentLists.Entries.New(ctx context.Context, zoneIdentifier string, identifier string, body web3.HostnameIPFSUniversalPathContentListEntryNewParams) (web3.HostnameIPFSUniversalPathContentListEntryNewResponse, error) - client.Web3.Hostnames.IPFSUniversalPaths.ContentLists.Entries.Update(ctx context.Context, zoneIdentifier string, identifier string, contentListEntryIdentifier string, body web3.HostnameIPFSUniversalPathContentListEntryUpdateParams) (web3.HostnameIPFSUniversalPathContentListEntryUpdateResponse, error) - client.Web3.Hostnames.IPFSUniversalPaths.ContentLists.Entries.List(ctx context.Context, zoneIdentifier string, identifier string) (web3.HostnameIPFSUniversalPathContentListEntryListResponse, error) -- client.Web3.Hostnames.IPFSUniversalPaths.ContentLists.Entries.Delete(ctx context.Context, zoneIdentifier string, identifier string, contentListEntryIdentifier string, body web3.HostnameIPFSUniversalPathContentListEntryDeleteParams) (web3.HostnameIPFSUniversalPathContentListEntryDeleteResponse, error) +- client.Web3.Hostnames.IPFSUniversalPaths.ContentLists.Entries.Delete(ctx context.Context, zoneIdentifier string, identifier string, contentListEntryIdentifier string) (web3.HostnameIPFSUniversalPathContentListEntryDeleteResponse, error) - client.Web3.Hostnames.IPFSUniversalPaths.ContentLists.Entries.Get(ctx context.Context, zoneIdentifier string, identifier string, contentListEntryIdentifier string) (web3.HostnameIPFSUniversalPathContentListEntryGetResponse, error) # Workers @@ -2486,7 +2486,7 @@ Response Types: Methods: - client.Workers.Scripts.Tail.New(ctx context.Context, scriptName string, params workers.ScriptTailNewParams) (workers.ScriptTailNewResponse, error) -- client.Workers.Scripts.Tail.Delete(ctx context.Context, scriptName string, id string, params workers.ScriptTailDeleteParams) (workers.ScriptTailDeleteResponse, error) +- client.Workers.Scripts.Tail.Delete(ctx context.Context, scriptName string, id string, body workers.ScriptTailDeleteParams) (workers.ScriptTailDeleteResponse, error) - client.Workers.Scripts.Tail.Get(ctx context.Context, scriptName string, query workers.ScriptTailGetParams) (workers.ScriptTailGetResponse, error) ### Content @@ -2556,7 +2556,7 @@ Methods: - client.Workers.Domains.Update(ctx context.Context, params workers.DomainUpdateParams) (workers.Domain, error) - client.Workers.Domains.List(ctx context.Context, params workers.DomainListParams) (pagination.SinglePage[workers.Domain], error) -- client.Workers.Domains.Delete(ctx context.Context, domainID string, params workers.DomainDeleteParams) error +- client.Workers.Domains.Delete(ctx context.Context, domainID string, body workers.DomainDeleteParams) error - client.Workers.Domains.Get(ctx context.Context, domainID string, query workers.DomainGetParams) (workers.Domain, error) ## Subdomains @@ -2586,7 +2586,7 @@ Methods: - client.KV.Namespaces.New(ctx context.Context, params kv.NamespaceNewParams) (kv.Namespace, error) - client.KV.Namespaces.Update(ctx context.Context, namespaceID string, params kv.NamespaceUpdateParams) (kv.NamespaceUpdateResponseUnion, error) - client.KV.Namespaces.List(ctx context.Context, params kv.NamespaceListParams) (pagination.V4PagePaginationArray[kv.Namespace], error) -- client.KV.Namespaces.Delete(ctx context.Context, namespaceID string, params kv.NamespaceDeleteParams) (kv.NamespaceDeleteResponseUnion, error) +- client.KV.Namespaces.Delete(ctx context.Context, namespaceID string, body kv.NamespaceDeleteParams) (kv.NamespaceDeleteResponseUnion, error) ### Bulk @@ -2598,7 +2598,7 @@ Response Types: Methods: - client.KV.Namespaces.Bulk.Update(ctx context.Context, namespaceID string, params kv.NamespaceBulkUpdateParams) (kv.NamespaceBulkUpdateResponseUnion, error) -- client.KV.Namespaces.Bulk.Delete(ctx context.Context, namespaceID string, params kv.NamespaceBulkDeleteParams) (kv.NamespaceBulkDeleteResponseUnion, error) +- client.KV.Namespaces.Bulk.Delete(ctx context.Context, namespaceID string, body kv.NamespaceBulkDeleteParams) (kv.NamespaceBulkDeleteResponseUnion, error) ### Keys @@ -2630,7 +2630,7 @@ Response Types: Methods: - client.KV.Namespaces.Values.Update(ctx context.Context, namespaceID string, keyName string, params kv.NamespaceValueUpdateParams) (kv.NamespaceValueUpdateResponseUnion, error) -- client.KV.Namespaces.Values.Delete(ctx context.Context, namespaceID string, keyName string, params kv.NamespaceValueDeleteParams) (kv.NamespaceValueDeleteResponseUnion, error) +- client.KV.Namespaces.Values.Delete(ctx context.Context, namespaceID string, keyName string, body kv.NamespaceValueDeleteParams) (kv.NamespaceValueDeleteResponseUnion, error) - client.KV.Namespaces.Values.Get(ctx context.Context, namespaceID string, keyName string, query kv.NamespaceValueGetParams) (string, error) # DurableObjects @@ -2669,7 +2669,7 @@ Methods: - client.Queues.New(ctx context.Context, params queues.QueueNewParams) (queues.QueueCreated, error) - client.Queues.Update(ctx context.Context, queueID string, params queues.QueueUpdateParams) (queues.QueueUpdated, error) - client.Queues.List(ctx context.Context, query queues.QueueListParams) (pagination.SinglePage[queues.Queue], error) -- client.Queues.Delete(ctx context.Context, queueID string, params queues.QueueDeleteParams) (queues.QueueDeleteResponseUnion, error) +- client.Queues.Delete(ctx context.Context, queueID string, body queues.QueueDeleteParams) (queues.QueueDeleteResponseUnion, error) - client.Queues.Get(ctx context.Context, queueID string, query queues.QueueGetParams) (queues.Queue, error) ## Consumers @@ -2685,7 +2685,7 @@ Methods: - client.Queues.Consumers.New(ctx context.Context, queueID string, params queues.ConsumerNewParams) (queues.ConsumerNewResponse, error) - client.Queues.Consumers.Update(ctx context.Context, queueID string, consumerID string, params queues.ConsumerUpdateParams) (queues.ConsumerUpdateResponse, error) -- client.Queues.Consumers.Delete(ctx context.Context, queueID string, consumerID string, params queues.ConsumerDeleteParams) (queues.ConsumerDeleteResponseUnion, error) +- client.Queues.Consumers.Delete(ctx context.Context, queueID string, consumerID string, body queues.ConsumerDeleteParams) (queues.ConsumerDeleteResponseUnion, error) - client.Queues.Consumers.Get(ctx context.Context, queueID string, query queues.ConsumerGetParams) ([]queues.Consumer, error) ## Messages @@ -2962,7 +2962,7 @@ Methods: - client.Spectrum.Apps.New(ctx context.Context, zone string, body spectrum.AppNewParams) (spectrum.AppNewResponse, error) - client.Spectrum.Apps.Update(ctx context.Context, zone string, appID string, body spectrum.AppUpdateParams) (spectrum.AppUpdateResponse, error) - client.Spectrum.Apps.List(ctx context.Context, zone string, query spectrum.AppListParams) (pagination.V4PagePaginationArray[spectrum.AppListResponse], error) -- client.Spectrum.Apps.Delete(ctx context.Context, zone string, appID string, body spectrum.AppDeleteParams) (spectrum.AppDeleteResponse, error) +- client.Spectrum.Apps.Delete(ctx context.Context, zone string, appID string) (spectrum.AppDeleteResponse, error) - client.Spectrum.Apps.Get(ctx context.Context, zone string, appID string) (spectrum.AppGetResponseUnion, error) # Addressing @@ -2990,7 +2990,7 @@ Methods: - client.Addressing.AddressMaps.New(ctx context.Context, params addressing.AddressMapNewParams) (addressing.AddressMapNewResponse, error) - client.Addressing.AddressMaps.List(ctx context.Context, query addressing.AddressMapListParams) (pagination.SinglePage[addressing.AddressMap], error) -- client.Addressing.AddressMaps.Delete(ctx context.Context, addressMapID string, params addressing.AddressMapDeleteParams) ([]addressing.AddressMapDeleteResponse, error) +- client.Addressing.AddressMaps.Delete(ctx context.Context, addressMapID string, body addressing.AddressMapDeleteParams) ([]addressing.AddressMapDeleteResponse, error) - client.Addressing.AddressMaps.Edit(ctx context.Context, addressMapID string, params addressing.AddressMapEditParams) (addressing.AddressMap, error) - client.Addressing.AddressMaps.Get(ctx context.Context, addressMapID string, query addressing.AddressMapGetParams) (addressing.AddressMapGetResponse, error) @@ -3004,7 +3004,7 @@ Response Types: Methods: - client.Addressing.AddressMaps.Accounts.Update(ctx context.Context, addressMapID string, params addressing.AddressMapAccountUpdateParams) ([]addressing.AddressMapAccountUpdateResponse, error) -- client.Addressing.AddressMaps.Accounts.Delete(ctx context.Context, addressMapID string, params addressing.AddressMapAccountDeleteParams) ([]addressing.AddressMapAccountDeleteResponse, error) +- client.Addressing.AddressMaps.Accounts.Delete(ctx context.Context, addressMapID string, body addressing.AddressMapAccountDeleteParams) ([]addressing.AddressMapAccountDeleteResponse, error) ### IPs @@ -3016,7 +3016,7 @@ Response Types: Methods: - client.Addressing.AddressMaps.IPs.Update(ctx context.Context, addressMapID string, ipAddress string, params addressing.AddressMapIPUpdateParams) ([]addressing.AddressMapIPUpdateResponse, error) -- client.Addressing.AddressMaps.IPs.Delete(ctx context.Context, addressMapID string, ipAddress string, params addressing.AddressMapIPDeleteParams) ([]addressing.AddressMapIPDeleteResponse, error) +- client.Addressing.AddressMaps.IPs.Delete(ctx context.Context, addressMapID string, ipAddress string, body addressing.AddressMapIPDeleteParams) ([]addressing.AddressMapIPDeleteResponse, error) ### Zones @@ -3028,7 +3028,7 @@ Response Types: Methods: - client.Addressing.AddressMaps.Zones.Update(ctx context.Context, addressMapID string, params addressing.AddressMapZoneUpdateParams) ([]addressing.AddressMapZoneUpdateResponse, error) -- client.Addressing.AddressMaps.Zones.Delete(ctx context.Context, addressMapID string, params addressing.AddressMapZoneDeleteParams) ([]addressing.AddressMapZoneDeleteResponse, error) +- client.Addressing.AddressMaps.Zones.Delete(ctx context.Context, addressMapID string, body addressing.AddressMapZoneDeleteParams) ([]addressing.AddressMapZoneDeleteResponse, error) ## LOADocuments @@ -3061,7 +3061,7 @@ Methods: - client.Addressing.Prefixes.New(ctx context.Context, params addressing.PrefixNewParams) (addressing.Prefix, error) - client.Addressing.Prefixes.List(ctx context.Context, query addressing.PrefixListParams) (pagination.SinglePage[addressing.Prefix], error) -- client.Addressing.Prefixes.Delete(ctx context.Context, prefixID string, params addressing.PrefixDeleteParams) ([]addressing.PrefixDeleteResponse, error) +- client.Addressing.Prefixes.Delete(ctx context.Context, prefixID string, body addressing.PrefixDeleteParams) ([]addressing.PrefixDeleteResponse, error) - client.Addressing.Prefixes.Edit(ctx context.Context, prefixID string, params addressing.PrefixEditParams) (addressing.Prefix, error) - client.Addressing.Prefixes.Get(ctx context.Context, prefixID string, query addressing.PrefixGetParams) (addressing.Prefix, error) @@ -3116,7 +3116,7 @@ Methods: - client.Addressing.Prefixes.Delegations.New(ctx context.Context, prefixID string, params addressing.PrefixDelegationNewParams) (addressing.Delegations, error) - client.Addressing.Prefixes.Delegations.List(ctx context.Context, prefixID string, query addressing.PrefixDelegationListParams) (pagination.SinglePage[addressing.Delegations], error) -- client.Addressing.Prefixes.Delegations.Delete(ctx context.Context, prefixID string, delegationID string, params addressing.PrefixDelegationDeleteParams) (addressing.PrefixDelegationDeleteResponse, error) +- client.Addressing.Prefixes.Delegations.Delete(ctx context.Context, prefixID string, delegationID string, body addressing.PrefixDelegationDeleteParams) (addressing.PrefixDelegationDeleteResponse, error) # AuditLogs @@ -3177,7 +3177,7 @@ Methods: - client.Images.V1.New(ctx context.Context, params images.V1NewParams) (images.Image, error) - client.Images.V1.List(ctx context.Context, params images.V1ListParams) (pagination.V4PagePagination[images.V1ListResponse], error) -- client.Images.V1.Delete(ctx context.Context, imageID string, params images.V1DeleteParams) (images.V1DeleteResponseUnion, error) +- client.Images.V1.Delete(ctx context.Context, imageID string, body images.V1DeleteParams) (images.V1DeleteResponseUnion, error) - client.Images.V1.Edit(ctx context.Context, imageID string, params images.V1EditParams) (images.Image, error) - client.Images.V1.Get(ctx context.Context, imageID string, query images.V1GetParams) (images.Image, error) @@ -3220,7 +3220,7 @@ Methods: - client.Images.V1.Variants.New(ctx context.Context, params images.V1VariantNewParams) (images.V1VariantNewResponse, error) - client.Images.V1.Variants.List(ctx context.Context, query images.V1VariantListParams) (images.Variant, error) -- client.Images.V1.Variants.Delete(ctx context.Context, variantID string, params images.V1VariantDeleteParams) (images.V1VariantDeleteResponseUnion, error) +- client.Images.V1.Variants.Delete(ctx context.Context, variantID string, body images.V1VariantDeleteParams) (images.V1VariantDeleteResponseUnion, error) - client.Images.V1.Variants.Edit(ctx context.Context, variantID string, params images.V1VariantEditParams) (images.V1VariantEditResponse, error) - client.Images.V1.Variants.Get(ctx context.Context, variantID string, query images.V1VariantGetParams) (images.V1VariantGetResponse, error) @@ -3402,11 +3402,8 @@ Methods: Params Types: -- intel.IssueClassParam - intel.IssueType -- intel.ProductParam - intel.SeverityQueryParam -- intel.SubjectParam Response Types: @@ -3467,7 +3464,7 @@ Methods: - client.MagicTransit.GRETunnels.New(ctx context.Context, params magic_transit.GRETunnelNewParams) (magic_transit.GRETunnelNewResponse, error) - client.MagicTransit.GRETunnels.Update(ctx context.Context, tunnelIdentifier string, params magic_transit.GRETunnelUpdateParams) (magic_transit.GRETunnelUpdateResponse, error) - client.MagicTransit.GRETunnels.List(ctx context.Context, query magic_transit.GRETunnelListParams) (magic_transit.GRETunnelListResponse, error) -- client.MagicTransit.GRETunnels.Delete(ctx context.Context, tunnelIdentifier string, params magic_transit.GRETunnelDeleteParams) (magic_transit.GRETunnelDeleteResponse, error) +- client.MagicTransit.GRETunnels.Delete(ctx context.Context, tunnelIdentifier string, body magic_transit.GRETunnelDeleteParams) (magic_transit.GRETunnelDeleteResponse, error) - client.MagicTransit.GRETunnels.Get(ctx context.Context, tunnelIdentifier string, query magic_transit.GRETunnelGetParams) (magic_transit.GRETunnelGetResponse, error) ## IPSECTunnels @@ -3487,7 +3484,7 @@ Methods: - client.MagicTransit.IPSECTunnels.New(ctx context.Context, params magic_transit.IPSECTunnelNewParams) (magic_transit.IPSECTunnelNewResponse, error) - client.MagicTransit.IPSECTunnels.Update(ctx context.Context, tunnelIdentifier string, params magic_transit.IPSECTunnelUpdateParams) (magic_transit.IPSECTunnelUpdateResponse, error) - client.MagicTransit.IPSECTunnels.List(ctx context.Context, query magic_transit.IPSECTunnelListParams) (magic_transit.IPSECTunnelListResponse, error) -- client.MagicTransit.IPSECTunnels.Delete(ctx context.Context, tunnelIdentifier string, params magic_transit.IPSECTunnelDeleteParams) (magic_transit.IPSECTunnelDeleteResponse, error) +- client.MagicTransit.IPSECTunnels.Delete(ctx context.Context, tunnelIdentifier string, body magic_transit.IPSECTunnelDeleteParams) (magic_transit.IPSECTunnelDeleteResponse, error) - client.MagicTransit.IPSECTunnels.Get(ctx context.Context, tunnelIdentifier string, query magic_transit.IPSECTunnelGetParams) (magic_transit.IPSECTunnelGetResponse, error) - client.MagicTransit.IPSECTunnels.PSKGenerate(ctx context.Context, tunnelIdentifier string, params magic_transit.IPSECTunnelPSKGenerateParams) (magic_transit.IPSECTunnelPSKGenerateResponse, error) @@ -3495,14 +3492,10 @@ Methods: Params Types: -- magic_transit.ColoNameParam -- magic_transit.ColoRegionParam - magic_transit.ScopeParam Response Types: -- magic_transit.ColoName -- magic_transit.ColoRegion - magic_transit.Scope - magic_transit.RouteNewResponse - magic_transit.RouteUpdateResponse @@ -3516,8 +3509,8 @@ Methods: - client.MagicTransit.Routes.New(ctx context.Context, params magic_transit.RouteNewParams) (magic_transit.RouteNewResponse, error) - client.MagicTransit.Routes.Update(ctx context.Context, routeIdentifier string, params magic_transit.RouteUpdateParams) (magic_transit.RouteUpdateResponse, error) - client.MagicTransit.Routes.List(ctx context.Context, query magic_transit.RouteListParams) (magic_transit.RouteListResponse, error) -- client.MagicTransit.Routes.Delete(ctx context.Context, routeIdentifier string, params magic_transit.RouteDeleteParams) (magic_transit.RouteDeleteResponse, error) -- client.MagicTransit.Routes.Empty(ctx context.Context, params magic_transit.RouteEmptyParams) (magic_transit.RouteEmptyResponse, error) +- client.MagicTransit.Routes.Delete(ctx context.Context, routeIdentifier string, body magic_transit.RouteDeleteParams) (magic_transit.RouteDeleteResponse, error) +- client.MagicTransit.Routes.Empty(ctx context.Context, body magic_transit.RouteEmptyParams) (magic_transit.RouteEmptyResponse, error) - client.MagicTransit.Routes.Get(ctx context.Context, routeIdentifier string, query magic_transit.RouteGetParams) (magic_transit.RouteGetResponse, error) ## Sites @@ -3536,7 +3529,7 @@ Methods: - client.MagicTransit.Sites.New(ctx context.Context, params magic_transit.SiteNewParams) (magic_transit.Site, error) - client.MagicTransit.Sites.Update(ctx context.Context, siteID string, params magic_transit.SiteUpdateParams) (magic_transit.Site, error) - client.MagicTransit.Sites.List(ctx context.Context, params magic_transit.SiteListParams) (pagination.SinglePage[magic_transit.Site], error) -- client.MagicTransit.Sites.Delete(ctx context.Context, siteID string, params magic_transit.SiteDeleteParams) (magic_transit.Site, error) +- client.MagicTransit.Sites.Delete(ctx context.Context, siteID string, body magic_transit.SiteDeleteParams) (magic_transit.Site, error) - client.MagicTransit.Sites.Get(ctx context.Context, siteID string, query magic_transit.SiteGetParams) (magic_transit.Site, error) ### ACLs @@ -3559,7 +3552,7 @@ Methods: - client.MagicTransit.Sites.ACLs.New(ctx context.Context, siteID string, params magic_transit.SiteACLNewParams) (magic_transit.ACL, error) - client.MagicTransit.Sites.ACLs.Update(ctx context.Context, siteID string, aclIdentifier string, params magic_transit.SiteACLUpdateParams) (magic_transit.ACL, error) - client.MagicTransit.Sites.ACLs.List(ctx context.Context, siteID string, query magic_transit.SiteACLListParams) (pagination.SinglePage[magic_transit.ACL], error) -- client.MagicTransit.Sites.ACLs.Delete(ctx context.Context, siteID string, aclIdentifier string, params magic_transit.SiteACLDeleteParams) (magic_transit.ACL, error) +- client.MagicTransit.Sites.ACLs.Delete(ctx context.Context, siteID string, aclIdentifier string, body magic_transit.SiteACLDeleteParams) (magic_transit.ACL, error) - client.MagicTransit.Sites.ACLs.Get(ctx context.Context, siteID string, aclIdentifier string, query magic_transit.SiteACLGetParams) (magic_transit.ACL, error) ### LANs @@ -3586,7 +3579,7 @@ Methods: - client.MagicTransit.Sites.LANs.New(ctx context.Context, siteID string, params magic_transit.SiteLANNewParams) ([]magic_transit.LAN, error) - client.MagicTransit.Sites.LANs.Update(ctx context.Context, siteID string, lanID string, params magic_transit.SiteLANUpdateParams) (magic_transit.LAN, error) - client.MagicTransit.Sites.LANs.List(ctx context.Context, siteID string, query magic_transit.SiteLANListParams) (pagination.SinglePage[magic_transit.LAN], error) -- client.MagicTransit.Sites.LANs.Delete(ctx context.Context, siteID string, lanID string, params magic_transit.SiteLANDeleteParams) (magic_transit.LAN, error) +- client.MagicTransit.Sites.LANs.Delete(ctx context.Context, siteID string, lanID string, body magic_transit.SiteLANDeleteParams) (magic_transit.LAN, error) - client.MagicTransit.Sites.LANs.Get(ctx context.Context, siteID string, lanID string, query magic_transit.SiteLANGetParams) (magic_transit.LAN, error) ### WANs @@ -3605,7 +3598,7 @@ Methods: - client.MagicTransit.Sites.WANs.New(ctx context.Context, siteID string, params magic_transit.SiteWANNewParams) ([]magic_transit.WAN, error) - client.MagicTransit.Sites.WANs.Update(ctx context.Context, siteID string, wanID string, params magic_transit.SiteWANUpdateParams) (magic_transit.WAN, error) - client.MagicTransit.Sites.WANs.List(ctx context.Context, siteID string, query magic_transit.SiteWANListParams) (pagination.SinglePage[magic_transit.WAN], error) -- client.MagicTransit.Sites.WANs.Delete(ctx context.Context, siteID string, wanID string, params magic_transit.SiteWANDeleteParams) (magic_transit.WAN, error) +- client.MagicTransit.Sites.WANs.Delete(ctx context.Context, siteID string, wanID string, body magic_transit.SiteWANDeleteParams) (magic_transit.WAN, error) - client.MagicTransit.Sites.WANs.Get(ctx context.Context, siteID string, wanID string, query magic_transit.SiteWANGetParams) (magic_transit.WAN, error) # MagicNetworkMonitoring @@ -3620,7 +3613,7 @@ Methods: - client.MagicNetworkMonitoring.Configs.New(ctx context.Context, params magic_network_monitoring.ConfigNewParams) (magic_network_monitoring.Configuration, error) - client.MagicNetworkMonitoring.Configs.Update(ctx context.Context, params magic_network_monitoring.ConfigUpdateParams) (magic_network_monitoring.Configuration, error) -- client.MagicNetworkMonitoring.Configs.Delete(ctx context.Context, params magic_network_monitoring.ConfigDeleteParams) (magic_network_monitoring.Configuration, error) +- client.MagicNetworkMonitoring.Configs.Delete(ctx context.Context, body magic_network_monitoring.ConfigDeleteParams) (magic_network_monitoring.Configuration, error) - client.MagicNetworkMonitoring.Configs.Edit(ctx context.Context, params magic_network_monitoring.ConfigEditParams) (magic_network_monitoring.Configuration, error) - client.MagicNetworkMonitoring.Configs.Get(ctx context.Context, query magic_network_monitoring.ConfigGetParams) (magic_network_monitoring.Configuration, error) @@ -3641,7 +3634,7 @@ Methods: - client.MagicNetworkMonitoring.Rules.New(ctx context.Context, params magic_network_monitoring.RuleNewParams) (magic_network_monitoring.MagicNetworkMonitoringRule, error) - client.MagicNetworkMonitoring.Rules.Update(ctx context.Context, params magic_network_monitoring.RuleUpdateParams) (magic_network_monitoring.MagicNetworkMonitoringRule, error) - client.MagicNetworkMonitoring.Rules.List(ctx context.Context, query magic_network_monitoring.RuleListParams) (pagination.SinglePage[magic_network_monitoring.MagicNetworkMonitoringRule], error) -- client.MagicNetworkMonitoring.Rules.Delete(ctx context.Context, ruleID string, params magic_network_monitoring.RuleDeleteParams) (magic_network_monitoring.MagicNetworkMonitoringRule, error) +- client.MagicNetworkMonitoring.Rules.Delete(ctx context.Context, ruleID string, body magic_network_monitoring.RuleDeleteParams) (magic_network_monitoring.MagicNetworkMonitoringRule, error) - client.MagicNetworkMonitoring.Rules.Edit(ctx context.Context, ruleID string, params magic_network_monitoring.RuleEditParams) (magic_network_monitoring.MagicNetworkMonitoringRule, error) - client.MagicNetworkMonitoring.Rules.Get(ctx context.Context, ruleID string, query magic_network_monitoring.RuleGetParams) (magic_network_monitoring.MagicNetworkMonitoringRule, error) @@ -3666,7 +3659,7 @@ Methods: - client.MTLSCertificates.New(ctx context.Context, params mtls_certificates.MTLSCertificateNewParams) (mtls_certificates.MTLSCertificateNewResponse, error) - client.MTLSCertificates.List(ctx context.Context, query mtls_certificates.MTLSCertificateListParams) (pagination.SinglePage[mtls_certificates.MTLSCertificate], error) -- client.MTLSCertificates.Delete(ctx context.Context, mtlsCertificateID string, params mtls_certificates.MTLSCertificateDeleteParams) (mtls_certificates.MTLSCertificate, error) +- client.MTLSCertificates.Delete(ctx context.Context, mtlsCertificateID string, body mtls_certificates.MTLSCertificateDeleteParams) (mtls_certificates.MTLSCertificate, error) - client.MTLSCertificates.Get(ctx context.Context, mtlsCertificateID string, query mtls_certificates.MTLSCertificateGetParams) (mtls_certificates.MTLSCertificate, error) ## Associations @@ -3703,7 +3696,7 @@ Methods: - client.Pages.Projects.New(ctx context.Context, params pages.ProjectNewParams) (pages.ProjectNewResponseUnion, error) - client.Pages.Projects.List(ctx context.Context, query pages.ProjectListParams) (pagination.SinglePage[pages.Deployment], error) -- client.Pages.Projects.Delete(ctx context.Context, projectName string, params pages.ProjectDeleteParams) (pages.ProjectDeleteResponse, error) +- client.Pages.Projects.Delete(ctx context.Context, projectName string, body pages.ProjectDeleteParams) (pages.ProjectDeleteResponse, error) - client.Pages.Projects.Edit(ctx context.Context, projectName string, params pages.ProjectEditParams) (pages.ProjectEditResponseUnion, error) - client.Pages.Projects.Get(ctx context.Context, projectName string, query pages.ProjectGetParams) (pages.Project, error) - client.Pages.Projects.PurgeBuildCache(ctx context.Context, projectName string, body pages.ProjectPurgeBuildCacheParams) (pages.ProjectPurgeBuildCacheResponse, error) @@ -3718,7 +3711,7 @@ Methods: - client.Pages.Projects.Deployments.New(ctx context.Context, projectName string, params pages.ProjectDeploymentNewParams) (pages.Deployment, error) - client.Pages.Projects.Deployments.List(ctx context.Context, projectName string, params pages.ProjectDeploymentListParams) (pagination.SinglePage[pages.Deployment], error) -- client.Pages.Projects.Deployments.Delete(ctx context.Context, projectName string, deploymentID string, params pages.ProjectDeploymentDeleteParams) (pages.ProjectDeploymentDeleteResponse, error) +- client.Pages.Projects.Deployments.Delete(ctx context.Context, projectName string, deploymentID string, body pages.ProjectDeploymentDeleteParams) (pages.ProjectDeploymentDeleteResponse, error) - client.Pages.Projects.Deployments.Get(ctx context.Context, projectName string, deploymentID string, query pages.ProjectDeploymentGetParams) (pages.Deployment, error) - client.Pages.Projects.Deployments.Retry(ctx context.Context, projectName string, deploymentID string, params pages.ProjectDeploymentRetryParams) (pages.Deployment, error) - client.Pages.Projects.Deployments.Rollback(ctx context.Context, projectName string, deploymentID string, params pages.ProjectDeploymentRollbackParams) (pages.Deployment, error) @@ -3749,7 +3742,7 @@ Methods: - client.Pages.Projects.Domains.New(ctx context.Context, projectName string, params pages.ProjectDomainNewParams) (pages.ProjectDomainNewResponseUnion, error) - client.Pages.Projects.Domains.List(ctx context.Context, projectName string, query pages.ProjectDomainListParams) (pagination.SinglePage[pages.ProjectDomainListResponse], error) -- client.Pages.Projects.Domains.Delete(ctx context.Context, projectName string, domainName string, params pages.ProjectDomainDeleteParams) (pages.ProjectDomainDeleteResponse, error) +- client.Pages.Projects.Domains.Delete(ctx context.Context, projectName string, domainName string, body pages.ProjectDomainDeleteParams) (pages.ProjectDomainDeleteResponse, error) - client.Pages.Projects.Domains.Edit(ctx context.Context, projectName string, domainName string, params pages.ProjectDomainEditParams) (pages.ProjectDomainEditResponseUnion, error) - client.Pages.Projects.Domains.Get(ctx context.Context, projectName string, domainName string, query pages.ProjectDomainGetParams) (pages.ProjectDomainGetResponseUnion, error) @@ -3846,7 +3839,7 @@ Methods: - client.Rules.Lists.New(ctx context.Context, params rules.ListNewParams) (rules.ListsList, error) - client.Rules.Lists.Update(ctx context.Context, listID string, params rules.ListUpdateParams) (rules.ListsList, error) - client.Rules.Lists.List(ctx context.Context, query rules.ListListParams) (pagination.SinglePage[rules.ListsList], error) -- client.Rules.Lists.Delete(ctx context.Context, listID string, params rules.ListDeleteParams) (rules.ListDeleteResponse, error) +- client.Rules.Lists.Delete(ctx context.Context, listID string, body rules.ListDeleteParams) (rules.ListDeleteResponse, error) - client.Rules.Lists.Get(ctx context.Context, listID string, query rules.ListGetParams) (rules.ListsList, error) ### BulkOperations @@ -3875,7 +3868,7 @@ Methods: - client.Rules.Lists.Items.New(ctx context.Context, listID string, params rules.ListItemNewParams) (rules.ListItemNewResponse, error) - client.Rules.Lists.Items.Update(ctx context.Context, listID string, params rules.ListItemUpdateParams) (rules.ListItemUpdateResponse, error) - client.Rules.Lists.Items.List(ctx context.Context, listID string, params rules.ListItemListParams) (pagination.CursorPagination[rules.ListItemListResponse], error) -- client.Rules.Lists.Items.Delete(ctx context.Context, listID string, params rules.ListItemDeleteParams) (rules.ListItemDeleteResponse, error) +- client.Rules.Lists.Items.Delete(ctx context.Context, listID string, body rules.ListItemDeleteParams) (rules.ListItemDeleteResponse, error) - client.Rules.Lists.Items.Get(ctx context.Context, accountIdentifier string, listID string, itemID string) (rules.ListItemGetResponseUnion, error) # Storage @@ -3907,7 +3900,7 @@ Methods: - client.Stream.New(ctx context.Context, params stream.StreamNewParams) error - client.Stream.List(ctx context.Context, params stream.StreamListParams) (pagination.SinglePage[stream.Video], error) -- client.Stream.Delete(ctx context.Context, identifier string, params stream.StreamDeleteParams) error +- client.Stream.Delete(ctx context.Context, identifier string, body stream.StreamDeleteParams) error - client.Stream.Get(ctx context.Context, identifier string, query stream.StreamGetParams) (stream.Video, error) ## AudioTracks @@ -3971,7 +3964,7 @@ Response Types: Methods: - client.Stream.Keys.New(ctx context.Context, params stream.KeyNewParams) (stream.Keys, error) -- client.Stream.Keys.Delete(ctx context.Context, identifier string, params stream.KeyDeleteParams) (stream.KeyDeleteResponseUnion, error) +- client.Stream.Keys.Delete(ctx context.Context, identifier string, body stream.KeyDeleteParams) (stream.KeyDeleteResponseUnion, error) - client.Stream.Keys.Get(ctx context.Context, query stream.KeyGetParams) ([]stream.KeyGetResponse, error) ## LiveInputs @@ -3986,7 +3979,7 @@ Methods: - client.Stream.LiveInputs.New(ctx context.Context, params stream.LiveInputNewParams) (stream.LiveInput, error) - client.Stream.LiveInputs.Update(ctx context.Context, liveInputIdentifier string, params stream.LiveInputUpdateParams) (stream.LiveInput, error) - client.Stream.LiveInputs.List(ctx context.Context, params stream.LiveInputListParams) (stream.LiveInputListResponse, error) -- client.Stream.LiveInputs.Delete(ctx context.Context, liveInputIdentifier string, params stream.LiveInputDeleteParams) error +- client.Stream.LiveInputs.Delete(ctx context.Context, liveInputIdentifier string, body stream.LiveInputDeleteParams) error - client.Stream.LiveInputs.Get(ctx context.Context, liveInputIdentifier string, query stream.LiveInputGetParams) (stream.LiveInput, error) ### Outputs @@ -4000,7 +3993,7 @@ Methods: - client.Stream.LiveInputs.Outputs.New(ctx context.Context, liveInputIdentifier string, params stream.LiveInputOutputNewParams) (stream.Output, error) - client.Stream.LiveInputs.Outputs.Update(ctx context.Context, liveInputIdentifier string, outputIdentifier string, params stream.LiveInputOutputUpdateParams) (stream.Output, error) - client.Stream.LiveInputs.Outputs.List(ctx context.Context, liveInputIdentifier string, query stream.LiveInputOutputListParams) (pagination.SinglePage[stream.Output], error) -- client.Stream.LiveInputs.Outputs.Delete(ctx context.Context, liveInputIdentifier string, outputIdentifier string, params stream.LiveInputOutputDeleteParams) error +- client.Stream.LiveInputs.Outputs.Delete(ctx context.Context, liveInputIdentifier string, outputIdentifier string, body stream.LiveInputOutputDeleteParams) error ## Watermarks @@ -4013,7 +4006,7 @@ Methods: - client.Stream.Watermarks.New(ctx context.Context, params stream.WatermarkNewParams) (stream.Watermark, error) - client.Stream.Watermarks.List(ctx context.Context, query stream.WatermarkListParams) (pagination.SinglePage[stream.Watermark], error) -- client.Stream.Watermarks.Delete(ctx context.Context, identifier string, params stream.WatermarkDeleteParams) (stream.WatermarkDeleteResponseUnion, error) +- client.Stream.Watermarks.Delete(ctx context.Context, identifier string, body stream.WatermarkDeleteParams) (stream.WatermarkDeleteResponseUnion, error) - client.Stream.Watermarks.Get(ctx context.Context, identifier string, query stream.WatermarkGetParams) (stream.Watermark, error) ## Webhooks @@ -4027,7 +4020,7 @@ Response Types: Methods: - client.Stream.Webhooks.Update(ctx context.Context, params stream.WebhookUpdateParams) (stream.WebhookUpdateResponseUnion, error) -- client.Stream.Webhooks.Delete(ctx context.Context, params stream.WebhookDeleteParams) (stream.WebhookDeleteResponseUnion, error) +- client.Stream.Webhooks.Delete(ctx context.Context, body stream.WebhookDeleteParams) (stream.WebhookDeleteResponseUnion, error) - client.Stream.Webhooks.Get(ctx context.Context, query stream.WebhookGetParams) (stream.WebhookGetResponseUnion, error) ## Captions @@ -4045,7 +4038,7 @@ Methods: Methods: - client.Stream.Captions.Language.Update(ctx context.Context, identifier string, language string, params stream.CaptionLanguageUpdateParams) (stream.Caption, error) -- client.Stream.Captions.Language.Delete(ctx context.Context, identifier string, language string, params stream.CaptionLanguageDeleteParams) (string, error) +- client.Stream.Captions.Language.Delete(ctx context.Context, identifier string, language string, body stream.CaptionLanguageDeleteParams) (string, error) - client.Stream.Captions.Language.Get(ctx context.Context, identifier string, language string, query stream.CaptionLanguageGetParams) (stream.Caption, error) #### Vtt @@ -4247,7 +4240,7 @@ Methods: - client.WARPConnector.New(ctx context.Context, params warp_connector.WARPConnectorNewParams) (warp_connector.WARPConnectorNewResponse, error) - client.WARPConnector.List(ctx context.Context, params warp_connector.WARPConnectorListParams) (pagination.V4PagePaginationArray[warp_connector.WARPConnectorListResponse], error) -- client.WARPConnector.Delete(ctx context.Context, tunnelID string, params warp_connector.WARPConnectorDeleteParams) (warp_connector.WARPConnectorDeleteResponse, error) +- client.WARPConnector.Delete(ctx context.Context, tunnelID string, body warp_connector.WARPConnectorDeleteParams) (warp_connector.WARPConnectorDeleteResponse, error) - client.WARPConnector.Edit(ctx context.Context, tunnelID string, params warp_connector.WARPConnectorEditParams) (warp_connector.WARPConnectorEditResponse, error) - client.WARPConnector.Get(ctx context.Context, tunnelID string, query warp_connector.WARPConnectorGetParams) (warp_connector.WARPConnectorGetResponse, error) - client.WARPConnector.Token(ctx context.Context, tunnelID string, query warp_connector.WARPConnectorTokenParams) (warp_connector.WARPConnectorTokenResponseUnion, error) @@ -4378,7 +4371,7 @@ Methods: - client.ZeroTrust.Devices.Networks.New(ctx context.Context, params zero_trust.DeviceNetworkNewParams) (zero_trust.DeviceNetwork, error) - client.ZeroTrust.Devices.Networks.Update(ctx context.Context, networkID string, params zero_trust.DeviceNetworkUpdateParams) (zero_trust.DeviceNetwork, error) - client.ZeroTrust.Devices.Networks.List(ctx context.Context, query zero_trust.DeviceNetworkListParams) (pagination.SinglePage[zero_trust.DeviceNetwork], error) -- client.ZeroTrust.Devices.Networks.Delete(ctx context.Context, networkID string, params zero_trust.DeviceNetworkDeleteParams) ([]zero_trust.DeviceNetwork, error) +- client.ZeroTrust.Devices.Networks.Delete(ctx context.Context, networkID string, body zero_trust.DeviceNetworkDeleteParams) ([]zero_trust.DeviceNetwork, error) - client.ZeroTrust.Devices.Networks.Get(ctx context.Context, networkID string, query zero_trust.DeviceNetworkGetParams) (zero_trust.DeviceNetwork, error) ### Policies @@ -4394,7 +4387,7 @@ Methods: - client.ZeroTrust.Devices.Policies.New(ctx context.Context, params zero_trust.DevicePolicyNewParams) (zero_trust.SettingsPolicy, error) - client.ZeroTrust.Devices.Policies.List(ctx context.Context, query zero_trust.DevicePolicyListParams) (pagination.SinglePage[zero_trust.SettingsPolicy], error) -- client.ZeroTrust.Devices.Policies.Delete(ctx context.Context, policyID string, params zero_trust.DevicePolicyDeleteParams) ([]zero_trust.SettingsPolicy, error) +- client.ZeroTrust.Devices.Policies.Delete(ctx context.Context, policyID string, body zero_trust.DevicePolicyDeleteParams) ([]zero_trust.SettingsPolicy, error) - client.ZeroTrust.Devices.Policies.Edit(ctx context.Context, policyID string, params zero_trust.DevicePolicyEditParams) (zero_trust.SettingsPolicy, error) - client.ZeroTrust.Devices.Policies.Get(ctx context.Context, policyID string, query zero_trust.DevicePolicyGetParams) (zero_trust.SettingsPolicy, error) @@ -4505,7 +4498,7 @@ Methods: - client.ZeroTrust.Devices.Posture.New(ctx context.Context, params zero_trust.DevicePostureNewParams) (zero_trust.DevicePostureRule, error) - client.ZeroTrust.Devices.Posture.Update(ctx context.Context, ruleID string, params zero_trust.DevicePostureUpdateParams) (zero_trust.DevicePostureRule, error) - client.ZeroTrust.Devices.Posture.List(ctx context.Context, query zero_trust.DevicePostureListParams) (pagination.SinglePage[zero_trust.DevicePostureRule], error) -- client.ZeroTrust.Devices.Posture.Delete(ctx context.Context, ruleID string, params zero_trust.DevicePostureDeleteParams) (zero_trust.DevicePostureDeleteResponse, error) +- client.ZeroTrust.Devices.Posture.Delete(ctx context.Context, ruleID string, body zero_trust.DevicePostureDeleteParams) (zero_trust.DevicePostureDeleteResponse, error) - client.ZeroTrust.Devices.Posture.Get(ctx context.Context, ruleID string, query zero_trust.DevicePostureGetParams) (zero_trust.DevicePostureRule, error) #### Integrations @@ -4519,7 +4512,7 @@ Methods: - client.ZeroTrust.Devices.Posture.Integrations.New(ctx context.Context, params zero_trust.DevicePostureIntegrationNewParams) (zero_trust.Integration, error) - client.ZeroTrust.Devices.Posture.Integrations.List(ctx context.Context, query zero_trust.DevicePostureIntegrationListParams) (pagination.SinglePage[zero_trust.Integration], error) -- client.ZeroTrust.Devices.Posture.Integrations.Delete(ctx context.Context, integrationID string, params zero_trust.DevicePostureIntegrationDeleteParams) (zero_trust.DevicePostureIntegrationDeleteResponseUnion, error) +- client.ZeroTrust.Devices.Posture.Integrations.Delete(ctx context.Context, integrationID string, body zero_trust.DevicePostureIntegrationDeleteParams) (zero_trust.DevicePostureIntegrationDeleteResponseUnion, error) - client.ZeroTrust.Devices.Posture.Integrations.Edit(ctx context.Context, integrationID string, params zero_trust.DevicePostureIntegrationEditParams) (zero_trust.Integration, error) - client.ZeroTrust.Devices.Posture.Integrations.Get(ctx context.Context, integrationID string, query zero_trust.DevicePostureIntegrationGetParams) (zero_trust.Integration, error) @@ -4843,7 +4836,7 @@ Methods: - client.ZeroTrust.Access.Bookmarks.New(ctx context.Context, identifier string, uuid string, body zero_trust.AccessBookmarkNewParams) (zero_trust.Bookmark, error) - client.ZeroTrust.Access.Bookmarks.Update(ctx context.Context, identifier string, uuid string, body zero_trust.AccessBookmarkUpdateParams) (zero_trust.Bookmark, error) - client.ZeroTrust.Access.Bookmarks.List(ctx context.Context, identifier string) (pagination.SinglePage[zero_trust.Bookmark], error) -- client.ZeroTrust.Access.Bookmarks.Delete(ctx context.Context, identifier string, uuid string, body zero_trust.AccessBookmarkDeleteParams) (zero_trust.AccessBookmarkDeleteResponse, error) +- client.ZeroTrust.Access.Bookmarks.Delete(ctx context.Context, identifier string, uuid string) (zero_trust.AccessBookmarkDeleteResponse, error) - client.ZeroTrust.Access.Bookmarks.Get(ctx context.Context, identifier string, uuid string) (zero_trust.Bookmark, error) ### Keys @@ -5073,7 +5066,7 @@ Methods: - client.ZeroTrust.Tunnels.New(ctx context.Context, params zero_trust.TunnelNewParams) (zero_trust.TunnelNewResponse, error) - client.ZeroTrust.Tunnels.List(ctx context.Context, params zero_trust.TunnelListParams) (pagination.V4PagePaginationArray[zero_trust.TunnelListResponse], error) -- client.ZeroTrust.Tunnels.Delete(ctx context.Context, tunnelID string, params zero_trust.TunnelDeleteParams) (zero_trust.TunnelDeleteResponse, error) +- client.ZeroTrust.Tunnels.Delete(ctx context.Context, tunnelID string, body zero_trust.TunnelDeleteParams) (zero_trust.TunnelDeleteResponse, error) - client.ZeroTrust.Tunnels.Edit(ctx context.Context, tunnelID string, params zero_trust.TunnelEditParams) (zero_trust.TunnelEditResponse, error) - client.ZeroTrust.Tunnels.Get(ctx context.Context, tunnelID string, query zero_trust.TunnelGetParams) (zero_trust.TunnelGetResponse, error) @@ -5098,7 +5091,7 @@ Response Types: Methods: -- client.ZeroTrust.Tunnels.Connections.Delete(ctx context.Context, tunnelID string, params zero_trust.TunnelConnectionDeleteParams) (zero_trust.TunnelConnectionDeleteResponseUnion, error) +- client.ZeroTrust.Tunnels.Connections.Delete(ctx context.Context, tunnelID string, body zero_trust.TunnelConnectionDeleteParams) (zero_trust.TunnelConnectionDeleteResponseUnion, error) - client.ZeroTrust.Tunnels.Connections.Get(ctx context.Context, tunnelID string, query zero_trust.TunnelConnectionGetParams) ([]zero_trust.Client, error) ### Token @@ -5221,7 +5214,7 @@ Methods: - client.ZeroTrust.DLP.Profiles.Custom.New(ctx context.Context, params zero_trust.DLPProfileCustomNewParams) ([]zero_trust.CustomProfile, error) - client.ZeroTrust.DLP.Profiles.Custom.Update(ctx context.Context, profileID string, params zero_trust.DLPProfileCustomUpdateParams) (zero_trust.CustomProfile, error) -- client.ZeroTrust.DLP.Profiles.Custom.Delete(ctx context.Context, profileID string, params zero_trust.DLPProfileCustomDeleteParams) (zero_trust.DLPProfileCustomDeleteResponseUnion, error) +- client.ZeroTrust.DLP.Profiles.Custom.Delete(ctx context.Context, profileID string, body zero_trust.DLPProfileCustomDeleteParams) (zero_trust.DLPProfileCustomDeleteResponseUnion, error) - client.ZeroTrust.DLP.Profiles.Custom.Get(ctx context.Context, profileID string, query zero_trust.DLPProfileCustomGetParams) (zero_trust.CustomProfile, error) #### Predefined @@ -5337,7 +5330,7 @@ Methods: - client.ZeroTrust.Gateway.Lists.New(ctx context.Context, params zero_trust.GatewayListNewParams) (zero_trust.GatewayListNewResponse, error) - client.ZeroTrust.Gateway.Lists.Update(ctx context.Context, listID string, params zero_trust.GatewayListUpdateParams) (zero_trust.GatewayList, error) - client.ZeroTrust.Gateway.Lists.List(ctx context.Context, query zero_trust.GatewayListListParams) (pagination.SinglePage[zero_trust.GatewayList], error) -- client.ZeroTrust.Gateway.Lists.Delete(ctx context.Context, listID string, params zero_trust.GatewayListDeleteParams) (zero_trust.GatewayListDeleteResponseUnion, error) +- client.ZeroTrust.Gateway.Lists.Delete(ctx context.Context, listID string, body zero_trust.GatewayListDeleteParams) (zero_trust.GatewayListDeleteResponseUnion, error) - client.ZeroTrust.Gateway.Lists.Edit(ctx context.Context, listID string, params zero_trust.GatewayListEditParams) (zero_trust.GatewayList, error) - client.ZeroTrust.Gateway.Lists.Get(ctx context.Context, listID string, query zero_trust.GatewayListGetParams) (zero_trust.GatewayList, error) @@ -5364,7 +5357,7 @@ Methods: - client.ZeroTrust.Gateway.Locations.New(ctx context.Context, params zero_trust.GatewayLocationNewParams) (zero_trust.Location, error) - client.ZeroTrust.Gateway.Locations.Update(ctx context.Context, locationID string, params zero_trust.GatewayLocationUpdateParams) (zero_trust.Location, error) - client.ZeroTrust.Gateway.Locations.List(ctx context.Context, query zero_trust.GatewayLocationListParams) (pagination.SinglePage[zero_trust.Location], error) -- client.ZeroTrust.Gateway.Locations.Delete(ctx context.Context, locationID string, params zero_trust.GatewayLocationDeleteParams) (zero_trust.GatewayLocationDeleteResponseUnion, error) +- client.ZeroTrust.Gateway.Locations.Delete(ctx context.Context, locationID string, body zero_trust.GatewayLocationDeleteParams) (zero_trust.GatewayLocationDeleteResponseUnion, error) - client.ZeroTrust.Gateway.Locations.Get(ctx context.Context, locationID string, query zero_trust.GatewayLocationGetParams) (zero_trust.Location, error) ### Logging @@ -5398,7 +5391,7 @@ Methods: - client.ZeroTrust.Gateway.ProxyEndpoints.New(ctx context.Context, params zero_trust.GatewayProxyEndpointNewParams) (zero_trust.ProxyEndpoint, error) - client.ZeroTrust.Gateway.ProxyEndpoints.List(ctx context.Context, query zero_trust.GatewayProxyEndpointListParams) (pagination.SinglePage[zero_trust.ProxyEndpoint], error) -- client.ZeroTrust.Gateway.ProxyEndpoints.Delete(ctx context.Context, proxyEndpointID string, params zero_trust.GatewayProxyEndpointDeleteParams) (zero_trust.GatewayProxyEndpointDeleteResponseUnion, error) +- client.ZeroTrust.Gateway.ProxyEndpoints.Delete(ctx context.Context, proxyEndpointID string, body zero_trust.GatewayProxyEndpointDeleteParams) (zero_trust.GatewayProxyEndpointDeleteResponseUnion, error) - client.ZeroTrust.Gateway.ProxyEndpoints.Edit(ctx context.Context, proxyEndpointID string, params zero_trust.GatewayProxyEndpointEditParams) (zero_trust.ProxyEndpoint, error) - client.ZeroTrust.Gateway.ProxyEndpoints.Get(ctx context.Context, proxyEndpointID string, query zero_trust.GatewayProxyEndpointGetParams) (zero_trust.ProxyEndpoint, error) @@ -5427,7 +5420,7 @@ Methods: - client.ZeroTrust.Gateway.Rules.New(ctx context.Context, params zero_trust.GatewayRuleNewParams) (zero_trust.GatewayRule, error) - client.ZeroTrust.Gateway.Rules.Update(ctx context.Context, ruleID string, params zero_trust.GatewayRuleUpdateParams) (zero_trust.GatewayRule, error) - client.ZeroTrust.Gateway.Rules.List(ctx context.Context, query zero_trust.GatewayRuleListParams) (pagination.SinglePage[zero_trust.GatewayRule], error) -- client.ZeroTrust.Gateway.Rules.Delete(ctx context.Context, ruleID string, params zero_trust.GatewayRuleDeleteParams) (zero_trust.GatewayRuleDeleteResponseUnion, error) +- client.ZeroTrust.Gateway.Rules.Delete(ctx context.Context, ruleID string, body zero_trust.GatewayRuleDeleteParams) (zero_trust.GatewayRuleDeleteResponseUnion, error) - client.ZeroTrust.Gateway.Rules.Get(ctx context.Context, ruleID string, query zero_trust.GatewayRuleGetParams) (zero_trust.GatewayRule, error) ## Networks @@ -5473,7 +5466,7 @@ Methods: - client.ZeroTrust.Networks.VirtualNetworks.New(ctx context.Context, params zero_trust.NetworkVirtualNetworkNewParams) (zero_trust.NetworkVirtualNetworkNewResponseUnion, error) - client.ZeroTrust.Networks.VirtualNetworks.List(ctx context.Context, params zero_trust.NetworkVirtualNetworkListParams) (pagination.SinglePage[zero_trust.VirtualNetwork], error) -- client.ZeroTrust.Networks.VirtualNetworks.Delete(ctx context.Context, virtualNetworkID string, params zero_trust.NetworkVirtualNetworkDeleteParams) (zero_trust.NetworkVirtualNetworkDeleteResponseUnion, error) +- client.ZeroTrust.Networks.VirtualNetworks.Delete(ctx context.Context, virtualNetworkID string, body zero_trust.NetworkVirtualNetworkDeleteParams) (zero_trust.NetworkVirtualNetworkDeleteResponseUnion, error) - client.ZeroTrust.Networks.VirtualNetworks.Edit(ctx context.Context, virtualNetworkID string, params zero_trust.NetworkVirtualNetworkEditParams) (zero_trust.NetworkVirtualNetworkEditResponseUnion, error) ## RiskScoring diff --git a/cache/smarttieredcache.go b/cache/smarttieredcache.go index dbbbec55ad7..d98fc64467c 100644 --- a/cache/smarttieredcache.go +++ b/cache/smarttieredcache.go @@ -35,10 +35,10 @@ func NewSmartTieredCacheService(opts ...option.RequestOption) (r *SmartTieredCac } // Remvoves enablement of Smart Tiered Cache -func (r *SmartTieredCacheService) Delete(ctx context.Context, params SmartTieredCacheDeleteParams, opts ...option.RequestOption) (res *SmartTieredCacheDeleteResponseUnion, err error) { +func (r *SmartTieredCacheService) Delete(ctx context.Context, body SmartTieredCacheDeleteParams, opts ...option.RequestOption) (res *SmartTieredCacheDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env SmartTieredCacheDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/cache/tiered_cache_smart_topology_enable", params.ZoneID) + path := fmt.Sprintf("zones/%s/cache/tiered_cache_smart_topology_enable", body.ZoneID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -127,11 +127,6 @@ func init() { type SmartTieredCacheDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r SmartTieredCacheDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type SmartTieredCacheDeleteResponseEnvelope struct { diff --git a/cache/smarttieredcache_test.go b/cache/smarttieredcache_test.go index 661bf82872f..cc24d46ab81 100644 --- a/cache/smarttieredcache_test.go +++ b/cache/smarttieredcache_test.go @@ -30,7 +30,6 @@ func TestSmartTieredCacheDelete(t *testing.T) { ) _, err := client.Cache.SmartTieredCache.Delete(context.TODO(), cache.SmartTieredCacheDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }) if err != nil { var apierr *cloudflare.Error diff --git a/cache/variant.go b/cache/variant.go index af095ffdbd0..4b1afc13a19 100644 --- a/cache/variant.go +++ b/cache/variant.go @@ -37,10 +37,10 @@ func NewVariantService(opts ...option.RequestOption) (r *VariantService) { // 'Vary: Accept' response header. If the origin server sends 'Vary: Accept' but // does not serve the variant requested, the response will not be cached. This will // be indicated with BYPASS cache status in the response headers. -func (r *VariantService) Delete(ctx context.Context, params VariantDeleteParams, opts ...option.RequestOption) (res *CacheVariant, err error) { +func (r *VariantService) Delete(ctx context.Context, body VariantDeleteParams, opts ...option.RequestOption) (res *CacheVariant, err error) { opts = append(r.Options[:], opts...) var env VariantDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/cache/variants", params.ZoneID) + path := fmt.Sprintf("zones/%s/cache/variants", body.ZoneID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -324,11 +324,6 @@ func (r variantGetResponseValueJSON) RawJSON() string { type VariantDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r VariantDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type VariantDeleteResponseEnvelope struct { diff --git a/cache/variant_test.go b/cache/variant_test.go index cfa9a34ae5f..7907f282926 100644 --- a/cache/variant_test.go +++ b/cache/variant_test.go @@ -30,7 +30,6 @@ func TestVariantDelete(t *testing.T) { ) _, err := client.Cache.Variants.Delete(context.TODO(), cache.VariantDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }) if err != nil { var apierr *cloudflare.Error diff --git a/custom_certificates/customcertificate.go b/custom_certificates/customcertificate.go index 5f1cd33ce6b..56595280d49 100644 --- a/custom_certificates/customcertificate.go +++ b/custom_certificates/customcertificate.go @@ -83,10 +83,10 @@ func (r *CustomCertificateService) ListAutoPaging(ctx context.Context, params Cu } // Remove a SSL certificate from a zone. -func (r *CustomCertificateService) Delete(ctx context.Context, customCertificateID string, params CustomCertificateDeleteParams, opts ...option.RequestOption) (res *CustomCertificateDeleteResponse, err error) { +func (r *CustomCertificateService) Delete(ctx context.Context, customCertificateID string, body CustomCertificateDeleteParams, opts ...option.RequestOption) (res *CustomCertificateDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env CustomCertificateDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/custom_certificates/%s", params.ZoneID, customCertificateID) + path := fmt.Sprintf("zones/%s/custom_certificates/%s", body.ZoneID, customCertificateID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -511,11 +511,6 @@ func (r CustomCertificateListParamsStatus) IsKnown() bool { type CustomCertificateDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r CustomCertificateDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type CustomCertificateDeleteResponseEnvelope struct { diff --git a/custom_certificates/customcertificate_test.go b/custom_certificates/customcertificate_test.go index ba46385c715..fea3655c533 100644 --- a/custom_certificates/customcertificate_test.go +++ b/custom_certificates/customcertificate_test.go @@ -98,7 +98,6 @@ func TestCustomCertificateDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", custom_certificates.CustomCertificateDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/custom_hostnames/customhostname.go b/custom_hostnames/customhostname.go index c06346dcc45..97618af8be9 100644 --- a/custom_hostnames/customhostname.go +++ b/custom_hostnames/customhostname.go @@ -81,9 +81,9 @@ func (r *CustomHostnameService) ListAutoPaging(ctx context.Context, params Custo } // Delete Custom Hostname (and any issued SSL certificates) -func (r *CustomHostnameService) Delete(ctx context.Context, customHostnameID string, params CustomHostnameDeleteParams, opts ...option.RequestOption) (res *CustomHostnameDeleteResponse, err error) { +func (r *CustomHostnameService) Delete(ctx context.Context, customHostnameID string, body CustomHostnameDeleteParams, opts ...option.RequestOption) (res *CustomHostnameDeleteResponse, err error) { opts = append(r.Options[:], opts...) - path := fmt.Sprintf("zones/%s/custom_hostnames/%s", params.ZoneID, customHostnameID) + path := fmt.Sprintf("zones/%s/custom_hostnames/%s", body.ZoneID, customHostnameID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &res, opts...) return } @@ -2388,11 +2388,6 @@ func (r CustomHostnameListParamsSSL) IsKnown() bool { type CustomHostnameDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r CustomHostnameDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type CustomHostnameEditParams struct { diff --git a/custom_hostnames/customhostname_test.go b/custom_hostnames/customhostname_test.go index 6ae3aeefb07..097099275f1 100644 --- a/custom_hostnames/customhostname_test.go +++ b/custom_hostnames/customhostname_test.go @@ -112,7 +112,6 @@ func TestCustomHostnameDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", custom_hostnames.CustomHostnameDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/custom_hostnames/fallbackorigin.go b/custom_hostnames/fallbackorigin.go index d63acaa3359..c5e283ca848 100644 --- a/custom_hostnames/fallbackorigin.go +++ b/custom_hostnames/fallbackorigin.go @@ -48,10 +48,10 @@ func (r *FallbackOriginService) Update(ctx context.Context, params FallbackOrigi } // Delete Fallback Origin for Custom Hostnames -func (r *FallbackOriginService) Delete(ctx context.Context, params FallbackOriginDeleteParams, opts ...option.RequestOption) (res *FallbackOriginDeleteResponseUnion, err error) { +func (r *FallbackOriginService) Delete(ctx context.Context, body FallbackOriginDeleteParams, opts ...option.RequestOption) (res *FallbackOriginDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env FallbackOriginDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/custom_hostnames/fallback_origin", params.ZoneID) + path := fmt.Sprintf("zones/%s/custom_hostnames/fallback_origin", body.ZoneID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -181,11 +181,6 @@ func (r FallbackOriginUpdateResponseEnvelopeSuccess) IsKnown() bool { type FallbackOriginDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r FallbackOriginDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type FallbackOriginDeleteResponseEnvelope struct { diff --git a/custom_hostnames/fallbackorigin_test.go b/custom_hostnames/fallbackorigin_test.go index 988da10cf65..1e2de9182a9 100644 --- a/custom_hostnames/fallbackorigin_test.go +++ b/custom_hostnames/fallbackorigin_test.go @@ -57,7 +57,6 @@ func TestFallbackOriginDelete(t *testing.T) { ) _, err := client.CustomHostnames.FallbackOrigin.Delete(context.TODO(), custom_hostnames.FallbackOriginDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }) if err != nil { var apierr *cloudflare.Error diff --git a/custom_nameservers/customnameserver.go b/custom_nameservers/customnameserver.go index 67dfa7ba459..f0cb850d8e2 100644 --- a/custom_nameservers/customnameserver.go +++ b/custom_nameservers/customnameserver.go @@ -48,10 +48,10 @@ func (r *CustomNameserverService) New(ctx context.Context, params CustomNameserv } // Delete Account Custom Nameserver -func (r *CustomNameserverService) Delete(ctx context.Context, customNSID string, params CustomNameserverDeleteParams, opts ...option.RequestOption) (res *CustomNameserverDeleteResponseUnion, err error) { +func (r *CustomNameserverService) Delete(ctx context.Context, customNSID string, body CustomNameserverDeleteParams, opts ...option.RequestOption) (res *CustomNameserverDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env CustomNameserverDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/custom_ns/%s", params.AccountID, customNSID) + path := fmt.Sprintf("accounts/%s/custom_ns/%s", body.AccountID, customNSID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -279,11 +279,6 @@ func (r CustomNameserverNewResponseEnvelopeSuccess) IsKnown() bool { type CustomNameserverDeleteParams struct { // Account identifier tag. AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r CustomNameserverDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type CustomNameserverDeleteResponseEnvelope struct { diff --git a/custom_nameservers/customnameserver_test.go b/custom_nameservers/customnameserver_test.go index 7d9df3e08e4..cb1ddc92d30 100644 --- a/custom_nameservers/customnameserver_test.go +++ b/custom_nameservers/customnameserver_test.go @@ -61,7 +61,6 @@ func TestCustomNameserverDelete(t *testing.T) { "ns1.example.com", custom_nameservers.CustomNameserverDeleteParams{ AccountID: cloudflare.F("372e67954025e0ba6aaa6d586b9e0b59"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/dns/firewall.go b/dns/firewall.go index cab5e9339c6..872e6a69117 100644 --- a/dns/firewall.go +++ b/dns/firewall.go @@ -76,10 +76,10 @@ func (r *FirewallService) ListAutoPaging(ctx context.Context, params FirewallLis } // Delete a configured DNS Firewall Cluster. -func (r *FirewallService) Delete(ctx context.Context, dnsFirewallID string, params FirewallDeleteParams, opts ...option.RequestOption) (res *FirewallDeleteResponse, err error) { +func (r *FirewallService) Delete(ctx context.Context, dnsFirewallID string, body FirewallDeleteParams, opts ...option.RequestOption) (res *FirewallDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env FirewallDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/dns_firewall/%s", params.AccountID, dnsFirewallID) + path := fmt.Sprintf("accounts/%s/dns_firewall/%s", body.AccountID, dnsFirewallID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -413,11 +413,6 @@ func (r FirewallListParams) URLQuery() (v url.Values) { type FirewallDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r FirewallDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type FirewallDeleteResponseEnvelope struct { diff --git a/dns/firewall_test.go b/dns/firewall_test.go index 624ae1b64ec..afda2009e44 100644 --- a/dns/firewall_test.go +++ b/dns/firewall_test.go @@ -101,7 +101,6 @@ func TestFirewallDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", dns.FirewallDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/dns/record.go b/dns/record.go index 4d132329a9a..cf0d62f7313 100644 --- a/dns/record.go +++ b/dns/record.go @@ -99,10 +99,10 @@ func (r *RecordService) ListAutoPaging(ctx context.Context, params RecordListPar } // Delete DNS Record -func (r *RecordService) Delete(ctx context.Context, dnsRecordID string, params RecordDeleteParams, opts ...option.RequestOption) (res *RecordDeleteResponse, err error) { +func (r *RecordService) Delete(ctx context.Context, dnsRecordID string, body RecordDeleteParams, opts ...option.RequestOption) (res *RecordDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env RecordDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/dns_records/%s", params.ZoneID, dnsRecordID) + path := fmt.Sprintf("zones/%s/dns_records/%s", body.ZoneID, dnsRecordID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -3847,11 +3847,6 @@ func (r RecordListParamsType) IsKnown() bool { type RecordDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r RecordDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type RecordDeleteResponseEnvelope struct { diff --git a/dns/record_test.go b/dns/record_test.go index 267e28141f4..9c8fdac4190 100644 --- a/dns/record_test.go +++ b/dns/record_test.go @@ -161,7 +161,6 @@ func TestRecordDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", dns.RecordDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/dnssec/dnssec.go b/dnssec/dnssec.go index 2236c973e56..eaa93042af9 100644 --- a/dnssec/dnssec.go +++ b/dnssec/dnssec.go @@ -35,10 +35,10 @@ func NewDNSSECService(opts ...option.RequestOption) (r *DNSSECService) { } // Delete DNSSEC. -func (r *DNSSECService) Delete(ctx context.Context, params DNSSECDeleteParams, opts ...option.RequestOption) (res *DNSSECDeleteResponseUnion, err error) { +func (r *DNSSECService) Delete(ctx context.Context, body DNSSECDeleteParams, opts ...option.RequestOption) (res *DNSSECDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env DNSSECDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/dnssec", params.ZoneID) + path := fmt.Sprintf("zones/%s/dnssec", body.ZoneID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -181,11 +181,6 @@ func init() { type DNSSECDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r DNSSECDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type DNSSECDeleteResponseEnvelope struct { diff --git a/dnssec/dnssec_test.go b/dnssec/dnssec_test.go index 2e87d475d14..e8f58a54b66 100644 --- a/dnssec/dnssec_test.go +++ b/dnssec/dnssec_test.go @@ -30,7 +30,6 @@ func TestDNSSECDelete(t *testing.T) { ) _, err := client.DNSSEC.Delete(context.TODO(), dnssec.DNSSECDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }) if err != nil { var apierr *cloudflare.Error diff --git a/filters/filter.go b/filters/filter.go index d25ec526732..2af2a1f3284 100644 --- a/filters/filter.go +++ b/filters/filter.go @@ -86,7 +86,7 @@ func (r *FilterService) ListAutoPaging(ctx context.Context, zoneIdentifier strin } // Deletes an existing filter. -func (r *FilterService) Delete(ctx context.Context, zoneIdentifier string, id string, body FilterDeleteParams, opts ...option.RequestOption) (res *FirewallFilter, err error) { +func (r *FilterService) Delete(ctx context.Context, zoneIdentifier string, id string, opts ...option.RequestOption) (res *FirewallFilter, err error) { opts = append(r.Options[:], opts...) var env FilterDeleteResponseEnvelope path := fmt.Sprintf("zones/%s/filters/%s", zoneIdentifier, id) @@ -307,14 +307,6 @@ func (r FilterListParams) URLQuery() (v url.Values) { }) } -type FilterDeleteParams struct { - Body interface{} `json:"body,required"` -} - -func (r FilterDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type FilterDeleteResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` diff --git a/filters/filter_test.go b/filters/filter_test.go index f39799c8455..79741554d1b 100644 --- a/filters/filter_test.go +++ b/filters/filter_test.go @@ -129,9 +129,6 @@ func TestFilterDelete(t *testing.T) { context.TODO(), "023e105f4ecef8ad9ca31a8372d0c353", "372e67954025e0ba6aaa6d586b9e0b61", - filters.FilterDeleteParams{ - Body: map[string]interface{}{}, - }, ) if err != nil { var apierr *cloudflare.Error diff --git a/firewall/accessrule.go b/firewall/accessrule.go index 81b293daa86..8d1045f5e11 100644 --- a/firewall/accessrule.go +++ b/firewall/accessrule.go @@ -101,17 +101,17 @@ func (r *AccessRuleService) ListAutoPaging(ctx context.Context, params AccessRul // Deletes an existing IP Access rule defined. // // Note: This operation will affect all zones in the account or zone. -func (r *AccessRuleService) Delete(ctx context.Context, identifier interface{}, params AccessRuleDeleteParams, opts ...option.RequestOption) (res *AccessRuleDeleteResponse, err error) { +func (r *AccessRuleService) Delete(ctx context.Context, identifier interface{}, body AccessRuleDeleteParams, opts ...option.RequestOption) (res *AccessRuleDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env AccessRuleDeleteResponseEnvelope var accountOrZone string var accountOrZoneID param.Field[string] - if params.AccountID.Present { + if body.AccountID.Present { accountOrZone = "accounts" - accountOrZoneID = params.AccountID + accountOrZoneID = body.AccountID } else { accountOrZone = "zones" - accountOrZoneID = params.ZoneID + accountOrZoneID = body.ZoneID } path := fmt.Sprintf("%s/%s/firewall/access_rules/rules/%v", accountOrZone, accountOrZoneID, identifier) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) @@ -703,17 +703,12 @@ func (r AccessRuleListParamsOrder) IsKnown() bool { } type AccessRuleDeleteParams struct { - Body interface{} `json:"body,required"` // The Account ID to use for this endpoint. Mutually exclusive with the Zone ID. AccountID param.Field[string] `path:"account_id"` // The Zone ID to use for this endpoint. Mutually exclusive with the Account ID. ZoneID param.Field[string] `path:"zone_id"` } -func (r AccessRuleDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type AccessRuleDeleteResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` diff --git a/firewall/accessrule_test.go b/firewall/accessrule_test.go index 102a172c4c0..8f63a4197cb 100644 --- a/firewall/accessrule_test.go +++ b/firewall/accessrule_test.go @@ -109,7 +109,6 @@ func TestAccessRuleDeleteWithOptionalParams(t *testing.T) { context.TODO(), map[string]interface{}{}, firewall.AccessRuleDeleteParams{ - Body: map[string]interface{}{}, AccountID: cloudflare.F("string"), ZoneID: cloudflare.F("string"), }, diff --git a/firewall/lockdown.go b/firewall/lockdown.go index df0fb227c7e..08f66668647 100644 --- a/firewall/lockdown.go +++ b/firewall/lockdown.go @@ -89,7 +89,7 @@ func (r *LockdownService) ListAutoPaging(ctx context.Context, zoneIdentifier str } // Deletes an existing Zone Lockdown rule. -func (r *LockdownService) Delete(ctx context.Context, zoneIdentifier string, id string, body LockdownDeleteParams, opts ...option.RequestOption) (res *LockdownDeleteResponse, err error) { +func (r *LockdownService) Delete(ctx context.Context, zoneIdentifier string, id string, opts ...option.RequestOption) (res *LockdownDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env LockdownDeleteResponseEnvelope path := fmt.Sprintf("zones/%s/firewall/lockdowns/%s", zoneIdentifier, id) @@ -488,14 +488,6 @@ func (r LockdownListParams) URLQuery() (v url.Values) { }) } -type LockdownDeleteParams struct { - Body interface{} `json:"body,required"` -} - -func (r LockdownDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type LockdownDeleteResponseEnvelope struct { Result LockdownDeleteResponse `json:"result"` JSON lockdownDeleteResponseEnvelopeJSON `json:"-"` diff --git a/firewall/lockdown_test.go b/firewall/lockdown_test.go index 37c38596048..33675ea8bec 100644 --- a/firewall/lockdown_test.go +++ b/firewall/lockdown_test.go @@ -134,9 +134,6 @@ func TestLockdownDelete(t *testing.T) { context.TODO(), "023e105f4ecef8ad9ca31a8372d0c353", "372e67954025e0ba6aaa6d586b9e0b59", - firewall.LockdownDeleteParams{ - Body: map[string]interface{}{}, - }, ) if err != nil { var apierr *cloudflare.Error diff --git a/firewall/rule.go b/firewall/rule.go index 864f1cfbef6..edf49e41373 100644 --- a/firewall/rule.go +++ b/firewall/rule.go @@ -90,11 +90,11 @@ func (r *RuleService) ListAutoPaging(ctx context.Context, zoneIdentifier string, } // Deletes an existing firewall rule. -func (r *RuleService) Delete(ctx context.Context, zoneIdentifier string, id string, body RuleDeleteParams, opts ...option.RequestOption) (res *FirewallRule, err error) { +func (r *RuleService) Delete(ctx context.Context, zoneIdentifier string, id string, opts ...option.RequestOption) (res *FirewallRule, err error) { opts = append(r.Options[:], opts...) var env RuleDeleteResponseEnvelope path := fmt.Sprintf("zones/%s/firewall/rules/%s", zoneIdentifier, id) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, body, &env, opts...) + err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return } @@ -443,16 +443,6 @@ func (r RuleListParams) URLQuery() (v url.Values) { }) } -type RuleDeleteParams struct { - // When true, indicates that Cloudflare should also delete the associated filter if - // there are no other firewall rules referencing the filter. - DeleteFilterIfUnused param.Field[bool] `json:"delete_filter_if_unused"` -} - -func (r RuleDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r) -} - type RuleDeleteResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` diff --git a/firewall/rule_test.go b/firewall/rule_test.go index 2d99b0534db..eaeb22e40db 100644 --- a/firewall/rule_test.go +++ b/firewall/rule_test.go @@ -110,7 +110,7 @@ func TestRuleListWithOptionalParams(t *testing.T) { } } -func TestRuleDeleteWithOptionalParams(t *testing.T) { +func TestRuleDelete(t *testing.T) { t.Skip("skipped: tests are disabled for the time being") baseURL := "http://localhost:4010" if envURL, ok := os.LookupEnv("TEST_API_BASE_URL"); ok { @@ -128,9 +128,6 @@ func TestRuleDeleteWithOptionalParams(t *testing.T) { context.TODO(), "023e105f4ecef8ad9ca31a8372d0c353", "372e67954025e0ba6aaa6d586b9e0b60", - firewall.RuleDeleteParams{ - DeleteFilterIfUnused: cloudflare.F(true), - }, ) if err != nil { var apierr *cloudflare.Error diff --git a/firewall/uarule.go b/firewall/uarule.go index bbddbba5b13..66e488898e0 100644 --- a/firewall/uarule.go +++ b/firewall/uarule.go @@ -88,7 +88,7 @@ func (r *UARuleService) ListAutoPaging(ctx context.Context, zoneIdentifier strin } // Deletes an existing User Agent Blocking rule. -func (r *UARuleService) Delete(ctx context.Context, zoneIdentifier string, id string, body UARuleDeleteParams, opts ...option.RequestOption) (res *UARuleDeleteResponse, err error) { +func (r *UARuleService) Delete(ctx context.Context, zoneIdentifier string, id string, opts ...option.RequestOption) (res *UARuleDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env UARuleDeleteResponseEnvelope path := fmt.Sprintf("zones/%s/firewall/ua_rules/%s", zoneIdentifier, id) @@ -388,14 +388,6 @@ func (r UARuleListParams) URLQuery() (v url.Values) { }) } -type UARuleDeleteParams struct { - Body interface{} `json:"body,required"` -} - -func (r UARuleDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type UARuleDeleteResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` diff --git a/firewall/uarule_test.go b/firewall/uarule_test.go index 909e141d2fc..ccbd1a2bbc4 100644 --- a/firewall/uarule_test.go +++ b/firewall/uarule_test.go @@ -127,9 +127,6 @@ func TestUARuleDelete(t *testing.T) { context.TODO(), "023e105f4ecef8ad9ca31a8372d0c353", "372e67954025e0ba6aaa6d586b9e0b59", - firewall.UARuleDeleteParams{ - Body: map[string]interface{}{}, - }, ) if err != nil { var apierr *cloudflare.Error diff --git a/firewall/wafoverride.go b/firewall/wafoverride.go index 18e2efa9f63..319f2486640 100644 --- a/firewall/wafoverride.go +++ b/firewall/wafoverride.go @@ -100,7 +100,7 @@ func (r *WAFOverrideService) ListAutoPaging(ctx context.Context, zoneIdentifier // // **Note:** Applies only to the // [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/). -func (r *WAFOverrideService) Delete(ctx context.Context, zoneIdentifier string, id string, body WAFOverrideDeleteParams, opts ...option.RequestOption) (res *WAFOverrideDeleteResponse, err error) { +func (r *WAFOverrideService) Delete(ctx context.Context, zoneIdentifier string, id string, opts ...option.RequestOption) (res *WAFOverrideDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env WAFOverrideDeleteResponseEnvelope path := fmt.Sprintf("zones/%s/firewall/waf/overrides/%s", zoneIdentifier, id) @@ -415,14 +415,6 @@ func (r WAFOverrideListParams) URLQuery() (v url.Values) { }) } -type WAFOverrideDeleteParams struct { - Body interface{} `json:"body,required"` -} - -func (r WAFOverrideDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type WAFOverrideDeleteResponseEnvelope struct { Result WAFOverrideDeleteResponse `json:"result"` JSON wafOverrideDeleteResponseEnvelopeJSON `json:"-"` diff --git a/firewall/wafoverride_test.go b/firewall/wafoverride_test.go index 1a187260cdf..0fdcf292af2 100644 --- a/firewall/wafoverride_test.go +++ b/firewall/wafoverride_test.go @@ -124,9 +124,6 @@ func TestWAFOverrideDelete(t *testing.T) { context.TODO(), "023e105f4ecef8ad9ca31a8372d0c353", "de677e5818985db1285d0e80225f06e5", - firewall.WAFOverrideDeleteParams{ - Body: map[string]interface{}{}, - }, ) if err != nil { var apierr *cloudflare.Error diff --git a/healthchecks/healthcheck.go b/healthchecks/healthcheck.go index 1916c5b0d4b..2dfd51db83f 100644 --- a/healthchecks/healthcheck.go +++ b/healthchecks/healthcheck.go @@ -88,10 +88,10 @@ func (r *HealthcheckService) ListAutoPaging(ctx context.Context, params Healthch } // Delete a health check. -func (r *HealthcheckService) Delete(ctx context.Context, healthcheckID string, params HealthcheckDeleteParams, opts ...option.RequestOption) (res *HealthcheckDeleteResponse, err error) { +func (r *HealthcheckService) Delete(ctx context.Context, healthcheckID string, body HealthcheckDeleteParams, opts ...option.RequestOption) (res *HealthcheckDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env HealthcheckDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/healthchecks/%s", params.ZoneID, healthcheckID) + path := fmt.Sprintf("zones/%s/healthchecks/%s", body.ZoneID, healthcheckID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -588,11 +588,6 @@ func (r HealthcheckListParams) URLQuery() (v url.Values) { type HealthcheckDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r HealthcheckDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type HealthcheckDeleteResponseEnvelope struct { diff --git a/healthchecks/healthcheck_test.go b/healthchecks/healthcheck_test.go index 3edde20e3d2..60f1f5c65e0 100644 --- a/healthchecks/healthcheck_test.go +++ b/healthchecks/healthcheck_test.go @@ -185,7 +185,6 @@ func TestHealthcheckDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", healthchecks.HealthcheckDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/healthchecks/preview.go b/healthchecks/preview.go index 2101e5169b2..4a2bb591a6e 100644 --- a/healthchecks/preview.go +++ b/healthchecks/preview.go @@ -45,10 +45,10 @@ func (r *PreviewService) New(ctx context.Context, params PreviewNewParams, opts } // Delete a health check. -func (r *PreviewService) Delete(ctx context.Context, healthcheckID string, params PreviewDeleteParams, opts ...option.RequestOption) (res *PreviewDeleteResponse, err error) { +func (r *PreviewService) Delete(ctx context.Context, healthcheckID string, body PreviewDeleteParams, opts ...option.RequestOption) (res *PreviewDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env PreviewDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/healthchecks/preview/%s", params.ZoneID, healthcheckID) + path := fmt.Sprintf("zones/%s/healthchecks/preview/%s", body.ZoneID, healthcheckID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -148,11 +148,6 @@ func (r PreviewNewResponseEnvelopeSuccess) IsKnown() bool { type PreviewDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r PreviewDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type PreviewDeleteResponseEnvelope struct { diff --git a/healthchecks/preview_test.go b/healthchecks/preview_test.go index 47267ef08f0..c02dfc44f37 100644 --- a/healthchecks/preview_test.go +++ b/healthchecks/preview_test.go @@ -93,7 +93,6 @@ func TestPreviewDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", healthchecks.PreviewDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/images/v1.go b/images/v1.go index 5508db86710..2724307ce1c 100644 --- a/images/v1.go +++ b/images/v1.go @@ -87,10 +87,10 @@ func (r *V1Service) ListAutoPaging(ctx context.Context, params V1ListParams, opt // Delete an image on Cloudflare Images. On success, all copies of the image are // deleted and purged from cache. -func (r *V1Service) Delete(ctx context.Context, imageID string, params V1DeleteParams, opts ...option.RequestOption) (res *V1DeleteResponseUnion, err error) { +func (r *V1Service) Delete(ctx context.Context, imageID string, body V1DeleteParams, opts ...option.RequestOption) (res *V1DeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env V1DeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/images/v1/%s", params.AccountID, imageID) + path := fmt.Sprintf("accounts/%s/images/v1/%s", body.AccountID, imageID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -352,11 +352,6 @@ func (r V1ListParams) URLQuery() (v url.Values) { type V1DeleteParams struct { // Account identifier tag. AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r V1DeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type V1DeleteResponseEnvelope struct { diff --git a/images/v1_test.go b/images/v1_test.go index 3971ac966bf..45033c2d447 100644 --- a/images/v1_test.go +++ b/images/v1_test.go @@ -91,7 +91,6 @@ func TestV1Delete(t *testing.T) { "string", images.V1DeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/images/v1variant.go b/images/v1variant.go index 1e1222b24a2..dc461ae0675 100644 --- a/images/v1variant.go +++ b/images/v1variant.go @@ -60,10 +60,10 @@ func (r *V1VariantService) List(ctx context.Context, query V1VariantListParams, } // Deleting a variant purges the cache for all images associated with the variant. -func (r *V1VariantService) Delete(ctx context.Context, variantID string, params V1VariantDeleteParams, opts ...option.RequestOption) (res *V1VariantDeleteResponseUnion, err error) { +func (r *V1VariantService) Delete(ctx context.Context, variantID string, body V1VariantDeleteParams, opts ...option.RequestOption) (res *V1VariantDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env V1VariantDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/images/v1/variants/%s", params.AccountID, variantID) + path := fmt.Sprintf("accounts/%s/images/v1/variants/%s", body.AccountID, variantID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -773,11 +773,6 @@ func (r V1VariantListResponseEnvelopeSuccess) IsKnown() bool { type V1VariantDeleteParams struct { // Account identifier tag. AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r V1VariantDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type V1VariantDeleteResponseEnvelope struct { diff --git a/images/v1variant_test.go b/images/v1variant_test.go index 75b21ec3790..f020cc2d65c 100644 --- a/images/v1variant_test.go +++ b/images/v1variant_test.go @@ -93,7 +93,6 @@ func TestV1VariantDelete(t *testing.T) { "hero", images.V1VariantDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/intel/attacksurfacereportissue.go b/intel/attacksurfacereportissue.go index 98a16d2b4bd..a0d9008419a 100644 --- a/intel/attacksurfacereportissue.go +++ b/intel/attacksurfacereportissue.go @@ -113,8 +113,6 @@ func (r *AttackSurfaceReportIssueService) Type(ctx context.Context, params Attac return } -type IssueClassParam []string - type IssueType string const ( @@ -133,8 +131,6 @@ func (r IssueType) IsKnown() bool { return false } -type ProductParam []string - type SeverityQueryParam string const ( @@ -151,8 +147,6 @@ func (r SeverityQueryParam) IsKnown() bool { return false } -type SubjectParam []string - type AttackSurfaceReportIssueListResponse struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` @@ -389,22 +383,22 @@ func (r attackSurfaceReportIssueTypeResponseJSON) RawJSON() string { type AttackSurfaceReportIssueListParams struct { // Identifier - AccountID param.Field[string] `path:"account_id,required"` - Dismissed param.Field[bool] `query:"dismissed"` - IssueClass param.Field[IssueClassParam] `query:"issue_class"` - IssueClassNeq param.Field[IssueClassParam] `query:"issue_class~neq"` - IssueType param.Field[[]IssueType] `query:"issue_type"` - IssueTypeNeq param.Field[[]IssueType] `query:"issue_type~neq"` + AccountID param.Field[string] `path:"account_id,required"` + Dismissed param.Field[bool] `query:"dismissed"` + IssueClass param.Field[[]string] `query:"issue_class"` + IssueClassNeq param.Field[[]string] `query:"issue_class~neq"` + IssueType param.Field[[]IssueType] `query:"issue_type"` + IssueTypeNeq param.Field[[]IssueType] `query:"issue_type~neq"` // Current page within paginated list of results Page param.Field[int64] `query:"page"` // Number of results per page of results PerPage param.Field[int64] `query:"per_page"` - Product param.Field[ProductParam] `query:"product"` - ProductNeq param.Field[ProductParam] `query:"product~neq"` + Product param.Field[[]string] `query:"product"` + ProductNeq param.Field[[]string] `query:"product~neq"` Severity param.Field[[]SeverityQueryParam] `query:"severity"` SeverityNeq param.Field[[]SeverityQueryParam] `query:"severity~neq"` - Subject param.Field[SubjectParam] `query:"subject"` - SubjectNeq param.Field[SubjectParam] `query:"subject~neq"` + Subject param.Field[[]string] `query:"subject"` + SubjectNeq param.Field[[]string] `query:"subject~neq"` } // URLQuery serializes [AttackSurfaceReportIssueListParams]'s query parameters as @@ -420,16 +414,16 @@ type AttackSurfaceReportIssueClassParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` Dismissed param.Field[bool] `query:"dismissed"` - IssueClass param.Field[IssueClassParam] `query:"issue_class"` - IssueClassNeq param.Field[IssueClassParam] `query:"issue_class~neq"` + IssueClass param.Field[[]string] `query:"issue_class"` + IssueClassNeq param.Field[[]string] `query:"issue_class~neq"` IssueType param.Field[[]IssueType] `query:"issue_type"` IssueTypeNeq param.Field[[]IssueType] `query:"issue_type~neq"` - Product param.Field[ProductParam] `query:"product"` - ProductNeq param.Field[ProductParam] `query:"product~neq"` + Product param.Field[[]string] `query:"product"` + ProductNeq param.Field[[]string] `query:"product~neq"` Severity param.Field[[]SeverityQueryParam] `query:"severity"` SeverityNeq param.Field[[]SeverityQueryParam] `query:"severity~neq"` - Subject param.Field[SubjectParam] `query:"subject"` - SubjectNeq param.Field[SubjectParam] `query:"subject~neq"` + Subject param.Field[[]string] `query:"subject"` + SubjectNeq param.Field[[]string] `query:"subject~neq"` } // URLQuery serializes [AttackSurfaceReportIssueClassParams]'s query parameters as @@ -541,16 +535,16 @@ type AttackSurfaceReportIssueSeverityParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` Dismissed param.Field[bool] `query:"dismissed"` - IssueClass param.Field[IssueClassParam] `query:"issue_class"` - IssueClassNeq param.Field[IssueClassParam] `query:"issue_class~neq"` + IssueClass param.Field[[]string] `query:"issue_class"` + IssueClassNeq param.Field[[]string] `query:"issue_class~neq"` IssueType param.Field[[]IssueType] `query:"issue_type"` IssueTypeNeq param.Field[[]IssueType] `query:"issue_type~neq"` - Product param.Field[ProductParam] `query:"product"` - ProductNeq param.Field[ProductParam] `query:"product~neq"` + Product param.Field[[]string] `query:"product"` + ProductNeq param.Field[[]string] `query:"product~neq"` Severity param.Field[[]SeverityQueryParam] `query:"severity"` SeverityNeq param.Field[[]SeverityQueryParam] `query:"severity~neq"` - Subject param.Field[SubjectParam] `query:"subject"` - SubjectNeq param.Field[SubjectParam] `query:"subject~neq"` + Subject param.Field[[]string] `query:"subject"` + SubjectNeq param.Field[[]string] `query:"subject~neq"` } // URLQuery serializes [AttackSurfaceReportIssueSeverityParams]'s query parameters @@ -609,16 +603,16 @@ type AttackSurfaceReportIssueTypeParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` Dismissed param.Field[bool] `query:"dismissed"` - IssueClass param.Field[IssueClassParam] `query:"issue_class"` - IssueClassNeq param.Field[IssueClassParam] `query:"issue_class~neq"` + IssueClass param.Field[[]string] `query:"issue_class"` + IssueClassNeq param.Field[[]string] `query:"issue_class~neq"` IssueType param.Field[[]IssueType] `query:"issue_type"` IssueTypeNeq param.Field[[]IssueType] `query:"issue_type~neq"` - Product param.Field[ProductParam] `query:"product"` - ProductNeq param.Field[ProductParam] `query:"product~neq"` + Product param.Field[[]string] `query:"product"` + ProductNeq param.Field[[]string] `query:"product~neq"` Severity param.Field[[]SeverityQueryParam] `query:"severity"` SeverityNeq param.Field[[]SeverityQueryParam] `query:"severity~neq"` - Subject param.Field[SubjectParam] `query:"subject"` - SubjectNeq param.Field[SubjectParam] `query:"subject~neq"` + Subject param.Field[[]string] `query:"subject"` + SubjectNeq param.Field[[]string] `query:"subject~neq"` } // URLQuery serializes [AttackSurfaceReportIssueTypeParams]'s query parameters as diff --git a/keyless_certificates/keylesscertificate.go b/keyless_certificates/keylesscertificate.go index 903d0dc2425..610a8d75f11 100644 --- a/keyless_certificates/keylesscertificate.go +++ b/keyless_certificates/keylesscertificate.go @@ -72,10 +72,10 @@ func (r *KeylessCertificateService) ListAutoPaging(ctx context.Context, query Ke } // Delete Keyless SSL Configuration -func (r *KeylessCertificateService) Delete(ctx context.Context, keylessCertificateID string, params KeylessCertificateDeleteParams, opts ...option.RequestOption) (res *KeylessCertificateDeleteResponse, err error) { +func (r *KeylessCertificateService) Delete(ctx context.Context, keylessCertificateID string, body KeylessCertificateDeleteParams, opts ...option.RequestOption) (res *KeylessCertificateDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env KeylessCertificateDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/keyless_certificates/%s", params.ZoneID, keylessCertificateID) + path := fmt.Sprintf("zones/%s/keyless_certificates/%s", body.ZoneID, keylessCertificateID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -313,11 +313,6 @@ type KeylessCertificateListParams struct { type KeylessCertificateDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r KeylessCertificateDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type KeylessCertificateDeleteResponseEnvelope struct { diff --git a/keyless_certificates/keylesscertificate_test.go b/keyless_certificates/keylesscertificate_test.go index bef4462bd5f..b34e62956fb 100644 --- a/keyless_certificates/keylesscertificate_test.go +++ b/keyless_certificates/keylesscertificate_test.go @@ -95,7 +95,6 @@ func TestKeylessCertificateDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", keyless_certificates.KeylessCertificateDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/kv/namespace.go b/kv/namespace.go index c91a623e4b9..745f08a6faa 100644 --- a/kv/namespace.go +++ b/kv/namespace.go @@ -96,10 +96,10 @@ func (r *NamespaceService) ListAutoPaging(ctx context.Context, params NamespaceL } // Deletes the namespace corresponding to the given ID. -func (r *NamespaceService) Delete(ctx context.Context, namespaceID string, params NamespaceDeleteParams, opts ...option.RequestOption) (res *NamespaceDeleteResponseUnion, err error) { +func (r *NamespaceService) Delete(ctx context.Context, namespaceID string, body NamespaceDeleteParams, opts ...option.RequestOption) (res *NamespaceDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env NamespaceDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/storage/kv/namespaces/%s", params.AccountID, namespaceID) + path := fmt.Sprintf("accounts/%s/storage/kv/namespaces/%s", body.AccountID, namespaceID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -332,11 +332,6 @@ func (r NamespaceListParamsOrder) IsKnown() bool { type NamespaceDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r NamespaceDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type NamespaceDeleteResponseEnvelope struct { diff --git a/kv/namespace_test.go b/kv/namespace_test.go index 3d4bbb4e88f..635b9e316c2 100644 --- a/kv/namespace_test.go +++ b/kv/namespace_test.go @@ -121,7 +121,6 @@ func TestNamespaceDelete(t *testing.T) { "0f2ac74b498b48028cb68387c421e279", kv.NamespaceDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/kv/namespacebulk.go b/kv/namespacebulk.go index 6d492909e2a..00f4f5c2d54 100644 --- a/kv/namespacebulk.go +++ b/kv/namespacebulk.go @@ -54,11 +54,11 @@ func (r *NamespaceBulkService) Update(ctx context.Context, namespaceID string, p // Remove multiple KV pairs from the namespace. Body should be an array of up to // 10,000 keys to be removed. -func (r *NamespaceBulkService) Delete(ctx context.Context, namespaceID string, params NamespaceBulkDeleteParams, opts ...option.RequestOption) (res *NamespaceBulkDeleteResponseUnion, err error) { +func (r *NamespaceBulkService) Delete(ctx context.Context, namespaceID string, body NamespaceBulkDeleteParams, opts ...option.RequestOption) (res *NamespaceBulkDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env NamespaceBulkDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/storage/kv/namespaces/%s/bulk", params.AccountID, namespaceID) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, params, &env, opts...) + path := fmt.Sprintf("accounts/%s/storage/kv/namespaces/%s/bulk", body.AccountID, namespaceID) + err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return } @@ -180,11 +180,6 @@ func (r NamespaceBulkUpdateResponseEnvelopeSuccess) IsKnown() bool { type NamespaceBulkDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body []string `json:"body,required"` -} - -func (r NamespaceBulkDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type NamespaceBulkDeleteResponseEnvelope struct { diff --git a/kv/namespacebulk_test.go b/kv/namespacebulk_test.go index b8ab731e9f1..85bb4994cda 100644 --- a/kv/namespacebulk_test.go +++ b/kv/namespacebulk_test.go @@ -91,7 +91,6 @@ func TestNamespaceBulkDelete(t *testing.T) { "0f2ac74b498b48028cb68387c421e279", kv.NamespaceBulkDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: []string{"My-Key", "My-Key", "My-Key"}, }, ) if err != nil { diff --git a/kv/namespacevalue.go b/kv/namespacevalue.go index c5b061402af..2563520d36e 100644 --- a/kv/namespacevalue.go +++ b/kv/namespacevalue.go @@ -54,10 +54,10 @@ func (r *NamespaceValueService) Update(ctx context.Context, namespaceID string, // Remove a KV pair from the namespace. Use URL-encoding to use special characters // (for example, `:`, `!`, `%`) in the key name. -func (r *NamespaceValueService) Delete(ctx context.Context, namespaceID string, keyName string, params NamespaceValueDeleteParams, opts ...option.RequestOption) (res *NamespaceValueDeleteResponseUnion, err error) { +func (r *NamespaceValueService) Delete(ctx context.Context, namespaceID string, keyName string, body NamespaceValueDeleteParams, opts ...option.RequestOption) (res *NamespaceValueDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env NamespaceValueDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/storage/kv/namespaces/%s/values/%s", params.AccountID, namespaceID, keyName) + path := fmt.Sprintf("accounts/%s/storage/kv/namespaces/%s/values/%s", body.AccountID, namespaceID, keyName) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -171,11 +171,6 @@ func (r NamespaceValueUpdateResponseEnvelopeSuccess) IsKnown() bool { type NamespaceValueDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r NamespaceValueDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type NamespaceValueDeleteResponseEnvelope struct { diff --git a/kv/namespacevalue_test.go b/kv/namespacevalue_test.go index 175a684b6fd..6cc0ab66977 100644 --- a/kv/namespacevalue_test.go +++ b/kv/namespacevalue_test.go @@ -67,7 +67,6 @@ func TestNamespaceValueDelete(t *testing.T) { "My-Key", kv.NamespaceValueDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/load_balancers/loadbalancer.go b/load_balancers/loadbalancer.go index 1447f7662cd..30b089522c7 100644 --- a/load_balancers/loadbalancer.go +++ b/load_balancers/loadbalancer.go @@ -94,10 +94,10 @@ func (r *LoadBalancerService) ListAutoPaging(ctx context.Context, query LoadBala } // Delete a configured load balancer. -func (r *LoadBalancerService) Delete(ctx context.Context, loadBalancerID string, params LoadBalancerDeleteParams, opts ...option.RequestOption) (res *LoadBalancerDeleteResponse, err error) { +func (r *LoadBalancerService) Delete(ctx context.Context, loadBalancerID string, body LoadBalancerDeleteParams, opts ...option.RequestOption) (res *LoadBalancerDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env LoadBalancerDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/load_balancers/%s", params.ZoneID, loadBalancerID) + path := fmt.Sprintf("zones/%s/load_balancers/%s", body.ZoneID, loadBalancerID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -2194,11 +2194,6 @@ type LoadBalancerListParams struct { type LoadBalancerDeleteParams struct { ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r LoadBalancerDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type LoadBalancerDeleteResponseEnvelope struct { diff --git a/load_balancers/loadbalancer_test.go b/load_balancers/loadbalancer_test.go index ce92749b2f3..9142624af47 100644 --- a/load_balancers/loadbalancer_test.go +++ b/load_balancers/loadbalancer_test.go @@ -680,7 +680,6 @@ func TestLoadBalancerDelete(t *testing.T) { "699d98642c564d2e855e9661899b7252", load_balancers.LoadBalancerDeleteParams{ ZoneID: cloudflare.F("699d98642c564d2e855e9661899b7252"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/load_balancers/monitor.go b/load_balancers/monitor.go index 1fdd2f373f0..4691e2e59fc 100644 --- a/load_balancers/monitor.go +++ b/load_balancers/monitor.go @@ -87,10 +87,10 @@ func (r *MonitorService) ListAutoPaging(ctx context.Context, query MonitorListPa } // Delete a configured monitor. -func (r *MonitorService) Delete(ctx context.Context, monitorID string, params MonitorDeleteParams, opts ...option.RequestOption) (res *MonitorDeleteResponse, err error) { +func (r *MonitorService) Delete(ctx context.Context, monitorID string, body MonitorDeleteParams, opts ...option.RequestOption) (res *MonitorDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env MonitorDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/load_balancers/monitors/%s", params.AccountID, monitorID) + path := fmt.Sprintf("accounts/%s/load_balancers/monitors/%s", body.AccountID, monitorID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -508,11 +508,6 @@ type MonitorListParams struct { type MonitorDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r MonitorDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type MonitorDeleteResponseEnvelope struct { diff --git a/load_balancers/monitor_test.go b/load_balancers/monitor_test.go index 60066c91079..10fc985fc58 100644 --- a/load_balancers/monitor_test.go +++ b/load_balancers/monitor_test.go @@ -161,7 +161,6 @@ func TestMonitorDelete(t *testing.T) { "f1aba936b94213e5b8dca0c0dbf1f9cc", load_balancers.MonitorDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/load_balancers/pool.go b/load_balancers/pool.go index 49a79ff74a6..b790ff98dd7 100644 --- a/load_balancers/pool.go +++ b/load_balancers/pool.go @@ -89,10 +89,10 @@ func (r *PoolService) ListAutoPaging(ctx context.Context, params PoolListParams, } // Delete a configured pool. -func (r *PoolService) Delete(ctx context.Context, poolID string, params PoolDeleteParams, opts ...option.RequestOption) (res *PoolDeleteResponse, err error) { +func (r *PoolService) Delete(ctx context.Context, poolID string, body PoolDeleteParams, opts ...option.RequestOption) (res *PoolDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env PoolDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/load_balancers/pools/%s", params.AccountID, poolID) + path := fmt.Sprintf("accounts/%s/load_balancers/pools/%s", body.AccountID, poolID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -435,11 +435,6 @@ func (r PoolListParams) URLQuery() (v url.Values) { type PoolDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r PoolDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type PoolDeleteResponseEnvelope struct { diff --git a/load_balancers/pool_test.go b/load_balancers/pool_test.go index 2d164435952..946e0246d5b 100644 --- a/load_balancers/pool_test.go +++ b/load_balancers/pool_test.go @@ -227,7 +227,6 @@ func TestPoolDelete(t *testing.T) { "17b5962d775c646f3f9725cbc7a53df4", load_balancers.PoolDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/logpush/job.go b/logpush/job.go index fdcec70eb64..d97768d62a8 100644 --- a/logpush/job.go +++ b/logpush/job.go @@ -110,17 +110,17 @@ func (r *JobService) ListAutoPaging(ctx context.Context, query JobListParams, op } // Deletes a Logpush job. -func (r *JobService) Delete(ctx context.Context, jobID int64, params JobDeleteParams, opts ...option.RequestOption) (res *JobDeleteResponse, err error) { +func (r *JobService) Delete(ctx context.Context, jobID int64, body JobDeleteParams, opts ...option.RequestOption) (res *JobDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env JobDeleteResponseEnvelope var accountOrZone string var accountOrZoneID param.Field[string] - if params.AccountID.Present { + if body.AccountID.Present { accountOrZone = "accounts" - accountOrZoneID = params.AccountID + accountOrZoneID = body.AccountID } else { accountOrZone = "zones" - accountOrZoneID = params.ZoneID + accountOrZoneID = body.ZoneID } path := fmt.Sprintf("%s/%s/logpush/jobs/%v", accountOrZone, accountOrZoneID, jobID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) @@ -588,17 +588,12 @@ type JobListParams struct { } type JobDeleteParams struct { - Body interface{} `json:"body,required"` // The Account ID to use for this endpoint. Mutually exclusive with the Zone ID. AccountID param.Field[string] `path:"account_id"` // The Zone ID to use for this endpoint. Mutually exclusive with the Account ID. ZoneID param.Field[string] `path:"zone_id"` } -func (r JobDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type JobDeleteResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` diff --git a/logpush/job_test.go b/logpush/job_test.go index b1793153a73..0e4ae154efa 100644 --- a/logpush/job_test.go +++ b/logpush/job_test.go @@ -157,7 +157,6 @@ func TestJobDeleteWithOptionalParams(t *testing.T) { context.TODO(), int64(1), logpush.JobDeleteParams{ - Body: map[string]interface{}{}, AccountID: cloudflare.F("string"), ZoneID: cloudflare.F("string"), }, diff --git a/logs/controlcmbconfig.go b/logs/controlcmbconfig.go index cfbda105947..1677c461141 100644 --- a/logs/controlcmbconfig.go +++ b/logs/controlcmbconfig.go @@ -46,10 +46,10 @@ func (r *ControlCmbConfigService) New(ctx context.Context, params ControlCmbConf } // Deletes CMB config. -func (r *ControlCmbConfigService) Delete(ctx context.Context, params ControlCmbConfigDeleteParams, opts ...option.RequestOption) (res *ControlCmbConfigDeleteResponse, err error) { +func (r *ControlCmbConfigService) Delete(ctx context.Context, body ControlCmbConfigDeleteParams, opts ...option.RequestOption) (res *ControlCmbConfigDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env ControlCmbConfigDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/logs/control/cmb/config", params.AccountID) + path := fmt.Sprintf("accounts/%s/logs/control/cmb/config", body.AccountID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -159,11 +159,6 @@ func (r ControlCmbConfigNewResponseEnvelopeSuccess) IsKnown() bool { type ControlCmbConfigDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r ControlCmbConfigDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type ControlCmbConfigDeleteResponseEnvelope struct { diff --git a/logs/controlcmbconfig_test.go b/logs/controlcmbconfig_test.go index adad27d9232..54d324e2291 100644 --- a/logs/controlcmbconfig_test.go +++ b/logs/controlcmbconfig_test.go @@ -59,7 +59,6 @@ func TestControlCmbConfigDelete(t *testing.T) { ) _, err := client.Logs.Control.Cmb.Config.Delete(context.TODO(), logs.ControlCmbConfigDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }) if err != nil { var apierr *cloudflare.Error diff --git a/magic_network_monitoring/config.go b/magic_network_monitoring/config.go index 8a0e76206cb..1a6284909db 100644 --- a/magic_network_monitoring/config.go +++ b/magic_network_monitoring/config.go @@ -61,10 +61,10 @@ func (r *ConfigService) Update(ctx context.Context, params ConfigUpdateParams, o } // Delete an existing network monitoring configuration. -func (r *ConfigService) Delete(ctx context.Context, params ConfigDeleteParams, opts ...option.RequestOption) (res *Configuration, err error) { +func (r *ConfigService) Delete(ctx context.Context, body ConfigDeleteParams, opts ...option.RequestOption) (res *Configuration, err error) { opts = append(r.Options[:], opts...) var env ConfigDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/mnm/config", params.AccountID) + path := fmt.Sprintf("accounts/%s/mnm/config", body.AccountID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -232,11 +232,6 @@ func (r ConfigUpdateResponseEnvelopeSuccess) IsKnown() bool { type ConfigDeleteParams struct { AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r ConfigDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type ConfigDeleteResponseEnvelope struct { diff --git a/magic_network_monitoring/config_test.go b/magic_network_monitoring/config_test.go index 7cc445edfb9..43e250192e4 100644 --- a/magic_network_monitoring/config_test.go +++ b/magic_network_monitoring/config_test.go @@ -84,7 +84,6 @@ func TestConfigDelete(t *testing.T) { ) _, err := client.MagicNetworkMonitoring.Configs.Delete(context.TODO(), magic_network_monitoring.ConfigDeleteParams{ AccountID: cloudflare.F("6f91088a406011ed95aed352566e8d4c"), - Body: map[string]interface{}{}, }) if err != nil { var apierr *cloudflare.Error diff --git a/magic_network_monitoring/rule.go b/magic_network_monitoring/rule.go index 54f907a8f6e..9b1636452fa 100644 --- a/magic_network_monitoring/rule.go +++ b/magic_network_monitoring/rule.go @@ -85,10 +85,10 @@ func (r *RuleService) ListAutoPaging(ctx context.Context, query RuleListParams, } // Delete a network monitoring rule for account. -func (r *RuleService) Delete(ctx context.Context, ruleID string, params RuleDeleteParams, opts ...option.RequestOption) (res *MagicNetworkMonitoringRule, err error) { +func (r *RuleService) Delete(ctx context.Context, ruleID string, body RuleDeleteParams, opts ...option.RequestOption) (res *MagicNetworkMonitoringRule, err error) { opts = append(r.Options[:], opts...) var env RuleDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/mnm/rules/%s", params.AccountID, ruleID) + path := fmt.Sprintf("accounts/%s/mnm/rules/%s", body.AccountID, ruleID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -282,11 +282,6 @@ type RuleListParams struct { type RuleDeleteParams struct { AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r RuleDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type RuleDeleteResponseEnvelope struct { diff --git a/magic_network_monitoring/rule_test.go b/magic_network_monitoring/rule_test.go index 711b273f820..3d302fa13fe 100644 --- a/magic_network_monitoring/rule_test.go +++ b/magic_network_monitoring/rule_test.go @@ -113,7 +113,6 @@ func TestRuleDelete(t *testing.T) { "2890e6fa406311ed9b5a23f70f6fb8cf", magic_network_monitoring.RuleDeleteParams{ AccountID: cloudflare.F("6f91088a406011ed95aed352566e8d4c"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/magic_transit/gretunnel.go b/magic_transit/gretunnel.go index 7e522ece0e5..9e07a41d29f 100644 --- a/magic_transit/gretunnel.go +++ b/magic_transit/gretunnel.go @@ -75,10 +75,10 @@ func (r *GRETunnelService) List(ctx context.Context, query GRETunnelListParams, // Disables and removes a specific static GRE tunnel. Use `?validate_only=true` as // an optional query parameter to only run validation without persisting changes. -func (r *GRETunnelService) Delete(ctx context.Context, tunnelIdentifier string, params GRETunnelDeleteParams, opts ...option.RequestOption) (res *GRETunnelDeleteResponse, err error) { +func (r *GRETunnelService) Delete(ctx context.Context, tunnelIdentifier string, body GRETunnelDeleteParams, opts ...option.RequestOption) (res *GRETunnelDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env GRETunnelDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/magic/gre_tunnels/%s", params.AccountID, tunnelIdentifier) + path := fmt.Sprintf("accounts/%s/magic/gre_tunnels/%s", body.AccountID, tunnelIdentifier) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -494,11 +494,6 @@ func (r GRETunnelListResponseEnvelopeSuccess) IsKnown() bool { type GRETunnelDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r GRETunnelDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type GRETunnelDeleteResponseEnvelope struct { diff --git a/magic_transit/gretunnel_test.go b/magic_transit/gretunnel_test.go index 585c40d1c39..4c1fc00b4f9 100644 --- a/magic_transit/gretunnel_test.go +++ b/magic_transit/gretunnel_test.go @@ -130,7 +130,6 @@ func TestGRETunnelDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", magic_transit.GRETunnelDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/magic_transit/ipsectunnel.go b/magic_transit/ipsectunnel.go index ce23c8d77c5..f436e585c6f 100644 --- a/magic_transit/ipsectunnel.go +++ b/magic_transit/ipsectunnel.go @@ -79,10 +79,10 @@ func (r *IPSECTunnelService) List(ctx context.Context, query IPSECTunnelListPara // Disables and removes a specific static IPsec Tunnel associated with an account. // Use `?validate_only=true` as an optional query parameter to only run validation // without persisting changes. -func (r *IPSECTunnelService) Delete(ctx context.Context, tunnelIdentifier string, params IPSECTunnelDeleteParams, opts ...option.RequestOption) (res *IPSECTunnelDeleteResponse, err error) { +func (r *IPSECTunnelService) Delete(ctx context.Context, tunnelIdentifier string, body IPSECTunnelDeleteParams, opts ...option.RequestOption) (res *IPSECTunnelDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env IPSECTunnelDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/magic/ipsec_tunnels/%s", params.AccountID, tunnelIdentifier) + path := fmt.Sprintf("accounts/%s/magic/ipsec_tunnels/%s", body.AccountID, tunnelIdentifier) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -657,11 +657,6 @@ func (r IPSECTunnelListResponseEnvelopeSuccess) IsKnown() bool { type IPSECTunnelDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r IPSECTunnelDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type IPSECTunnelDeleteResponseEnvelope struct { diff --git a/magic_transit/ipsectunnel_test.go b/magic_transit/ipsectunnel_test.go index 535200851f8..db0d620d477 100644 --- a/magic_transit/ipsectunnel_test.go +++ b/magic_transit/ipsectunnel_test.go @@ -143,7 +143,6 @@ func TestIPSECTunnelDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", magic_transit.IPSECTunnelDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/magic_transit/route.go b/magic_transit/route.go index 7f1a252d679..620707b7bd2 100644 --- a/magic_transit/route.go +++ b/magic_transit/route.go @@ -74,10 +74,10 @@ func (r *RouteService) List(ctx context.Context, query RouteListParams, opts ... } // Disable and remove a specific Magic static route. -func (r *RouteService) Delete(ctx context.Context, routeIdentifier string, params RouteDeleteParams, opts ...option.RequestOption) (res *RouteDeleteResponse, err error) { +func (r *RouteService) Delete(ctx context.Context, routeIdentifier string, body RouteDeleteParams, opts ...option.RequestOption) (res *RouteDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env RouteDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/magic/routes/%s", params.AccountID, routeIdentifier) + path := fmt.Sprintf("accounts/%s/magic/routes/%s", body.AccountID, routeIdentifier) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -87,11 +87,11 @@ func (r *RouteService) Delete(ctx context.Context, routeIdentifier string, param } // Delete multiple Magic static routes. -func (r *RouteService) Empty(ctx context.Context, params RouteEmptyParams, opts ...option.RequestOption) (res *RouteEmptyResponse, err error) { +func (r *RouteService) Empty(ctx context.Context, body RouteEmptyParams, opts ...option.RequestOption) (res *RouteEmptyResponse, err error) { opts = append(r.Options[:], opts...) var env RouteEmptyResponseEnvelope - path := fmt.Sprintf("accounts/%s/magic/routes", params.AccountID) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, params, &env, opts...) + path := fmt.Sprintf("accounts/%s/magic/routes", body.AccountID) + err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return } @@ -112,21 +112,13 @@ func (r *RouteService) Get(ctx context.Context, routeIdentifier string, query Ro return } -type ColoName []string - -type ColoNameParam []string - -type ColoRegion []string - -type ColoRegionParam []string - // Used only for ECMP routes. type Scope struct { // List of colo names for the ECMP scope. - ColoNames ColoName `json:"colo_names"` + ColoNames []string `json:"colo_names"` // List of colo regions for the ECMP scope. - ColoRegions ColoRegion `json:"colo_regions"` - JSON scopeJSON `json:"-"` + ColoRegions []string `json:"colo_regions"` + JSON scopeJSON `json:"-"` } // scopeJSON contains the JSON metadata for the struct [Scope] @@ -148,9 +140,9 @@ func (r scopeJSON) RawJSON() string { // Used only for ECMP routes. type ScopeParam struct { // List of colo names for the ECMP scope. - ColoNames param.Field[ColoNameParam] `json:"colo_names"` + ColoNames param.Field[[]string] `json:"colo_names"` // List of colo regions for the ECMP scope. - ColoRegions param.Field[ColoRegionParam] `json:"colo_regions"` + ColoRegions param.Field[[]string] `json:"colo_regions"` } func (r ScopeParam) MarshalJSON() (data []byte, err error) { @@ -549,11 +541,6 @@ func (r RouteListResponseEnvelopeSuccess) IsKnown() bool { type RouteDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r RouteDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type RouteDeleteResponseEnvelope struct { @@ -601,19 +588,7 @@ func (r RouteDeleteResponseEnvelopeSuccess) IsKnown() bool { type RouteEmptyParams struct { // Identifier - AccountID param.Field[string] `path:"account_id,required"` - Routes param.Field[[]RouteEmptyParamsRoute] `json:"routes,required"` -} - -func (r RouteEmptyParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r) -} - -type RouteEmptyParamsRoute struct { -} - -func (r RouteEmptyParamsRoute) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r) + AccountID param.Field[string] `path:"account_id,required"` } type RouteEmptyResponseEnvelope struct { diff --git a/magic_transit/route_test.go b/magic_transit/route_test.go index bf86a596a0b..f7d3643936d 100644 --- a/magic_transit/route_test.go +++ b/magic_transit/route_test.go @@ -125,7 +125,6 @@ func TestRouteDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", magic_transit.RouteDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { @@ -153,7 +152,6 @@ func TestRouteEmpty(t *testing.T) { ) _, err := client.MagicTransit.Routes.Empty(context.TODO(), magic_transit.RouteEmptyParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Routes: cloudflare.F([]magic_transit.RouteEmptyParamsRoute{{}, {}, {}}), }) if err != nil { var apierr *cloudflare.Error diff --git a/magic_transit/site.go b/magic_transit/site.go index e5f320a267b..b1e1020e33d 100644 --- a/magic_transit/site.go +++ b/magic_transit/site.go @@ -94,10 +94,10 @@ func (r *SiteService) ListAutoPaging(ctx context.Context, params SiteListParams, } // Remove a specific Site. -func (r *SiteService) Delete(ctx context.Context, siteID string, params SiteDeleteParams, opts ...option.RequestOption) (res *Site, err error) { +func (r *SiteService) Delete(ctx context.Context, siteID string, body SiteDeleteParams, opts ...option.RequestOption) (res *Site, err error) { opts = append(r.Options[:], opts...) var env SiteDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/magic/sites/%s", params.AccountID, siteID) + path := fmt.Sprintf("accounts/%s/magic/sites/%s", body.AccountID, siteID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -338,11 +338,6 @@ func (r SiteListParams) URLQuery() (v url.Values) { type SiteDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r SiteDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type SiteDeleteResponseEnvelope struct { diff --git a/magic_transit/site_test.go b/magic_transit/site_test.go index eac5b8ab0b2..564504ec540 100644 --- a/magic_transit/site_test.go +++ b/magic_transit/site_test.go @@ -133,7 +133,6 @@ func TestSiteDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", magic_transit.SiteDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/magic_transit/siteacl.go b/magic_transit/siteacl.go index 186b4b1c854..1ccb1c427f4 100644 --- a/magic_transit/siteacl.go +++ b/magic_transit/siteacl.go @@ -84,10 +84,10 @@ func (r *SiteACLService) ListAutoPaging(ctx context.Context, siteID string, quer } // Remove a specific Site ACL. -func (r *SiteACLService) Delete(ctx context.Context, siteID string, aclIdentifier string, params SiteACLDeleteParams, opts ...option.RequestOption) (res *ACL, err error) { +func (r *SiteACLService) Delete(ctx context.Context, siteID string, aclIdentifier string, body SiteACLDeleteParams, opts ...option.RequestOption) (res *ACL, err error) { opts = append(r.Options[:], opts...) var env SiteACLDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/magic/sites/%s/acls/%s", params.AccountID, siteID, aclIdentifier) + path := fmt.Sprintf("accounts/%s/magic/sites/%s/acls/%s", body.AccountID, siteID, aclIdentifier) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -384,11 +384,6 @@ type SiteACLListParams struct { type SiteACLDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r SiteACLDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type SiteACLDeleteResponseEnvelope struct { diff --git a/magic_transit/siteacl_test.go b/magic_transit/siteacl_test.go index 11706522409..2879fe22445 100644 --- a/magic_transit/siteacl_test.go +++ b/magic_transit/siteacl_test.go @@ -158,7 +158,6 @@ func TestSiteACLDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", magic_transit.SiteACLDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/magic_transit/sitelan.go b/magic_transit/sitelan.go index 171caa1bf40..2e46b370c77 100644 --- a/magic_transit/sitelan.go +++ b/magic_transit/sitelan.go @@ -83,10 +83,10 @@ func (r *SiteLANService) ListAutoPaging(ctx context.Context, siteID string, quer } // Remove a specific LAN. -func (r *SiteLANService) Delete(ctx context.Context, siteID string, lanID string, params SiteLANDeleteParams, opts ...option.RequestOption) (res *LAN, err error) { +func (r *SiteLANService) Delete(ctx context.Context, siteID string, lanID string, body SiteLANDeleteParams, opts ...option.RequestOption) (res *LAN, err error) { opts = append(r.Options[:], opts...) var env SiteLANDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/magic/sites/%s/lans/%s", params.AccountID, siteID, lanID) + path := fmt.Sprintf("accounts/%s/magic/sites/%s/lans/%s", body.AccountID, siteID, lanID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -483,11 +483,6 @@ type SiteLANListParams struct { type SiteLANDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r SiteLANDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type SiteLANDeleteResponseEnvelope struct { diff --git a/magic_transit/sitelan_test.go b/magic_transit/sitelan_test.go index 8ea86cbfc60..6b7a1b20335 100644 --- a/magic_transit/sitelan_test.go +++ b/magic_transit/sitelan_test.go @@ -210,7 +210,6 @@ func TestSiteLANDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", magic_transit.SiteLANDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/magic_transit/sitewan.go b/magic_transit/sitewan.go index 31cdc76d3d4..6753d907fe8 100644 --- a/magic_transit/sitewan.go +++ b/magic_transit/sitewan.go @@ -82,10 +82,10 @@ func (r *SiteWANService) ListAutoPaging(ctx context.Context, siteID string, quer } // Remove a specific WAN. -func (r *SiteWANService) Delete(ctx context.Context, siteID string, wanID string, params SiteWANDeleteParams, opts ...option.RequestOption) (res *WAN, err error) { +func (r *SiteWANService) Delete(ctx context.Context, siteID string, wanID string, body SiteWANDeleteParams, opts ...option.RequestOption) (res *WAN, err error) { opts = append(r.Options[:], opts...) var env SiteWANDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/magic/sites/%s/wans/%s", params.AccountID, siteID, wanID) + path := fmt.Sprintf("accounts/%s/magic/sites/%s/wans/%s", body.AccountID, siteID, wanID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -318,11 +318,6 @@ type SiteWANListParams struct { type SiteWANDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r SiteWANDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type SiteWANDeleteResponseEnvelope struct { diff --git a/magic_transit/sitewan_test.go b/magic_transit/sitewan_test.go index 2961c1ac374..3942bdc7dd6 100644 --- a/magic_transit/sitewan_test.go +++ b/magic_transit/sitewan_test.go @@ -143,7 +143,6 @@ func TestSiteWANDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", magic_transit.SiteWANDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/memberships/membership.go b/memberships/membership.go index 2d2c95a52aa..cf6ea93d265 100644 --- a/memberships/membership.go +++ b/memberships/membership.go @@ -74,7 +74,7 @@ func (r *MembershipService) ListAutoPaging(ctx context.Context, query Membership } // Remove the associated member from an account. -func (r *MembershipService) Delete(ctx context.Context, membershipID string, body MembershipDeleteParams, opts ...option.RequestOption) (res *MembershipDeleteResponse, err error) { +func (r *MembershipService) Delete(ctx context.Context, membershipID string, opts ...option.RequestOption) (res *MembershipDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env MembershipDeleteResponseEnvelope path := fmt.Sprintf("memberships/%s", membershipID) @@ -411,14 +411,6 @@ func (r MembershipListParamsStatus) IsKnown() bool { return false } -type MembershipDeleteParams struct { - Body interface{} `json:"body,required"` -} - -func (r MembershipDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type MembershipDeleteResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` diff --git a/memberships/membership_test.go b/memberships/membership_test.go index cd5c30699ea..0181c24d7f3 100644 --- a/memberships/membership_test.go +++ b/memberships/membership_test.go @@ -92,13 +92,7 @@ func TestMembershipDelete(t *testing.T) { option.WithAPIKey("144c9defac04969c7bfad8efaa8ea194"), option.WithAPIEmail("user@example.com"), ) - _, err := client.Memberships.Delete( - context.TODO(), - "4536bcfad5faccb111b47003c79917fa", - memberships.MembershipDeleteParams{ - Body: map[string]interface{}{}, - }, - ) + _, err := client.Memberships.Delete(context.TODO(), "4536bcfad5faccb111b47003c79917fa") if err != nil { var apierr *cloudflare.Error if errors.As(err, &apierr) { diff --git a/mtls_certificates/mtlscertificate.go b/mtls_certificates/mtlscertificate.go index f6edb7beb2a..35b54e47aef 100644 --- a/mtls_certificates/mtlscertificate.go +++ b/mtls_certificates/mtlscertificate.go @@ -74,10 +74,10 @@ func (r *MTLSCertificateService) ListAutoPaging(ctx context.Context, query MTLSC // Deletes the mTLS certificate unless the certificate is in use by one or more // Cloudflare services. -func (r *MTLSCertificateService) Delete(ctx context.Context, mtlsCertificateID string, params MTLSCertificateDeleteParams, opts ...option.RequestOption) (res *MTLSCertificate, err error) { +func (r *MTLSCertificateService) Delete(ctx context.Context, mtlsCertificateID string, body MTLSCertificateDeleteParams, opts ...option.RequestOption) (res *MTLSCertificate, err error) { opts = append(r.Options[:], opts...) var env MTLSCertificateDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/mtls_certificates/%s", params.AccountID, mtlsCertificateID) + path := fmt.Sprintf("accounts/%s/mtls_certificates/%s", body.AccountID, mtlsCertificateID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -261,11 +261,6 @@ type MTLSCertificateListParams struct { type MTLSCertificateDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r MTLSCertificateDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type MTLSCertificateDeleteResponseEnvelope struct { diff --git a/mtls_certificates/mtlscertificate_test.go b/mtls_certificates/mtlscertificate_test.go index 339b113e186..7646b992b42 100644 --- a/mtls_certificates/mtlscertificate_test.go +++ b/mtls_certificates/mtlscertificate_test.go @@ -89,7 +89,6 @@ func TestMTLSCertificateDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", mtls_certificates.MTLSCertificateDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/origin_ca_certificates/origincacertificate.go b/origin_ca_certificates/origincacertificate.go index 53660efd004..fa40626675d 100644 --- a/origin_ca_certificates/origincacertificate.go +++ b/origin_ca_certificates/origincacertificate.go @@ -82,7 +82,7 @@ func (r *OriginCACertificateService) ListAutoPaging(ctx context.Context, query O // Revoke an existing Origin CA certificate by its serial number. Use your Origin // CA Key as your User Service Key when calling this endpoint // ([see above](#requests)). -func (r *OriginCACertificateService) Delete(ctx context.Context, certificateID string, body OriginCACertificateDeleteParams, opts ...option.RequestOption) (res *OriginCACertificateDeleteResponse, err error) { +func (r *OriginCACertificateService) Delete(ctx context.Context, certificateID string, opts ...option.RequestOption) (res *OriginCACertificateDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env OriginCACertificateDeleteResponseEnvelope path := fmt.Sprintf("certificates/%s", certificateID) @@ -361,14 +361,6 @@ func (r OriginCACertificateListParams) URLQuery() (v url.Values) { }) } -type OriginCACertificateDeleteParams struct { - Body interface{} `json:"body,required"` -} - -func (r OriginCACertificateDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type OriginCACertificateDeleteResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` diff --git a/origin_ca_certificates/origincacertificate_test.go b/origin_ca_certificates/origincacertificate_test.go index d9697157fb1..ba20e6d9614 100644 --- a/origin_ca_certificates/origincacertificate_test.go +++ b/origin_ca_certificates/origincacertificate_test.go @@ -83,13 +83,7 @@ func TestOriginCACertificateDelete(t *testing.T) { option.WithAPIKey("144c9defac04969c7bfad8efaa8ea194"), option.WithAPIEmail("user@example.com"), ) - _, err := client.OriginCACertificates.Delete( - context.TODO(), - "023e105f4ecef8ad9ca31a8372d0c353", - origin_ca_certificates.OriginCACertificateDeleteParams{ - Body: map[string]interface{}{}, - }, - ) + _, err := client.OriginCACertificates.Delete(context.TODO(), "023e105f4ecef8ad9ca31a8372d0c353") if err != nil { var apierr *cloudflare.Error if errors.As(err, &apierr) { diff --git a/origin_tls_client_auth/hostnamecertificate.go b/origin_tls_client_auth/hostnamecertificate.go index 5682c21ec32..84d8914cd71 100644 --- a/origin_tls_client_auth/hostnamecertificate.go +++ b/origin_tls_client_auth/hostnamecertificate.go @@ -72,10 +72,10 @@ func (r *HostnameCertificateService) ListAutoPaging(ctx context.Context, query H } // Delete Hostname Client Certificate -func (r *HostnameCertificateService) Delete(ctx context.Context, certificateID string, params HostnameCertificateDeleteParams, opts ...option.RequestOption) (res *HostnameCertificateDeleteResponse, err error) { +func (r *HostnameCertificateService) Delete(ctx context.Context, certificateID string, body HostnameCertificateDeleteParams, opts ...option.RequestOption) (res *HostnameCertificateDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env HostnameCertificateDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/origin_tls_client_auth/hostnames/certificates/%s", params.ZoneID, certificateID) + path := fmt.Sprintf("zones/%s/origin_tls_client_auth/hostnames/certificates/%s", body.ZoneID, certificateID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -353,11 +353,6 @@ type HostnameCertificateListParams struct { type HostnameCertificateDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r HostnameCertificateDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type HostnameCertificateDeleteResponseEnvelope struct { diff --git a/origin_tls_client_auth/hostnamecertificate_test.go b/origin_tls_client_auth/hostnamecertificate_test.go index 28868c3714f..6af3d9f65fd 100644 --- a/origin_tls_client_auth/hostnamecertificate_test.go +++ b/origin_tls_client_auth/hostnamecertificate_test.go @@ -87,7 +87,6 @@ func TestHostnameCertificateDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", origin_tls_client_auth.HostnameCertificateDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/origin_tls_client_auth/origintlsclientauth.go b/origin_tls_client_auth/origintlsclientauth.go index 1c8f62d9672..26512d5daf9 100644 --- a/origin_tls_client_auth/origintlsclientauth.go +++ b/origin_tls_client_auth/origintlsclientauth.go @@ -81,10 +81,10 @@ func (r *OriginTLSClientAuthService) ListAutoPaging(ctx context.Context, query O } // Delete Certificate -func (r *OriginTLSClientAuthService) Delete(ctx context.Context, certificateID string, params OriginTLSClientAuthDeleteParams, opts ...option.RequestOption) (res *OriginTLSClientAuthDeleteResponseUnion, err error) { +func (r *OriginTLSClientAuthService) Delete(ctx context.Context, certificateID string, body OriginTLSClientAuthDeleteParams, opts ...option.RequestOption) (res *OriginTLSClientAuthDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env OriginTLSClientAuthDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/origin_tls_client_auth/%s", params.ZoneID, certificateID) + path := fmt.Sprintf("zones/%s/origin_tls_client_auth/%s", body.ZoneID, certificateID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -285,11 +285,6 @@ type OriginTLSClientAuthListParams struct { type OriginTLSClientAuthDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r OriginTLSClientAuthDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type OriginTLSClientAuthDeleteResponseEnvelope struct { diff --git a/origin_tls_client_auth/origintlsclientauth_test.go b/origin_tls_client_auth/origintlsclientauth_test.go index a35d31223c1..2f058c9f0f0 100644 --- a/origin_tls_client_auth/origintlsclientauth_test.go +++ b/origin_tls_client_auth/origintlsclientauth_test.go @@ -87,7 +87,6 @@ func TestOriginTLSClientAuthDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", origin_tls_client_auth.OriginTLSClientAuthDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/pagerules/pagerule.go b/pagerules/pagerule.go index 552195ead40..9f7a4a64869 100644 --- a/pagerules/pagerule.go +++ b/pagerules/pagerule.go @@ -79,10 +79,10 @@ func (r *PageruleService) List(ctx context.Context, params PageruleListParams, o } // Deletes an existing Page Rule. -func (r *PageruleService) Delete(ctx context.Context, pageruleID string, params PageruleDeleteParams, opts ...option.RequestOption) (res *PageruleDeleteResponse, err error) { +func (r *PageruleService) Delete(ctx context.Context, pageruleID string, body PageruleDeleteParams, opts ...option.RequestOption) (res *PageruleDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env PageruleDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/pagerules/%s", params.ZoneID, pageruleID) + path := fmt.Sprintf("zones/%s/pagerules/%s", body.ZoneID, pageruleID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -777,11 +777,6 @@ func (r PageruleListResponseEnvelopeSuccess) IsKnown() bool { type PageruleDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r PageruleDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type PageruleDeleteResponseEnvelope struct { diff --git a/pagerules/pagerule_test.go b/pagerules/pagerule_test.go index 6901225ca61..96ad36c20d9 100644 --- a/pagerules/pagerule_test.go +++ b/pagerules/pagerule_test.go @@ -151,7 +151,6 @@ func TestPageruleDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", pagerules.PageruleDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/pages/project.go b/pages/project.go index 39d97451126..d98a5825a01 100644 --- a/pages/project.go +++ b/pages/project.go @@ -76,9 +76,9 @@ func (r *ProjectService) ListAutoPaging(ctx context.Context, query ProjectListPa } // Delete a project by name. -func (r *ProjectService) Delete(ctx context.Context, projectName string, params ProjectDeleteParams, opts ...option.RequestOption) (res *ProjectDeleteResponse, err error) { +func (r *ProjectService) Delete(ctx context.Context, projectName string, body ProjectDeleteParams, opts ...option.RequestOption) (res *ProjectDeleteResponse, err error) { opts = append(r.Options[:], opts...) - path := fmt.Sprintf("accounts/%s/pages/projects/%s", params.AccountID, projectName) + path := fmt.Sprintf("accounts/%s/pages/projects/%s", body.AccountID, projectName) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &res, opts...) return } @@ -2572,11 +2572,6 @@ type ProjectListParams struct { type ProjectDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r ProjectDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type ProjectEditParams struct { diff --git a/pages/project_test.go b/pages/project_test.go index 5b8aab66c82..5d11449b58b 100644 --- a/pages/project_test.go +++ b/pages/project_test.go @@ -247,7 +247,6 @@ func TestProjectDelete(t *testing.T) { "this-is-my-project-01", pages.ProjectDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/pages/projectdeployment.go b/pages/projectdeployment.go index 2504a97fce3..3e55eacc5fa 100644 --- a/pages/projectdeployment.go +++ b/pages/projectdeployment.go @@ -75,9 +75,9 @@ func (r *ProjectDeploymentService) ListAutoPaging(ctx context.Context, projectNa } // Delete a deployment. -func (r *ProjectDeploymentService) Delete(ctx context.Context, projectName string, deploymentID string, params ProjectDeploymentDeleteParams, opts ...option.RequestOption) (res *ProjectDeploymentDeleteResponse, err error) { +func (r *ProjectDeploymentService) Delete(ctx context.Context, projectName string, deploymentID string, body ProjectDeploymentDeleteParams, opts ...option.RequestOption) (res *ProjectDeploymentDeleteResponse, err error) { opts = append(r.Options[:], opts...) - path := fmt.Sprintf("accounts/%s/pages/projects/%s/deployments/%s", params.AccountID, projectName, deploymentID) + path := fmt.Sprintf("accounts/%s/pages/projects/%s/deployments/%s", body.AccountID, projectName, deploymentID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &res, opts...) return } @@ -214,11 +214,6 @@ func (r ProjectDeploymentListParamsEnv) IsKnown() bool { type ProjectDeploymentDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r ProjectDeploymentDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type ProjectDeploymentGetParams struct { diff --git a/pages/projectdeployment_test.go b/pages/projectdeployment_test.go index cd560bf2796..7481b12c297 100644 --- a/pages/projectdeployment_test.go +++ b/pages/projectdeployment_test.go @@ -96,7 +96,6 @@ func TestProjectDeploymentDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", pages.ProjectDeploymentDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/pages/projectdomain.go b/pages/projectdomain.go index 6e86b6b1176..735a0649687 100644 --- a/pages/projectdomain.go +++ b/pages/projectdomain.go @@ -72,9 +72,9 @@ func (r *ProjectDomainService) ListAutoPaging(ctx context.Context, projectName s } // Delete a Pages project's domain. -func (r *ProjectDomainService) Delete(ctx context.Context, projectName string, domainName string, params ProjectDomainDeleteParams, opts ...option.RequestOption) (res *ProjectDomainDeleteResponse, err error) { +func (r *ProjectDomainService) Delete(ctx context.Context, projectName string, domainName string, body ProjectDomainDeleteParams, opts ...option.RequestOption) (res *ProjectDomainDeleteResponse, err error) { opts = append(r.Options[:], opts...) - path := fmt.Sprintf("accounts/%s/pages/projects/%s/domains/%s", params.AccountID, projectName, domainName) + path := fmt.Sprintf("accounts/%s/pages/projects/%s/domains/%s", body.AccountID, projectName, domainName) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &res, opts...) return } @@ -245,11 +245,6 @@ type ProjectDomainListParams struct { type ProjectDomainDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r ProjectDomainDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type ProjectDomainEditParams struct { diff --git a/pages/projectdomain_test.go b/pages/projectdomain_test.go index 6e54698b562..8f543d72304 100644 --- a/pages/projectdomain_test.go +++ b/pages/projectdomain_test.go @@ -97,7 +97,6 @@ func TestProjectDomainDelete(t *testing.T) { "this-is-my-domain-01.com", pages.ProjectDomainDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/queues/consumer.go b/queues/consumer.go index 9ada172c59b..0a7e02681f1 100644 --- a/queues/consumer.go +++ b/queues/consumer.go @@ -60,10 +60,10 @@ func (r *ConsumerService) Update(ctx context.Context, queueID string, consumerID } // Deletes the consumer for a queue. -func (r *ConsumerService) Delete(ctx context.Context, queueID string, consumerID string, params ConsumerDeleteParams, opts ...option.RequestOption) (res *ConsumerDeleteResponseUnion, err error) { +func (r *ConsumerService) Delete(ctx context.Context, queueID string, consumerID string, body ConsumerDeleteParams, opts ...option.RequestOption) (res *ConsumerDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env ConsumerDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/queues/%s/consumers/%s", params.AccountID, queueID, consumerID) + path := fmt.Sprintf("accounts/%s/queues/%s/consumers/%s", body.AccountID, queueID, consumerID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -472,11 +472,6 @@ func (r consumerUpdateResponseEnvelopeResultInfoJSON) RawJSON() string { type ConsumerDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r ConsumerDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type ConsumerDeleteResponseEnvelope struct { diff --git a/queues/consumer_test.go b/queues/consumer_test.go index 3abbbcf1c4d..82e01dc4515 100644 --- a/queues/consumer_test.go +++ b/queues/consumer_test.go @@ -114,7 +114,6 @@ func TestConsumerDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", queues.ConsumerDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/queues/queue.go b/queues/queue.go index c8ca1468ac5..b28e5b17f95 100644 --- a/queues/queue.go +++ b/queues/queue.go @@ -88,10 +88,10 @@ func (r *QueueService) ListAutoPaging(ctx context.Context, query QueueListParams } // Deletes a queue. -func (r *QueueService) Delete(ctx context.Context, queueID string, params QueueDeleteParams, opts ...option.RequestOption) (res *QueueDeleteResponseUnion, err error) { +func (r *QueueService) Delete(ctx context.Context, queueID string, body QueueDeleteParams, opts ...option.RequestOption) (res *QueueDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env QueueDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/queues/%s", params.AccountID, queueID) + path := fmt.Sprintf("accounts/%s/queues/%s", body.AccountID, queueID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -420,11 +420,6 @@ type QueueListParams struct { type QueueDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r QueueDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type QueueDeleteResponseEnvelope struct { diff --git a/queues/queue_test.go b/queues/queue_test.go index 3cf77ee8818..f8c3f0a63af 100644 --- a/queues/queue_test.go +++ b/queues/queue_test.go @@ -121,7 +121,6 @@ func TestQueueDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", queues.QueueDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/rate_limits/ratelimit.go b/rate_limits/ratelimit.go index 4e8b4936a65..2d2e0ba4c8c 100644 --- a/rate_limits/ratelimit.go +++ b/rate_limits/ratelimit.go @@ -74,7 +74,7 @@ func (r *RateLimitService) ListAutoPaging(ctx context.Context, zoneIdentifier st } // Deletes an existing rate limit. -func (r *RateLimitService) Delete(ctx context.Context, zoneIdentifier string, id string, body RateLimitDeleteParams, opts ...option.RequestOption) (res *RateLimitDeleteResponse, err error) { +func (r *RateLimitService) Delete(ctx context.Context, zoneIdentifier string, id string, opts ...option.RequestOption) (res *RateLimitDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env RateLimitDeleteResponseEnvelope path := fmt.Sprintf("zones/%s/rate_limits/%s", zoneIdentifier, id) @@ -599,14 +599,6 @@ func (r RateLimitListParams) URLQuery() (v url.Values) { }) } -type RateLimitDeleteParams struct { - Body interface{} `json:"body,required"` -} - -func (r RateLimitDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type RateLimitDeleteResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` diff --git a/rate_limits/ratelimit_test.go b/rate_limits/ratelimit_test.go index 596ab863a01..bf8bb692a06 100644 --- a/rate_limits/ratelimit_test.go +++ b/rate_limits/ratelimit_test.go @@ -93,9 +93,6 @@ func TestRateLimitDelete(t *testing.T) { context.TODO(), "023e105f4ecef8ad9ca31a8372d0c353", "372e67954025e0ba6aaa6d586b9e0b59", - rate_limits.RateLimitDeleteParams{ - Body: map[string]interface{}{}, - }, ) if err != nil { var apierr *cloudflare.Error diff --git a/rules/list.go b/rules/list.go index 4310bf410bb..b143ac6c31d 100644 --- a/rules/list.go +++ b/rules/list.go @@ -86,10 +86,10 @@ func (r *ListService) ListAutoPaging(ctx context.Context, query ListListParams, } // Deletes a specific list and all its items. -func (r *ListService) Delete(ctx context.Context, listID string, params ListDeleteParams, opts ...option.RequestOption) (res *ListDeleteResponse, err error) { +func (r *ListService) Delete(ctx context.Context, listID string, body ListDeleteParams, opts ...option.RequestOption) (res *ListDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env ListDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/rules/lists/%s", params.AccountID, listID) + path := fmt.Sprintf("accounts/%s/rules/lists/%s", body.AccountID, listID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -442,11 +442,6 @@ type ListListParams struct { type ListDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r ListDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type ListDeleteResponseEnvelope struct { diff --git a/rules/list_test.go b/rules/list_test.go index 9273ae14fba..746f9149eab 100644 --- a/rules/list_test.go +++ b/rules/list_test.go @@ -119,7 +119,6 @@ func TestListDelete(t *testing.T) { "2c0fc9fa937b11eaa1b71c4d701ab86e", rules.ListDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/rules/listitem.go b/rules/listitem.go index 365a28b4919..b2ba1e4de40 100644 --- a/rules/listitem.go +++ b/rules/listitem.go @@ -99,11 +99,11 @@ func (r *ListItemService) ListAutoPaging(ctx context.Context, listID string, par // This operation is asynchronous. To get current the operation status, invoke the // [Get bulk operation status](/operations/lists-get-bulk-operation-status) // endpoint with the returned `operation_id`. -func (r *ListItemService) Delete(ctx context.Context, listID string, params ListItemDeleteParams, opts ...option.RequestOption) (res *ListItemDeleteResponse, err error) { +func (r *ListItemService) Delete(ctx context.Context, listID string, body ListItemDeleteParams, opts ...option.RequestOption) (res *ListItemDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env ListItemDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/rules/lists/%s/items", params.AccountID, listID) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, params, &env, opts...) + path := fmt.Sprintf("accounts/%s/rules/lists/%s/items", body.AccountID, listID) + err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return } @@ -417,21 +417,7 @@ func (r ListItemListParams) URLQuery() (v url.Values) { type ListItemDeleteParams struct { // Identifier - AccountID param.Field[string] `path:"account_id,required"` - Items param.Field[[]ListItemDeleteParamsItem] `json:"items"` -} - -func (r ListItemDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r) -} - -type ListItemDeleteParamsItem struct { - // The unique ID of the item in the List. - ID param.Field[string] `json:"id"` -} - -func (r ListItemDeleteParamsItem) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r) + AccountID param.Field[string] `path:"account_id,required"` } type ListItemDeleteResponseEnvelope struct { diff --git a/rules/listitem_test.go b/rules/listitem_test.go index f7e0ccdb4d4..09100e76c38 100644 --- a/rules/listitem_test.go +++ b/rules/listitem_test.go @@ -205,7 +205,7 @@ func TestListItemListWithOptionalParams(t *testing.T) { } } -func TestListItemDeleteWithOptionalParams(t *testing.T) { +func TestListItemDelete(t *testing.T) { t.Skip("skipped: tests are disabled for the time being") baseURL := "http://localhost:4010" if envURL, ok := os.LookupEnv("TEST_API_BASE_URL"); ok { @@ -224,9 +224,6 @@ func TestListItemDeleteWithOptionalParams(t *testing.T) { "2c0fc9fa937b11eaa1b71c4d701ab86e", rules.ListItemDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Items: cloudflare.F([]rules.ListItemDeleteParamsItem{{ - ID: cloudflare.F("34b12448945f11eaa1b71c4d701ab86e"), - }}), }, ) if err != nil { diff --git a/secondary_dns/acl.go b/secondary_dns/acl.go index 1631e014aa7..75c19e01159 100644 --- a/secondary_dns/acl.go +++ b/secondary_dns/acl.go @@ -82,10 +82,10 @@ func (r *ACLService) ListAutoPaging(ctx context.Context, query ACLListParams, op } // Delete ACL. -func (r *ACLService) Delete(ctx context.Context, aclID string, params ACLDeleteParams, opts ...option.RequestOption) (res *ACLDeleteResponse, err error) { +func (r *ACLService) Delete(ctx context.Context, aclID string, body ACLDeleteParams, opts ...option.RequestOption) (res *ACLDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env ACLDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/secondary_dns/acls/%s", params.AccountID, aclID) + path := fmt.Sprintf("accounts/%s/secondary_dns/acls/%s", body.AccountID, aclID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -283,11 +283,6 @@ type ACLListParams struct { type ACLDeleteParams struct { AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r ACLDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type ACLDeleteResponseEnvelope struct { diff --git a/secondary_dns/acl_test.go b/secondary_dns/acl_test.go index c63989f7f30..226e9054d71 100644 --- a/secondary_dns/acl_test.go +++ b/secondary_dns/acl_test.go @@ -120,7 +120,6 @@ func TestACLDelete(t *testing.T) { "23ff594956f20c2a721606e94745a8aa", secondary_dns.ACLDeleteParams{ AccountID: cloudflare.F("01a7362d577a6c3019a474fd6f485823"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/secondary_dns/incoming.go b/secondary_dns/incoming.go index 035ee3e0978..46f5784fc79 100644 --- a/secondary_dns/incoming.go +++ b/secondary_dns/incoming.go @@ -58,10 +58,10 @@ func (r *IncomingService) Update(ctx context.Context, params IncomingUpdateParam } // Delete secondary zone configuration for incoming zone transfers. -func (r *IncomingService) Delete(ctx context.Context, params IncomingDeleteParams, opts ...option.RequestOption) (res *IncomingDeleteResponse, err error) { +func (r *IncomingService) Delete(ctx context.Context, body IncomingDeleteParams, opts ...option.RequestOption) (res *IncomingDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env IncomingDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/secondary_dns/incoming", params.ZoneID) + path := fmt.Sprintf("zones/%s/secondary_dns/incoming", body.ZoneID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -351,11 +351,6 @@ func (r IncomingUpdateResponseEnvelopeSuccess) IsKnown() bool { type IncomingDeleteParams struct { ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r IncomingDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type IncomingDeleteResponseEnvelope struct { diff --git a/secondary_dns/incoming_test.go b/secondary_dns/incoming_test.go index 14759a57c91..589d132d81c 100644 --- a/secondary_dns/incoming_test.go +++ b/secondary_dns/incoming_test.go @@ -88,7 +88,6 @@ func TestIncomingDelete(t *testing.T) { ) _, err := client.SecondaryDNS.Incoming.Delete(context.TODO(), secondary_dns.IncomingDeleteParams{ ZoneID: cloudflare.F("269d8f4853475ca241c4e730be286b20"), - Body: map[string]interface{}{}, }) if err != nil { var apierr *cloudflare.Error diff --git a/secondary_dns/outgoing.go b/secondary_dns/outgoing.go index 07fbc7492de..3a7d5fbb319 100644 --- a/secondary_dns/outgoing.go +++ b/secondary_dns/outgoing.go @@ -60,10 +60,10 @@ func (r *OutgoingService) Update(ctx context.Context, params OutgoingUpdateParam } // Delete primary zone configuration for outgoing zone transfers. -func (r *OutgoingService) Delete(ctx context.Context, params OutgoingDeleteParams, opts ...option.RequestOption) (res *OutgoingDeleteResponse, err error) { +func (r *OutgoingService) Delete(ctx context.Context, body OutgoingDeleteParams, opts ...option.RequestOption) (res *OutgoingDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env OutgoingDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/secondary_dns/outgoing", params.ZoneID) + path := fmt.Sprintf("zones/%s/secondary_dns/outgoing", body.ZoneID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -379,11 +379,6 @@ func (r OutgoingUpdateResponseEnvelopeSuccess) IsKnown() bool { type OutgoingDeleteParams struct { ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r OutgoingDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type OutgoingDeleteResponseEnvelope struct { diff --git a/secondary_dns/outgoing_test.go b/secondary_dns/outgoing_test.go index b8354c90450..2d3f6116b98 100644 --- a/secondary_dns/outgoing_test.go +++ b/secondary_dns/outgoing_test.go @@ -86,7 +86,6 @@ func TestOutgoingDelete(t *testing.T) { ) _, err := client.SecondaryDNS.Outgoing.Delete(context.TODO(), secondary_dns.OutgoingDeleteParams{ ZoneID: cloudflare.F("269d8f4853475ca241c4e730be286b20"), - Body: map[string]interface{}{}, }) if err != nil { var apierr *cloudflare.Error diff --git a/secondary_dns/peer.go b/secondary_dns/peer.go index b5b4009f3bf..12ebc0271f0 100644 --- a/secondary_dns/peer.go +++ b/secondary_dns/peer.go @@ -82,10 +82,10 @@ func (r *PeerService) ListAutoPaging(ctx context.Context, query PeerListParams, } // Delete Peer. -func (r *PeerService) Delete(ctx context.Context, peerID string, params PeerDeleteParams, opts ...option.RequestOption) (res *PeerDeleteResponse, err error) { +func (r *PeerService) Delete(ctx context.Context, peerID string, body PeerDeleteParams, opts ...option.RequestOption) (res *PeerDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env PeerDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/secondary_dns/peers/%s", params.AccountID, peerID) + path := fmt.Sprintf("accounts/%s/secondary_dns/peers/%s", body.AccountID, peerID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -302,11 +302,6 @@ type PeerListParams struct { type PeerDeleteParams struct { AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r PeerDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type PeerDeleteResponseEnvelope struct { diff --git a/secondary_dns/peer_test.go b/secondary_dns/peer_test.go index 0142a0d7aef..c16d3599eda 100644 --- a/secondary_dns/peer_test.go +++ b/secondary_dns/peer_test.go @@ -123,7 +123,6 @@ func TestPeerDelete(t *testing.T) { "23ff594956f20c2a721606e94745a8aa", secondary_dns.PeerDeleteParams{ AccountID: cloudflare.F("01a7362d577a6c3019a474fd6f485823"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/secondary_dns/tsig.go b/secondary_dns/tsig.go index 53fcb94cb73..59882e57695 100644 --- a/secondary_dns/tsig.go +++ b/secondary_dns/tsig.go @@ -82,10 +82,10 @@ func (r *TSIGService) ListAutoPaging(ctx context.Context, query TSIGListParams, } // Delete TSIG. -func (r *TSIGService) Delete(ctx context.Context, tsigID string, params TSIGDeleteParams, opts ...option.RequestOption) (res *TSIGDeleteResponse, err error) { +func (r *TSIGService) Delete(ctx context.Context, tsigID string, body TSIGDeleteParams, opts ...option.RequestOption) (res *TSIGDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env TSIGDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/secondary_dns/tsigs/%s", params.AccountID, tsigID) + path := fmt.Sprintf("accounts/%s/secondary_dns/tsigs/%s", body.AccountID, tsigID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -280,11 +280,6 @@ type TSIGListParams struct { type TSIGDeleteParams struct { AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r TSIGDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type TSIGDeleteResponseEnvelope struct { diff --git a/secondary_dns/tsig_test.go b/secondary_dns/tsig_test.go index a3777afb610..02a8e9174e2 100644 --- a/secondary_dns/tsig_test.go +++ b/secondary_dns/tsig_test.go @@ -125,7 +125,6 @@ func TestTSIGDelete(t *testing.T) { "69cd1e104af3e6ed3cb344f263fd0d5a", secondary_dns.TSIGDeleteParams{ AccountID: cloudflare.F("01a7362d577a6c3019a474fd6f485823"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/spectrum/app.go b/spectrum/app.go index 7bc29137044..20a12da1b05 100644 --- a/spectrum/app.go +++ b/spectrum/app.go @@ -89,7 +89,7 @@ func (r *AppService) ListAutoPaging(ctx context.Context, zone string, query AppL } // Deletes a previously existing application. -func (r *AppService) Delete(ctx context.Context, zone string, appID string, body AppDeleteParams, opts ...option.RequestOption) (res *AppDeleteResponse, err error) { +func (r *AppService) Delete(ctx context.Context, zone string, appID string, opts ...option.RequestOption) (res *AppDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env AppDeleteResponseEnvelope path := fmt.Sprintf("zones/%s/spectrum/apps/%s", zone, appID) @@ -761,14 +761,6 @@ func (r AppListParamsOrder) IsKnown() bool { return false } -type AppDeleteParams struct { - Body interface{} `json:"body,required"` -} - -func (r AppDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type AppDeleteResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` diff --git a/spectrum/app_test.go b/spectrum/app_test.go index ed334b07c38..6248900fba4 100644 --- a/spectrum/app_test.go +++ b/spectrum/app_test.go @@ -165,9 +165,6 @@ func TestAppDelete(t *testing.T) { context.TODO(), "023e105f4ecef8ad9ca31a8372d0c353", "ea95132c15732412d22c1476fa83f27a", - spectrum.AppDeleteParams{ - Body: map[string]interface{}{}, - }, ) if err != nil { var apierr *cloudflare.Error diff --git a/ssl/certificatepack.go b/ssl/certificatepack.go index ce48fca68fc..e55389a4c28 100644 --- a/ssl/certificatepack.go +++ b/ssl/certificatepack.go @@ -65,10 +65,10 @@ func (r *CertificatePackService) ListAutoPaging(ctx context.Context, params Cert } // For a given zone, delete an advanced certificate pack. -func (r *CertificatePackService) Delete(ctx context.Context, certificatePackID string, params CertificatePackDeleteParams, opts ...option.RequestOption) (res *CertificatePackDeleteResponse, err error) { +func (r *CertificatePackService) Delete(ctx context.Context, certificatePackID string, body CertificatePackDeleteParams, opts ...option.RequestOption) (res *CertificatePackDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env CertificatePackDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/ssl/certificate_packs/%s", params.ZoneID, certificatePackID) + path := fmt.Sprintf("zones/%s/ssl/certificate_packs/%s", body.ZoneID, certificatePackID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -334,11 +334,6 @@ func (r CertificatePackListParamsStatus) IsKnown() bool { type CertificatePackDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r CertificatePackDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type CertificatePackDeleteResponseEnvelope struct { diff --git a/ssl/certificatepack_test.go b/ssl/certificatepack_test.go index b4b22045431..f3141fe265b 100644 --- a/ssl/certificatepack_test.go +++ b/ssl/certificatepack_test.go @@ -60,7 +60,6 @@ func TestCertificatePackDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", ssl.CertificatePackDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/stream/captionlanguage.go b/stream/captionlanguage.go index b43d91ad177..70e8b6918be 100644 --- a/stream/captionlanguage.go +++ b/stream/captionlanguage.go @@ -49,10 +49,10 @@ func (r *CaptionLanguageService) Update(ctx context.Context, identifier string, } // Removes the captions or subtitles from a video. -func (r *CaptionLanguageService) Delete(ctx context.Context, identifier string, language string, params CaptionLanguageDeleteParams, opts ...option.RequestOption) (res *string, err error) { +func (r *CaptionLanguageService) Delete(ctx context.Context, identifier string, language string, body CaptionLanguageDeleteParams, opts ...option.RequestOption) (res *string, err error) { opts = append(r.Options[:], opts...) var env CaptionLanguageDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/stream/%s/captions/%s", params.AccountID, identifier, language) + path := fmt.Sprintf("accounts/%s/stream/%s/captions/%s", body.AccountID, identifier, language) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -131,11 +131,6 @@ func (r CaptionLanguageUpdateResponseEnvelopeSuccess) IsKnown() bool { type CaptionLanguageDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r CaptionLanguageDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type CaptionLanguageDeleteResponseEnvelope struct { diff --git a/stream/captionlanguage_test.go b/stream/captionlanguage_test.go index 6ee9346253e..fcea8218c50 100644 --- a/stream/captionlanguage_test.go +++ b/stream/captionlanguage_test.go @@ -66,7 +66,6 @@ func TestCaptionLanguageDelete(t *testing.T) { "tr", stream.CaptionLanguageDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/stream/key.go b/stream/key.go index 83440e41b75..112d0ad3e5d 100644 --- a/stream/key.go +++ b/stream/key.go @@ -50,10 +50,10 @@ func (r *KeyService) New(ctx context.Context, params KeyNewParams, opts ...optio } // Deletes signing keys and revokes all signed URLs generated with the key. -func (r *KeyService) Delete(ctx context.Context, identifier string, params KeyDeleteParams, opts ...option.RequestOption) (res *KeyDeleteResponseUnion, err error) { +func (r *KeyService) Delete(ctx context.Context, identifier string, body KeyDeleteParams, opts ...option.RequestOption) (res *KeyDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env KeyDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/stream/keys/%s", params.AccountID, identifier) + path := fmt.Sprintf("accounts/%s/stream/keys/%s", body.AccountID, identifier) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -201,11 +201,6 @@ func (r KeyNewResponseEnvelopeSuccess) IsKnown() bool { type KeyDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r KeyDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type KeyDeleteResponseEnvelope struct { diff --git a/stream/key_test.go b/stream/key_test.go index b644d70ddf7..ea0359c7aa3 100644 --- a/stream/key_test.go +++ b/stream/key_test.go @@ -60,7 +60,6 @@ func TestKeyDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", stream.KeyDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/stream/liveinput.go b/stream/liveinput.go index f3fe6c66467..d58a63f5b4b 100644 --- a/stream/liveinput.go +++ b/stream/liveinput.go @@ -79,10 +79,10 @@ func (r *LiveInputService) List(ctx context.Context, params LiveInputListParams, // Prevents a live input from being streamed to and makes the live input // inaccessible to any future API calls. -func (r *LiveInputService) Delete(ctx context.Context, liveInputIdentifier string, params LiveInputDeleteParams, opts ...option.RequestOption) (err error) { +func (r *LiveInputService) Delete(ctx context.Context, liveInputIdentifier string, body LiveInputDeleteParams, opts ...option.RequestOption) (err error) { opts = append(r.Options[:], opts...) opts = append([]option.RequestOption{option.WithHeader("Accept", "")}, opts...) - path := fmt.Sprintf("accounts/%s/stream/live_inputs/%s", params.AccountID, liveInputIdentifier) + path := fmt.Sprintf("accounts/%s/stream/live_inputs/%s", body.AccountID, liveInputIdentifier) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, nil, opts...) return } @@ -752,11 +752,6 @@ func (r LiveInputListResponseEnvelopeSuccess) IsKnown() bool { type LiveInputDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r LiveInputDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type LiveInputGetParams struct { diff --git a/stream/liveinput_test.go b/stream/liveinput_test.go index 60c0c11215a..e34ae982654 100644 --- a/stream/liveinput_test.go +++ b/stream/liveinput_test.go @@ -138,7 +138,6 @@ func TestLiveInputDelete(t *testing.T) { "66be4bf738797e01e1fca35a7bdecdcd", stream.LiveInputDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/stream/liveinputoutput.go b/stream/liveinputoutput.go index 979da0c6530..8f777332c3f 100644 --- a/stream/liveinputoutput.go +++ b/stream/liveinputoutput.go @@ -85,10 +85,10 @@ func (r *LiveInputOutputService) ListAutoPaging(ctx context.Context, liveInputId } // Deletes an output and removes it from the associated live input. -func (r *LiveInputOutputService) Delete(ctx context.Context, liveInputIdentifier string, outputIdentifier string, params LiveInputOutputDeleteParams, opts ...option.RequestOption) (err error) { +func (r *LiveInputOutputService) Delete(ctx context.Context, liveInputIdentifier string, outputIdentifier string, body LiveInputOutputDeleteParams, opts ...option.RequestOption) (err error) { opts = append(r.Options[:], opts...) opts = append([]option.RequestOption{option.WithHeader("Accept", "")}, opts...) - path := fmt.Sprintf("accounts/%s/stream/live_inputs/%s/outputs/%s", params.AccountID, liveInputIdentifier, outputIdentifier) + path := fmt.Sprintf("accounts/%s/stream/live_inputs/%s/outputs/%s", body.AccountID, liveInputIdentifier, outputIdentifier) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, nil, opts...) return } @@ -255,9 +255,4 @@ type LiveInputOutputListParams struct { type LiveInputOutputDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r LiveInputOutputDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } diff --git a/stream/liveinputoutput_test.go b/stream/liveinputoutput_test.go index 91f851fb5ee..9aa171cb887 100644 --- a/stream/liveinputoutput_test.go +++ b/stream/liveinputoutput_test.go @@ -129,7 +129,6 @@ func TestLiveInputOutputDelete(t *testing.T) { "baea4d9c515887b80289d5c33cf01145", stream.LiveInputOutputDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/stream/stream.go b/stream/stream.go index 122bb94cebc..487349cb2b0 100644 --- a/stream/stream.go +++ b/stream/stream.go @@ -99,10 +99,10 @@ func (r *StreamService) ListAutoPaging(ctx context.Context, params StreamListPar } // Deletes a video and its copies from Cloudflare Stream. -func (r *StreamService) Delete(ctx context.Context, identifier string, params StreamDeleteParams, opts ...option.RequestOption) (err error) { +func (r *StreamService) Delete(ctx context.Context, identifier string, body StreamDeleteParams, opts ...option.RequestOption) (err error) { opts = append(r.Options[:], opts...) opts = append([]option.RequestOption{option.WithHeader("Accept", "")}, opts...) - path := fmt.Sprintf("accounts/%s/stream/%s", params.AccountID, identifier) + path := fmt.Sprintf("accounts/%s/stream/%s", body.AccountID, identifier) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, nil, opts...) return } @@ -430,11 +430,6 @@ func (r StreamListParamsStatus) IsKnown() bool { type StreamDeleteParams struct { // The account identifier tag. AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r StreamDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type StreamGetParams struct { diff --git a/stream/stream_test.go b/stream/stream_test.go index 5cffd011340..221367bea0b 100644 --- a/stream/stream_test.go +++ b/stream/stream_test.go @@ -99,7 +99,6 @@ func TestStreamDelete(t *testing.T) { "ea95132c15732412d22c1476fa83f27a", stream.StreamDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/stream/watermark.go b/stream/watermark.go index 188470410ae..0c296e65598 100644 --- a/stream/watermark.go +++ b/stream/watermark.go @@ -73,10 +73,10 @@ func (r *WatermarkService) ListAutoPaging(ctx context.Context, query WatermarkLi } // Deletes a watermark profile. -func (r *WatermarkService) Delete(ctx context.Context, identifier string, params WatermarkDeleteParams, opts ...option.RequestOption) (res *WatermarkDeleteResponseUnion, err error) { +func (r *WatermarkService) Delete(ctx context.Context, identifier string, body WatermarkDeleteParams, opts ...option.RequestOption) (res *WatermarkDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env WatermarkDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/stream/watermarks/%s", params.AccountID, identifier) + path := fmt.Sprintf("accounts/%s/stream/watermarks/%s", body.AccountID, identifier) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -257,11 +257,6 @@ type WatermarkListParams struct { type WatermarkDeleteParams struct { // The account identifier tag. AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r WatermarkDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type WatermarkDeleteResponseEnvelope struct { diff --git a/stream/watermark_test.go b/stream/watermark_test.go index 325aa80c310..b09a8b52831 100644 --- a/stream/watermark_test.go +++ b/stream/watermark_test.go @@ -91,7 +91,6 @@ func TestWatermarkDelete(t *testing.T) { "ea95132c15732412d22c1476fa83f27a", stream.WatermarkDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/stream/webhook.go b/stream/webhook.go index 6ebdf1846a4..77ccd997a8f 100644 --- a/stream/webhook.go +++ b/stream/webhook.go @@ -47,10 +47,10 @@ func (r *WebhookService) Update(ctx context.Context, params WebhookUpdateParams, } // Deletes a webhook. -func (r *WebhookService) Delete(ctx context.Context, params WebhookDeleteParams, opts ...option.RequestOption) (res *WebhookDeleteResponseUnion, err error) { +func (r *WebhookService) Delete(ctx context.Context, body WebhookDeleteParams, opts ...option.RequestOption) (res *WebhookDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env WebhookDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/stream/webhook", params.AccountID) + path := fmt.Sprintf("accounts/%s/stream/webhook", body.AccountID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -179,11 +179,6 @@ func (r WebhookUpdateResponseEnvelopeSuccess) IsKnown() bool { type WebhookDeleteParams struct { // The account identifier tag. AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r WebhookDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type WebhookDeleteResponseEnvelope struct { diff --git a/stream/webhook_test.go b/stream/webhook_test.go index 2f7d92d5bd1..c5af1895401 100644 --- a/stream/webhook_test.go +++ b/stream/webhook_test.go @@ -57,7 +57,6 @@ func TestWebhookDelete(t *testing.T) { ) _, err := client.Stream.Webhooks.Delete(context.TODO(), stream.WebhookDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }) if err != nil { var apierr *cloudflare.Error diff --git a/subscriptions/subscription.go b/subscriptions/subscription.go index ab4eda87083..66de38011e1 100644 --- a/subscriptions/subscription.go +++ b/subscriptions/subscription.go @@ -85,7 +85,7 @@ func (r *SubscriptionService) ListAutoPaging(ctx context.Context, accountIdentif } // Deletes an account's subscription. -func (r *SubscriptionService) Delete(ctx context.Context, accountIdentifier string, subscriptionIdentifier string, body SubscriptionDeleteParams, opts ...option.RequestOption) (res *SubscriptionDeleteResponse, err error) { +func (r *SubscriptionService) Delete(ctx context.Context, accountIdentifier string, subscriptionIdentifier string, opts ...option.RequestOption) (res *SubscriptionDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env SubscriptionDeleteResponseEnvelope path := fmt.Sprintf("accounts/%s/subscriptions/%s", accountIdentifier, subscriptionIdentifier) @@ -285,14 +285,6 @@ func (r SubscriptionUpdateResponseEnvelopeSuccess) IsKnown() bool { return false } -type SubscriptionDeleteParams struct { - Body interface{} `json:"body,required"` -} - -func (r SubscriptionDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type SubscriptionDeleteResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` diff --git a/subscriptions/subscription_test.go b/subscriptions/subscription_test.go index 13885f10cb1..036b589bdb2 100644 --- a/subscriptions/subscription_test.go +++ b/subscriptions/subscription_test.go @@ -180,9 +180,6 @@ func TestSubscriptionDelete(t *testing.T) { context.TODO(), "023e105f4ecef8ad9ca31a8372d0c353", "506e3185e9c882d175a2d0cb0093d9f2", - subscriptions.SubscriptionDeleteParams{ - Body: map[string]interface{}{}, - }, ) if err != nil { var apierr *cloudflare.Error diff --git a/user/organization.go b/user/organization.go index 56bcfa54846..8caa44de841 100644 --- a/user/organization.go +++ b/user/organization.go @@ -61,7 +61,7 @@ func (r *OrganizationService) ListAutoPaging(ctx context.Context, query Organiza } // Removes association to an organization. -func (r *OrganizationService) Delete(ctx context.Context, organizationID string, body OrganizationDeleteParams, opts ...option.RequestOption) (res *OrganizationDeleteResponse, err error) { +func (r *OrganizationService) Delete(ctx context.Context, organizationID string, opts ...option.RequestOption) (res *OrganizationDeleteResponse, err error) { opts = append(r.Options[:], opts...) path := fmt.Sprintf("user/organizations/%s", organizationID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &res, opts...) @@ -259,14 +259,6 @@ func (r OrganizationListParamsStatus) IsKnown() bool { return false } -type OrganizationDeleteParams struct { - Body interface{} `json:"body,required"` -} - -func (r OrganizationDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type OrganizationGetResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` diff --git a/user/organization_test.go b/user/organization_test.go index bb3adc45ea2..a4792578a7c 100644 --- a/user/organization_test.go +++ b/user/organization_test.go @@ -60,13 +60,7 @@ func TestOrganizationDelete(t *testing.T) { option.WithAPIKey("144c9defac04969c7bfad8efaa8ea194"), option.WithAPIEmail("user@example.com"), ) - _, err := client.User.Organizations.Delete( - context.TODO(), - "023e105f4ecef8ad9ca31a8372d0c353", - user.OrganizationDeleteParams{ - Body: map[string]interface{}{}, - }, - ) + _, err := client.User.Organizations.Delete(context.TODO(), "023e105f4ecef8ad9ca31a8372d0c353") if err != nil { var apierr *cloudflare.Error if errors.As(err, &apierr) { diff --git a/user/subscription.go b/user/subscription.go index 7e37ade6c79..a266dee5a2c 100644 --- a/user/subscription.go +++ b/user/subscription.go @@ -49,7 +49,7 @@ func (r *SubscriptionService) Update(ctx context.Context, identifier string, bod } // Deletes a user's subscription. -func (r *SubscriptionService) Delete(ctx context.Context, identifier string, body SubscriptionDeleteParams, opts ...option.RequestOption) (res *SubscriptionDeleteResponse, err error) { +func (r *SubscriptionService) Delete(ctx context.Context, identifier string, opts ...option.RequestOption) (res *SubscriptionDeleteResponse, err error) { opts = append(r.Options[:], opts...) path := fmt.Sprintf("user/subscriptions/%s", identifier) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &res, opts...) @@ -469,14 +469,6 @@ func (r SubscriptionUpdateResponseEnvelopeSuccess) IsKnown() bool { return false } -type SubscriptionDeleteParams struct { - Body interface{} `json:"body,required"` -} - -func (r SubscriptionDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type SubscriptionEditParams struct { Subscription SubscriptionParam `json:"subscription,required"` } diff --git a/user/subscription_test.go b/user/subscription_test.go index d4462742dd0..ad4fe2835b6 100644 --- a/user/subscription_test.go +++ b/user/subscription_test.go @@ -89,13 +89,7 @@ func TestSubscriptionDelete(t *testing.T) { option.WithAPIKey("144c9defac04969c7bfad8efaa8ea194"), option.WithAPIEmail("user@example.com"), ) - _, err := client.User.Subscriptions.Delete( - context.TODO(), - "506e3185e9c882d175a2d0cb0093d9f2", - user.SubscriptionDeleteParams{ - Body: map[string]interface{}{}, - }, - ) + _, err := client.User.Subscriptions.Delete(context.TODO(), "506e3185e9c882d175a2d0cb0093d9f2") if err != nil { var apierr *cloudflare.Error if errors.As(err, &apierr) { diff --git a/user/token.go b/user/token.go index 398f295ac6d..e78260116f3 100644 --- a/user/token.go +++ b/user/token.go @@ -91,7 +91,7 @@ func (r *TokenService) ListAutoPaging(ctx context.Context, query TokenListParams } // Destroy a token. -func (r *TokenService) Delete(ctx context.Context, tokenID interface{}, body TokenDeleteParams, opts ...option.RequestOption) (res *TokenDeleteResponse, err error) { +func (r *TokenService) Delete(ctx context.Context, tokenID interface{}, opts ...option.RequestOption) (res *TokenDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env TokenDeleteResponseEnvelope path := fmt.Sprintf("user/tokens/%v", tokenID) @@ -518,14 +518,6 @@ func (r TokenListParamsDirection) IsKnown() bool { return false } -type TokenDeleteParams struct { - Body interface{} `json:"body,required"` -} - -func (r TokenDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type TokenDeleteResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` diff --git a/user/token_test.go b/user/token_test.go index 39570f78386..471d5ade563 100644 --- a/user/token_test.go +++ b/user/token_test.go @@ -176,13 +176,7 @@ func TestTokenDelete(t *testing.T) { option.WithAPIKey("144c9defac04969c7bfad8efaa8ea194"), option.WithAPIEmail("user@example.com"), ) - _, err := client.User.Tokens.Delete( - context.TODO(), - map[string]interface{}{}, - user.TokenDeleteParams{ - Body: map[string]interface{}{}, - }, - ) + _, err := client.User.Tokens.Delete(context.TODO(), map[string]interface{}{}) if err != nil { var apierr *cloudflare.Error if errors.As(err, &apierr) { diff --git a/waiting_rooms/event.go b/waiting_rooms/event.go index 1faff34ac57..d17cad8daca 100644 --- a/waiting_rooms/event.go +++ b/waiting_rooms/event.go @@ -91,10 +91,10 @@ func (r *EventService) ListAutoPaging(ctx context.Context, waitingRoomID string, } // Deletes an event for a waiting room. -func (r *EventService) Delete(ctx context.Context, waitingRoomID string, eventID string, params EventDeleteParams, opts ...option.RequestOption) (res *EventDeleteResponse, err error) { +func (r *EventService) Delete(ctx context.Context, waitingRoomID string, eventID string, body EventDeleteParams, opts ...option.RequestOption) (res *EventDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env EventDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/waiting_rooms/%s/events/%s", params.ZoneID, waitingRoomID, eventID) + path := fmt.Sprintf("zones/%s/waiting_rooms/%s/events/%s", body.ZoneID, waitingRoomID, eventID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -326,11 +326,6 @@ func (r EventListParams) URLQuery() (v url.Values) { type EventDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r EventDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type EventDeleteResponseEnvelope struct { diff --git a/waiting_rooms/event_test.go b/waiting_rooms/event_test.go index df298de4efb..92fa209797d 100644 --- a/waiting_rooms/event_test.go +++ b/waiting_rooms/event_test.go @@ -157,7 +157,6 @@ func TestEventDelete(t *testing.T) { "25756b2dfe6e378a06b033b670413757", waiting_rooms.EventDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/waiting_rooms/rule.go b/waiting_rooms/rule.go index 9e3df896258..20e834b612c 100644 --- a/waiting_rooms/rule.go +++ b/waiting_rooms/rule.go @@ -85,10 +85,10 @@ func (r *RuleService) ListAutoPaging(ctx context.Context, waitingRoomID string, } // Deletes a rule for a waiting room. -func (r *RuleService) Delete(ctx context.Context, waitingRoomID string, ruleID string, params RuleDeleteParams, opts ...option.RequestOption) (res *[]WaitingRoomRule, err error) { +func (r *RuleService) Delete(ctx context.Context, waitingRoomID string, ruleID string, body RuleDeleteParams, opts ...option.RequestOption) (res *[]WaitingRoomRule, err error) { opts = append(r.Options[:], opts...) var env RuleDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/waiting_rooms/%s/rules/%s", params.ZoneID, waitingRoomID, ruleID) + path := fmt.Sprintf("zones/%s/waiting_rooms/%s/rules/%s", body.ZoneID, waitingRoomID, ruleID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -395,11 +395,6 @@ type RuleListParams struct { type RuleDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r RuleDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type RuleDeleteResponseEnvelope struct { diff --git a/waiting_rooms/rule_test.go b/waiting_rooms/rule_test.go index 5535ce64dfd..aeadc331f1f 100644 --- a/waiting_rooms/rule_test.go +++ b/waiting_rooms/rule_test.go @@ -144,7 +144,6 @@ func TestRuleDelete(t *testing.T) { "25756b2dfe6e378a06b033b670413757", waiting_rooms.RuleDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/waiting_rooms/waitingroom.go b/waiting_rooms/waitingroom.go index 164249c28af..e07bf44f545 100644 --- a/waiting_rooms/waitingroom.go +++ b/waiting_rooms/waitingroom.go @@ -95,10 +95,10 @@ func (r *WaitingRoomService) ListAutoPaging(ctx context.Context, params WaitingR } // Deletes a waiting room. -func (r *WaitingRoomService) Delete(ctx context.Context, waitingRoomID string, params WaitingRoomDeleteParams, opts ...option.RequestOption) (res *WaitingRoomDeleteResponse, err error) { +func (r *WaitingRoomService) Delete(ctx context.Context, waitingRoomID string, body WaitingRoomDeleteParams, opts ...option.RequestOption) (res *WaitingRoomDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env WaitingRoomDeleteResponseEnvelope - path := fmt.Sprintf("zones/%s/waiting_rooms/%s", params.ZoneID, waitingRoomID) + path := fmt.Sprintf("zones/%s/waiting_rooms/%s", body.ZoneID, waitingRoomID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -1140,11 +1140,6 @@ func (r WaitingRoomListParams) URLQuery() (v url.Values) { type WaitingRoomDeleteParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` - Body interface{} `json:"body,required"` -} - -func (r WaitingRoomDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type WaitingRoomDeleteResponseEnvelope struct { diff --git a/waiting_rooms/waitingroom_test.go b/waiting_rooms/waitingroom_test.go index c67d532b914..ee16c604c3f 100644 --- a/waiting_rooms/waitingroom_test.go +++ b/waiting_rooms/waitingroom_test.go @@ -181,7 +181,6 @@ func TestWaitingRoomDelete(t *testing.T) { "699d98642c564d2e855e9661899b7252", waiting_rooms.WaitingRoomDeleteParams{ ZoneID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/warp_connector/warpconnector.go b/warp_connector/warpconnector.go index 0f931219581..e1e480fe998 100644 --- a/warp_connector/warpconnector.go +++ b/warp_connector/warpconnector.go @@ -75,11 +75,11 @@ func (r *WARPConnectorService) ListAutoPaging(ctx context.Context, params WARPCo } // Deletes a Warp Connector Tunnel from an account. -func (r *WARPConnectorService) Delete(ctx context.Context, tunnelID string, params WARPConnectorDeleteParams, opts ...option.RequestOption) (res *WARPConnectorDeleteResponse, err error) { +func (r *WARPConnectorService) Delete(ctx context.Context, tunnelID string, body WARPConnectorDeleteParams, opts ...option.RequestOption) (res *WARPConnectorDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env WARPConnectorDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/warp_connector/%s", params.AccountID, tunnelID) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, params, &env, opts...) + path := fmt.Sprintf("accounts/%s/warp_connector/%s", body.AccountID, tunnelID) + err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return } @@ -1442,11 +1442,6 @@ func (r WARPConnectorListParams) URLQuery() (v url.Values) { type WARPConnectorDeleteParams struct { // Cloudflare account ID AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r WARPConnectorDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type WARPConnectorDeleteResponseEnvelope struct { diff --git a/warp_connector/warpconnector_test.go b/warp_connector/warpconnector_test.go index 4a52ce9e494..f50b0d06594 100644 --- a/warp_connector/warpconnector_test.go +++ b/warp_connector/warpconnector_test.go @@ -97,7 +97,6 @@ func TestWARPConnectorDelete(t *testing.T) { "f70ff985-a4ef-4643-bbbc-4a0ed4fc8415", warp_connector.WARPConnectorDeleteParams{ AccountID: cloudflare.F("699d98642c564d2e855e9661899b7252"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/web3/hostname.go b/web3/hostname.go index 8ab0466100b..c9cf85275ed 100644 --- a/web3/hostname.go +++ b/web3/hostname.go @@ -72,7 +72,7 @@ func (r *HostnameService) ListAutoPaging(ctx context.Context, zoneIdentifier str } // Delete Web3 Hostname -func (r *HostnameService) Delete(ctx context.Context, zoneIdentifier string, identifier string, body HostnameDeleteParams, opts ...option.RequestOption) (res *HostnameDeleteResponse, err error) { +func (r *HostnameService) Delete(ctx context.Context, zoneIdentifier string, identifier string, opts ...option.RequestOption) (res *HostnameDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env HostnameDeleteResponseEnvelope path := fmt.Sprintf("zones/%s/web3/hostnames/%s", zoneIdentifier, identifier) @@ -282,14 +282,6 @@ func (r HostnameNewResponseEnvelopeSuccess) IsKnown() bool { return false } -type HostnameDeleteParams struct { - Body interface{} `json:"body,required"` -} - -func (r HostnameDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type HostnameDeleteResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` diff --git a/web3/hostname_test.go b/web3/hostname_test.go index f8881dd8584..e91b06efcf6 100644 --- a/web3/hostname_test.go +++ b/web3/hostname_test.go @@ -88,9 +88,6 @@ func TestHostnameDelete(t *testing.T) { context.TODO(), "023e105f4ecef8ad9ca31a8372d0c353", "023e105f4ecef8ad9ca31a8372d0c353", - web3.HostnameDeleteParams{ - Body: map[string]interface{}{}, - }, ) if err != nil { var apierr *cloudflare.Error diff --git a/web3/hostnameipfsuniversalpathcontentlistentry.go b/web3/hostnameipfsuniversalpathcontentlistentry.go index b47006fe67c..18cc92b4e80 100644 --- a/web3/hostnameipfsuniversalpathcontentlistentry.go +++ b/web3/hostnameipfsuniversalpathcontentlistentry.go @@ -74,7 +74,7 @@ func (r *HostnameIPFSUniversalPathContentListEntryService) List(ctx context.Cont } // Delete IPFS Universal Path Gateway Content List Entry -func (r *HostnameIPFSUniversalPathContentListEntryService) Delete(ctx context.Context, zoneIdentifier string, identifier string, contentListEntryIdentifier string, body HostnameIPFSUniversalPathContentListEntryDeleteParams, opts ...option.RequestOption) (res *HostnameIPFSUniversalPathContentListEntryDeleteResponse, err error) { +func (r *HostnameIPFSUniversalPathContentListEntryService) Delete(ctx context.Context, zoneIdentifier string, identifier string, contentListEntryIdentifier string, opts ...option.RequestOption) (res *HostnameIPFSUniversalPathContentListEntryDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env HostnameIPFSUniversalPathContentListEntryDeleteResponseEnvelope path := fmt.Sprintf("zones/%s/web3/hostnames/%s/ipfs_universal_path/content_list/entries/%s", zoneIdentifier, identifier, contentListEntryIdentifier) @@ -580,14 +580,6 @@ func (r hostnameIPFSUniversalPathContentListEntryListResponseEnvelopeResultInfoJ return r.raw } -type HostnameIPFSUniversalPathContentListEntryDeleteParams struct { - Body interface{} `json:"body,required"` -} - -func (r HostnameIPFSUniversalPathContentListEntryDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type HostnameIPFSUniversalPathContentListEntryDeleteResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` diff --git a/web3/hostnameipfsuniversalpathcontentlistentry_test.go b/web3/hostnameipfsuniversalpathcontentlistentry_test.go index be6989fa6d6..486cd5d7681 100644 --- a/web3/hostnameipfsuniversalpathcontentlistentry_test.go +++ b/web3/hostnameipfsuniversalpathcontentlistentry_test.go @@ -128,9 +128,6 @@ func TestHostnameIPFSUniversalPathContentListEntryDelete(t *testing.T) { "023e105f4ecef8ad9ca31a8372d0c353", "023e105f4ecef8ad9ca31a8372d0c353", "023e105f4ecef8ad9ca31a8372d0c353", - web3.HostnameIPFSUniversalPathContentListEntryDeleteParams{ - Body: map[string]interface{}{}, - }, ) if err != nil { var apierr *cloudflare.Error diff --git a/workers/domain.go b/workers/domain.go index f4b5984b1b3..bda5bf24c9b 100644 --- a/workers/domain.go +++ b/workers/domain.go @@ -71,10 +71,10 @@ func (r *DomainService) ListAutoPaging(ctx context.Context, params DomainListPar } // Detaches a Worker from a zone and hostname. -func (r *DomainService) Delete(ctx context.Context, domainID string, params DomainDeleteParams, opts ...option.RequestOption) (err error) { +func (r *DomainService) Delete(ctx context.Context, domainID string, body DomainDeleteParams, opts ...option.RequestOption) (err error) { opts = append(r.Options[:], opts...) opts = append([]option.RequestOption{option.WithHeader("Accept", "")}, opts...) - path := fmt.Sprintf("accounts/%s/workers/domains/%s", params.AccountID, domainID) + path := fmt.Sprintf("accounts/%s/workers/domains/%s", body.AccountID, domainID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, nil, opts...) return } @@ -211,11 +211,6 @@ func (r DomainListParams) URLQuery() (v url.Values) { type DomainDeleteParams struct { AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r DomainDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type DomainGetParams struct { diff --git a/workers/domain_test.go b/workers/domain_test.go index a2a6e5ba3c8..6f04843c1f5 100644 --- a/workers/domain_test.go +++ b/workers/domain_test.go @@ -94,7 +94,6 @@ func TestDomainDelete(t *testing.T) { "dbe10b4bc17c295377eabd600e1787fd", workers.DomainDeleteParams{ AccountID: cloudflare.F("9a7806061c88ada191ed06f989cc3dac"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/workers/script.go b/workers/script.go index 9d61c719e1d..d54505ddb19 100644 --- a/workers/script.go +++ b/workers/script.go @@ -389,17 +389,12 @@ type ScriptListParams struct { type ScriptDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` // If set to true, delete will not be stopped by associated service binding, // durable object, or other binding. Any of these associated bindings/durable // objects will be deleted along with the script. Force param.Field[bool] `query:"force"` } -func (r ScriptDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - // URLQuery serializes [ScriptDeleteParams]'s query parameters as `url.Values`. func (r ScriptDeleteParams) URLQuery() (v url.Values) { return apiquery.MarshalWithSettings(r, apiquery.QuerySettings{ diff --git a/workers/script_test.go b/workers/script_test.go index 95c8c9fd2d6..252df12eaba 100644 --- a/workers/script_test.go +++ b/workers/script_test.go @@ -158,7 +158,6 @@ func TestScriptDeleteWithOptionalParams(t *testing.T) { "this-is_my_script-01", workers.ScriptDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, Force: cloudflare.F(true), }, ) diff --git a/workers/scripttail.go b/workers/scripttail.go index 5abc1c62226..ab150b35280 100644 --- a/workers/scripttail.go +++ b/workers/scripttail.go @@ -45,9 +45,9 @@ func (r *ScriptTailService) New(ctx context.Context, scriptName string, params S } // Deletes a tail from a Worker. -func (r *ScriptTailService) Delete(ctx context.Context, scriptName string, id string, params ScriptTailDeleteParams, opts ...option.RequestOption) (res *ScriptTailDeleteResponse, err error) { +func (r *ScriptTailService) Delete(ctx context.Context, scriptName string, id string, body ScriptTailDeleteParams, opts ...option.RequestOption) (res *ScriptTailDeleteResponse, err error) { opts = append(r.Options[:], opts...) - path := fmt.Sprintf("accounts/%s/workers/scripts/%s/tails/%s", params.AccountID, scriptName, id) + path := fmt.Sprintf("accounts/%s/workers/scripts/%s/tails/%s", body.AccountID, scriptName, id) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &res, opts...) return } @@ -254,11 +254,6 @@ func (r ScriptTailNewResponseEnvelopeSuccess) IsKnown() bool { type ScriptTailDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r ScriptTailDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type ScriptTailGetParams struct { diff --git a/workers/scripttail_test.go b/workers/scripttail_test.go index 42b6671626b..4bdff3a9c3a 100644 --- a/workers/scripttail_test.go +++ b/workers/scripttail_test.go @@ -65,7 +65,6 @@ func TestScriptTailDelete(t *testing.T) { "03dc9f77817b488fb26c5861ec18f791", workers.ScriptTailDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/workers_for_platforms/dispatchnamespacescript.go b/workers_for_platforms/dispatchnamespacescript.go index 8a2b4433322..e7a528834e2 100644 --- a/workers_for_platforms/dispatchnamespacescript.go +++ b/workers_for_platforms/dispatchnamespacescript.go @@ -311,17 +311,12 @@ func (r DispatchNamespaceScriptUpdateResponseEnvelopeSuccess) IsKnown() bool { type DispatchNamespaceScriptDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` // If set to true, delete will not be stopped by associated service binding, // durable object, or other binding. Any of these associated bindings/durable // objects will be deleted along with the script. Force param.Field[bool] `query:"force"` } -func (r DispatchNamespaceScriptDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - // URLQuery serializes [DispatchNamespaceScriptDeleteParams]'s query parameters as // `url.Values`. func (r DispatchNamespaceScriptDeleteParams) URLQuery() (v url.Values) { diff --git a/workers_for_platforms/dispatchnamespacescript_test.go b/workers_for_platforms/dispatchnamespacescript_test.go index 5d77cc1d499..9b0683a4141 100644 --- a/workers_for_platforms/dispatchnamespacescript_test.go +++ b/workers_for_platforms/dispatchnamespacescript_test.go @@ -132,7 +132,6 @@ func TestDispatchNamespaceScriptDeleteWithOptionalParams(t *testing.T) { "this-is_my_script-01", workers_for_platforms.DispatchNamespaceScriptDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, Force: cloudflare.F(true), }, ) diff --git a/zero_trust/accessbookmark.go b/zero_trust/accessbookmark.go index 0d3bc0c05c2..44e8bf2423d 100644 --- a/zero_trust/accessbookmark.go +++ b/zero_trust/accessbookmark.go @@ -83,7 +83,7 @@ func (r *AccessBookmarkService) ListAutoPaging(ctx context.Context, identifier s } // Deletes a Bookmark application. -func (r *AccessBookmarkService) Delete(ctx context.Context, identifier string, uuid string, body AccessBookmarkDeleteParams, opts ...option.RequestOption) (res *AccessBookmarkDeleteResponse, err error) { +func (r *AccessBookmarkService) Delete(ctx context.Context, identifier string, uuid string, opts ...option.RequestOption) (res *AccessBookmarkDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env AccessBookmarkDeleteResponseEnvelope path := fmt.Sprintf("accounts/%s/access/bookmarks/%s", identifier, uuid) @@ -269,14 +269,6 @@ func (r AccessBookmarkUpdateResponseEnvelopeSuccess) IsKnown() bool { return false } -type AccessBookmarkDeleteParams struct { - Body interface{} `json:"body,required"` -} - -func (r AccessBookmarkDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) -} - type AccessBookmarkDeleteResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` diff --git a/zero_trust/accessbookmark_test.go b/zero_trust/accessbookmark_test.go index 98f7e866fe1..88e4a7d5983 100644 --- a/zero_trust/accessbookmark_test.go +++ b/zero_trust/accessbookmark_test.go @@ -118,9 +118,6 @@ func TestAccessBookmarkDelete(t *testing.T) { context.TODO(), "699d98642c564d2e855e9661899b7252", "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", - zero_trust.AccessBookmarkDeleteParams{ - Body: map[string]interface{}{}, - }, ) if err != nil { var apierr *cloudflare.Error diff --git a/zero_trust/devicenetwork.go b/zero_trust/devicenetwork.go index 151d3cdbe80..fdd03d86c1d 100644 --- a/zero_trust/devicenetwork.go +++ b/zero_trust/devicenetwork.go @@ -84,10 +84,10 @@ func (r *DeviceNetworkService) ListAutoPaging(ctx context.Context, query DeviceN // Deletes a device managed network and fetches a list of the remaining device // managed networks for an account. -func (r *DeviceNetworkService) Delete(ctx context.Context, networkID string, params DeviceNetworkDeleteParams, opts ...option.RequestOption) (res *[]DeviceNetwork, err error) { +func (r *DeviceNetworkService) Delete(ctx context.Context, networkID string, body DeviceNetworkDeleteParams, opts ...option.RequestOption) (res *[]DeviceNetwork, err error) { opts = append(r.Options[:], opts...) var env DeviceNetworkDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/devices/networks/%s", params.AccountID, networkID) + path := fmt.Sprintf("accounts/%s/devices/networks/%s", body.AccountID, networkID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -369,11 +369,6 @@ type DeviceNetworkListParams struct { type DeviceNetworkDeleteParams struct { AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r DeviceNetworkDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type DeviceNetworkDeleteResponseEnvelope struct { diff --git a/zero_trust/devicenetwork_test.go b/zero_trust/devicenetwork_test.go index f897bd17f7b..ef5b7f7e10e 100644 --- a/zero_trust/devicenetwork_test.go +++ b/zero_trust/devicenetwork_test.go @@ -127,7 +127,6 @@ func TestDeviceNetworkDelete(t *testing.T) { "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", zero_trust.DeviceNetworkDeleteParams{ AccountID: cloudflare.F("699d98642c564d2e855e9661899b7252"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/zero_trust/devicepolicy.go b/zero_trust/devicepolicy.go index f76fcf349a2..9247cc6629f 100644 --- a/zero_trust/devicepolicy.go +++ b/zero_trust/devicepolicy.go @@ -80,10 +80,10 @@ func (r *DevicePolicyService) ListAutoPaging(ctx context.Context, query DevicePo // Deletes a device settings profile and fetches a list of the remaining profiles // for an account. -func (r *DevicePolicyService) Delete(ctx context.Context, policyID string, params DevicePolicyDeleteParams, opts ...option.RequestOption) (res *[]SettingsPolicy, err error) { +func (r *DevicePolicyService) Delete(ctx context.Context, policyID string, body DevicePolicyDeleteParams, opts ...option.RequestOption) (res *[]SettingsPolicy, err error) { opts = append(r.Options[:], opts...) var env DevicePolicyDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/devices/policy/%s", params.AccountID, policyID) + path := fmt.Sprintf("accounts/%s/devices/policy/%s", body.AccountID, policyID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -408,11 +408,6 @@ type DevicePolicyListParams struct { type DevicePolicyDeleteParams struct { AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r DevicePolicyDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type DevicePolicyDeleteResponseEnvelope struct { diff --git a/zero_trust/devicepolicy_test.go b/zero_trust/devicepolicy_test.go index bf407178c6d..b3e6a6b85f9 100644 --- a/zero_trust/devicepolicy_test.go +++ b/zero_trust/devicepolicy_test.go @@ -105,7 +105,6 @@ func TestDevicePolicyDelete(t *testing.T) { "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", zero_trust.DevicePolicyDeleteParams{ AccountID: cloudflare.F("699d98642c564d2e855e9661899b7252"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/zero_trust/deviceposture.go b/zero_trust/deviceposture.go index 1c0bb0fcc78..5c0b4c55e8f 100644 --- a/zero_trust/deviceposture.go +++ b/zero_trust/deviceposture.go @@ -87,10 +87,10 @@ func (r *DevicePostureService) ListAutoPaging(ctx context.Context, query DeviceP } // Deletes a device posture rule. -func (r *DevicePostureService) Delete(ctx context.Context, ruleID string, params DevicePostureDeleteParams, opts ...option.RequestOption) (res *DevicePostureDeleteResponse, err error) { +func (r *DevicePostureService) Delete(ctx context.Context, ruleID string, body DevicePostureDeleteParams, opts ...option.RequestOption) (res *DevicePostureDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env DevicePostureDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/devices/posture/%s", params.AccountID, ruleID) + path := fmt.Sprintf("accounts/%s/devices/posture/%s", body.AccountID, ruleID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -2090,11 +2090,6 @@ type DevicePostureListParams struct { type DevicePostureDeleteParams struct { AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r DevicePostureDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type DevicePostureDeleteResponseEnvelope struct { diff --git a/zero_trust/deviceposture_test.go b/zero_trust/deviceposture_test.go index 09ef0eda59d..15128ba1d78 100644 --- a/zero_trust/deviceposture_test.go +++ b/zero_trust/deviceposture_test.go @@ -153,7 +153,6 @@ func TestDevicePostureDelete(t *testing.T) { "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", zero_trust.DevicePostureDeleteParams{ AccountID: cloudflare.F("699d98642c564d2e855e9661899b7252"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/zero_trust/devicepostureintegration.go b/zero_trust/devicepostureintegration.go index 020bfceae32..59e65131e7b 100644 --- a/zero_trust/devicepostureintegration.go +++ b/zero_trust/devicepostureintegration.go @@ -72,10 +72,10 @@ func (r *DevicePostureIntegrationService) ListAutoPaging(ctx context.Context, qu } // Delete a configured device posture integration. -func (r *DevicePostureIntegrationService) Delete(ctx context.Context, integrationID string, params DevicePostureIntegrationDeleteParams, opts ...option.RequestOption) (res *DevicePostureIntegrationDeleteResponseUnion, err error) { +func (r *DevicePostureIntegrationService) Delete(ctx context.Context, integrationID string, body DevicePostureIntegrationDeleteParams, opts ...option.RequestOption) (res *DevicePostureIntegrationDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env DevicePostureIntegrationDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/devices/posture/integration/%s", params.AccountID, integrationID) + path := fmt.Sprintf("accounts/%s/devices/posture/integration/%s", body.AccountID, integrationID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -460,11 +460,6 @@ type DevicePostureIntegrationListParams struct { type DevicePostureIntegrationDeleteParams struct { AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r DevicePostureIntegrationDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type DevicePostureIntegrationDeleteResponseEnvelope struct { diff --git a/zero_trust/devicepostureintegration_test.go b/zero_trust/devicepostureintegration_test.go index dcb58a0734e..03a998fb1e8 100644 --- a/zero_trust/devicepostureintegration_test.go +++ b/zero_trust/devicepostureintegration_test.go @@ -94,7 +94,6 @@ func TestDevicePostureIntegrationDelete(t *testing.T) { "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", zero_trust.DevicePostureIntegrationDeleteParams{ AccountID: cloudflare.F("699d98642c564d2e855e9661899b7252"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/zero_trust/dlpprofilecustom.go b/zero_trust/dlpprofilecustom.go index b07dedce7b5..794f360cf4f 100644 --- a/zero_trust/dlpprofilecustom.go +++ b/zero_trust/dlpprofilecustom.go @@ -57,10 +57,10 @@ func (r *DLPProfileCustomService) Update(ctx context.Context, profileID string, } // Deletes a DLP custom profile. -func (r *DLPProfileCustomService) Delete(ctx context.Context, profileID string, params DLPProfileCustomDeleteParams, opts ...option.RequestOption) (res *DLPProfileCustomDeleteResponseUnion, err error) { +func (r *DLPProfileCustomService) Delete(ctx context.Context, profileID string, body DLPProfileCustomDeleteParams, opts ...option.RequestOption) (res *DLPProfileCustomDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env DLPProfileCustomDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/dlp/profiles/custom/%s", params.AccountID, profileID) + path := fmt.Sprintf("accounts/%s/dlp/profiles/custom/%s", body.AccountID, profileID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -474,11 +474,6 @@ func (r DLPProfileCustomUpdateParamsSharedEntriesDLPSharedEntryUpdateIntegration type DLPProfileCustomDeleteParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r DLPProfileCustomDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type DLPProfileCustomDeleteResponseEnvelope struct { diff --git a/zero_trust/dlpprofilecustom_test.go b/zero_trust/dlpprofilecustom_test.go index 64cea9e783f..22ea6b4022b 100644 --- a/zero_trust/dlpprofilecustom_test.go +++ b/zero_trust/dlpprofilecustom_test.go @@ -231,7 +231,6 @@ func TestDLPProfileCustomDelete(t *testing.T) { "384e129d-25bd-403c-8019-bc19eb7a8a5f", zero_trust.DLPProfileCustomDeleteParams{ AccountID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/zero_trust/gatewaylist.go b/zero_trust/gatewaylist.go index f6ec411ce31..f1255d7816f 100644 --- a/zero_trust/gatewaylist.go +++ b/zero_trust/gatewaylist.go @@ -88,10 +88,10 @@ func (r *GatewayListService) ListAutoPaging(ctx context.Context, query GatewayLi } // Deletes a Zero Trust list. -func (r *GatewayListService) Delete(ctx context.Context, listID string, params GatewayListDeleteParams, opts ...option.RequestOption) (res *GatewayListDeleteResponseUnion, err error) { +func (r *GatewayListService) Delete(ctx context.Context, listID string, body GatewayListDeleteParams, opts ...option.RequestOption) (res *GatewayListDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env GatewayListDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/gateway/lists/%s", params.AccountID, listID) + path := fmt.Sprintf("accounts/%s/gateway/lists/%s", body.AccountID, listID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -427,11 +427,6 @@ type GatewayListListParams struct { type GatewayListDeleteParams struct { AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r GatewayListDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type GatewayListDeleteResponseEnvelope struct { diff --git a/zero_trust/gatewaylist_test.go b/zero_trust/gatewaylist_test.go index 3dc8766ef9d..f6c6d946471 100644 --- a/zero_trust/gatewaylist_test.go +++ b/zero_trust/gatewaylist_test.go @@ -127,7 +127,6 @@ func TestGatewayListDelete(t *testing.T) { "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", zero_trust.GatewayListDeleteParams{ AccountID: cloudflare.F("699d98642c564d2e855e9661899b7252"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/zero_trust/gatewaylocation.go b/zero_trust/gatewaylocation.go index fcb9ff2e4ed..66a8dee81c0 100644 --- a/zero_trust/gatewaylocation.go +++ b/zero_trust/gatewaylocation.go @@ -86,10 +86,10 @@ func (r *GatewayLocationService) ListAutoPaging(ctx context.Context, query Gatew } // Deletes a configured Zero Trust Gateway location. -func (r *GatewayLocationService) Delete(ctx context.Context, locationID string, params GatewayLocationDeleteParams, opts ...option.RequestOption) (res *GatewayLocationDeleteResponseUnion, err error) { +func (r *GatewayLocationService) Delete(ctx context.Context, locationID string, body GatewayLocationDeleteParams, opts ...option.RequestOption) (res *GatewayLocationDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env GatewayLocationDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/gateway/locations/%s", params.AccountID, locationID) + path := fmt.Sprintf("accounts/%s/gateway/locations/%s", body.AccountID, locationID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -327,11 +327,6 @@ type GatewayLocationListParams struct { type GatewayLocationDeleteParams struct { AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r GatewayLocationDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type GatewayLocationDeleteResponseEnvelope struct { diff --git a/zero_trust/gatewaylocation_test.go b/zero_trust/gatewaylocation_test.go index e0b1ef6b2da..87f8bc35429 100644 --- a/zero_trust/gatewaylocation_test.go +++ b/zero_trust/gatewaylocation_test.go @@ -135,7 +135,6 @@ func TestGatewayLocationDelete(t *testing.T) { "ed35569b41ce4d1facfe683550f54086", zero_trust.GatewayLocationDeleteParams{ AccountID: cloudflare.F("699d98642c564d2e855e9661899b7252"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/zero_trust/gatewayproxyendpoint.go b/zero_trust/gatewayproxyendpoint.go index 13423654bea..bcd61fca349 100644 --- a/zero_trust/gatewayproxyendpoint.go +++ b/zero_trust/gatewayproxyendpoint.go @@ -73,10 +73,10 @@ func (r *GatewayProxyEndpointService) ListAutoPaging(ctx context.Context, query } // Deletes a configured Zero Trust Gateway proxy endpoint. -func (r *GatewayProxyEndpointService) Delete(ctx context.Context, proxyEndpointID string, params GatewayProxyEndpointDeleteParams, opts ...option.RequestOption) (res *GatewayProxyEndpointDeleteResponseUnion, err error) { +func (r *GatewayProxyEndpointService) Delete(ctx context.Context, proxyEndpointID string, body GatewayProxyEndpointDeleteParams, opts ...option.RequestOption) (res *GatewayProxyEndpointDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env GatewayProxyEndpointDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/gateway/proxy_endpoints/%s", params.AccountID, proxyEndpointID) + path := fmt.Sprintf("accounts/%s/gateway/proxy_endpoints/%s", body.AccountID, proxyEndpointID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -226,11 +226,6 @@ type GatewayProxyEndpointListParams struct { type GatewayProxyEndpointDeleteParams struct { AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r GatewayProxyEndpointDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type GatewayProxyEndpointDeleteResponseEnvelope struct { diff --git a/zero_trust/gatewayproxyendpoint_test.go b/zero_trust/gatewayproxyendpoint_test.go index f522e8ef5a5..194ca3e6f10 100644 --- a/zero_trust/gatewayproxyendpoint_test.go +++ b/zero_trust/gatewayproxyendpoint_test.go @@ -87,7 +87,6 @@ func TestGatewayProxyEndpointDelete(t *testing.T) { "ed35569b41ce4d1facfe683550f54086", zero_trust.GatewayProxyEndpointDeleteParams{ AccountID: cloudflare.F("699d98642c564d2e855e9661899b7252"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/zero_trust/gatewayrule.go b/zero_trust/gatewayrule.go index 7af70bddc06..bd08793fcbd 100644 --- a/zero_trust/gatewayrule.go +++ b/zero_trust/gatewayrule.go @@ -86,10 +86,10 @@ func (r *GatewayRuleService) ListAutoPaging(ctx context.Context, query GatewayRu } // Deletes a Zero Trust Gateway rule. -func (r *GatewayRuleService) Delete(ctx context.Context, ruleID string, params GatewayRuleDeleteParams, opts ...option.RequestOption) (res *GatewayRuleDeleteResponseUnion, err error) { +func (r *GatewayRuleService) Delete(ctx context.Context, ruleID string, body GatewayRuleDeleteParams, opts ...option.RequestOption) (res *GatewayRuleDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env GatewayRuleDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/gateway/rules/%s", params.AccountID, ruleID) + path := fmt.Sprintf("accounts/%s/gateway/rules/%s", body.AccountID, ruleID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -1210,11 +1210,6 @@ type GatewayRuleListParams struct { type GatewayRuleDeleteParams struct { AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r GatewayRuleDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type GatewayRuleDeleteResponseEnvelope struct { diff --git a/zero_trust/gatewayrule_test.go b/zero_trust/gatewayrule_test.go index 1b39f4bbb96..2a12870620e 100644 --- a/zero_trust/gatewayrule_test.go +++ b/zero_trust/gatewayrule_test.go @@ -331,7 +331,6 @@ func TestGatewayRuleDelete(t *testing.T) { "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", zero_trust.GatewayRuleDeleteParams{ AccountID: cloudflare.F("699d98642c564d2e855e9661899b7252"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/zero_trust/networkvirtualnetwork.go b/zero_trust/networkvirtualnetwork.go index 792ea65fe6e..7cbdd8b597e 100644 --- a/zero_trust/networkvirtualnetwork.go +++ b/zero_trust/networkvirtualnetwork.go @@ -75,10 +75,10 @@ func (r *NetworkVirtualNetworkService) ListAutoPaging(ctx context.Context, param } // Deletes an existing virtual network. -func (r *NetworkVirtualNetworkService) Delete(ctx context.Context, virtualNetworkID string, params NetworkVirtualNetworkDeleteParams, opts ...option.RequestOption) (res *NetworkVirtualNetworkDeleteResponseUnion, err error) { +func (r *NetworkVirtualNetworkService) Delete(ctx context.Context, virtualNetworkID string, body NetworkVirtualNetworkDeleteParams, opts ...option.RequestOption) (res *NetworkVirtualNetworkDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env NetworkVirtualNetworkDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/teamnet/virtual_networks/%s", params.AccountID, virtualNetworkID) + path := fmt.Sprintf("accounts/%s/teamnet/virtual_networks/%s", body.AccountID, virtualNetworkID) err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return @@ -300,11 +300,6 @@ func (r NetworkVirtualNetworkListParams) URLQuery() (v url.Values) { type NetworkVirtualNetworkDeleteParams struct { // Cloudflare account ID AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r NetworkVirtualNetworkDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type NetworkVirtualNetworkDeleteResponseEnvelope struct { diff --git a/zero_trust/networkvirtualnetwork_test.go b/zero_trust/networkvirtualnetwork_test.go index 1acfc055793..6e58a63a84c 100644 --- a/zero_trust/networkvirtualnetwork_test.go +++ b/zero_trust/networkvirtualnetwork_test.go @@ -92,7 +92,6 @@ func TestNetworkVirtualNetworkDelete(t *testing.T) { "f70ff985-a4ef-4643-bbbc-4a0ed4fc8415", zero_trust.NetworkVirtualNetworkDeleteParams{ AccountID: cloudflare.F("699d98642c564d2e855e9661899b7252"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/zero_trust/tunnel.go b/zero_trust/tunnel.go index 197ec971de3..b0572eadcef 100644 --- a/zero_trust/tunnel.go +++ b/zero_trust/tunnel.go @@ -84,11 +84,11 @@ func (r *TunnelService) ListAutoPaging(ctx context.Context, params TunnelListPar } // Deletes an Argo Tunnel from an account. -func (r *TunnelService) Delete(ctx context.Context, tunnelID string, params TunnelDeleteParams, opts ...option.RequestOption) (res *TunnelDeleteResponse, err error) { +func (r *TunnelService) Delete(ctx context.Context, tunnelID string, body TunnelDeleteParams, opts ...option.RequestOption) (res *TunnelDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env TunnelDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/tunnels/%s", params.AccountID, tunnelID) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, params, &env, opts...) + path := fmt.Sprintf("accounts/%s/tunnels/%s", body.AccountID, tunnelID) + err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return } @@ -826,11 +826,6 @@ func (r TunnelListParams) URLQuery() (v url.Values) { type TunnelDeleteParams struct { // Cloudflare account ID AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r TunnelDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type TunnelDeleteResponseEnvelope struct { diff --git a/zero_trust/tunnel_test.go b/zero_trust/tunnel_test.go index 3894d09ba10..155ee914196 100644 --- a/zero_trust/tunnel_test.go +++ b/zero_trust/tunnel_test.go @@ -99,7 +99,6 @@ func TestTunnelDelete(t *testing.T) { "f70ff985-a4ef-4643-bbbc-4a0ed4fc8415", zero_trust.TunnelDeleteParams{ AccountID: cloudflare.F("699d98642c564d2e855e9661899b7252"), - Body: map[string]interface{}{}, }, ) if err != nil { diff --git a/zero_trust/tunnelconnection.go b/zero_trust/tunnelconnection.go index 7285f174de7..598984b8a3a 100644 --- a/zero_trust/tunnelconnection.go +++ b/zero_trust/tunnelconnection.go @@ -37,11 +37,11 @@ func NewTunnelConnectionService(opts ...option.RequestOption) (r *TunnelConnecti // Removes connections that are in a disconnected or pending reconnect state. We // recommend running this command after shutting down a tunnel. -func (r *TunnelConnectionService) Delete(ctx context.Context, tunnelID string, params TunnelConnectionDeleteParams, opts ...option.RequestOption) (res *TunnelConnectionDeleteResponseUnion, err error) { +func (r *TunnelConnectionService) Delete(ctx context.Context, tunnelID string, body TunnelConnectionDeleteParams, opts ...option.RequestOption) (res *TunnelConnectionDeleteResponseUnion, err error) { opts = append(r.Options[:], opts...) var env TunnelConnectionDeleteResponseEnvelope - path := fmt.Sprintf("accounts/%s/tunnels/%s/connections", params.AccountID, tunnelID) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, params, &env, opts...) + path := fmt.Sprintf("accounts/%s/tunnels/%s/connections", body.AccountID, tunnelID) + err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &env, opts...) if err != nil { return } @@ -178,11 +178,6 @@ func (r TunnelConnectionDeleteResponseArray) ImplementsZeroTrustTunnelConnection type TunnelConnectionDeleteParams struct { // Cloudflare account ID AccountID param.Field[string] `path:"account_id,required"` - Body interface{} `json:"body,required"` -} - -func (r TunnelConnectionDeleteParams) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r.Body) } type TunnelConnectionDeleteResponseEnvelope struct { diff --git a/zero_trust/tunnelconnection_test.go b/zero_trust/tunnelconnection_test.go index bbb7625efa7..abb16e4e207 100644 --- a/zero_trust/tunnelconnection_test.go +++ b/zero_trust/tunnelconnection_test.go @@ -33,7 +33,6 @@ func TestTunnelConnectionDelete(t *testing.T) { "f70ff985-a4ef-4643-bbbc-4a0ed4fc8415", zero_trust.TunnelConnectionDeleteParams{ AccountID: cloudflare.F("699d98642c564d2e855e9661899b7252"), - Body: map[string]interface{}{}, }, ) if err != nil {