diff --git a/accounts/aliases.go b/accounts/aliases.go index 9b1d1c6c6cb..70640e27289 100644 --- a/accounts/aliases.go +++ b/accounts/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/acm/aliases.go b/acm/aliases.go index 34ea1f3bbf1..f7925c1e571 100644 --- a/acm/aliases.go +++ b/acm/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/addressing/addressmap.go b/addressing/addressmap.go index 38aba05bfe6..382020ce2b7 100644 --- a/addressing/addressmap.go +++ b/addressing/addressmap.go @@ -6,6 +6,7 @@ import ( "context" "fmt" "net/http" + "reflect" "time" "github.com/cloudflare/cloudflare-go/v2/internal/apijson" @@ -14,6 +15,7 @@ import ( "github.com/cloudflare/cloudflare-go/v2/internal/requestconfig" "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/option" + "github.com/tidwall/gjson" ) // AddressMapService contains methods and other services that help with interacting @@ -77,7 +79,7 @@ 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 *shared.UnnamedSchemaRef167, err error) { +func (r *AddressMapService) Delete(ctx context.Context, addressMapID string, params 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) @@ -290,6 +292,31 @@ func (r AddressMapNewResponseMembershipsKind) IsKnown() bool { return false } +// Union satisfied by [addressing.AddressMapDeleteResponseUnknown], +// [addressing.AddressMapDeleteResponseArray] or [shared.UnionString]. +type AddressMapDeleteResponse interface { + ImplementsAddressingAddressMapDeleteResponse() +} + +func init() { + apijson.RegisterUnion( + reflect.TypeOf((*AddressMapDeleteResponse)(nil)).Elem(), + "", + apijson.UnionVariant{ + TypeFilter: gjson.JSON, + Type: reflect.TypeOf(AddressMapDeleteResponseArray{}), + }, + apijson.UnionVariant{ + TypeFilter: gjson.String, + Type: reflect.TypeOf(shared.UnionString("")), + }, + ) +} + +type AddressMapDeleteResponseArray []interface{} + +func (r AddressMapDeleteResponseArray) ImplementsAddressingAddressMapDeleteResponse() {} + type AddressMapGetResponse struct { // Identifier ID string `json:"id"` @@ -490,9 +517,9 @@ func (r AddressMapDeleteParams) MarshalJSON() (data []byte, err error) { } type AddressMapDeleteResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result shared.UnnamedSchemaRef167 `json:"result,required,nullable"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result AddressMapDeleteResponse `json:"result,required,nullable"` // Whether the API call was successful Success AddressMapDeleteResponseEnvelopeSuccess `json:"success,required"` ResultInfo AddressMapDeleteResponseEnvelopeResultInfo `json:"result_info"` diff --git a/addressing/addressmapaccount.go b/addressing/addressmapaccount.go index e124135069e..9fc6f8820e8 100644 --- a/addressing/addressmapaccount.go +++ b/addressing/addressmapaccount.go @@ -6,12 +6,14 @@ import ( "context" "fmt" "net/http" + "reflect" "github.com/cloudflare/cloudflare-go/v2/internal/apijson" "github.com/cloudflare/cloudflare-go/v2/internal/param" "github.com/cloudflare/cloudflare-go/v2/internal/requestconfig" "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/option" + "github.com/tidwall/gjson" ) // AddressMapAccountService contains methods and other services that help with @@ -33,7 +35,7 @@ func NewAddressMapAccountService(opts ...option.RequestOption) (r *AddressMapAcc } // Add an account as a member of a particular address map. -func (r *AddressMapAccountService) Update(ctx context.Context, addressMapID string, params AddressMapAccountUpdateParams, opts ...option.RequestOption) (res *shared.UnnamedSchemaRef167, err error) { +func (r *AddressMapAccountService) Update(ctx context.Context, addressMapID string, params AddressMapAccountUpdateParams, opts ...option.RequestOption) (res *AddressMapAccountUpdateResponse, err error) { opts = append(r.Options[:], opts...) var env AddressMapAccountUpdateResponseEnvelope path := fmt.Sprintf("accounts/%s/addressing/address_maps/%s/accounts/%s", params.AccountID, addressMapID, params.AccountID) @@ -46,7 +48,7 @@ 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 *shared.UnnamedSchemaRef167, err error) { +func (r *AddressMapAccountService) Delete(ctx context.Context, addressMapID string, params 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) @@ -58,6 +60,56 @@ func (r *AddressMapAccountService) Delete(ctx context.Context, addressMapID stri return } +// Union satisfied by [addressing.AddressMapAccountUpdateResponseUnknown], +// [addressing.AddressMapAccountUpdateResponseArray] or [shared.UnionString]. +type AddressMapAccountUpdateResponse interface { + ImplementsAddressingAddressMapAccountUpdateResponse() +} + +func init() { + apijson.RegisterUnion( + reflect.TypeOf((*AddressMapAccountUpdateResponse)(nil)).Elem(), + "", + apijson.UnionVariant{ + TypeFilter: gjson.JSON, + Type: reflect.TypeOf(AddressMapAccountUpdateResponseArray{}), + }, + apijson.UnionVariant{ + TypeFilter: gjson.String, + Type: reflect.TypeOf(shared.UnionString("")), + }, + ) +} + +type AddressMapAccountUpdateResponseArray []interface{} + +func (r AddressMapAccountUpdateResponseArray) ImplementsAddressingAddressMapAccountUpdateResponse() {} + +// Union satisfied by [addressing.AddressMapAccountDeleteResponseUnknown], +// [addressing.AddressMapAccountDeleteResponseArray] or [shared.UnionString]. +type AddressMapAccountDeleteResponse interface { + ImplementsAddressingAddressMapAccountDeleteResponse() +} + +func init() { + apijson.RegisterUnion( + reflect.TypeOf((*AddressMapAccountDeleteResponse)(nil)).Elem(), + "", + apijson.UnionVariant{ + TypeFilter: gjson.JSON, + Type: reflect.TypeOf(AddressMapAccountDeleteResponseArray{}), + }, + apijson.UnionVariant{ + TypeFilter: gjson.String, + Type: reflect.TypeOf(shared.UnionString("")), + }, + ) +} + +type AddressMapAccountDeleteResponseArray []interface{} + +func (r AddressMapAccountDeleteResponseArray) ImplementsAddressingAddressMapAccountDeleteResponse() {} + type AddressMapAccountUpdateParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` @@ -69,9 +121,9 @@ func (r AddressMapAccountUpdateParams) MarshalJSON() (data []byte, err error) { } type AddressMapAccountUpdateResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result shared.UnnamedSchemaRef167 `json:"result,required,nullable"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result AddressMapAccountUpdateResponse `json:"result,required,nullable"` // Whether the API call was successful Success AddressMapAccountUpdateResponseEnvelopeSuccess `json:"success,required"` ResultInfo AddressMapAccountUpdateResponseEnvelopeResultInfo `json:"result_info"` @@ -155,9 +207,9 @@ func (r AddressMapAccountDeleteParams) MarshalJSON() (data []byte, err error) { } type AddressMapAccountDeleteResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result shared.UnnamedSchemaRef167 `json:"result,required,nullable"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result AddressMapAccountDeleteResponse `json:"result,required,nullable"` // Whether the API call was successful Success AddressMapAccountDeleteResponseEnvelopeSuccess `json:"success,required"` ResultInfo AddressMapAccountDeleteResponseEnvelopeResultInfo `json:"result_info"` diff --git a/addressing/addressmapip.go b/addressing/addressmapip.go index 59b0b7c4c69..dd215543ae1 100644 --- a/addressing/addressmapip.go +++ b/addressing/addressmapip.go @@ -6,12 +6,14 @@ import ( "context" "fmt" "net/http" + "reflect" "github.com/cloudflare/cloudflare-go/v2/internal/apijson" "github.com/cloudflare/cloudflare-go/v2/internal/param" "github.com/cloudflare/cloudflare-go/v2/internal/requestconfig" "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/option" + "github.com/tidwall/gjson" ) // AddressMapIPService contains methods and other services that help with @@ -33,7 +35,7 @@ func NewAddressMapIPService(opts ...option.RequestOption) (r *AddressMapIPServic } // Add an IP from a prefix owned by the account to a particular address map. -func (r *AddressMapIPService) Update(ctx context.Context, addressMapID string, ipAddress string, params AddressMapIPUpdateParams, opts ...option.RequestOption) (res *shared.UnnamedSchemaRef167, err error) { +func (r *AddressMapIPService) Update(ctx context.Context, addressMapID string, ipAddress string, params AddressMapIPUpdateParams, opts ...option.RequestOption) (res *AddressMapIPUpdateResponse, err error) { opts = append(r.Options[:], opts...) var env AddressMapIPUpdateResponseEnvelope path := fmt.Sprintf("accounts/%s/addressing/address_maps/%s/ips/%s", params.AccountID, addressMapID, ipAddress) @@ -46,7 +48,7 @@ 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 *shared.UnnamedSchemaRef167, err error) { +func (r *AddressMapIPService) Delete(ctx context.Context, addressMapID string, ipAddress string, params 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) @@ -58,6 +60,56 @@ func (r *AddressMapIPService) Delete(ctx context.Context, addressMapID string, i return } +// Union satisfied by [addressing.AddressMapIPUpdateResponseUnknown], +// [addressing.AddressMapIPUpdateResponseArray] or [shared.UnionString]. +type AddressMapIPUpdateResponse interface { + ImplementsAddressingAddressMapIPUpdateResponse() +} + +func init() { + apijson.RegisterUnion( + reflect.TypeOf((*AddressMapIPUpdateResponse)(nil)).Elem(), + "", + apijson.UnionVariant{ + TypeFilter: gjson.JSON, + Type: reflect.TypeOf(AddressMapIPUpdateResponseArray{}), + }, + apijson.UnionVariant{ + TypeFilter: gjson.String, + Type: reflect.TypeOf(shared.UnionString("")), + }, + ) +} + +type AddressMapIPUpdateResponseArray []interface{} + +func (r AddressMapIPUpdateResponseArray) ImplementsAddressingAddressMapIPUpdateResponse() {} + +// Union satisfied by [addressing.AddressMapIPDeleteResponseUnknown], +// [addressing.AddressMapIPDeleteResponseArray] or [shared.UnionString]. +type AddressMapIPDeleteResponse interface { + ImplementsAddressingAddressMapIPDeleteResponse() +} + +func init() { + apijson.RegisterUnion( + reflect.TypeOf((*AddressMapIPDeleteResponse)(nil)).Elem(), + "", + apijson.UnionVariant{ + TypeFilter: gjson.JSON, + Type: reflect.TypeOf(AddressMapIPDeleteResponseArray{}), + }, + apijson.UnionVariant{ + TypeFilter: gjson.String, + Type: reflect.TypeOf(shared.UnionString("")), + }, + ) +} + +type AddressMapIPDeleteResponseArray []interface{} + +func (r AddressMapIPDeleteResponseArray) ImplementsAddressingAddressMapIPDeleteResponse() {} + type AddressMapIPUpdateParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` @@ -71,7 +123,7 @@ func (r AddressMapIPUpdateParams) MarshalJSON() (data []byte, err error) { type AddressMapIPUpdateResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` - Result shared.UnnamedSchemaRef167 `json:"result,required,nullable"` + Result AddressMapIPUpdateResponse `json:"result,required,nullable"` // Whether the API call was successful Success AddressMapIPUpdateResponseEnvelopeSuccess `json:"success,required"` ResultInfo AddressMapIPUpdateResponseEnvelopeResultInfo `json:"result_info"` @@ -157,7 +209,7 @@ func (r AddressMapIPDeleteParams) MarshalJSON() (data []byte, err error) { type AddressMapIPDeleteResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` - Result shared.UnnamedSchemaRef167 `json:"result,required,nullable"` + Result AddressMapIPDeleteResponse `json:"result,required,nullable"` // Whether the API call was successful Success AddressMapIPDeleteResponseEnvelopeSuccess `json:"success,required"` ResultInfo AddressMapIPDeleteResponseEnvelopeResultInfo `json:"result_info"` diff --git a/addressing/addressmapzone.go b/addressing/addressmapzone.go index 3f51a5a637b..f2d14ae9477 100644 --- a/addressing/addressmapzone.go +++ b/addressing/addressmapzone.go @@ -6,12 +6,14 @@ import ( "context" "fmt" "net/http" + "reflect" "github.com/cloudflare/cloudflare-go/v2/internal/apijson" "github.com/cloudflare/cloudflare-go/v2/internal/param" "github.com/cloudflare/cloudflare-go/v2/internal/requestconfig" "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/option" + "github.com/tidwall/gjson" ) // AddressMapZoneService contains methods and other services that help with @@ -33,7 +35,7 @@ func NewAddressMapZoneService(opts ...option.RequestOption) (r *AddressMapZoneSe } // Add a zone as a member of a particular address map. -func (r *AddressMapZoneService) Update(ctx context.Context, addressMapID string, params AddressMapZoneUpdateParams, opts ...option.RequestOption) (res *shared.UnnamedSchemaRef167, err error) { +func (r *AddressMapZoneService) Update(ctx context.Context, addressMapID string, params AddressMapZoneUpdateParams, opts ...option.RequestOption) (res *AddressMapZoneUpdateResponse, err error) { opts = append(r.Options[:], opts...) var env AddressMapZoneUpdateResponseEnvelope path := fmt.Sprintf("accounts/%s/addressing/address_maps/%s/zones/%s", params.AccountID, addressMapID, params.ZoneID) @@ -46,7 +48,7 @@ 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 *shared.UnnamedSchemaRef167, err error) { +func (r *AddressMapZoneService) Delete(ctx context.Context, addressMapID string, params 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) @@ -58,6 +60,56 @@ func (r *AddressMapZoneService) Delete(ctx context.Context, addressMapID string, return } +// Union satisfied by [addressing.AddressMapZoneUpdateResponseUnknown], +// [addressing.AddressMapZoneUpdateResponseArray] or [shared.UnionString]. +type AddressMapZoneUpdateResponse interface { + ImplementsAddressingAddressMapZoneUpdateResponse() +} + +func init() { + apijson.RegisterUnion( + reflect.TypeOf((*AddressMapZoneUpdateResponse)(nil)).Elem(), + "", + apijson.UnionVariant{ + TypeFilter: gjson.JSON, + Type: reflect.TypeOf(AddressMapZoneUpdateResponseArray{}), + }, + apijson.UnionVariant{ + TypeFilter: gjson.String, + Type: reflect.TypeOf(shared.UnionString("")), + }, + ) +} + +type AddressMapZoneUpdateResponseArray []interface{} + +func (r AddressMapZoneUpdateResponseArray) ImplementsAddressingAddressMapZoneUpdateResponse() {} + +// Union satisfied by [addressing.AddressMapZoneDeleteResponseUnknown], +// [addressing.AddressMapZoneDeleteResponseArray] or [shared.UnionString]. +type AddressMapZoneDeleteResponse interface { + ImplementsAddressingAddressMapZoneDeleteResponse() +} + +func init() { + apijson.RegisterUnion( + reflect.TypeOf((*AddressMapZoneDeleteResponse)(nil)).Elem(), + "", + apijson.UnionVariant{ + TypeFilter: gjson.JSON, + Type: reflect.TypeOf(AddressMapZoneDeleteResponseArray{}), + }, + apijson.UnionVariant{ + TypeFilter: gjson.String, + Type: reflect.TypeOf(shared.UnionString("")), + }, + ) +} + +type AddressMapZoneDeleteResponseArray []interface{} + +func (r AddressMapZoneDeleteResponseArray) ImplementsAddressingAddressMapZoneDeleteResponse() {} + type AddressMapZoneUpdateParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` @@ -71,9 +123,9 @@ func (r AddressMapZoneUpdateParams) MarshalJSON() (data []byte, err error) { } type AddressMapZoneUpdateResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result shared.UnnamedSchemaRef167 `json:"result,required,nullable"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result AddressMapZoneUpdateResponse `json:"result,required,nullable"` // Whether the API call was successful Success AddressMapZoneUpdateResponseEnvelopeSuccess `json:"success,required"` ResultInfo AddressMapZoneUpdateResponseEnvelopeResultInfo `json:"result_info"` @@ -159,9 +211,9 @@ func (r AddressMapZoneDeleteParams) MarshalJSON() (data []byte, err error) { } type AddressMapZoneDeleteResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result shared.UnnamedSchemaRef167 `json:"result,required,nullable"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result AddressMapZoneDeleteResponse `json:"result,required,nullable"` // Whether the API call was successful Success AddressMapZoneDeleteResponseEnvelopeSuccess `json:"success,required"` ResultInfo AddressMapZoneDeleteResponseEnvelopeResultInfo `json:"result_info"` diff --git a/addressing/aliases.go b/addressing/aliases.go index b16bc881b2d..abee60ee699 100644 --- a/addressing/aliases.go +++ b/addressing/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/addressing/prefix.go b/addressing/prefix.go index 0215137a047..df3b3e8360f 100644 --- a/addressing/prefix.go +++ b/addressing/prefix.go @@ -6,6 +6,7 @@ import ( "context" "fmt" "net/http" + "reflect" "time" "github.com/cloudflare/cloudflare-go/v2/internal/apijson" @@ -14,6 +15,7 @@ import ( "github.com/cloudflare/cloudflare-go/v2/internal/requestconfig" "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/option" + "github.com/tidwall/gjson" ) // PrefixService contains methods and other services that help with interacting @@ -74,7 +76,7 @@ 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 *shared.UnnamedSchemaRef167, err error) { +func (r *PrefixService) Delete(ctx context.Context, prefixID string, params 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) @@ -172,6 +174,31 @@ func (r addressingIpamPrefixesJSON) RawJSON() string { return r.raw } +// Union satisfied by [addressing.PrefixDeleteResponseUnknown], +// [addressing.PrefixDeleteResponseArray] or [shared.UnionString]. +type PrefixDeleteResponse interface { + ImplementsAddressingPrefixDeleteResponse() +} + +func init() { + apijson.RegisterUnion( + reflect.TypeOf((*PrefixDeleteResponse)(nil)).Elem(), + "", + apijson.UnionVariant{ + TypeFilter: gjson.JSON, + Type: reflect.TypeOf(PrefixDeleteResponseArray{}), + }, + apijson.UnionVariant{ + TypeFilter: gjson.String, + Type: reflect.TypeOf(shared.UnionString("")), + }, + ) +} + +type PrefixDeleteResponseArray []interface{} + +func (r PrefixDeleteResponseArray) ImplementsAddressingPrefixDeleteResponse() {} + type PrefixNewParams struct { // Identifier AccountID param.Field[string] `path:"account_id,required"` @@ -246,9 +273,9 @@ func (r PrefixDeleteParams) MarshalJSON() (data []byte, err error) { } type PrefixDeleteResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result shared.UnnamedSchemaRef167 `json:"result,required,nullable"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result PrefixDeleteResponse `json:"result,required,nullable"` // Whether the API call was successful Success PrefixDeleteResponseEnvelopeSuccess `json:"success,required"` ResultInfo PrefixDeleteResponseEnvelopeResultInfo `json:"result_info"` diff --git a/alerting/aliases.go b/alerting/aliases.go index 881193d27d4..4095cdb0d32 100644 --- a/alerting/aliases.go +++ b/alerting/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/alerting/destinationpagerduty.go b/alerting/destinationpagerduty.go index 3b7edbf2361..0901ad0f101 100644 --- a/alerting/destinationpagerduty.go +++ b/alerting/destinationpagerduty.go @@ -6,12 +6,14 @@ import ( "context" "fmt" "net/http" + "reflect" "github.com/cloudflare/cloudflare-go/v2/internal/apijson" "github.com/cloudflare/cloudflare-go/v2/internal/param" "github.com/cloudflare/cloudflare-go/v2/internal/requestconfig" "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/option" + "github.com/tidwall/gjson" ) // DestinationPagerdutyService contains methods and other services that help with @@ -46,7 +48,7 @@ func (r *DestinationPagerdutyService) New(ctx context.Context, body DestinationP } // Deletes all the PagerDuty Services connected to the account. -func (r *DestinationPagerdutyService) Delete(ctx context.Context, body DestinationPagerdutyDeleteParams, opts ...option.RequestOption) (res *shared.UnnamedSchemaRef167, err error) { +func (r *DestinationPagerdutyService) Delete(ctx context.Context, body DestinationPagerdutyDeleteParams, opts ...option.RequestOption) (res *DestinationPagerdutyDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env DestinationPagerdutyDeleteResponseEnvelope path := fmt.Sprintf("accounts/%s/alerting/v3/destinations/pagerduty", body.AccountID) @@ -131,6 +133,32 @@ func (r destinationPagerdutyNewResponseJSON) RawJSON() string { return r.raw } +// Union satisfied by [alerting.DestinationPagerdutyDeleteResponseUnknown], +// [alerting.DestinationPagerdutyDeleteResponseArray] or [shared.UnionString]. +type DestinationPagerdutyDeleteResponse interface { + ImplementsAlertingDestinationPagerdutyDeleteResponse() +} + +func init() { + apijson.RegisterUnion( + reflect.TypeOf((*DestinationPagerdutyDeleteResponse)(nil)).Elem(), + "", + apijson.UnionVariant{ + TypeFilter: gjson.JSON, + Type: reflect.TypeOf(DestinationPagerdutyDeleteResponseArray{}), + }, + apijson.UnionVariant{ + TypeFilter: gjson.String, + Type: reflect.TypeOf(shared.UnionString("")), + }, + ) +} + +type DestinationPagerdutyDeleteResponseArray []interface{} + +func (r DestinationPagerdutyDeleteResponseArray) ImplementsAlertingDestinationPagerdutyDeleteResponse() { +} + type DestinationPagerdutyLinkResponse struct { // UUID ID string `json:"id"` @@ -207,9 +235,9 @@ type DestinationPagerdutyDeleteParams struct { } type DestinationPagerdutyDeleteResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result shared.UnnamedSchemaRef167 `json:"result,required,nullable"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result DestinationPagerdutyDeleteResponse `json:"result,required,nullable"` // Whether the API call was successful Success DestinationPagerdutyDeleteResponseEnvelopeSuccess `json:"success,required"` ResultInfo DestinationPagerdutyDeleteResponseEnvelopeResultInfo `json:"result_info"` diff --git a/alerting/destinationwebhook.go b/alerting/destinationwebhook.go index b85b42121f7..5732fcad4b4 100644 --- a/alerting/destinationwebhook.go +++ b/alerting/destinationwebhook.go @@ -6,6 +6,7 @@ import ( "context" "fmt" "net/http" + "reflect" "time" "github.com/cloudflare/cloudflare-go/v2/internal/apijson" @@ -14,6 +15,7 @@ import ( "github.com/cloudflare/cloudflare-go/v2/internal/requestconfig" "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/option" + "github.com/tidwall/gjson" ) // DestinationWebhookService contains methods and other services that help with @@ -84,7 +86,7 @@ func (r *DestinationWebhookService) ListAutoPaging(ctx context.Context, query De } // Delete a configured webhook destination. -func (r *DestinationWebhookService) Delete(ctx context.Context, webhookID string, body DestinationWebhookDeleteParams, opts ...option.RequestOption) (res *shared.UnnamedSchemaRef167, err error) { +func (r *DestinationWebhookService) Delete(ctx context.Context, webhookID string, body DestinationWebhookDeleteParams, opts ...option.RequestOption) (res *DestinationWebhookDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env DestinationWebhookDeleteResponseEnvelope path := fmt.Sprintf("accounts/%s/alerting/v3/destinations/webhooks/%s", body.AccountID, webhookID) @@ -218,6 +220,31 @@ func (r destinationWebhookUpdateResponseJSON) RawJSON() string { return r.raw } +// Union satisfied by [alerting.DestinationWebhookDeleteResponseUnknown], +// [alerting.DestinationWebhookDeleteResponseArray] or [shared.UnionString]. +type DestinationWebhookDeleteResponse interface { + ImplementsAlertingDestinationWebhookDeleteResponse() +} + +func init() { + apijson.RegisterUnion( + reflect.TypeOf((*DestinationWebhookDeleteResponse)(nil)).Elem(), + "", + apijson.UnionVariant{ + TypeFilter: gjson.JSON, + Type: reflect.TypeOf(DestinationWebhookDeleteResponseArray{}), + }, + apijson.UnionVariant{ + TypeFilter: gjson.String, + Type: reflect.TypeOf(shared.UnionString("")), + }, + ) +} + +type DestinationWebhookDeleteResponseArray []interface{} + +func (r DestinationWebhookDeleteResponseArray) ImplementsAlertingDestinationWebhookDeleteResponse() {} + type DestinationWebhookNewParams struct { // The account id AccountID param.Field[string] `path:"account_id,required"` @@ -351,9 +378,9 @@ type DestinationWebhookDeleteParams struct { } type DestinationWebhookDeleteResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result shared.UnnamedSchemaRef167 `json:"result,required,nullable"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result DestinationWebhookDeleteResponse `json:"result,required,nullable"` // Whether the API call was successful Success DestinationWebhookDeleteResponseEnvelopeSuccess `json:"success,required"` ResultInfo DestinationWebhookDeleteResponseEnvelopeResultInfo `json:"result_info"` diff --git a/alerting/policy.go b/alerting/policy.go index 1c13905e76e..59ccc332ec7 100644 --- a/alerting/policy.go +++ b/alerting/policy.go @@ -85,7 +85,7 @@ func (r *PolicyService) ListAutoPaging(ctx context.Context, query PolicyListPara } // Delete a Notification policy. -func (r *PolicyService) Delete(ctx context.Context, policyID string, body PolicyDeleteParams, opts ...option.RequestOption) (res *shared.UnnamedSchemaRef167, err error) { +func (r *PolicyService) Delete(ctx context.Context, policyID string, body PolicyDeleteParams, opts ...option.RequestOption) (res *PolicyDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env PolicyDeleteResponseEnvelope path := fmt.Sprintf("accounts/%s/alerting/v3/policies/%s", body.AccountID, policyID) @@ -508,6 +508,31 @@ func (r policyUpdateResponseJSON) RawJSON() string { return r.raw } +// Union satisfied by [alerting.PolicyDeleteResponseUnknown], +// [alerting.PolicyDeleteResponseArray] or [shared.UnionString]. +type PolicyDeleteResponse interface { + ImplementsAlertingPolicyDeleteResponse() +} + +func init() { + apijson.RegisterUnion( + reflect.TypeOf((*PolicyDeleteResponse)(nil)).Elem(), + "", + apijson.UnionVariant{ + TypeFilter: gjson.JSON, + Type: reflect.TypeOf(PolicyDeleteResponseArray{}), + }, + apijson.UnionVariant{ + TypeFilter: gjson.String, + Type: reflect.TypeOf(shared.UnionString("")), + }, + ) +} + +type PolicyDeleteResponseArray []interface{} + +func (r PolicyDeleteResponseArray) ImplementsAlertingPolicyDeleteResponse() {} + type PolicyNewParams struct { // The account id AccountID param.Field[string] `path:"account_id,required"` @@ -1107,9 +1132,9 @@ type PolicyDeleteParams struct { } type PolicyDeleteResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result shared.UnnamedSchemaRef167 `json:"result,required,nullable"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result PolicyDeleteResponse `json:"result,required,nullable"` // Whether the API call was successful Success PolicyDeleteResponseEnvelopeSuccess `json:"success,required"` ResultInfo PolicyDeleteResponseEnvelopeResultInfo `json:"result_info"` diff --git a/aliases.go b/aliases.go index 95c364e1ed9..29698a0679f 100644 --- a/aliases.go +++ b/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/api.md b/api.md index fbf677988ae..2c6a10fa80a 100644 --- a/api.md +++ b/api.md @@ -1,6 +1,5 @@ # Shared Params Types -- shared.LoggingParam - shared.ResponseInfoParam - shared.UnnamedSchemaRef119 - shared.UnnamedSchemaRef121Param @@ -26,7 +25,6 @@ # Shared Response Types - shared.ErrorData -- shared.Logging - shared.ResponseInfo - shared.UnnamedSchemaRef10 - shared.UnnamedSchemaRef102 @@ -56,7 +54,6 @@ - shared.UnnamedSchemaRef161 - shared.UnnamedSchemaRef162 - shared.UnnamedSchemaRef163 -- shared.UnnamedSchemaRef167 - shared.UnnamedSchemaRef169 - shared.UnnamedSchemaRef171 - shared.UnnamedSchemaRef173 @@ -239,15 +236,15 @@ Methods: Response Types: -- user.FirewallRule +- user.AccessRule - user.FirewallAccessRuleDeleteResponse Methods: -- client.User.Firewall.AccessRules.New(ctx context.Context, body user.FirewallAccessRuleNewParams) (user.FirewallRule, error) -- client.User.Firewall.AccessRules.List(ctx context.Context, query user.FirewallAccessRuleListParams) (pagination.V4PagePaginationArray[user.FirewallRule], error) +- client.User.Firewall.AccessRules.New(ctx context.Context, body user.FirewallAccessRuleNewParams) (user.AccessRule, error) +- client.User.Firewall.AccessRules.List(ctx context.Context, query user.FirewallAccessRuleListParams) (pagination.V4PagePaginationArray[user.AccessRule], error) - client.User.Firewall.AccessRules.Delete(ctx context.Context, identifier string, body user.FirewallAccessRuleDeleteParams) (user.FirewallAccessRuleDeleteResponse, error) -- client.User.Firewall.AccessRules.Edit(ctx context.Context, identifier string, body user.FirewallAccessRuleEditParams) (user.FirewallRule, error) +- client.User.Firewall.AccessRules.Edit(ctx context.Context, identifier string, body user.FirewallAccessRuleEditParams) (user.AccessRule, error) ## Invites @@ -269,19 +266,19 @@ Methods: Response Types: -- user.LoadBalancingMonitor +- user.Monitor - user.LoadBalancerMonitorDeleteResponse - user.LoadBalancerMonitorPreviewResponse - user.LoadBalancerMonitorReferencesResponse Methods: -- client.User.LoadBalancers.Monitors.New(ctx context.Context, body user.LoadBalancerMonitorNewParams) (user.LoadBalancingMonitor, error) -- client.User.LoadBalancers.Monitors.Update(ctx context.Context, monitorID string, body user.LoadBalancerMonitorUpdateParams) (user.LoadBalancingMonitor, error) -- client.User.LoadBalancers.Monitors.List(ctx context.Context) (pagination.SinglePage[user.LoadBalancingMonitor], error) +- client.User.LoadBalancers.Monitors.New(ctx context.Context, body user.LoadBalancerMonitorNewParams) (user.Monitor, error) +- client.User.LoadBalancers.Monitors.Update(ctx context.Context, monitorID string, body user.LoadBalancerMonitorUpdateParams) (user.Monitor, error) +- client.User.LoadBalancers.Monitors.List(ctx context.Context) (pagination.SinglePage[user.Monitor], error) - client.User.LoadBalancers.Monitors.Delete(ctx context.Context, monitorID string, body user.LoadBalancerMonitorDeleteParams) (user.LoadBalancerMonitorDeleteResponse, error) -- client.User.LoadBalancers.Monitors.Edit(ctx context.Context, monitorID string, body user.LoadBalancerMonitorEditParams) (user.LoadBalancingMonitor, error) -- client.User.LoadBalancers.Monitors.Get(ctx context.Context, monitorID string) (user.LoadBalancingMonitor, error) +- client.User.LoadBalancers.Monitors.Edit(ctx context.Context, monitorID string, body user.LoadBalancerMonitorEditParams) (user.Monitor, error) +- client.User.LoadBalancers.Monitors.Get(ctx context.Context, monitorID string) (user.Monitor, error) - client.User.LoadBalancers.Monitors.Preview(ctx context.Context, monitorID string, body user.LoadBalancerMonitorPreviewParams) (user.LoadBalancerMonitorPreviewResponse, error) - client.User.LoadBalancers.Monitors.References(ctx context.Context, monitorID string) ([]user.LoadBalancerMonitorReferencesResponse, error) @@ -289,7 +286,7 @@ Methods: Response Types: -- user.LoadBalancingPool +- user.Pool - user.LoadBalancerPoolDeleteResponse - user.LoadBalancerPoolHealthResponse - user.LoadBalancerPoolPreviewResponse @@ -297,12 +294,12 @@ Response Types: Methods: -- client.User.LoadBalancers.Pools.New(ctx context.Context, body user.LoadBalancerPoolNewParams) (user.LoadBalancingPool, error) -- client.User.LoadBalancers.Pools.Update(ctx context.Context, poolID string, body user.LoadBalancerPoolUpdateParams) (user.LoadBalancingPool, error) -- client.User.LoadBalancers.Pools.List(ctx context.Context, query user.LoadBalancerPoolListParams) (pagination.SinglePage[user.LoadBalancingPool], error) +- client.User.LoadBalancers.Pools.New(ctx context.Context, body user.LoadBalancerPoolNewParams) (user.Pool, error) +- client.User.LoadBalancers.Pools.Update(ctx context.Context, poolID string, body user.LoadBalancerPoolUpdateParams) (user.Pool, error) +- client.User.LoadBalancers.Pools.List(ctx context.Context, query user.LoadBalancerPoolListParams) (pagination.SinglePage[user.Pool], error) - client.User.LoadBalancers.Pools.Delete(ctx context.Context, poolID string, body user.LoadBalancerPoolDeleteParams) (user.LoadBalancerPoolDeleteResponse, error) -- client.User.LoadBalancers.Pools.Edit(ctx context.Context, poolID string, body user.LoadBalancerPoolEditParams) (user.LoadBalancingPool, error) -- client.User.LoadBalancers.Pools.Get(ctx context.Context, poolID string) (user.LoadBalancingPool, error) +- client.User.LoadBalancers.Pools.Edit(ctx context.Context, poolID string, body user.LoadBalancerPoolEditParams) (user.Pool, error) +- client.User.LoadBalancers.Pools.Get(ctx context.Context, poolID string) (user.Pool, error) - client.User.LoadBalancers.Pools.Health(ctx context.Context, poolID string) (user.LoadBalancerPoolHealthResponse, error) - client.User.LoadBalancers.Pools.Preview(ctx context.Context, poolID string, body user.LoadBalancerPoolPreviewParams) (user.LoadBalancerPoolPreviewResponse, error) - client.User.LoadBalancers.Pools.References(ctx context.Context, poolID string) ([]user.LoadBalancerPoolReferencesResponse, error) @@ -1208,11 +1205,12 @@ Methods: Response Types: - zones.CustomNameserverUpdateResponse +- zones.CustomNameserverGetResponse Methods: - client.Zones.CustomNameservers.Update(ctx context.Context, params zones.CustomNameserverUpdateParams) (zones.CustomNameserverUpdateResponse, error) -- client.Zones.CustomNameservers.Get(ctx context.Context, query zones.CustomNameserverGetParams) (shared.UnnamedSchemaRef167, error) +- client.Zones.CustomNameservers.Get(ctx context.Context, query zones.CustomNameserverGetParams) (zones.CustomNameserverGetResponse, error) ## Holds @@ -1280,12 +1278,12 @@ Response Types: Methods: -- client.LoadBalancers.Monitors.New(ctx context.Context, params load_balancers.MonitorNewParams) (user.LoadBalancingMonitor, error) -- client.LoadBalancers.Monitors.Update(ctx context.Context, monitorID string, params load_balancers.MonitorUpdateParams) (user.LoadBalancingMonitor, error) -- client.LoadBalancers.Monitors.List(ctx context.Context, query load_balancers.MonitorListParams) (pagination.SinglePage[user.LoadBalancingMonitor], error) +- client.LoadBalancers.Monitors.New(ctx context.Context, params load_balancers.MonitorNewParams) (user.Monitor, error) +- client.LoadBalancers.Monitors.Update(ctx context.Context, monitorID string, params load_balancers.MonitorUpdateParams) (user.Monitor, error) +- client.LoadBalancers.Monitors.List(ctx context.Context, query load_balancers.MonitorListParams) (pagination.SinglePage[user.Monitor], error) - client.LoadBalancers.Monitors.Delete(ctx context.Context, monitorID string, params load_balancers.MonitorDeleteParams) (load_balancers.MonitorDeleteResponse, error) -- client.LoadBalancers.Monitors.Edit(ctx context.Context, monitorID string, params load_balancers.MonitorEditParams) (user.LoadBalancingMonitor, error) -- client.LoadBalancers.Monitors.Get(ctx context.Context, monitorID string, query load_balancers.MonitorGetParams) (user.LoadBalancingMonitor, error) +- client.LoadBalancers.Monitors.Edit(ctx context.Context, monitorID string, params load_balancers.MonitorEditParams) (user.Monitor, error) +- client.LoadBalancers.Monitors.Get(ctx context.Context, monitorID string, query load_balancers.MonitorGetParams) (user.Monitor, error) ### Previews @@ -1315,12 +1313,12 @@ Response Types: Methods: -- client.LoadBalancers.Pools.New(ctx context.Context, params load_balancers.PoolNewParams) (user.LoadBalancingPool, error) -- client.LoadBalancers.Pools.Update(ctx context.Context, poolID string, params load_balancers.PoolUpdateParams) (user.LoadBalancingPool, error) -- client.LoadBalancers.Pools.List(ctx context.Context, params load_balancers.PoolListParams) (pagination.SinglePage[user.LoadBalancingPool], error) +- client.LoadBalancers.Pools.New(ctx context.Context, params load_balancers.PoolNewParams) (user.Pool, error) +- client.LoadBalancers.Pools.Update(ctx context.Context, poolID string, params load_balancers.PoolUpdateParams) (user.Pool, error) +- client.LoadBalancers.Pools.List(ctx context.Context, params load_balancers.PoolListParams) (pagination.SinglePage[user.Pool], error) - client.LoadBalancers.Pools.Delete(ctx context.Context, poolID string, params load_balancers.PoolDeleteParams) (load_balancers.PoolDeleteResponse, error) -- client.LoadBalancers.Pools.Edit(ctx context.Context, poolID string, params load_balancers.PoolEditParams) (user.LoadBalancingPool, error) -- client.LoadBalancers.Pools.Get(ctx context.Context, poolID string, query load_balancers.PoolGetParams) (user.LoadBalancingPool, error) +- client.LoadBalancers.Pools.Edit(ctx context.Context, poolID string, params load_balancers.PoolEditParams) (user.Pool, error) +- client.LoadBalancers.Pools.Get(ctx context.Context, poolID string, query load_balancers.PoolGetParams) (user.Pool, error) ### Health @@ -2836,6 +2834,7 @@ Response Types: - queues.QueueNewResponse - queues.QueueUpdateResponse - queues.QueueListResponse +- queues.QueueDeleteResponse - queues.QueueGetResponse Methods: @@ -2843,7 +2842,7 @@ Methods: - client.Queues.New(ctx context.Context, params queues.QueueNewParams) (queues.QueueNewResponse, error) - client.Queues.Update(ctx context.Context, queueID string, params queues.QueueUpdateParams) (queues.QueueUpdateResponse, error) - client.Queues.List(ctx context.Context, query queues.QueueListParams) ([]queues.QueueListResponse, error) -- client.Queues.Delete(ctx context.Context, queueID string, params queues.QueueDeleteParams) (shared.UnnamedSchemaRef167, error) +- client.Queues.Delete(ctx context.Context, queueID string, params queues.QueueDeleteParams) (queues.QueueDeleteResponse, error) - client.Queues.Get(ctx context.Context, queueID string, query queues.QueueGetParams) (queues.QueueGetResponse, error) ## Consumers @@ -2852,13 +2851,14 @@ Response Types: - queues.ConsumerNewResponse - queues.ConsumerUpdateResponse +- queues.ConsumerDeleteResponse - queues.ConsumerGetResponse 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) (shared.UnnamedSchemaRef167, error) +- client.Queues.Consumers.Delete(ctx context.Context, queueID string, consumerID string, params queues.ConsumerDeleteParams) (queues.ConsumerDeleteResponse, error) - client.Queues.Consumers.Get(ctx context.Context, queueID string, query queues.ConsumerGetParams) ([]queues.ConsumerGetResponse, error) ## Messages @@ -2936,8 +2936,13 @@ Methods: # Rulesets +Params Types: + +- rulesets.LoggingParam + Response Types: +- rulesets.Logging - rulesets.RulesetNewResponse - rulesets.RulesetUpdateResponse - rulesets.RulesetListResponse @@ -3097,36 +3102,52 @@ Response Types: - addressing.AddressingAddressMaps - addressing.AddressMapNewResponse +- addressing.AddressMapDeleteResponse - addressing.AddressMapGetResponse 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.AddressingAddressMaps], error) -- client.Addressing.AddressMaps.Delete(ctx context.Context, addressMapID string, params addressing.AddressMapDeleteParams) (shared.UnnamedSchemaRef167, error) +- client.Addressing.AddressMaps.Delete(ctx context.Context, addressMapID string, params addressing.AddressMapDeleteParams) (addressing.AddressMapDeleteResponse, error) - client.Addressing.AddressMaps.Edit(ctx context.Context, addressMapID string, params addressing.AddressMapEditParams) (addressing.AddressingAddressMaps, error) - client.Addressing.AddressMaps.Get(ctx context.Context, addressMapID string, query addressing.AddressMapGetParams) (addressing.AddressMapGetResponse, error) ### Accounts +Response Types: + +- addressing.AddressMapAccountUpdateResponse +- addressing.AddressMapAccountDeleteResponse + Methods: -- client.Addressing.AddressMaps.Accounts.Update(ctx context.Context, addressMapID string, params addressing.AddressMapAccountUpdateParams) (shared.UnnamedSchemaRef167, error) -- client.Addressing.AddressMaps.Accounts.Delete(ctx context.Context, addressMapID string, params addressing.AddressMapAccountDeleteParams) (shared.UnnamedSchemaRef167, error) +- 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) ### IPs +Response Types: + +- addressing.AddressMapIPUpdateResponse +- addressing.AddressMapIPDeleteResponse + Methods: -- client.Addressing.AddressMaps.IPs.Update(ctx context.Context, addressMapID string, ipAddress string, params addressing.AddressMapIPUpdateParams) (shared.UnnamedSchemaRef167, error) -- client.Addressing.AddressMaps.IPs.Delete(ctx context.Context, addressMapID string, ipAddress string, params addressing.AddressMapIPDeleteParams) (shared.UnnamedSchemaRef167, error) +- 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) ### Zones +Response Types: + +- addressing.AddressMapZoneUpdateResponse +- addressing.AddressMapZoneDeleteResponse + Methods: -- client.Addressing.AddressMaps.Zones.Update(ctx context.Context, addressMapID string, params addressing.AddressMapZoneUpdateParams) (shared.UnnamedSchemaRef167, error) -- client.Addressing.AddressMaps.Zones.Delete(ctx context.Context, addressMapID string, params addressing.AddressMapZoneDeleteParams) (shared.UnnamedSchemaRef167, error) +- 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) ## LOADocuments @@ -3153,12 +3174,13 @@ Methods: Response Types: - addressing.AddressingIpamPrefixes +- addressing.PrefixDeleteResponse Methods: - client.Addressing.Prefixes.New(ctx context.Context, params addressing.PrefixNewParams) (addressing.AddressingIpamPrefixes, error) - client.Addressing.Prefixes.List(ctx context.Context, query addressing.PrefixListParams) (pagination.SinglePage[addressing.AddressingIpamPrefixes], error) -- client.Addressing.Prefixes.Delete(ctx context.Context, prefixID string, params addressing.PrefixDeleteParams) (shared.UnnamedSchemaRef167, error) +- client.Addressing.Prefixes.Delete(ctx context.Context, prefixID string, params addressing.PrefixDeleteParams) (addressing.PrefixDeleteResponse, error) - client.Addressing.Prefixes.Edit(ctx context.Context, prefixID string, params addressing.PrefixEditParams) (addressing.AddressingIpamPrefixes, error) - client.Addressing.Prefixes.Get(ctx context.Context, prefixID string, query addressing.PrefixGetParams) (addressing.AddressingIpamPrefixes, error) @@ -4132,12 +4154,13 @@ Response Types: - alerting.AlertingPagerduty - alerting.DestinationPagerdutyNewResponse +- alerting.DestinationPagerdutyDeleteResponse - alerting.DestinationPagerdutyLinkResponse Methods: - client.Alerting.Destinations.Pagerduty.New(ctx context.Context, body alerting.DestinationPagerdutyNewParams) (alerting.DestinationPagerdutyNewResponse, error) -- client.Alerting.Destinations.Pagerduty.Delete(ctx context.Context, body alerting.DestinationPagerdutyDeleteParams) (shared.UnnamedSchemaRef167, error) +- client.Alerting.Destinations.Pagerduty.Delete(ctx context.Context, body alerting.DestinationPagerdutyDeleteParams) (alerting.DestinationPagerdutyDeleteResponse, error) - client.Alerting.Destinations.Pagerduty.Get(ctx context.Context, query alerting.DestinationPagerdutyGetParams) ([]alerting.AlertingPagerduty, error) - client.Alerting.Destinations.Pagerduty.Link(ctx context.Context, tokenID string, query alerting.DestinationPagerdutyLinkParams) (alerting.DestinationPagerdutyLinkResponse, error) @@ -4148,13 +4171,14 @@ Response Types: - alerting.AlertingWebhooks - alerting.DestinationWebhookNewResponse - alerting.DestinationWebhookUpdateResponse +- alerting.DestinationWebhookDeleteResponse Methods: - client.Alerting.Destinations.Webhooks.New(ctx context.Context, params alerting.DestinationWebhookNewParams) (alerting.DestinationWebhookNewResponse, error) - client.Alerting.Destinations.Webhooks.Update(ctx context.Context, webhookID string, params alerting.DestinationWebhookUpdateParams) (alerting.DestinationWebhookUpdateResponse, error) - client.Alerting.Destinations.Webhooks.List(ctx context.Context, query alerting.DestinationWebhookListParams) (pagination.SinglePage[alerting.AlertingWebhooks], error) -- client.Alerting.Destinations.Webhooks.Delete(ctx context.Context, webhookID string, body alerting.DestinationWebhookDeleteParams) (shared.UnnamedSchemaRef167, error) +- client.Alerting.Destinations.Webhooks.Delete(ctx context.Context, webhookID string, body alerting.DestinationWebhookDeleteParams) (alerting.DestinationWebhookDeleteResponse, error) - client.Alerting.Destinations.Webhooks.Get(ctx context.Context, webhookID string, query alerting.DestinationWebhookGetParams) (alerting.AlertingWebhooks, error) ## History @@ -4174,13 +4198,14 @@ Response Types: - alerting.AlertingPolicies - alerting.PolicyNewResponse - alerting.PolicyUpdateResponse +- alerting.PolicyDeleteResponse Methods: - client.Alerting.Policies.New(ctx context.Context, params alerting.PolicyNewParams) (alerting.PolicyNewResponse, error) - client.Alerting.Policies.Update(ctx context.Context, policyID string, params alerting.PolicyUpdateParams) (alerting.PolicyUpdateResponse, error) - client.Alerting.Policies.List(ctx context.Context, query alerting.PolicyListParams) (pagination.SinglePage[alerting.AlertingPolicies], error) -- client.Alerting.Policies.Delete(ctx context.Context, policyID string, body alerting.PolicyDeleteParams) (shared.UnnamedSchemaRef167, error) +- client.Alerting.Policies.Delete(ctx context.Context, policyID string, body alerting.PolicyDeleteParams) (alerting.PolicyDeleteResponse, error) - client.Alerting.Policies.Get(ctx context.Context, policyID string, query alerting.PolicyGetParams) (alerting.AlertingPolicies, error) # D1 diff --git a/argo/aliases.go b/argo/aliases.go index 0791c16cabb..3abe68c3a81 100644 --- a/argo/aliases.go +++ b/argo/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/audit_logs/aliases.go b/audit_logs/aliases.go index 90440e95a48..f66cff91b22 100644 --- a/audit_logs/aliases.go +++ b/audit_logs/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/billing/aliases.go b/billing/aliases.go index 52b27ee9238..bc8b83f06ee 100644 --- a/billing/aliases.go +++ b/billing/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/bot_management/aliases.go b/bot_management/aliases.go index b000c803fda..0fff30fefe2 100644 --- a/bot_management/aliases.go +++ b/bot_management/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/brand_protection/aliases.go b/brand_protection/aliases.go index 9e41d0cfc5a..7e12f1bc5db 100644 --- a/brand_protection/aliases.go +++ b/brand_protection/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/cache/aliases.go b/cache/aliases.go index f33fde38e42..6886c741ef3 100644 --- a/cache/aliases.go +++ b/cache/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/calls/aliases.go b/calls/aliases.go index df786b06fc8..d7037f63308 100644 --- a/calls/aliases.go +++ b/calls/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/certificate_authorities/aliases.go b/certificate_authorities/aliases.go index e7b57db589b..9c599a27048 100644 --- a/certificate_authorities/aliases.go +++ b/certificate_authorities/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/challenges/aliases.go b/challenges/aliases.go index 5411153e633..49800bc20e4 100644 --- a/challenges/aliases.go +++ b/challenges/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/client_certificates/aliases.go b/client_certificates/aliases.go index c1185227a0c..931bb4cc6f7 100644 --- a/client_certificates/aliases.go +++ b/client_certificates/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/cloudforce_one/aliases.go b/cloudforce_one/aliases.go index bcbf6ec4da5..fc7184b8ffc 100644 --- a/cloudforce_one/aliases.go +++ b/cloudforce_one/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/custom_certificates/aliases.go b/custom_certificates/aliases.go index e99c82a719f..62415d7961a 100644 --- a/custom_certificates/aliases.go +++ b/custom_certificates/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/custom_hostnames/aliases.go b/custom_hostnames/aliases.go index b38f3168848..f72122edd15 100644 --- a/custom_hostnames/aliases.go +++ b/custom_hostnames/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/custom_nameservers/aliases.go b/custom_nameservers/aliases.go index e1158dbb1f5..b9196205805 100644 --- a/custom_nameservers/aliases.go +++ b/custom_nameservers/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/d1/aliases.go b/d1/aliases.go index e0bdcd96271..2a5d2f38992 100644 --- a/d1/aliases.go +++ b/d1/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/dcv_delegation/aliases.go b/dcv_delegation/aliases.go index ea16eb07d25..ac9c9e08056 100644 --- a/dcv_delegation/aliases.go +++ b/dcv_delegation/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/diagnostics/aliases.go b/diagnostics/aliases.go index 95b41b17d6e..2981d0d2d78 100644 --- a/diagnostics/aliases.go +++ b/diagnostics/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/dns/aliases.go b/dns/aliases.go index 7abda6cadf5..1142a4fb524 100644 --- a/dns/aliases.go +++ b/dns/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/dnssec/aliases.go b/dnssec/aliases.go index 1522bfa788b..393e1113655 100644 --- a/dnssec/aliases.go +++ b/dnssec/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/durable_objects/aliases.go b/durable_objects/aliases.go index 691e1d1ef0a..169704cea25 100644 --- a/durable_objects/aliases.go +++ b/durable_objects/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/email_routing/aliases.go b/email_routing/aliases.go index fa81ac37a38..c62efac84b3 100644 --- a/email_routing/aliases.go +++ b/email_routing/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/filters/aliases.go b/filters/aliases.go index e92aeccc081..bae76cc22b8 100644 --- a/filters/aliases.go +++ b/filters/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/firewall/aliases.go b/firewall/aliases.go index 48bd9fdff19..b7a0ef2e42d 100644 --- a/firewall/aliases.go +++ b/firewall/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/firewall/wafpackage.go b/firewall/wafpackage.go index 3270ab5b5b8..e72e03a594e 100644 --- a/firewall/wafpackage.go +++ b/firewall/wafpackage.go @@ -103,9 +103,9 @@ func init() { } type WAFPackageListResponseLegacyJhsAPIResponseCollection struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result shared.UnnamedSchemaRef167 `json:"result,required,nullable"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result WAFPackageListResponseLegacyJhsAPIResponseCollectionResult `json:"result,required,nullable"` // Whether the API call was successful Success WAFPackageListResponseLegacyJhsAPIResponseCollectionSuccess `json:"success,required"` ResultInfo WAFPackageListResponseLegacyJhsAPIResponseCollectionResultInfo `json:"result_info"` @@ -135,6 +135,34 @@ func (r wafPackageListResponseLegacyJhsAPIResponseCollectionJSON) RawJSON() stri func (r WAFPackageListResponseLegacyJhsAPIResponseCollection) implementsFirewallWAFPackageListResponse() { } +// Union satisfied by +// [firewall.WAFPackageListResponseLegacyJhsAPIResponseCollectionResultUnknown], +// [firewall.WAFPackageListResponseLegacyJhsAPIResponseCollectionResultArray] or +// [shared.UnionString]. +type WAFPackageListResponseLegacyJhsAPIResponseCollectionResult interface { + ImplementsFirewallWAFPackageListResponseLegacyJhsAPIResponseCollectionResult() +} + +func init() { + apijson.RegisterUnion( + reflect.TypeOf((*WAFPackageListResponseLegacyJhsAPIResponseCollectionResult)(nil)).Elem(), + "", + apijson.UnionVariant{ + TypeFilter: gjson.JSON, + Type: reflect.TypeOf(WAFPackageListResponseLegacyJhsAPIResponseCollectionResultArray{}), + }, + apijson.UnionVariant{ + TypeFilter: gjson.String, + Type: reflect.TypeOf(shared.UnionString("")), + }, + ) +} + +type WAFPackageListResponseLegacyJhsAPIResponseCollectionResultArray []interface{} + +func (r WAFPackageListResponseLegacyJhsAPIResponseCollectionResultArray) ImplementsFirewallWAFPackageListResponseLegacyJhsAPIResponseCollectionResult() { +} + // Whether the API call was successful type WAFPackageListResponseLegacyJhsAPIResponseCollectionSuccess bool diff --git a/healthchecks/aliases.go b/healthchecks/aliases.go index 9a7cb690c4f..99ce62d9937 100644 --- a/healthchecks/aliases.go +++ b/healthchecks/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/hostnames/aliases.go b/hostnames/aliases.go index d65f3722149..b03ad3484fa 100644 --- a/hostnames/aliases.go +++ b/hostnames/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/hyperdrive/aliases.go b/hyperdrive/aliases.go index 3c536e13352..191eb86d2da 100644 --- a/hyperdrive/aliases.go +++ b/hyperdrive/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/images/aliases.go b/images/aliases.go index f0ddfed0912..926bf177d5d 100644 --- a/images/aliases.go +++ b/images/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/intel/aliases.go b/intel/aliases.go index d2e78bd9b6f..6e324a7cc91 100644 --- a/intel/aliases.go +++ b/intel/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/internal/shared/shared.go b/internal/shared/shared.go index b917a246a59..0c4e6d8081c 100644 --- a/internal/shared/shared.go +++ b/internal/shared/shared.go @@ -34,38 +34,6 @@ func (r errorDataJSON) RawJSON() string { return r.raw } -// An object configuring the rule's logging behavior. -type Logging struct { - // Whether to generate a log when the rule matches. - Enabled bool `json:"enabled,required"` - JSON loggingJSON `json:"-"` -} - -// loggingJSON contains the JSON metadata for the struct [Logging] -type loggingJSON struct { - Enabled apijson.Field - raw string - ExtraFields map[string]apijson.Field -} - -func (r *Logging) UnmarshalJSON(data []byte) (err error) { - return apijson.UnmarshalRoot(data, r) -} - -func (r loggingJSON) RawJSON() string { - return r.raw -} - -// An object configuring the rule's logging behavior. -type LoggingParam struct { - // Whether to generate a log when the rule matches. - Enabled param.Field[bool] `json:"enabled,required"` -} - -func (r LoggingParam) MarshalJSON() (data []byte, err error) { - return apijson.MarshalRoot(r) -} - type ResponseInfo struct { Code int64 `json:"code,required"` Message string `json:"message,required"` @@ -1581,31 +1549,6 @@ func (r UnnamedSchemaRef163) IsKnown() bool { return false } -// Union satisfied by [shared.UnnamedSchemaRef167Unknown], -// [shared.UnnamedSchemaRef167Array] or [shared.UnionString]. -type UnnamedSchemaRef167 interface { - ImplementsSharedUnnamedSchemaRef167() -} - -func init() { - apijson.RegisterUnion( - reflect.TypeOf((*UnnamedSchemaRef167)(nil)).Elem(), - "", - apijson.UnionVariant{ - TypeFilter: gjson.JSON, - Type: reflect.TypeOf(UnnamedSchemaRef167Array{}), - }, - apijson.UnionVariant{ - TypeFilter: gjson.String, - Type: reflect.TypeOf(UnionString("")), - }, - ) -} - -type UnnamedSchemaRef167Array []interface{} - -func (r UnnamedSchemaRef167Array) ImplementsSharedUnnamedSchemaRef167() {} - // Union satisfied by [shared.UnnamedSchemaRef169Unknown] or [shared.UnionString]. type UnnamedSchemaRef169 interface { ImplementsSharedUnnamedSchemaRef169() diff --git a/internal/shared/union.go b/internal/shared/union.go index 84c9e0ebcd3..528f62bd058 100644 --- a/internal/shared/union.go +++ b/internal/shared/union.go @@ -4,147 +4,161 @@ package shared type UnionString string -func (UnionString) ImplementsSharedUnnamedSchemaRef116() {} -func (UnionString) ImplementsSharedUnnamedSchemaRef121Param() {} -func (UnionString) ImplementsSharedUnnamedSchemaRef161() {} -func (UnionString) ImplementsSharedUnnamedSchemaRef167() {} -func (UnionString) ImplementsSharedUnnamedSchemaRef169() {} -func (UnionString) ImplementsSharedUnnamedSchemaRef171() {} -func (UnionString) ImplementsSharedUnnamedSchemaRef173() {} -func (UnionString) ImplementsSharedUnnamedSchemaRef49() {} -func (UnionString) ImplementsSharedUnnamedSchemaRef65Value() {} -func (UnionString) ImplementsAccountsAccountUpdateResponse() {} -func (UnionString) ImplementsAccountsAccountGetResponse() {} -func (UnionString) ImplementsAccountsRoleGetResponse() {} -func (UnionString) ImplementsOriginCACertificatesOriginCACertificateNewResponse() {} -func (UnionString) ImplementsOriginCACertificatesOriginCACertificateGetResponse() {} -func (UnionString) ImplementsMembershipsMembershipUpdateResponse() {} -func (UnionString) ImplementsMembershipsMembershipGetResponse() {} -func (UnionString) ImplementsUserUserEditResponse() {} -func (UnionString) ImplementsUserUserGetResponse() {} -func (UnionString) ImplementsUserBillingProfileGetResponse() {} -func (UnionString) ImplementsUserInviteEditResponse() {} -func (UnionString) ImplementsUserInviteGetResponse() {} -func (UnionString) ImplementsUserLoadBalancerPoolHealthResponse() {} -func (UnionString) ImplementsUserOrganizationGetResponse() {} -func (UnionString) ImplementsUserSubscriptionUpdateResponse() {} -func (UnionString) ImplementsUserSubscriptionEditResponse() {} -func (UnionString) ImplementsUserTokenUpdateResponse() {} -func (UnionString) ImplementsUserTokenGetResponse() {} -func (UnionString) ImplementsZonesCustomNameserverUpdateResponse() {} -func (UnionString) ImplementsZonesWorkerScriptUpdateResponse() {} -func (UnionString) ImplementsZonesSubscriptionNewResponse() {} -func (UnionString) ImplementsZonesSubscriptionGetResponse() {} -func (UnionString) ImplementsLoadBalancersPoolHealthGetResponse() {} -func (UnionString) ImplementsLoadBalancersRegionListResponse() {} -func (UnionString) ImplementsLoadBalancersRegionGetResponse() {} -func (UnionString) ImplementsCacheCachePurgeParamsCachePurgeFilesFile() {} -func (UnionString) ImplementsCacheSmartTieredCacheDeleteResponse() {} -func (UnionString) ImplementsCacheSmartTieredCacheEditResponse() {} -func (UnionString) ImplementsCacheSmartTieredCacheGetResponse() {} -func (UnionString) ImplementsSSLAnalyzeNewResponse() {} -func (UnionString) ImplementsSSLCertificatePackGetResponse() {} -func (UnionString) ImplementsSubscriptionsSubscriptionNewResponse() {} -func (UnionString) ImplementsSubscriptionsSubscriptionUpdateResponse() {} -func (UnionString) ImplementsSubscriptionsSubscriptionGetResponse() {} -func (UnionString) ImplementsArgoSmartRoutingEditResponse() {} -func (UnionString) ImplementsArgoSmartRoutingGetResponse() {} -func (UnionString) ImplementsArgoTieredCachingEditResponse() {} -func (UnionString) ImplementsArgoTieredCachingGetResponse() {} -func (UnionString) ImplementsCustomCertificatesCustomCertificateNewResponse() {} -func (UnionString) ImplementsCustomCertificatesCustomCertificateEditResponse() {} -func (UnionString) ImplementsCustomCertificatesCustomCertificateGetResponse() {} -func (UnionString) ImplementsCustomHostnamesFallbackOriginUpdateResponse() {} -func (UnionString) ImplementsCustomHostnamesFallbackOriginDeleteResponse() {} -func (UnionString) ImplementsCustomHostnamesFallbackOriginGetResponse() {} -func (UnionString) ImplementsCustomNameserversCustomNameserverDeleteResponse() {} -func (UnionString) ImplementsDNSDNSFirewallDNSFirewallIP() {} -func (UnionString) ImplementsDNSDNSFirewallUpstreamIP() {} -func (UnionString) ImplementsDNSFirewallNewParamsUpstreamIP() {} -func (UnionString) ImplementsDNSFirewallEditParamsDNSFirewallIP() {} -func (UnionString) ImplementsDNSFirewallEditParamsUpstreamIP() {} -func (UnionString) ImplementsFirewallWAFPackageGetResponseLegacyJhsAPIResponseSingleResult() {} -func (UnionString) ImplementsFirewallWAFPackageGroupEditResponse() {} -func (UnionString) ImplementsFirewallWAFPackageGroupGetResponse() {} -func (UnionString) ImplementsFirewallWAFPackageRuleGetResponse() {} -func (UnionString) ImplementsLogsRayIDGetResponse() {} -func (UnionString) ImplementsLogsReceivedGetResponse() {} -func (UnionString) ImplementsLogsReceivedGetParamsEnd() {} -func (UnionString) ImplementsLogsReceivedGetParamsStart() {} -func (UnionString) ImplementsOriginTLSClientAuthOriginTLSClientAuthNewResponse() {} -func (UnionString) ImplementsOriginTLSClientAuthOriginTLSClientAuthDeleteResponse() {} -func (UnionString) ImplementsOriginTLSClientAuthOriginTLSClientAuthGetResponse() {} -func (UnionString) ImplementsPagerulesPageruleNewResponse() {} -func (UnionString) ImplementsPagerulesPageruleUpdateResponse() {} -func (UnionString) ImplementsPagerulesPageruleEditResponse() {} -func (UnionString) ImplementsPagerulesPageruleGetResponse() {} -func (UnionString) ImplementsWorkersAIRunResponse() {} -func (UnionString) ImplementsWorkersRouteNewResponse() {} -func (UnionString) ImplementsWorkersRouteDeleteResponse() {} -func (UnionString) ImplementsKVNamespaceUpdateResponse() {} -func (UnionString) ImplementsKVNamespaceDeleteResponse() {} -func (UnionString) ImplementsKVNamespaceBulkUpdateResponse() {} -func (UnionString) ImplementsKVNamespaceBulkDeleteResponse() {} -func (UnionString) ImplementsKVNamespaceValueUpdateResponse() {} -func (UnionString) ImplementsKVNamespaceValueDeleteResponse() {} -func (UnionString) ImplementsSpectrumAnalyticsEventBytimeGetResponse() {} -func (UnionString) ImplementsSpectrumAnalyticsEventSummaryGetResponse() {} -func (UnionString) ImplementsSpectrumAppNewResponseOriginPort() {} -func (UnionString) ImplementsSpectrumAppUpdateResponseOriginPort() {} -func (UnionString) ImplementsSpectrumAppNewParamsOriginPort() {} -func (UnionString) ImplementsSpectrumAppUpdateParamsOriginPort() {} -func (UnionString) ImplementsBillingProfileGetResponse() {} -func (UnionString) ImplementsImagesImageVariant() {} -func (UnionString) ImplementsImagesV1DeleteResponse() {} -func (UnionString) ImplementsImagesV1VariantDeleteResponse() {} -func (UnionString) ImplementsIntelIntelSchemasIpip() {} -func (UnionString) ImplementsIntelMiscategorizationNewResponse() {} -func (UnionString) ImplementsIntelAttackSurfaceReportIssueDismissResponse() {} -func (UnionString) ImplementsMagicTransitSiteACLNewResponseACLsLan1Subnet() {} -func (UnionString) ImplementsMagicTransitSiteACLNewResponseACLsLan2Subnet() {} -func (UnionString) ImplementsMagicTransitSiteACLUpdateResponseAcllan1Subnet() {} -func (UnionString) ImplementsMagicTransitSiteACLUpdateResponseAcllan2Subnet() {} -func (UnionString) ImplementsMagicTransitSiteACLListResponseACLsLan1Subnet() {} -func (UnionString) ImplementsMagicTransitSiteACLListResponseACLsLan2Subnet() {} -func (UnionString) ImplementsMagicTransitSiteACLDeleteResponseDeletedAcllan1Subnet() {} -func (UnionString) ImplementsMagicTransitSiteACLDeleteResponseDeletedAcllan2Subnet() {} -func (UnionString) ImplementsMagicTransitSiteACLGetResponseAcllan1Subnet() {} -func (UnionString) ImplementsMagicTransitSiteACLGetResponseAcllan2Subnet() {} -func (UnionString) ImplementsMagicTransitSiteACLNewParamsAcllan1Subnet() {} -func (UnionString) ImplementsMagicTransitSiteACLNewParamsAcllan2Subnet() {} -func (UnionString) ImplementsMagicTransitSiteACLUpdateParamsAcllan1Subnet() {} -func (UnionString) ImplementsMagicTransitSiteACLUpdateParamsAcllan2Subnet() {} -func (UnionString) ImplementsPagesProjectNewResponse() {} -func (UnionString) ImplementsPagesProjectEditResponse() {} -func (UnionString) ImplementsPagesProjectDeploymentHistoryLogGetResponse() {} -func (UnionString) ImplementsPagesProjectDomainNewResponse() {} -func (UnionString) ImplementsPagesProjectDomainEditResponse() {} -func (UnionString) ImplementsPagesProjectDomainGetResponse() {} -func (UnionString) ImplementsRegistrarDomainUpdateResponse() {} -func (UnionString) ImplementsRegistrarDomainGetResponse() {} -func (UnionString) ImplementsRulesListItemGetResponse() {} -func (UnionString) ImplementsStreamAudioTrackDeleteResponse() {} -func (UnionString) ImplementsStreamKeyDeleteResponse() {} -func (UnionString) ImplementsStreamWatermarkNewResponse() {} -func (UnionString) ImplementsStreamWatermarkGetResponse() {} -func (UnionString) ImplementsStreamWebhookUpdateResponse() {} -func (UnionString) ImplementsStreamWebhookDeleteResponse() {} -func (UnionString) ImplementsStreamWebhookGetResponse() {} -func (UnionString) ImplementsStreamCaptionUpdateResponse() {} -func (UnionString) ImplementsStreamCaptionDeleteResponse() {} -func (UnionString) ImplementsStreamDownloadNewResponse() {} -func (UnionString) ImplementsStreamDownloadDeleteResponse() {} -func (UnionString) ImplementsStreamDownloadGetResponse() {} -func (UnionString) ImplementsAlertingDestinationEligibleGetResponse() {} -func (UnionString) ImplementsAlertingAlertingPoliciesMechanismsID() {} -func (UnionString) ImplementsAlertingPolicyNewParamsMechanismsID() {} -func (UnionString) ImplementsAlertingPolicyUpdateParamsMechanismsID() {} -func (UnionString) ImplementsWARPConnectorWARPConnectorTokenResponse() {} -func (UnionString) ImplementsZeroTrustAccessApplicationUpdateParamsSelfHostedApplicationAppID() {} -func (UnionString) ImplementsZeroTrustAccessApplicationUpdateParamsSaaSApplicationAppID() {} -func (UnionString) ImplementsZeroTrustAccessApplicationUpdateParamsBrowserSSHApplicationAppID() {} -func (UnionString) ImplementsZeroTrustAccessApplicationUpdateParamsBrowserVncApplicationAppID() {} -func (UnionString) ImplementsZeroTrustAccessApplicationUpdateParamsAppLauncherApplicationAppID() {} +func (UnionString) ImplementsSharedUnnamedSchemaRef116() {} +func (UnionString) ImplementsSharedUnnamedSchemaRef121Param() {} +func (UnionString) ImplementsSharedUnnamedSchemaRef161() {} +func (UnionString) ImplementsSharedUnnamedSchemaRef169() {} +func (UnionString) ImplementsSharedUnnamedSchemaRef171() {} +func (UnionString) ImplementsSharedUnnamedSchemaRef173() {} +func (UnionString) ImplementsSharedUnnamedSchemaRef49() {} +func (UnionString) ImplementsSharedUnnamedSchemaRef65Value() {} +func (UnionString) ImplementsAccountsAccountUpdateResponse() {} +func (UnionString) ImplementsAccountsAccountGetResponse() {} +func (UnionString) ImplementsAccountsRoleGetResponse() {} +func (UnionString) ImplementsOriginCACertificatesOriginCACertificateNewResponse() {} +func (UnionString) ImplementsOriginCACertificatesOriginCACertificateGetResponse() {} +func (UnionString) ImplementsMembershipsMembershipUpdateResponse() {} +func (UnionString) ImplementsMembershipsMembershipGetResponse() {} +func (UnionString) ImplementsUserUserEditResponse() {} +func (UnionString) ImplementsUserUserGetResponse() {} +func (UnionString) ImplementsUserBillingProfileGetResponse() {} +func (UnionString) ImplementsUserInviteEditResponse() {} +func (UnionString) ImplementsUserInviteGetResponse() {} +func (UnionString) ImplementsUserLoadBalancerPoolHealthResponse() {} +func (UnionString) ImplementsUserOrganizationGetResponse() {} +func (UnionString) ImplementsUserSubscriptionUpdateResponse() {} +func (UnionString) ImplementsUserSubscriptionEditResponse() {} +func (UnionString) ImplementsUserTokenUpdateResponse() {} +func (UnionString) ImplementsUserTokenGetResponse() {} +func (UnionString) ImplementsZonesCustomNameserverUpdateResponse() {} +func (UnionString) ImplementsZonesCustomNameserverGetResponse() {} +func (UnionString) ImplementsZonesWorkerScriptUpdateResponse() {} +func (UnionString) ImplementsZonesSubscriptionNewResponse() {} +func (UnionString) ImplementsZonesSubscriptionGetResponse() {} +func (UnionString) ImplementsLoadBalancersPoolHealthGetResponse() {} +func (UnionString) ImplementsLoadBalancersRegionListResponse() {} +func (UnionString) ImplementsLoadBalancersRegionGetResponse() {} +func (UnionString) ImplementsCacheCachePurgeParamsCachePurgeFilesFile() {} +func (UnionString) ImplementsCacheSmartTieredCacheDeleteResponse() {} +func (UnionString) ImplementsCacheSmartTieredCacheEditResponse() {} +func (UnionString) ImplementsCacheSmartTieredCacheGetResponse() {} +func (UnionString) ImplementsSSLAnalyzeNewResponse() {} +func (UnionString) ImplementsSSLCertificatePackGetResponse() {} +func (UnionString) ImplementsSubscriptionsSubscriptionNewResponse() {} +func (UnionString) ImplementsSubscriptionsSubscriptionUpdateResponse() {} +func (UnionString) ImplementsSubscriptionsSubscriptionGetResponse() {} +func (UnionString) ImplementsArgoSmartRoutingEditResponse() {} +func (UnionString) ImplementsArgoSmartRoutingGetResponse() {} +func (UnionString) ImplementsArgoTieredCachingEditResponse() {} +func (UnionString) ImplementsArgoTieredCachingGetResponse() {} +func (UnionString) ImplementsCustomCertificatesCustomCertificateNewResponse() {} +func (UnionString) ImplementsCustomCertificatesCustomCertificateEditResponse() {} +func (UnionString) ImplementsCustomCertificatesCustomCertificateGetResponse() {} +func (UnionString) ImplementsCustomHostnamesFallbackOriginUpdateResponse() {} +func (UnionString) ImplementsCustomHostnamesFallbackOriginDeleteResponse() {} +func (UnionString) ImplementsCustomHostnamesFallbackOriginGetResponse() {} +func (UnionString) ImplementsCustomNameserversCustomNameserverDeleteResponse() {} +func (UnionString) ImplementsDNSDNSFirewallDNSFirewallIP() {} +func (UnionString) ImplementsDNSDNSFirewallUpstreamIP() {} +func (UnionString) ImplementsDNSFirewallNewParamsUpstreamIP() {} +func (UnionString) ImplementsDNSFirewallEditParamsDNSFirewallIP() {} +func (UnionString) ImplementsDNSFirewallEditParamsUpstreamIP() {} +func (UnionString) ImplementsFirewallWAFPackageListResponseLegacyJhsAPIResponseCollectionResult() {} +func (UnionString) ImplementsFirewallWAFPackageGetResponseLegacyJhsAPIResponseSingleResult() {} +func (UnionString) ImplementsFirewallWAFPackageGroupEditResponse() {} +func (UnionString) ImplementsFirewallWAFPackageGroupGetResponse() {} +func (UnionString) ImplementsFirewallWAFPackageRuleGetResponse() {} +func (UnionString) ImplementsLogsRayIDGetResponse() {} +func (UnionString) ImplementsLogsReceivedGetResponse() {} +func (UnionString) ImplementsLogsReceivedGetParamsEnd() {} +func (UnionString) ImplementsLogsReceivedGetParamsStart() {} +func (UnionString) ImplementsOriginTLSClientAuthOriginTLSClientAuthNewResponse() {} +func (UnionString) ImplementsOriginTLSClientAuthOriginTLSClientAuthDeleteResponse() {} +func (UnionString) ImplementsOriginTLSClientAuthOriginTLSClientAuthGetResponse() {} +func (UnionString) ImplementsPagerulesPageruleNewResponse() {} +func (UnionString) ImplementsPagerulesPageruleUpdateResponse() {} +func (UnionString) ImplementsPagerulesPageruleEditResponse() {} +func (UnionString) ImplementsPagerulesPageruleGetResponse() {} +func (UnionString) ImplementsWorkersAIRunResponse() {} +func (UnionString) ImplementsWorkersRouteNewResponse() {} +func (UnionString) ImplementsWorkersRouteDeleteResponse() {} +func (UnionString) ImplementsKVNamespaceUpdateResponse() {} +func (UnionString) ImplementsKVNamespaceDeleteResponse() {} +func (UnionString) ImplementsKVNamespaceBulkUpdateResponse() {} +func (UnionString) ImplementsKVNamespaceBulkDeleteResponse() {} +func (UnionString) ImplementsKVNamespaceValueUpdateResponse() {} +func (UnionString) ImplementsKVNamespaceValueDeleteResponse() {} +func (UnionString) ImplementsQueuesQueueDeleteResponse() {} +func (UnionString) ImplementsQueuesConsumerDeleteResponse() {} +func (UnionString) ImplementsSpectrumAnalyticsEventBytimeGetResponse() {} +func (UnionString) ImplementsSpectrumAnalyticsEventSummaryGetResponse() {} +func (UnionString) ImplementsSpectrumAppNewResponseOriginPort() {} +func (UnionString) ImplementsSpectrumAppUpdateResponseOriginPort() {} +func (UnionString) ImplementsSpectrumAppNewParamsOriginPort() {} +func (UnionString) ImplementsSpectrumAppUpdateParamsOriginPort() {} +func (UnionString) ImplementsAddressingAddressMapDeleteResponse() {} +func (UnionString) ImplementsAddressingAddressMapAccountUpdateResponse() {} +func (UnionString) ImplementsAddressingAddressMapAccountDeleteResponse() {} +func (UnionString) ImplementsAddressingAddressMapIPUpdateResponse() {} +func (UnionString) ImplementsAddressingAddressMapIPDeleteResponse() {} +func (UnionString) ImplementsAddressingAddressMapZoneUpdateResponse() {} +func (UnionString) ImplementsAddressingAddressMapZoneDeleteResponse() {} +func (UnionString) ImplementsAddressingPrefixDeleteResponse() {} +func (UnionString) ImplementsBillingProfileGetResponse() {} +func (UnionString) ImplementsImagesImageVariant() {} +func (UnionString) ImplementsImagesV1DeleteResponse() {} +func (UnionString) ImplementsImagesV1VariantDeleteResponse() {} +func (UnionString) ImplementsIntelIntelSchemasIpip() {} +func (UnionString) ImplementsIntelMiscategorizationNewResponse() {} +func (UnionString) ImplementsIntelAttackSurfaceReportIssueDismissResponse() {} +func (UnionString) ImplementsMagicTransitSiteACLNewResponseACLsLan1Subnet() {} +func (UnionString) ImplementsMagicTransitSiteACLNewResponseACLsLan2Subnet() {} +func (UnionString) ImplementsMagicTransitSiteACLUpdateResponseAcllan1Subnet() {} +func (UnionString) ImplementsMagicTransitSiteACLUpdateResponseAcllan2Subnet() {} +func (UnionString) ImplementsMagicTransitSiteACLListResponseACLsLan1Subnet() {} +func (UnionString) ImplementsMagicTransitSiteACLListResponseACLsLan2Subnet() {} +func (UnionString) ImplementsMagicTransitSiteACLDeleteResponseDeletedAcllan1Subnet() {} +func (UnionString) ImplementsMagicTransitSiteACLDeleteResponseDeletedAcllan2Subnet() {} +func (UnionString) ImplementsMagicTransitSiteACLGetResponseAcllan1Subnet() {} +func (UnionString) ImplementsMagicTransitSiteACLGetResponseAcllan2Subnet() {} +func (UnionString) ImplementsMagicTransitSiteACLNewParamsAcllan1Subnet() {} +func (UnionString) ImplementsMagicTransitSiteACLNewParamsAcllan2Subnet() {} +func (UnionString) ImplementsMagicTransitSiteACLUpdateParamsAcllan1Subnet() {} +func (UnionString) ImplementsMagicTransitSiteACLUpdateParamsAcllan2Subnet() {} +func (UnionString) ImplementsPagesProjectNewResponse() {} +func (UnionString) ImplementsPagesProjectEditResponse() {} +func (UnionString) ImplementsPagesProjectDeploymentHistoryLogGetResponse() {} +func (UnionString) ImplementsPagesProjectDomainNewResponse() {} +func (UnionString) ImplementsPagesProjectDomainEditResponse() {} +func (UnionString) ImplementsPagesProjectDomainGetResponse() {} +func (UnionString) ImplementsRegistrarDomainUpdateResponse() {} +func (UnionString) ImplementsRegistrarDomainGetResponse() {} +func (UnionString) ImplementsRulesListItemGetResponse() {} +func (UnionString) ImplementsStreamAudioTrackDeleteResponse() {} +func (UnionString) ImplementsStreamKeyDeleteResponse() {} +func (UnionString) ImplementsStreamWatermarkNewResponse() {} +func (UnionString) ImplementsStreamWatermarkGetResponse() {} +func (UnionString) ImplementsStreamWebhookUpdateResponse() {} +func (UnionString) ImplementsStreamWebhookDeleteResponse() {} +func (UnionString) ImplementsStreamWebhookGetResponse() {} +func (UnionString) ImplementsStreamCaptionUpdateResponse() {} +func (UnionString) ImplementsStreamCaptionDeleteResponse() {} +func (UnionString) ImplementsStreamDownloadNewResponse() {} +func (UnionString) ImplementsStreamDownloadDeleteResponse() {} +func (UnionString) ImplementsStreamDownloadGetResponse() {} +func (UnionString) ImplementsAlertingDestinationEligibleGetResponse() {} +func (UnionString) ImplementsAlertingDestinationPagerdutyDeleteResponse() {} +func (UnionString) ImplementsAlertingDestinationWebhookDeleteResponse() {} +func (UnionString) ImplementsAlertingAlertingPoliciesMechanismsID() {} +func (UnionString) ImplementsAlertingPolicyDeleteResponse() {} +func (UnionString) ImplementsAlertingPolicyNewParamsMechanismsID() {} +func (UnionString) ImplementsAlertingPolicyUpdateParamsMechanismsID() {} +func (UnionString) ImplementsWARPConnectorWARPConnectorTokenResponse() {} +func (UnionString) ImplementsZeroTrustAccessApplicationUpdateParamsSelfHostedApplicationAppID() {} +func (UnionString) ImplementsZeroTrustAccessApplicationUpdateParamsSaaSApplicationAppID() {} +func (UnionString) ImplementsZeroTrustAccessApplicationUpdateParamsBrowserSSHApplicationAppID() {} +func (UnionString) ImplementsZeroTrustAccessApplicationUpdateParamsBrowserVncApplicationAppID() {} +func (UnionString) ImplementsZeroTrustAccessApplicationUpdateParamsAppLauncherApplicationAppID() {} func (UnionString) ImplementsZeroTrustAccessApplicationUpdateParamsDeviceEnrollmentPermissionsApplicationAppID() { } func (UnionString) ImplementsZeroTrustAccessApplicationUpdateParamsBrowserIsolationPermissionsApplicationAppID() { diff --git a/ips/aliases.go b/ips/aliases.go index 4c086428b4a..c4cf1877427 100644 --- a/ips/aliases.go +++ b/ips/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/keyless_certificates/aliases.go b/keyless_certificates/aliases.go index bc354dce4f9..f746c9391ab 100644 --- a/keyless_certificates/aliases.go +++ b/keyless_certificates/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/kv/aliases.go b/kv/aliases.go index 7afaf246207..4e1427de1b3 100644 --- a/kv/aliases.go +++ b/kv/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/load_balancers/aliases.go b/load_balancers/aliases.go index 42a1de53d85..c65558fc47e 100644 --- a/load_balancers/aliases.go +++ b/load_balancers/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/load_balancers/monitor.go b/load_balancers/monitor.go index c7775ec3623..c751ccd2be8 100644 --- a/load_balancers/monitor.go +++ b/load_balancers/monitor.go @@ -38,7 +38,7 @@ func NewMonitorService(opts ...option.RequestOption) (r *MonitorService) { } // Create a configured monitor. -func (r *MonitorService) New(ctx context.Context, params MonitorNewParams, opts ...option.RequestOption) (res *user.LoadBalancingMonitor, err error) { +func (r *MonitorService) New(ctx context.Context, params MonitorNewParams, opts ...option.RequestOption) (res *user.Monitor, err error) { opts = append(r.Options[:], opts...) var env MonitorNewResponseEnvelope path := fmt.Sprintf("accounts/%s/load_balancers/monitors", params.AccountID) @@ -51,7 +51,7 @@ func (r *MonitorService) New(ctx context.Context, params MonitorNewParams, opts } // Modify a configured monitor. -func (r *MonitorService) Update(ctx context.Context, monitorID string, params MonitorUpdateParams, opts ...option.RequestOption) (res *user.LoadBalancingMonitor, err error) { +func (r *MonitorService) Update(ctx context.Context, monitorID string, params MonitorUpdateParams, opts ...option.RequestOption) (res *user.Monitor, err error) { opts = append(r.Options[:], opts...) var env MonitorUpdateResponseEnvelope path := fmt.Sprintf("accounts/%s/load_balancers/monitors/%s", params.AccountID, monitorID) @@ -64,7 +64,7 @@ func (r *MonitorService) Update(ctx context.Context, monitorID string, params Mo } // List configured monitors for an account. -func (r *MonitorService) List(ctx context.Context, query MonitorListParams, opts ...option.RequestOption) (res *pagination.SinglePage[user.LoadBalancingMonitor], err error) { +func (r *MonitorService) List(ctx context.Context, query MonitorListParams, opts ...option.RequestOption) (res *pagination.SinglePage[user.Monitor], err error) { var raw *http.Response opts = append(r.Options, opts...) opts = append([]option.RequestOption{option.WithResponseInto(&raw)}, opts...) @@ -82,7 +82,7 @@ func (r *MonitorService) List(ctx context.Context, query MonitorListParams, opts } // List configured monitors for an account. -func (r *MonitorService) ListAutoPaging(ctx context.Context, query MonitorListParams, opts ...option.RequestOption) *pagination.SinglePageAutoPager[user.LoadBalancingMonitor] { +func (r *MonitorService) ListAutoPaging(ctx context.Context, query MonitorListParams, opts ...option.RequestOption) *pagination.SinglePageAutoPager[user.Monitor] { return pagination.NewSinglePageAutoPager(r.List(ctx, query, opts...)) } @@ -100,7 +100,7 @@ func (r *MonitorService) Delete(ctx context.Context, monitorID string, params Mo } // Apply changes to an existing monitor, overwriting the supplied properties. -func (r *MonitorService) Edit(ctx context.Context, monitorID string, params MonitorEditParams, opts ...option.RequestOption) (res *user.LoadBalancingMonitor, err error) { +func (r *MonitorService) Edit(ctx context.Context, monitorID string, params MonitorEditParams, opts ...option.RequestOption) (res *user.Monitor, err error) { opts = append(r.Options[:], opts...) var env MonitorEditResponseEnvelope path := fmt.Sprintf("accounts/%s/load_balancers/monitors/%s", params.AccountID, monitorID) @@ -113,7 +113,7 @@ func (r *MonitorService) Edit(ctx context.Context, monitorID string, params Moni } // List a single configured monitor for an account. -func (r *MonitorService) Get(ctx context.Context, monitorID string, query MonitorGetParams, opts ...option.RequestOption) (res *user.LoadBalancingMonitor, err error) { +func (r *MonitorService) Get(ctx context.Context, monitorID string, query MonitorGetParams, opts ...option.RequestOption) (res *user.Monitor, err error) { opts = append(r.Options[:], opts...) var env MonitorGetResponseEnvelope path := fmt.Sprintf("accounts/%s/load_balancers/monitors/%s", query.AccountID, monitorID) @@ -226,9 +226,9 @@ func (r MonitorNewParamsType) IsKnown() bool { } type MonitorNewResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result user.LoadBalancingMonitor `json:"result,required"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result user.Monitor `json:"result,required"` // Whether the API call was successful Success MonitorNewResponseEnvelopeSuccess `json:"success,required"` JSON monitorNewResponseEnvelopeJSON `json:"-"` @@ -348,9 +348,9 @@ func (r MonitorUpdateParamsType) IsKnown() bool { } type MonitorUpdateResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result user.LoadBalancingMonitor `json:"result,required"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result user.Monitor `json:"result,required"` // Whether the API call was successful Success MonitorUpdateResponseEnvelopeSuccess `json:"success,required"` JSON monitorUpdateResponseEnvelopeJSON `json:"-"` @@ -528,9 +528,9 @@ func (r MonitorEditParamsType) IsKnown() bool { } type MonitorEditResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result user.LoadBalancingMonitor `json:"result,required"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result user.Monitor `json:"result,required"` // Whether the API call was successful Success MonitorEditResponseEnvelopeSuccess `json:"success,required"` JSON monitorEditResponseEnvelopeJSON `json:"-"` @@ -576,9 +576,9 @@ type MonitorGetParams struct { } type MonitorGetResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result user.LoadBalancingMonitor `json:"result,required"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result user.Monitor `json:"result,required"` // Whether the API call was successful Success MonitorGetResponseEnvelopeSuccess `json:"success,required"` JSON monitorGetResponseEnvelopeJSON `json:"-"` diff --git a/load_balancers/pool.go b/load_balancers/pool.go index f22d6cad953..830f4c65641 100644 --- a/load_balancers/pool.go +++ b/load_balancers/pool.go @@ -40,7 +40,7 @@ func NewPoolService(opts ...option.RequestOption) (r *PoolService) { } // Create a new pool. -func (r *PoolService) New(ctx context.Context, params PoolNewParams, opts ...option.RequestOption) (res *user.LoadBalancingPool, err error) { +func (r *PoolService) New(ctx context.Context, params PoolNewParams, opts ...option.RequestOption) (res *user.Pool, err error) { opts = append(r.Options[:], opts...) var env PoolNewResponseEnvelope path := fmt.Sprintf("accounts/%s/load_balancers/pools", params.AccountID) @@ -53,7 +53,7 @@ func (r *PoolService) New(ctx context.Context, params PoolNewParams, opts ...opt } // Modify a configured pool. -func (r *PoolService) Update(ctx context.Context, poolID string, params PoolUpdateParams, opts ...option.RequestOption) (res *user.LoadBalancingPool, err error) { +func (r *PoolService) Update(ctx context.Context, poolID string, params PoolUpdateParams, opts ...option.RequestOption) (res *user.Pool, err error) { opts = append(r.Options[:], opts...) var env PoolUpdateResponseEnvelope path := fmt.Sprintf("accounts/%s/load_balancers/pools/%s", params.AccountID, poolID) @@ -66,7 +66,7 @@ func (r *PoolService) Update(ctx context.Context, poolID string, params PoolUpda } // List configured pools. -func (r *PoolService) List(ctx context.Context, params PoolListParams, opts ...option.RequestOption) (res *pagination.SinglePage[user.LoadBalancingPool], err error) { +func (r *PoolService) List(ctx context.Context, params PoolListParams, opts ...option.RequestOption) (res *pagination.SinglePage[user.Pool], err error) { var raw *http.Response opts = append(r.Options, opts...) opts = append([]option.RequestOption{option.WithResponseInto(&raw)}, opts...) @@ -84,7 +84,7 @@ func (r *PoolService) List(ctx context.Context, params PoolListParams, opts ...o } // List configured pools. -func (r *PoolService) ListAutoPaging(ctx context.Context, params PoolListParams, opts ...option.RequestOption) *pagination.SinglePageAutoPager[user.LoadBalancingPool] { +func (r *PoolService) ListAutoPaging(ctx context.Context, params PoolListParams, opts ...option.RequestOption) *pagination.SinglePageAutoPager[user.Pool] { return pagination.NewSinglePageAutoPager(r.List(ctx, params, opts...)) } @@ -102,7 +102,7 @@ func (r *PoolService) Delete(ctx context.Context, poolID string, params PoolDele } // Apply changes to an existing pool, overwriting the supplied properties. -func (r *PoolService) Edit(ctx context.Context, poolID string, params PoolEditParams, opts ...option.RequestOption) (res *user.LoadBalancingPool, err error) { +func (r *PoolService) Edit(ctx context.Context, poolID string, params PoolEditParams, opts ...option.RequestOption) (res *user.Pool, err error) { opts = append(r.Options[:], opts...) var env PoolEditResponseEnvelope path := fmt.Sprintf("accounts/%s/load_balancers/pools/%s", params.AccountID, poolID) @@ -115,7 +115,7 @@ func (r *PoolService) Edit(ctx context.Context, poolID string, params PoolEditPa } // Fetch a single configured pool. -func (r *PoolService) Get(ctx context.Context, poolID string, query PoolGetParams, opts ...option.RequestOption) (res *user.LoadBalancingPool, err error) { +func (r *PoolService) Get(ctx context.Context, poolID string, query PoolGetParams, opts ...option.RequestOption) (res *user.Pool, err error) { opts = append(r.Options[:], opts...) var env PoolGetResponseEnvelope path := fmt.Sprintf("accounts/%s/load_balancers/pools/%s", query.AccountID, poolID) @@ -395,9 +395,9 @@ func (r PoolNewParamsOriginSteeringPolicy) IsKnown() bool { } type PoolNewResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result user.LoadBalancingPool `json:"result,required"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result user.Pool `json:"result,required"` // Whether the API call was successful Success PoolNewResponseEnvelopeSuccess `json:"success,required"` JSON poolNewResponseEnvelopeJSON `json:"-"` @@ -719,9 +719,9 @@ func (r PoolUpdateParamsOriginSteeringPolicy) IsKnown() bool { } type PoolUpdateResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result user.LoadBalancingPool `json:"result,required"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result user.Pool `json:"result,required"` // Whether the API call was successful Success PoolUpdateResponseEnvelopeSuccess `json:"success,required"` JSON poolUpdateResponseEnvelopeJSON `json:"-"` @@ -1112,9 +1112,9 @@ func (r PoolEditParamsOriginsHeader) MarshalJSON() (data []byte, err error) { } type PoolEditResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result user.LoadBalancingPool `json:"result,required"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result user.Pool `json:"result,required"` // Whether the API call was successful Success PoolEditResponseEnvelopeSuccess `json:"success,required"` JSON poolEditResponseEnvelopeJSON `json:"-"` @@ -1160,9 +1160,9 @@ type PoolGetParams struct { } type PoolGetResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result user.LoadBalancingPool `json:"result,required"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result user.Pool `json:"result,required"` // Whether the API call was successful Success PoolGetResponseEnvelopeSuccess `json:"success,required"` JSON poolGetResponseEnvelopeJSON `json:"-"` diff --git a/logpush/aliases.go b/logpush/aliases.go index 81ee5c4558b..fef048ae159 100644 --- a/logpush/aliases.go +++ b/logpush/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/logs/aliases.go b/logs/aliases.go index e4719547bde..7759c99ef3e 100644 --- a/logs/aliases.go +++ b/logs/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/magic_network_monitoring/aliases.go b/magic_network_monitoring/aliases.go index 2d5ef9ca38d..0e09d1332c9 100644 --- a/magic_network_monitoring/aliases.go +++ b/magic_network_monitoring/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/magic_transit/aliases.go b/magic_transit/aliases.go index 55787883c78..423d9f52939 100644 --- a/magic_transit/aliases.go +++ b/magic_transit/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/managed_headers/aliases.go b/managed_headers/aliases.go index a9d1ff665dd..9e493183237 100644 --- a/managed_headers/aliases.go +++ b/managed_headers/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/memberships/aliases.go b/memberships/aliases.go index 9100af093b0..19d4018f24e 100644 --- a/memberships/aliases.go +++ b/memberships/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/mtls_certificates/aliases.go b/mtls_certificates/aliases.go index 11a381ff36d..54dbde3dfad 100644 --- a/mtls_certificates/aliases.go +++ b/mtls_certificates/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/origin_ca_certificates/aliases.go b/origin_ca_certificates/aliases.go index e3b68c60ee8..017514b6725 100644 --- a/origin_ca_certificates/aliases.go +++ b/origin_ca_certificates/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/origin_post_quantum_encryption/aliases.go b/origin_post_quantum_encryption/aliases.go index 638a40e4781..91c947416e3 100644 --- a/origin_post_quantum_encryption/aliases.go +++ b/origin_post_quantum_encryption/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/origin_tls_client_auth/aliases.go b/origin_tls_client_auth/aliases.go index 0e9ca65d519..91f68b68d6e 100644 --- a/origin_tls_client_auth/aliases.go +++ b/origin_tls_client_auth/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/page_shield/aliases.go b/page_shield/aliases.go index dedc8147637..fc12f25a437 100644 --- a/page_shield/aliases.go +++ b/page_shield/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/pagerules/aliases.go b/pagerules/aliases.go index 69b51a32cc6..39cdf8d3882 100644 --- a/pagerules/aliases.go +++ b/pagerules/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/pages/aliases.go b/pages/aliases.go index 352fb0da8dc..f461ade443f 100644 --- a/pages/aliases.go +++ b/pages/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/pcaps/aliases.go b/pcaps/aliases.go index 1b26e958590..0b997a7c454 100644 --- a/pcaps/aliases.go +++ b/pcaps/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/plans/aliases.go b/plans/aliases.go index 5fcebf9b45e..11a833bc845 100644 --- a/plans/aliases.go +++ b/plans/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/queues/aliases.go b/queues/aliases.go index 5f72362fd67..1a16cf8a118 100644 --- a/queues/aliases.go +++ b/queues/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/queues/consumer.go b/queues/consumer.go index 1c012e07d72..574690ffedf 100644 --- a/queues/consumer.go +++ b/queues/consumer.go @@ -6,12 +6,14 @@ import ( "context" "fmt" "net/http" + "reflect" "github.com/cloudflare/cloudflare-go/v2/internal/apijson" "github.com/cloudflare/cloudflare-go/v2/internal/param" "github.com/cloudflare/cloudflare-go/v2/internal/requestconfig" "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/option" + "github.com/tidwall/gjson" ) // ConsumerService contains methods and other services that help with interacting @@ -58,7 +60,7 @@ 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 *shared.UnnamedSchemaRef167, err error) { +func (r *ConsumerService) Delete(ctx context.Context, queueID string, consumerID string, params ConsumerDeleteParams, opts ...option.RequestOption) (res *ConsumerDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env ConsumerDeleteResponseEnvelope path := fmt.Sprintf("accounts/%s/queues/%s/consumers/%s", params.AccountID, queueID, consumerID) @@ -170,6 +172,31 @@ func (r consumerUpdateResponseSettingsJSON) RawJSON() string { return r.raw } +// Union satisfied by [queues.ConsumerDeleteResponseUnknown], +// [queues.ConsumerDeleteResponseArray] or [shared.UnionString]. +type ConsumerDeleteResponse interface { + ImplementsQueuesConsumerDeleteResponse() +} + +func init() { + apijson.RegisterUnion( + reflect.TypeOf((*ConsumerDeleteResponse)(nil)).Elem(), + "", + apijson.UnionVariant{ + TypeFilter: gjson.JSON, + Type: reflect.TypeOf(ConsumerDeleteResponseArray{}), + }, + apijson.UnionVariant{ + TypeFilter: gjson.String, + Type: reflect.TypeOf(shared.UnionString("")), + }, + ) +} + +type ConsumerDeleteResponseArray []interface{} + +func (r ConsumerDeleteResponseArray) ImplementsQueuesConsumerDeleteResponse() {} + type ConsumerGetResponse struct { CreatedOn interface{} `json:"created_on"` Environment interface{} `json:"environment"` @@ -402,9 +429,9 @@ func (r ConsumerDeleteParams) MarshalJSON() (data []byte, err error) { } type ConsumerDeleteResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result shared.UnnamedSchemaRef167 `json:"result,required,nullable"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result ConsumerDeleteResponse `json:"result,required,nullable"` // Whether the API call was successful Success ConsumerDeleteResponseEnvelopeSuccess `json:"success,required"` ResultInfo ConsumerDeleteResponseEnvelopeResultInfo `json:"result_info"` diff --git a/queues/queue.go b/queues/queue.go index 7d72c008db7..9df304be42c 100644 --- a/queues/queue.go +++ b/queues/queue.go @@ -6,12 +6,14 @@ import ( "context" "fmt" "net/http" + "reflect" "github.com/cloudflare/cloudflare-go/v2/internal/apijson" "github.com/cloudflare/cloudflare-go/v2/internal/param" "github.com/cloudflare/cloudflare-go/v2/internal/requestconfig" "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/option" + "github.com/tidwall/gjson" ) // QueueService contains methods and other services that help with interacting with @@ -75,7 +77,7 @@ func (r *QueueService) List(ctx context.Context, query QueueListParams, opts ... } // Deletes a queue. -func (r *QueueService) Delete(ctx context.Context, queueID string, params QueueDeleteParams, opts ...option.RequestOption) (res *shared.UnnamedSchemaRef167, err error) { +func (r *QueueService) Delete(ctx context.Context, queueID string, params QueueDeleteParams, opts ...option.RequestOption) (res *QueueDeleteResponse, err error) { opts = append(r.Options[:], opts...) var env QueueDeleteResponseEnvelope path := fmt.Sprintf("accounts/%s/queues/%s", params.AccountID, queueID) @@ -189,6 +191,31 @@ func (r queueListResponseJSON) RawJSON() string { return r.raw } +// Union satisfied by [queues.QueueDeleteResponseUnknown], +// [queues.QueueDeleteResponseArray] or [shared.UnionString]. +type QueueDeleteResponse interface { + ImplementsQueuesQueueDeleteResponse() +} + +func init() { + apijson.RegisterUnion( + reflect.TypeOf((*QueueDeleteResponse)(nil)).Elem(), + "", + apijson.UnionVariant{ + TypeFilter: gjson.JSON, + Type: reflect.TypeOf(QueueDeleteResponseArray{}), + }, + apijson.UnionVariant{ + TypeFilter: gjson.String, + Type: reflect.TypeOf(shared.UnionString("")), + }, + ) +} + +type QueueDeleteResponseArray []interface{} + +func (r QueueDeleteResponseArray) ImplementsQueuesQueueDeleteResponse() {} + type QueueGetResponse struct { Consumers interface{} `json:"consumers"` ConsumersTotalCount interface{} `json:"consumers_total_count"` @@ -522,9 +549,9 @@ func (r QueueDeleteParams) MarshalJSON() (data []byte, err error) { } type QueueDeleteResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result shared.UnnamedSchemaRef167 `json:"result,required,nullable"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result QueueDeleteResponse `json:"result,required,nullable"` // Whether the API call was successful Success QueueDeleteResponseEnvelopeSuccess `json:"success,required"` ResultInfo QueueDeleteResponseEnvelopeResultInfo `json:"result_info"` diff --git a/r2/aliases.go b/r2/aliases.go index eee48a88aa5..eb6b163d5c9 100644 --- a/r2/aliases.go +++ b/r2/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/radar/aliases.go b/radar/aliases.go index ce6fd3acc96..106054f7496 100644 --- a/radar/aliases.go +++ b/radar/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/rate_limits/aliases.go b/rate_limits/aliases.go index 4c45c974ebf..2d4db435c6a 100644 --- a/rate_limits/aliases.go +++ b/rate_limits/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/rate_plans/aliases.go b/rate_plans/aliases.go index f6605e008e5..be8fd2e78c1 100644 --- a/rate_plans/aliases.go +++ b/rate_plans/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/registrar/aliases.go b/registrar/aliases.go index 1ea0a1c2383..de37e6fadf0 100644 --- a/registrar/aliases.go +++ b/registrar/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/request_tracers/aliases.go b/request_tracers/aliases.go index 4c088a2d283..19be5aa8117 100644 --- a/request_tracers/aliases.go +++ b/request_tracers/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/rules/aliases.go b/rules/aliases.go index 2e847dd2a83..4ff837452b2 100644 --- a/rules/aliases.go +++ b/rules/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/rulesets/aliases.go b/rulesets/aliases.go index 38d232ecdf4..ab315490cfc 100644 --- a/rulesets/aliases.go +++ b/rulesets/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/rulesets/phase.go b/rulesets/phase.go index 5b82e573b66..37dcbc6b03b 100644 --- a/rulesets/phase.go +++ b/rulesets/phase.go @@ -12,7 +12,6 @@ import ( "github.com/cloudflare/cloudflare-go/v2/internal/apijson" "github.com/cloudflare/cloudflare-go/v2/internal/param" "github.com/cloudflare/cloudflare-go/v2/internal/requestconfig" - "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/option" "github.com/tidwall/gjson" ) @@ -235,7 +234,7 @@ type PhaseUpdateResponseRulesRulesetsBlockRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON phaseUpdateResponseRulesRulesetsBlockRuleJSON `json:"-"` @@ -358,7 +357,7 @@ type PhaseUpdateResponseRulesRulesetsExecuteRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON phaseUpdateResponseRulesRulesetsExecuteRuleJSON `json:"-"` @@ -645,7 +644,7 @@ type PhaseUpdateResponseRulesRulesetsLogRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON phaseUpdateResponseRulesRulesetsLogRuleJSON `json:"-"` @@ -714,7 +713,7 @@ type PhaseUpdateResponseRulesRulesetsSkipRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON phaseUpdateResponseRulesRulesetsSkipRuleJSON `json:"-"` @@ -1031,7 +1030,7 @@ type PhaseGetResponseRulesRulesetsBlockRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON phaseGetResponseRulesRulesetsBlockRuleJSON `json:"-"` @@ -1153,7 +1152,7 @@ type PhaseGetResponseRulesRulesetsExecuteRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON phaseGetResponseRulesRulesetsExecuteRuleJSON `json:"-"` @@ -1440,7 +1439,7 @@ type PhaseGetResponseRulesRulesetsLogRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON phaseGetResponseRulesRulesetsLogRuleJSON `json:"-"` @@ -1509,7 +1508,7 @@ type PhaseGetResponseRulesRulesetsSkipRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON phaseGetResponseRulesRulesetsSkipRuleJSON `json:"-"` @@ -1751,7 +1750,7 @@ type PhaseUpdateParamsRulesRulesetsBlockRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -1815,7 +1814,7 @@ type PhaseUpdateParamsRulesRulesetsExecuteRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -1990,7 +1989,7 @@ type PhaseUpdateParamsRulesRulesetsLogRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -2030,7 +2029,7 @@ type PhaseUpdateParamsRulesRulesetsSkipRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } diff --git a/rulesets/phase_test.go b/rulesets/phase_test.go index 4d526f8f887..c59cd155f0c 100644 --- a/rulesets/phase_test.go +++ b/rulesets/phase_test.go @@ -9,7 +9,6 @@ import ( "testing" "github.com/cloudflare/cloudflare-go/v2" - "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/internal/testutil" "github.com/cloudflare/cloudflare-go/v2/option" "github.com/cloudflare/cloudflare-go/v2/rulesets" @@ -46,7 +45,7 @@ func TestPhaseUpdateWithOptionalParams(t *testing.T) { Enabled: cloudflare.F(true), Expression: cloudflare.F("ip.src ne 1.1.1.1"), ID: cloudflare.F("3a03d665bac047339bb530ecb439a90d"), - Logging: cloudflare.F(shared.LoggingParam{ + Logging: cloudflare.F(rulesets.LoggingParam{ Enabled: cloudflare.F(true), }), Ref: cloudflare.F("my_ref"), @@ -63,7 +62,7 @@ func TestPhaseUpdateWithOptionalParams(t *testing.T) { Enabled: cloudflare.F(true), Expression: cloudflare.F("ip.src ne 1.1.1.1"), ID: cloudflare.F("3a03d665bac047339bb530ecb439a90d"), - Logging: cloudflare.F(shared.LoggingParam{ + Logging: cloudflare.F(rulesets.LoggingParam{ Enabled: cloudflare.F(true), }), Ref: cloudflare.F("my_ref"), @@ -80,7 +79,7 @@ func TestPhaseUpdateWithOptionalParams(t *testing.T) { Enabled: cloudflare.F(true), Expression: cloudflare.F("ip.src ne 1.1.1.1"), ID: cloudflare.F("3a03d665bac047339bb530ecb439a90d"), - Logging: cloudflare.F(shared.LoggingParam{ + Logging: cloudflare.F(rulesets.LoggingParam{ Enabled: cloudflare.F(true), }), Ref: cloudflare.F("my_ref"), diff --git a/rulesets/phaseversion.go b/rulesets/phaseversion.go index df52844f89b..531415a89f0 100644 --- a/rulesets/phaseversion.go +++ b/rulesets/phaseversion.go @@ -13,7 +13,6 @@ import ( "github.com/cloudflare/cloudflare-go/v2/internal/pagination" "github.com/cloudflare/cloudflare-go/v2/internal/param" "github.com/cloudflare/cloudflare-go/v2/internal/requestconfig" - "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/option" "github.com/tidwall/gjson" ) @@ -340,7 +339,7 @@ type PhaseVersionGetResponseRulesRulesetsBlockRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON phaseVersionGetResponseRulesRulesetsBlockRuleJSON `json:"-"` @@ -464,7 +463,7 @@ type PhaseVersionGetResponseRulesRulesetsExecuteRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON phaseVersionGetResponseRulesRulesetsExecuteRuleJSON `json:"-"` @@ -752,7 +751,7 @@ type PhaseVersionGetResponseRulesRulesetsLogRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON phaseVersionGetResponseRulesRulesetsLogRuleJSON `json:"-"` @@ -822,7 +821,7 @@ type PhaseVersionGetResponseRulesRulesetsSkipRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON phaseVersionGetResponseRulesRulesetsSkipRuleJSON `json:"-"` diff --git a/rulesets/rule.go b/rulesets/rule.go index e160de5d650..69f608e6751 100644 --- a/rulesets/rule.go +++ b/rulesets/rule.go @@ -12,7 +12,6 @@ import ( "github.com/cloudflare/cloudflare-go/v2/internal/apijson" "github.com/cloudflare/cloudflare-go/v2/internal/param" "github.com/cloudflare/cloudflare-go/v2/internal/requestconfig" - "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/option" "github.com/tidwall/gjson" ) @@ -254,7 +253,7 @@ type RuleNewResponseRulesRulesetsBlockRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON ruleNewResponseRulesRulesetsBlockRuleJSON `json:"-"` @@ -376,7 +375,7 @@ type RuleNewResponseRulesRulesetsExecuteRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON ruleNewResponseRulesRulesetsExecuteRuleJSON `json:"-"` @@ -663,7 +662,7 @@ type RuleNewResponseRulesRulesetsLogRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON ruleNewResponseRulesRulesetsLogRuleJSON `json:"-"` @@ -732,7 +731,7 @@ type RuleNewResponseRulesRulesetsSkipRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON ruleNewResponseRulesRulesetsSkipRuleJSON `json:"-"` @@ -1048,7 +1047,7 @@ type RuleDeleteResponseRulesRulesetsBlockRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON ruleDeleteResponseRulesRulesetsBlockRuleJSON `json:"-"` @@ -1171,7 +1170,7 @@ type RuleDeleteResponseRulesRulesetsExecuteRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON ruleDeleteResponseRulesRulesetsExecuteRuleJSON `json:"-"` @@ -1458,7 +1457,7 @@ type RuleDeleteResponseRulesRulesetsLogRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON ruleDeleteResponseRulesRulesetsLogRuleJSON `json:"-"` @@ -1527,7 +1526,7 @@ type RuleDeleteResponseRulesRulesetsSkipRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON ruleDeleteResponseRulesRulesetsSkipRuleJSON `json:"-"` @@ -1844,7 +1843,7 @@ type RuleEditResponseRulesRulesetsBlockRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON ruleEditResponseRulesRulesetsBlockRuleJSON `json:"-"` @@ -1966,7 +1965,7 @@ type RuleEditResponseRulesRulesetsExecuteRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON ruleEditResponseRulesRulesetsExecuteRuleJSON `json:"-"` @@ -2253,7 +2252,7 @@ type RuleEditResponseRulesRulesetsLogRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON ruleEditResponseRulesRulesetsLogRuleJSON `json:"-"` @@ -2322,7 +2321,7 @@ type RuleEditResponseRulesRulesetsSkipRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON ruleEditResponseRulesRulesetsSkipRuleJSON `json:"-"` @@ -2513,7 +2512,7 @@ type RuleNewParamsRulesetsBlockRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -2591,7 +2590,7 @@ type RuleNewParamsRulesetsExecuteRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -2780,7 +2779,7 @@ type RuleNewParamsRulesetsLogRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -2834,7 +2833,7 @@ type RuleNewParamsRulesetsSkipRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -3304,7 +3303,7 @@ type RuleEditParamsRulesetsBlockRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -3382,7 +3381,7 @@ type RuleEditParamsRulesetsExecuteRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -3571,7 +3570,7 @@ type RuleEditParamsRulesetsLogRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -3625,7 +3624,7 @@ type RuleEditParamsRulesetsSkipRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } diff --git a/rulesets/rule_test.go b/rulesets/rule_test.go index 422b1eca934..128cb85af89 100644 --- a/rulesets/rule_test.go +++ b/rulesets/rule_test.go @@ -9,7 +9,6 @@ import ( "testing" "github.com/cloudflare/cloudflare-go/v2" - "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/internal/testutil" "github.com/cloudflare/cloudflare-go/v2/option" "github.com/cloudflare/cloudflare-go/v2/rulesets" @@ -47,7 +46,7 @@ func TestRuleNewWithOptionalParams(t *testing.T) { Description: cloudflare.F("Block when the IP address is not 1.1.1.1"), Enabled: cloudflare.F(true), Expression: cloudflare.F("ip.src ne 1.1.1.1"), - Logging: cloudflare.F(shared.LoggingParam{ + Logging: cloudflare.F(rulesets.LoggingParam{ Enabled: cloudflare.F(true), }), Ref: cloudflare.F("my_ref"), @@ -127,7 +126,7 @@ func TestRuleEditWithOptionalParams(t *testing.T) { Description: cloudflare.F("Block when the IP address is not 1.1.1.1"), Enabled: cloudflare.F(true), Expression: cloudflare.F("ip.src ne 1.1.1.1"), - Logging: cloudflare.F(shared.LoggingParam{ + Logging: cloudflare.F(rulesets.LoggingParam{ Enabled: cloudflare.F(true), }), Ref: cloudflare.F("my_ref"), diff --git a/rulesets/ruleset.go b/rulesets/ruleset.go index 15079c0c35e..5ebcfc69e13 100644 --- a/rulesets/ruleset.go +++ b/rulesets/ruleset.go @@ -13,7 +13,6 @@ import ( "github.com/cloudflare/cloudflare-go/v2/internal/pagination" "github.com/cloudflare/cloudflare-go/v2/internal/param" "github.com/cloudflare/cloudflare-go/v2/internal/requestconfig" - "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/option" "github.com/tidwall/gjson" ) @@ -157,6 +156,38 @@ func (r *RulesetService) Get(ctx context.Context, rulesetID string, query Rulese return } +// An object configuring the rule's logging behavior. +type Logging struct { + // Whether to generate a log when the rule matches. + Enabled bool `json:"enabled,required"` + JSON loggingJSON `json:"-"` +} + +// loggingJSON contains the JSON metadata for the struct [Logging] +type loggingJSON struct { + Enabled apijson.Field + raw string + ExtraFields map[string]apijson.Field +} + +func (r *Logging) UnmarshalJSON(data []byte) (err error) { + return apijson.UnmarshalRoot(data, r) +} + +func (r loggingJSON) RawJSON() string { + return r.raw +} + +// An object configuring the rule's logging behavior. +type LoggingParam struct { + // Whether to generate a log when the rule matches. + Enabled param.Field[bool] `json:"enabled,required"` +} + +func (r LoggingParam) MarshalJSON() (data []byte, err error) { + return apijson.MarshalRoot(r) +} + // A ruleset object. type RulesetNewResponse struct { // The unique ID of the ruleset. @@ -311,7 +342,7 @@ type RulesetNewResponseRulesRulesetsBlockRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON rulesetNewResponseRulesRulesetsBlockRuleJSON `json:"-"` @@ -434,7 +465,7 @@ type RulesetNewResponseRulesRulesetsExecuteRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON rulesetNewResponseRulesRulesetsExecuteRuleJSON `json:"-"` @@ -721,7 +752,7 @@ type RulesetNewResponseRulesRulesetsLogRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON rulesetNewResponseRulesRulesetsLogRuleJSON `json:"-"` @@ -790,7 +821,7 @@ type RulesetNewResponseRulesRulesetsSkipRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON rulesetNewResponseRulesRulesetsSkipRuleJSON `json:"-"` @@ -1107,7 +1138,7 @@ type RulesetUpdateResponseRulesRulesetsBlockRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON rulesetUpdateResponseRulesRulesetsBlockRuleJSON `json:"-"` @@ -1230,7 +1261,7 @@ type RulesetUpdateResponseRulesRulesetsExecuteRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON rulesetUpdateResponseRulesRulesetsExecuteRuleJSON `json:"-"` @@ -1518,7 +1549,7 @@ type RulesetUpdateResponseRulesRulesetsLogRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON rulesetUpdateResponseRulesRulesetsLogRuleJSON `json:"-"` @@ -1587,7 +1618,7 @@ type RulesetUpdateResponseRulesRulesetsSkipRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON rulesetUpdateResponseRulesRulesetsSkipRuleJSON `json:"-"` @@ -2000,7 +2031,7 @@ type RulesetGetResponseRulesRulesetsBlockRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON rulesetGetResponseRulesRulesetsBlockRuleJSON `json:"-"` @@ -2123,7 +2154,7 @@ type RulesetGetResponseRulesRulesetsExecuteRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON rulesetGetResponseRulesRulesetsExecuteRuleJSON `json:"-"` @@ -2410,7 +2441,7 @@ type RulesetGetResponseRulesRulesetsLogRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON rulesetGetResponseRulesRulesetsLogRuleJSON `json:"-"` @@ -2479,7 +2510,7 @@ type RulesetGetResponseRulesRulesetsSkipRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON rulesetGetResponseRulesRulesetsSkipRuleJSON `json:"-"` @@ -2740,7 +2771,7 @@ type RulesetNewParamsRulesRulesetsBlockRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -2804,7 +2835,7 @@ type RulesetNewParamsRulesRulesetsExecuteRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -2979,7 +3010,7 @@ type RulesetNewParamsRulesRulesetsLogRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -3019,7 +3050,7 @@ type RulesetNewParamsRulesRulesetsSkipRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -3335,7 +3366,7 @@ type RulesetUpdateParamsRulesRulesetsBlockRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -3399,7 +3430,7 @@ type RulesetUpdateParamsRulesRulesetsExecuteRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -3574,7 +3605,7 @@ type RulesetUpdateParamsRulesRulesetsLogRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } @@ -3614,7 +3645,7 @@ type RulesetUpdateParamsRulesRulesetsSkipRule struct { // The expression defining which traffic will match the rule. Expression param.Field[string] `json:"expression"` // An object configuring the rule's logging behavior. - Logging param.Field[shared.LoggingParam] `json:"logging"` + Logging param.Field[LoggingParam] `json:"logging"` // The reference of the rule (the rule ID by default). Ref param.Field[string] `json:"ref"` } diff --git a/rulesets/ruleset_test.go b/rulesets/ruleset_test.go index 4401d984a57..d94e31eb719 100644 --- a/rulesets/ruleset_test.go +++ b/rulesets/ruleset_test.go @@ -9,7 +9,6 @@ import ( "testing" "github.com/cloudflare/cloudflare-go/v2" - "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/internal/testutil" "github.com/cloudflare/cloudflare-go/v2/option" "github.com/cloudflare/cloudflare-go/v2/rulesets" @@ -46,7 +45,7 @@ func TestRulesetNewWithOptionalParams(t *testing.T) { Enabled: cloudflare.F(true), Expression: cloudflare.F("ip.src ne 1.1.1.1"), ID: cloudflare.F("3a03d665bac047339bb530ecb439a90d"), - Logging: cloudflare.F(shared.LoggingParam{ + Logging: cloudflare.F(rulesets.LoggingParam{ Enabled: cloudflare.F(true), }), Ref: cloudflare.F("my_ref"), @@ -63,7 +62,7 @@ func TestRulesetNewWithOptionalParams(t *testing.T) { Enabled: cloudflare.F(true), Expression: cloudflare.F("ip.src ne 1.1.1.1"), ID: cloudflare.F("3a03d665bac047339bb530ecb439a90d"), - Logging: cloudflare.F(shared.LoggingParam{ + Logging: cloudflare.F(rulesets.LoggingParam{ Enabled: cloudflare.F(true), }), Ref: cloudflare.F("my_ref"), @@ -80,7 +79,7 @@ func TestRulesetNewWithOptionalParams(t *testing.T) { Enabled: cloudflare.F(true), Expression: cloudflare.F("ip.src ne 1.1.1.1"), ID: cloudflare.F("3a03d665bac047339bb530ecb439a90d"), - Logging: cloudflare.F(shared.LoggingParam{ + Logging: cloudflare.F(rulesets.LoggingParam{ Enabled: cloudflare.F(true), }), Ref: cloudflare.F("my_ref"), @@ -129,7 +128,7 @@ func TestRulesetUpdateWithOptionalParams(t *testing.T) { Enabled: cloudflare.F(true), Expression: cloudflare.F("ip.src ne 1.1.1.1"), ID: cloudflare.F("3a03d665bac047339bb530ecb439a90d"), - Logging: cloudflare.F(shared.LoggingParam{ + Logging: cloudflare.F(rulesets.LoggingParam{ Enabled: cloudflare.F(true), }), Ref: cloudflare.F("my_ref"), @@ -146,7 +145,7 @@ func TestRulesetUpdateWithOptionalParams(t *testing.T) { Enabled: cloudflare.F(true), Expression: cloudflare.F("ip.src ne 1.1.1.1"), ID: cloudflare.F("3a03d665bac047339bb530ecb439a90d"), - Logging: cloudflare.F(shared.LoggingParam{ + Logging: cloudflare.F(rulesets.LoggingParam{ Enabled: cloudflare.F(true), }), Ref: cloudflare.F("my_ref"), @@ -163,7 +162,7 @@ func TestRulesetUpdateWithOptionalParams(t *testing.T) { Enabled: cloudflare.F(true), Expression: cloudflare.F("ip.src ne 1.1.1.1"), ID: cloudflare.F("3a03d665bac047339bb530ecb439a90d"), - Logging: cloudflare.F(shared.LoggingParam{ + Logging: cloudflare.F(rulesets.LoggingParam{ Enabled: cloudflare.F(true), }), Ref: cloudflare.F("my_ref"), diff --git a/rulesets/version.go b/rulesets/version.go index 48b014d9285..db6e9508426 100644 --- a/rulesets/version.go +++ b/rulesets/version.go @@ -13,7 +13,6 @@ import ( "github.com/cloudflare/cloudflare-go/v2/internal/pagination" "github.com/cloudflare/cloudflare-go/v2/internal/param" "github.com/cloudflare/cloudflare-go/v2/internal/requestconfig" - "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/option" "github.com/tidwall/gjson" ) @@ -359,7 +358,7 @@ type VersionGetResponseRulesRulesetsBlockRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON versionGetResponseRulesRulesetsBlockRuleJSON `json:"-"` @@ -482,7 +481,7 @@ type VersionGetResponseRulesRulesetsExecuteRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON versionGetResponseRulesRulesetsExecuteRuleJSON `json:"-"` @@ -769,7 +768,7 @@ type VersionGetResponseRulesRulesetsLogRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON versionGetResponseRulesRulesetsLogRuleJSON `json:"-"` @@ -838,7 +837,7 @@ type VersionGetResponseRulesRulesetsSkipRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON versionGetResponseRulesRulesetsSkipRuleJSON `json:"-"` diff --git a/rulesets/versionbytag.go b/rulesets/versionbytag.go index d7854ea187f..4a7cb1a60c9 100644 --- a/rulesets/versionbytag.go +++ b/rulesets/versionbytag.go @@ -12,7 +12,6 @@ import ( "github.com/cloudflare/cloudflare-go/v2/internal/apijson" "github.com/cloudflare/cloudflare-go/v2/internal/param" "github.com/cloudflare/cloudflare-go/v2/internal/requestconfig" - "github.com/cloudflare/cloudflare-go/v2/internal/shared" "github.com/cloudflare/cloudflare-go/v2/option" "github.com/tidwall/gjson" ) @@ -202,7 +201,7 @@ type VersionByTagGetResponseRulesRulesetsBlockRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON versionByTagGetResponseRulesRulesetsBlockRuleJSON `json:"-"` @@ -326,7 +325,7 @@ type VersionByTagGetResponseRulesRulesetsExecuteRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON versionByTagGetResponseRulesRulesetsExecuteRuleJSON `json:"-"` @@ -614,7 +613,7 @@ type VersionByTagGetResponseRulesRulesetsLogRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON versionByTagGetResponseRulesRulesetsLogRuleJSON `json:"-"` @@ -684,7 +683,7 @@ type VersionByTagGetResponseRulesRulesetsSkipRule struct { // The expression defining which traffic will match the rule. Expression string `json:"expression"` // An object configuring the rule's logging behavior. - Logging shared.Logging `json:"logging"` + Logging Logging `json:"logging"` // The reference of the rule (the rule ID by default). Ref string `json:"ref"` JSON versionByTagGetResponseRulesRulesetsSkipRuleJSON `json:"-"` diff --git a/rum/aliases.go b/rum/aliases.go index 20a3b21d81e..7dfabbc2393 100644 --- a/rum/aliases.go +++ b/rum/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/secondary_dns/aliases.go b/secondary_dns/aliases.go index ce49bd5393b..67abf928c49 100644 --- a/secondary_dns/aliases.go +++ b/secondary_dns/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/snippets/aliases.go b/snippets/aliases.go index 5e9ee68514f..02696ca0db5 100644 --- a/snippets/aliases.go +++ b/snippets/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/spectrum/aliases.go b/spectrum/aliases.go index 06923adb2ff..6238ef0214b 100644 --- a/spectrum/aliases.go +++ b/spectrum/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/speed/aliases.go b/speed/aliases.go index 200e8812a71..eac09eb2d40 100644 --- a/speed/aliases.go +++ b/speed/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/ssl/aliases.go b/ssl/aliases.go index feea97c3c49..1bc3d479f17 100644 --- a/ssl/aliases.go +++ b/ssl/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/storage/aliases.go b/storage/aliases.go index 70221ea150b..3a70686af7c 100644 --- a/storage/aliases.go +++ b/storage/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/stream/aliases.go b/stream/aliases.go index 51bf45e899d..38eef7cb4f3 100644 --- a/stream/aliases.go +++ b/stream/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/subscriptions/aliases.go b/subscriptions/aliases.go index 176ae22d414..08a0a459133 100644 --- a/subscriptions/aliases.go +++ b/subscriptions/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/url_normalization/aliases.go b/url_normalization/aliases.go index 334b704ca9d..99ecb70601b 100644 --- a/url_normalization/aliases.go +++ b/url_normalization/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/url_scanner/aliases.go b/url_scanner/aliases.go index 91d941e9461..8d73f92f745 100644 --- a/url_scanner/aliases.go +++ b/url_scanner/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/user/aliases.go b/user/aliases.go index d1bc53ae966..cd95eb0adf6 100644 --- a/user/aliases.go +++ b/user/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/user/firewallaccessrule.go b/user/firewallaccessrule.go index ad9e11ef73c..570eaccb121 100644 --- a/user/firewallaccessrule.go +++ b/user/firewallaccessrule.go @@ -42,7 +42,7 @@ func NewFirewallAccessRuleService(opts ...option.RequestOption) (r *FirewallAcce // // Note: To create an IP Access rule that applies to a specific zone, refer to the // [IP Access rules for a zone](#ip-access-rules-for-a-zone) endpoints. -func (r *FirewallAccessRuleService) New(ctx context.Context, body FirewallAccessRuleNewParams, opts ...option.RequestOption) (res *FirewallRule, err error) { +func (r *FirewallAccessRuleService) New(ctx context.Context, body FirewallAccessRuleNewParams, opts ...option.RequestOption) (res *AccessRule, err error) { opts = append(r.Options[:], opts...) var env FirewallAccessRuleNewResponseEnvelope path := "user/firewall/access_rules/rules" @@ -56,7 +56,7 @@ func (r *FirewallAccessRuleService) New(ctx context.Context, body FirewallAccess // Fetches IP Access rules of the user. You can filter the results using several // optional parameters. -func (r *FirewallAccessRuleService) List(ctx context.Context, query FirewallAccessRuleListParams, opts ...option.RequestOption) (res *pagination.V4PagePaginationArray[FirewallRule], err error) { +func (r *FirewallAccessRuleService) List(ctx context.Context, query FirewallAccessRuleListParams, opts ...option.RequestOption) (res *pagination.V4PagePaginationArray[AccessRule], err error) { var raw *http.Response opts = append(r.Options, opts...) opts = append([]option.RequestOption{option.WithResponseInto(&raw)}, opts...) @@ -75,7 +75,7 @@ func (r *FirewallAccessRuleService) List(ctx context.Context, query FirewallAcce // Fetches IP Access rules of the user. You can filter the results using several // optional parameters. -func (r *FirewallAccessRuleService) ListAutoPaging(ctx context.Context, query FirewallAccessRuleListParams, opts ...option.RequestOption) *pagination.V4PagePaginationArrayAutoPager[FirewallRule] { +func (r *FirewallAccessRuleService) ListAutoPaging(ctx context.Context, query FirewallAccessRuleListParams, opts ...option.RequestOption) *pagination.V4PagePaginationArrayAutoPager[AccessRule] { return pagination.NewV4PagePaginationArrayAutoPager(r.List(ctx, query, opts...)) } @@ -96,7 +96,7 @@ func (r *FirewallAccessRuleService) Delete(ctx context.Context, identifier strin // Updates an IP Access rule defined at the user level. You can only update the // rule action (`mode` parameter) and notes. -func (r *FirewallAccessRuleService) Edit(ctx context.Context, identifier string, body FirewallAccessRuleEditParams, opts ...option.RequestOption) (res *FirewallRule, err error) { +func (r *FirewallAccessRuleService) Edit(ctx context.Context, identifier string, body FirewallAccessRuleEditParams, opts ...option.RequestOption) (res *AccessRule, err error) { opts = append(r.Options[:], opts...) var env FirewallAccessRuleEditResponseEnvelope path := fmt.Sprintf("user/firewall/access_rules/rules/%s", identifier) @@ -108,26 +108,26 @@ func (r *FirewallAccessRuleService) Edit(ctx context.Context, identifier string, return } -type FirewallRule struct { +type AccessRule struct { // The unique identifier of the IP Access rule. ID string `json:"id,required"` // The available actions that a rule can apply to a matched request. - AllowedModes []FirewallRuleAllowedMode `json:"allowed_modes,required"` + AllowedModes []AccessRuleAllowedMode `json:"allowed_modes,required"` // The rule configuration. - Configuration FirewallRuleConfiguration `json:"configuration,required"` + Configuration AccessRuleConfiguration `json:"configuration,required"` // The action to apply to a matched request. - Mode FirewallRuleMode `json:"mode,required"` + Mode AccessRuleMode `json:"mode,required"` // The timestamp of when the rule was created. CreatedOn time.Time `json:"created_on" format:"date-time"` // The timestamp of when the rule was last modified. ModifiedOn time.Time `json:"modified_on" format:"date-time"` // An informative summary of the rule, typically used as a reminder or explanation. - Notes string `json:"notes"` - JSON firewallRuleJSON `json:"-"` + Notes string `json:"notes"` + JSON accessRuleJSON `json:"-"` } -// firewallRuleJSON contains the JSON metadata for the struct [FirewallRule] -type firewallRuleJSON struct { +// accessRuleJSON contains the JSON metadata for the struct [AccessRule] +type accessRuleJSON struct { ID apijson.Field AllowedModes apijson.Field Configuration apijson.Field @@ -139,28 +139,28 @@ type firewallRuleJSON struct { ExtraFields map[string]apijson.Field } -func (r *FirewallRule) UnmarshalJSON(data []byte) (err error) { +func (r *AccessRule) UnmarshalJSON(data []byte) (err error) { return apijson.UnmarshalRoot(data, r) } -func (r firewallRuleJSON) RawJSON() string { +func (r accessRuleJSON) RawJSON() string { return r.raw } // The action to apply to a matched request. -type FirewallRuleAllowedMode string +type AccessRuleAllowedMode string const ( - FirewallRuleAllowedModeBlock FirewallRuleAllowedMode = "block" - FirewallRuleAllowedModeChallenge FirewallRuleAllowedMode = "challenge" - FirewallRuleAllowedModeWhitelist FirewallRuleAllowedMode = "whitelist" - FirewallRuleAllowedModeJsChallenge FirewallRuleAllowedMode = "js_challenge" - FirewallRuleAllowedModeManagedChallenge FirewallRuleAllowedMode = "managed_challenge" + AccessRuleAllowedModeBlock AccessRuleAllowedMode = "block" + AccessRuleAllowedModeChallenge AccessRuleAllowedMode = "challenge" + AccessRuleAllowedModeWhitelist AccessRuleAllowedMode = "whitelist" + AccessRuleAllowedModeJsChallenge AccessRuleAllowedMode = "js_challenge" + AccessRuleAllowedModeManagedChallenge AccessRuleAllowedMode = "managed_challenge" ) -func (r FirewallRuleAllowedMode) IsKnown() bool { +func (r AccessRuleAllowedMode) IsKnown() bool { switch r { - case FirewallRuleAllowedModeBlock, FirewallRuleAllowedModeChallenge, FirewallRuleAllowedModeWhitelist, FirewallRuleAllowedModeJsChallenge, FirewallRuleAllowedModeManagedChallenge: + case AccessRuleAllowedModeBlock, AccessRuleAllowedModeChallenge, AccessRuleAllowedModeWhitelist, AccessRuleAllowedModeJsChallenge, AccessRuleAllowedModeManagedChallenge: return true } return false @@ -168,284 +168,280 @@ func (r FirewallRuleAllowedMode) IsKnown() bool { // The rule configuration. // -// Union satisfied by [user.FirewallRuleConfigurationLegacyJhsIPConfiguration], -// [user.FirewallRuleConfigurationLegacyJhsIPV6Configuration], -// [user.FirewallRuleConfigurationLegacyJhsCIDRConfiguration], -// [user.FirewallRuleConfigurationLegacyJhsASNConfiguration] or -// [user.FirewallRuleConfigurationLegacyJhsCountryConfiguration]. -type FirewallRuleConfiguration interface { - implementsUserFirewallRuleConfiguration() +// Union satisfied by [user.AccessRuleConfigurationLegacyJhsIPConfiguration], +// [user.AccessRuleConfigurationLegacyJhsIPV6Configuration], +// [user.AccessRuleConfigurationLegacyJhsCIDRConfiguration], +// [user.AccessRuleConfigurationLegacyJhsASNConfiguration] or +// [user.AccessRuleConfigurationLegacyJhsCountryConfiguration]. +type AccessRuleConfiguration interface { + implementsUserAccessRuleConfiguration() } func init() { apijson.RegisterUnion( - reflect.TypeOf((*FirewallRuleConfiguration)(nil)).Elem(), + reflect.TypeOf((*AccessRuleConfiguration)(nil)).Elem(), "", apijson.UnionVariant{ TypeFilter: gjson.JSON, - Type: reflect.TypeOf(FirewallRuleConfigurationLegacyJhsIPConfiguration{}), + Type: reflect.TypeOf(AccessRuleConfigurationLegacyJhsIPConfiguration{}), }, apijson.UnionVariant{ TypeFilter: gjson.JSON, - Type: reflect.TypeOf(FirewallRuleConfigurationLegacyJhsIPV6Configuration{}), + Type: reflect.TypeOf(AccessRuleConfigurationLegacyJhsIPV6Configuration{}), }, apijson.UnionVariant{ TypeFilter: gjson.JSON, - Type: reflect.TypeOf(FirewallRuleConfigurationLegacyJhsCIDRConfiguration{}), + Type: reflect.TypeOf(AccessRuleConfigurationLegacyJhsCIDRConfiguration{}), }, apijson.UnionVariant{ TypeFilter: gjson.JSON, - Type: reflect.TypeOf(FirewallRuleConfigurationLegacyJhsASNConfiguration{}), + Type: reflect.TypeOf(AccessRuleConfigurationLegacyJhsASNConfiguration{}), }, apijson.UnionVariant{ TypeFilter: gjson.JSON, - Type: reflect.TypeOf(FirewallRuleConfigurationLegacyJhsCountryConfiguration{}), + Type: reflect.TypeOf(AccessRuleConfigurationLegacyJhsCountryConfiguration{}), }, ) } -type FirewallRuleConfigurationLegacyJhsIPConfiguration struct { +type AccessRuleConfigurationLegacyJhsIPConfiguration struct { // The configuration target. You must set the target to `ip` when specifying an IP // address in the rule. - Target FirewallRuleConfigurationLegacyJhsIPConfigurationTarget `json:"target"` + Target AccessRuleConfigurationLegacyJhsIPConfigurationTarget `json:"target"` // The IP address to match. This address will be compared to the IP address of // incoming requests. - Value string `json:"value"` - JSON firewallRuleConfigurationLegacyJhsIPConfigurationJSON `json:"-"` + Value string `json:"value"` + JSON accessRuleConfigurationLegacyJhsIPConfigurationJSON `json:"-"` } -// firewallRuleConfigurationLegacyJhsIPConfigurationJSON contains the JSON metadata -// for the struct [FirewallRuleConfigurationLegacyJhsIPConfiguration] -type firewallRuleConfigurationLegacyJhsIPConfigurationJSON struct { +// accessRuleConfigurationLegacyJhsIPConfigurationJSON contains the JSON metadata +// for the struct [AccessRuleConfigurationLegacyJhsIPConfiguration] +type accessRuleConfigurationLegacyJhsIPConfigurationJSON struct { Target apijson.Field Value apijson.Field raw string ExtraFields map[string]apijson.Field } -func (r *FirewallRuleConfigurationLegacyJhsIPConfiguration) UnmarshalJSON(data []byte) (err error) { +func (r *AccessRuleConfigurationLegacyJhsIPConfiguration) UnmarshalJSON(data []byte) (err error) { return apijson.UnmarshalRoot(data, r) } -func (r firewallRuleConfigurationLegacyJhsIPConfigurationJSON) RawJSON() string { +func (r accessRuleConfigurationLegacyJhsIPConfigurationJSON) RawJSON() string { return r.raw } -func (r FirewallRuleConfigurationLegacyJhsIPConfiguration) implementsUserFirewallRuleConfiguration() { -} +func (r AccessRuleConfigurationLegacyJhsIPConfiguration) implementsUserAccessRuleConfiguration() {} // The configuration target. You must set the target to `ip` when specifying an IP // address in the rule. -type FirewallRuleConfigurationLegacyJhsIPConfigurationTarget string +type AccessRuleConfigurationLegacyJhsIPConfigurationTarget string const ( - FirewallRuleConfigurationLegacyJhsIPConfigurationTargetIP FirewallRuleConfigurationLegacyJhsIPConfigurationTarget = "ip" + AccessRuleConfigurationLegacyJhsIPConfigurationTargetIP AccessRuleConfigurationLegacyJhsIPConfigurationTarget = "ip" ) -func (r FirewallRuleConfigurationLegacyJhsIPConfigurationTarget) IsKnown() bool { +func (r AccessRuleConfigurationLegacyJhsIPConfigurationTarget) IsKnown() bool { switch r { - case FirewallRuleConfigurationLegacyJhsIPConfigurationTargetIP: + case AccessRuleConfigurationLegacyJhsIPConfigurationTargetIP: return true } return false } -type FirewallRuleConfigurationLegacyJhsIPV6Configuration struct { +type AccessRuleConfigurationLegacyJhsIPV6Configuration struct { // The configuration target. You must set the target to `ip6` when specifying an // IPv6 address in the rule. - Target FirewallRuleConfigurationLegacyJhsIPV6ConfigurationTarget `json:"target"` + Target AccessRuleConfigurationLegacyJhsIPV6ConfigurationTarget `json:"target"` // The IPv6 address to match. - Value string `json:"value"` - JSON firewallRuleConfigurationLegacyJhsIPV6ConfigurationJSON `json:"-"` + Value string `json:"value"` + JSON accessRuleConfigurationLegacyJhsIPV6ConfigurationJSON `json:"-"` } -// firewallRuleConfigurationLegacyJhsIPV6ConfigurationJSON contains the JSON -// metadata for the struct [FirewallRuleConfigurationLegacyJhsIPV6Configuration] -type firewallRuleConfigurationLegacyJhsIPV6ConfigurationJSON struct { +// accessRuleConfigurationLegacyJhsIPV6ConfigurationJSON contains the JSON metadata +// for the struct [AccessRuleConfigurationLegacyJhsIPV6Configuration] +type accessRuleConfigurationLegacyJhsIPV6ConfigurationJSON struct { Target apijson.Field Value apijson.Field raw string ExtraFields map[string]apijson.Field } -func (r *FirewallRuleConfigurationLegacyJhsIPV6Configuration) UnmarshalJSON(data []byte) (err error) { +func (r *AccessRuleConfigurationLegacyJhsIPV6Configuration) UnmarshalJSON(data []byte) (err error) { return apijson.UnmarshalRoot(data, r) } -func (r firewallRuleConfigurationLegacyJhsIPV6ConfigurationJSON) RawJSON() string { +func (r accessRuleConfigurationLegacyJhsIPV6ConfigurationJSON) RawJSON() string { return r.raw } -func (r FirewallRuleConfigurationLegacyJhsIPV6Configuration) implementsUserFirewallRuleConfiguration() { -} +func (r AccessRuleConfigurationLegacyJhsIPV6Configuration) implementsUserAccessRuleConfiguration() {} // The configuration target. You must set the target to `ip6` when specifying an // IPv6 address in the rule. -type FirewallRuleConfigurationLegacyJhsIPV6ConfigurationTarget string +type AccessRuleConfigurationLegacyJhsIPV6ConfigurationTarget string const ( - FirewallRuleConfigurationLegacyJhsIPV6ConfigurationTargetIp6 FirewallRuleConfigurationLegacyJhsIPV6ConfigurationTarget = "ip6" + AccessRuleConfigurationLegacyJhsIPV6ConfigurationTargetIp6 AccessRuleConfigurationLegacyJhsIPV6ConfigurationTarget = "ip6" ) -func (r FirewallRuleConfigurationLegacyJhsIPV6ConfigurationTarget) IsKnown() bool { +func (r AccessRuleConfigurationLegacyJhsIPV6ConfigurationTarget) IsKnown() bool { switch r { - case FirewallRuleConfigurationLegacyJhsIPV6ConfigurationTargetIp6: + case AccessRuleConfigurationLegacyJhsIPV6ConfigurationTargetIp6: return true } return false } -type FirewallRuleConfigurationLegacyJhsCIDRConfiguration struct { +type AccessRuleConfigurationLegacyJhsCIDRConfiguration struct { // The configuration target. You must set the target to `ip_range` when specifying // an IP address range in the rule. - Target FirewallRuleConfigurationLegacyJhsCIDRConfigurationTarget `json:"target"` + Target AccessRuleConfigurationLegacyJhsCIDRConfigurationTarget `json:"target"` // The IP address range to match. You can only use prefix lengths `/16` and `/24` // for IPv4 ranges, and prefix lengths `/32`, `/48`, and `/64` for IPv6 ranges. - Value string `json:"value"` - JSON firewallRuleConfigurationLegacyJhsCIDRConfigurationJSON `json:"-"` + Value string `json:"value"` + JSON accessRuleConfigurationLegacyJhsCIDRConfigurationJSON `json:"-"` } -// firewallRuleConfigurationLegacyJhsCIDRConfigurationJSON contains the JSON -// metadata for the struct [FirewallRuleConfigurationLegacyJhsCIDRConfiguration] -type firewallRuleConfigurationLegacyJhsCIDRConfigurationJSON struct { +// accessRuleConfigurationLegacyJhsCIDRConfigurationJSON contains the JSON metadata +// for the struct [AccessRuleConfigurationLegacyJhsCIDRConfiguration] +type accessRuleConfigurationLegacyJhsCIDRConfigurationJSON struct { Target apijson.Field Value apijson.Field raw string ExtraFields map[string]apijson.Field } -func (r *FirewallRuleConfigurationLegacyJhsCIDRConfiguration) UnmarshalJSON(data []byte) (err error) { +func (r *AccessRuleConfigurationLegacyJhsCIDRConfiguration) UnmarshalJSON(data []byte) (err error) { return apijson.UnmarshalRoot(data, r) } -func (r firewallRuleConfigurationLegacyJhsCIDRConfigurationJSON) RawJSON() string { +func (r accessRuleConfigurationLegacyJhsCIDRConfigurationJSON) RawJSON() string { return r.raw } -func (r FirewallRuleConfigurationLegacyJhsCIDRConfiguration) implementsUserFirewallRuleConfiguration() { -} +func (r AccessRuleConfigurationLegacyJhsCIDRConfiguration) implementsUserAccessRuleConfiguration() {} // The configuration target. You must set the target to `ip_range` when specifying // an IP address range in the rule. -type FirewallRuleConfigurationLegacyJhsCIDRConfigurationTarget string +type AccessRuleConfigurationLegacyJhsCIDRConfigurationTarget string const ( - FirewallRuleConfigurationLegacyJhsCIDRConfigurationTargetIPRange FirewallRuleConfigurationLegacyJhsCIDRConfigurationTarget = "ip_range" + AccessRuleConfigurationLegacyJhsCIDRConfigurationTargetIPRange AccessRuleConfigurationLegacyJhsCIDRConfigurationTarget = "ip_range" ) -func (r FirewallRuleConfigurationLegacyJhsCIDRConfigurationTarget) IsKnown() bool { +func (r AccessRuleConfigurationLegacyJhsCIDRConfigurationTarget) IsKnown() bool { switch r { - case FirewallRuleConfigurationLegacyJhsCIDRConfigurationTargetIPRange: + case AccessRuleConfigurationLegacyJhsCIDRConfigurationTargetIPRange: return true } return false } -type FirewallRuleConfigurationLegacyJhsASNConfiguration struct { +type AccessRuleConfigurationLegacyJhsASNConfiguration struct { // The configuration target. You must set the target to `asn` when specifying an // Autonomous System Number (ASN) in the rule. - Target FirewallRuleConfigurationLegacyJhsASNConfigurationTarget `json:"target"` + Target AccessRuleConfigurationLegacyJhsASNConfigurationTarget `json:"target"` // The AS number to match. - Value string `json:"value"` - JSON firewallRuleConfigurationLegacyJhsASNConfigurationJSON `json:"-"` + Value string `json:"value"` + JSON accessRuleConfigurationLegacyJhsASNConfigurationJSON `json:"-"` } -// firewallRuleConfigurationLegacyJhsASNConfigurationJSON contains the JSON -// metadata for the struct [FirewallRuleConfigurationLegacyJhsASNConfiguration] -type firewallRuleConfigurationLegacyJhsASNConfigurationJSON struct { +// accessRuleConfigurationLegacyJhsASNConfigurationJSON contains the JSON metadata +// for the struct [AccessRuleConfigurationLegacyJhsASNConfiguration] +type accessRuleConfigurationLegacyJhsASNConfigurationJSON struct { Target apijson.Field Value apijson.Field raw string ExtraFields map[string]apijson.Field } -func (r *FirewallRuleConfigurationLegacyJhsASNConfiguration) UnmarshalJSON(data []byte) (err error) { +func (r *AccessRuleConfigurationLegacyJhsASNConfiguration) UnmarshalJSON(data []byte) (err error) { return apijson.UnmarshalRoot(data, r) } -func (r firewallRuleConfigurationLegacyJhsASNConfigurationJSON) RawJSON() string { +func (r accessRuleConfigurationLegacyJhsASNConfigurationJSON) RawJSON() string { return r.raw } -func (r FirewallRuleConfigurationLegacyJhsASNConfiguration) implementsUserFirewallRuleConfiguration() { -} +func (r AccessRuleConfigurationLegacyJhsASNConfiguration) implementsUserAccessRuleConfiguration() {} // The configuration target. You must set the target to `asn` when specifying an // Autonomous System Number (ASN) in the rule. -type FirewallRuleConfigurationLegacyJhsASNConfigurationTarget string +type AccessRuleConfigurationLegacyJhsASNConfigurationTarget string const ( - FirewallRuleConfigurationLegacyJhsASNConfigurationTargetASN FirewallRuleConfigurationLegacyJhsASNConfigurationTarget = "asn" + AccessRuleConfigurationLegacyJhsASNConfigurationTargetASN AccessRuleConfigurationLegacyJhsASNConfigurationTarget = "asn" ) -func (r FirewallRuleConfigurationLegacyJhsASNConfigurationTarget) IsKnown() bool { +func (r AccessRuleConfigurationLegacyJhsASNConfigurationTarget) IsKnown() bool { switch r { - case FirewallRuleConfigurationLegacyJhsASNConfigurationTargetASN: + case AccessRuleConfigurationLegacyJhsASNConfigurationTargetASN: return true } return false } -type FirewallRuleConfigurationLegacyJhsCountryConfiguration struct { +type AccessRuleConfigurationLegacyJhsCountryConfiguration struct { // The configuration target. You must set the target to `country` when specifying a // country code in the rule. - Target FirewallRuleConfigurationLegacyJhsCountryConfigurationTarget `json:"target"` + Target AccessRuleConfigurationLegacyJhsCountryConfigurationTarget `json:"target"` // The two-letter ISO-3166-1 alpha-2 code to match. For more information, refer to // [IP Access rules: Parameters](https://developers.cloudflare.com/waf/tools/ip-access-rules/parameters/#country). - Value string `json:"value"` - JSON firewallRuleConfigurationLegacyJhsCountryConfigurationJSON `json:"-"` + Value string `json:"value"` + JSON accessRuleConfigurationLegacyJhsCountryConfigurationJSON `json:"-"` } -// firewallRuleConfigurationLegacyJhsCountryConfigurationJSON contains the JSON -// metadata for the struct [FirewallRuleConfigurationLegacyJhsCountryConfiguration] -type firewallRuleConfigurationLegacyJhsCountryConfigurationJSON struct { +// accessRuleConfigurationLegacyJhsCountryConfigurationJSON contains the JSON +// metadata for the struct [AccessRuleConfigurationLegacyJhsCountryConfiguration] +type accessRuleConfigurationLegacyJhsCountryConfigurationJSON struct { Target apijson.Field Value apijson.Field raw string ExtraFields map[string]apijson.Field } -func (r *FirewallRuleConfigurationLegacyJhsCountryConfiguration) UnmarshalJSON(data []byte) (err error) { +func (r *AccessRuleConfigurationLegacyJhsCountryConfiguration) UnmarshalJSON(data []byte) (err error) { return apijson.UnmarshalRoot(data, r) } -func (r firewallRuleConfigurationLegacyJhsCountryConfigurationJSON) RawJSON() string { +func (r accessRuleConfigurationLegacyJhsCountryConfigurationJSON) RawJSON() string { return r.raw } -func (r FirewallRuleConfigurationLegacyJhsCountryConfiguration) implementsUserFirewallRuleConfiguration() { +func (r AccessRuleConfigurationLegacyJhsCountryConfiguration) implementsUserAccessRuleConfiguration() { } // The configuration target. You must set the target to `country` when specifying a // country code in the rule. -type FirewallRuleConfigurationLegacyJhsCountryConfigurationTarget string +type AccessRuleConfigurationLegacyJhsCountryConfigurationTarget string const ( - FirewallRuleConfigurationLegacyJhsCountryConfigurationTargetCountry FirewallRuleConfigurationLegacyJhsCountryConfigurationTarget = "country" + AccessRuleConfigurationLegacyJhsCountryConfigurationTargetCountry AccessRuleConfigurationLegacyJhsCountryConfigurationTarget = "country" ) -func (r FirewallRuleConfigurationLegacyJhsCountryConfigurationTarget) IsKnown() bool { +func (r AccessRuleConfigurationLegacyJhsCountryConfigurationTarget) IsKnown() bool { switch r { - case FirewallRuleConfigurationLegacyJhsCountryConfigurationTargetCountry: + case AccessRuleConfigurationLegacyJhsCountryConfigurationTargetCountry: return true } return false } // The action to apply to a matched request. -type FirewallRuleMode string +type AccessRuleMode string const ( - FirewallRuleModeBlock FirewallRuleMode = "block" - FirewallRuleModeChallenge FirewallRuleMode = "challenge" - FirewallRuleModeWhitelist FirewallRuleMode = "whitelist" - FirewallRuleModeJsChallenge FirewallRuleMode = "js_challenge" - FirewallRuleModeManagedChallenge FirewallRuleMode = "managed_challenge" + AccessRuleModeBlock AccessRuleMode = "block" + AccessRuleModeChallenge AccessRuleMode = "challenge" + AccessRuleModeWhitelist AccessRuleMode = "whitelist" + AccessRuleModeJsChallenge AccessRuleMode = "js_challenge" + AccessRuleModeManagedChallenge AccessRuleMode = "managed_challenge" ) -func (r FirewallRuleMode) IsKnown() bool { +func (r AccessRuleMode) IsKnown() bool { switch r { - case FirewallRuleModeBlock, FirewallRuleModeChallenge, FirewallRuleModeWhitelist, FirewallRuleModeJsChallenge, FirewallRuleModeManagedChallenge: + case AccessRuleModeBlock, AccessRuleModeChallenge, AccessRuleModeWhitelist, AccessRuleModeJsChallenge, AccessRuleModeManagedChallenge: return true } return false @@ -678,7 +674,7 @@ func (r FirewallAccessRuleNewParamsMode) IsKnown() bool { type FirewallAccessRuleNewResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` - Result FirewallRule `json:"result,required,nullable"` + Result AccessRule `json:"result,required,nullable"` // Whether the API call was successful Success FirewallAccessRuleNewResponseEnvelopeSuccess `json:"success,required"` JSON firewallAccessRuleNewResponseEnvelopeJSON `json:"-"` @@ -969,7 +965,7 @@ func (r FirewallAccessRuleEditParamsMode) IsKnown() bool { type FirewallAccessRuleEditResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` - Result FirewallRule `json:"result,required,nullable"` + Result AccessRule `json:"result,required,nullable"` // Whether the API call was successful Success FirewallAccessRuleEditResponseEnvelopeSuccess `json:"success,required"` JSON firewallAccessRuleEditResponseEnvelopeJSON `json:"-"` diff --git a/user/loadbalancermonitor.go b/user/loadbalancermonitor.go index 1708a014b04..51a8da3cef0 100644 --- a/user/loadbalancermonitor.go +++ b/user/loadbalancermonitor.go @@ -35,7 +35,7 @@ func NewLoadBalancerMonitorService(opts ...option.RequestOption) (r *LoadBalance } // Create a configured monitor. -func (r *LoadBalancerMonitorService) New(ctx context.Context, body LoadBalancerMonitorNewParams, opts ...option.RequestOption) (res *LoadBalancingMonitor, err error) { +func (r *LoadBalancerMonitorService) New(ctx context.Context, body LoadBalancerMonitorNewParams, opts ...option.RequestOption) (res *Monitor, err error) { opts = append(r.Options[:], opts...) var env LoadBalancerMonitorNewResponseEnvelope path := "user/load_balancers/monitors" @@ -48,7 +48,7 @@ func (r *LoadBalancerMonitorService) New(ctx context.Context, body LoadBalancerM } // Modify a configured monitor. -func (r *LoadBalancerMonitorService) Update(ctx context.Context, monitorID string, body LoadBalancerMonitorUpdateParams, opts ...option.RequestOption) (res *LoadBalancingMonitor, err error) { +func (r *LoadBalancerMonitorService) Update(ctx context.Context, monitorID string, body LoadBalancerMonitorUpdateParams, opts ...option.RequestOption) (res *Monitor, err error) { opts = append(r.Options[:], opts...) var env LoadBalancerMonitorUpdateResponseEnvelope path := fmt.Sprintf("user/load_balancers/monitors/%s", monitorID) @@ -61,7 +61,7 @@ func (r *LoadBalancerMonitorService) Update(ctx context.Context, monitorID strin } // List configured monitors for a user. -func (r *LoadBalancerMonitorService) List(ctx context.Context, opts ...option.RequestOption) (res *pagination.SinglePage[LoadBalancingMonitor], err error) { +func (r *LoadBalancerMonitorService) List(ctx context.Context, opts ...option.RequestOption) (res *pagination.SinglePage[Monitor], err error) { var raw *http.Response opts = append(r.Options, opts...) opts = append([]option.RequestOption{option.WithResponseInto(&raw)}, opts...) @@ -79,7 +79,7 @@ func (r *LoadBalancerMonitorService) List(ctx context.Context, opts ...option.Re } // List configured monitors for a user. -func (r *LoadBalancerMonitorService) ListAutoPaging(ctx context.Context, opts ...option.RequestOption) *pagination.SinglePageAutoPager[LoadBalancingMonitor] { +func (r *LoadBalancerMonitorService) ListAutoPaging(ctx context.Context, opts ...option.RequestOption) *pagination.SinglePageAutoPager[Monitor] { return pagination.NewSinglePageAutoPager(r.List(ctx, opts...)) } @@ -97,7 +97,7 @@ func (r *LoadBalancerMonitorService) Delete(ctx context.Context, monitorID strin } // Apply changes to an existing monitor, overwriting the supplied properties. -func (r *LoadBalancerMonitorService) Edit(ctx context.Context, monitorID string, body LoadBalancerMonitorEditParams, opts ...option.RequestOption) (res *LoadBalancingMonitor, err error) { +func (r *LoadBalancerMonitorService) Edit(ctx context.Context, monitorID string, body LoadBalancerMonitorEditParams, opts ...option.RequestOption) (res *Monitor, err error) { opts = append(r.Options[:], opts...) var env LoadBalancerMonitorEditResponseEnvelope path := fmt.Sprintf("user/load_balancers/monitors/%s", monitorID) @@ -110,7 +110,7 @@ func (r *LoadBalancerMonitorService) Edit(ctx context.Context, monitorID string, } // List a single configured monitor for a user. -func (r *LoadBalancerMonitorService) Get(ctx context.Context, monitorID string, opts ...option.RequestOption) (res *LoadBalancingMonitor, err error) { +func (r *LoadBalancerMonitorService) Get(ctx context.Context, monitorID string, opts ...option.RequestOption) (res *Monitor, err error) { opts = append(r.Options[:], opts...) var env LoadBalancerMonitorGetResponseEnvelope path := fmt.Sprintf("user/load_balancers/monitors/%s", monitorID) @@ -149,7 +149,7 @@ func (r *LoadBalancerMonitorService) References(ctx context.Context, monitorID s return } -type LoadBalancingMonitor struct { +type Monitor struct { ID string `json:"id"` // Do not validate the certificate when monitor use HTTPS. This parameter is // currently only valid for HTTP and HTTPS monitors. @@ -201,13 +201,12 @@ type LoadBalancingMonitor struct { Timeout int64 `json:"timeout"` // The protocol to use for the health check. Currently supported protocols are // 'HTTP','HTTPS', 'TCP', 'ICMP-PING', 'UDP-ICMP', and 'SMTP'. - Type LoadBalancingMonitorType `json:"type"` - JSON loadBalancingMonitorJSON `json:"-"` + Type MonitorType `json:"type"` + JSON monitorJSON `json:"-"` } -// loadBalancingMonitorJSON contains the JSON metadata for the struct -// [LoadBalancingMonitor] -type loadBalancingMonitorJSON struct { +// monitorJSON contains the JSON metadata for the struct [Monitor] +type monitorJSON struct { ID apijson.Field AllowInsecure apijson.Field ConsecutiveDown apijson.Field @@ -231,30 +230,30 @@ type loadBalancingMonitorJSON struct { ExtraFields map[string]apijson.Field } -func (r *LoadBalancingMonitor) UnmarshalJSON(data []byte) (err error) { +func (r *Monitor) UnmarshalJSON(data []byte) (err error) { return apijson.UnmarshalRoot(data, r) } -func (r loadBalancingMonitorJSON) RawJSON() string { +func (r monitorJSON) RawJSON() string { return r.raw } // The protocol to use for the health check. Currently supported protocols are // 'HTTP','HTTPS', 'TCP', 'ICMP-PING', 'UDP-ICMP', and 'SMTP'. -type LoadBalancingMonitorType string +type MonitorType string const ( - LoadBalancingMonitorTypeHTTP LoadBalancingMonitorType = "http" - LoadBalancingMonitorTypeHTTPS LoadBalancingMonitorType = "https" - LoadBalancingMonitorTypeTcp LoadBalancingMonitorType = "tcp" - LoadBalancingMonitorTypeUdpIcmp LoadBalancingMonitorType = "udp_icmp" - LoadBalancingMonitorTypeIcmpPing LoadBalancingMonitorType = "icmp_ping" - LoadBalancingMonitorTypeSmtp LoadBalancingMonitorType = "smtp" + MonitorTypeHTTP MonitorType = "http" + MonitorTypeHTTPS MonitorType = "https" + MonitorTypeTcp MonitorType = "tcp" + MonitorTypeUdpIcmp MonitorType = "udp_icmp" + MonitorTypeIcmpPing MonitorType = "icmp_ping" + MonitorTypeSmtp MonitorType = "smtp" ) -func (r LoadBalancingMonitorType) IsKnown() bool { +func (r MonitorType) IsKnown() bool { switch r { - case LoadBalancingMonitorTypeHTTP, LoadBalancingMonitorTypeHTTPS, LoadBalancingMonitorTypeTcp, LoadBalancingMonitorTypeUdpIcmp, LoadBalancingMonitorTypeIcmpPing, LoadBalancingMonitorTypeSmtp: + case MonitorTypeHTTP, MonitorTypeHTTPS, MonitorTypeTcp, MonitorTypeUdpIcmp, MonitorTypeIcmpPing, MonitorTypeSmtp: return true } return false @@ -412,7 +411,7 @@ func (r LoadBalancerMonitorNewParamsType) IsKnown() bool { type LoadBalancerMonitorNewResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` - Result LoadBalancingMonitor `json:"result,required"` + Result Monitor `json:"result,required"` // Whether the API call was successful Success LoadBalancerMonitorNewResponseEnvelopeSuccess `json:"success,required"` JSON loadBalancerMonitorNewResponseEnvelopeJSON `json:"-"` @@ -532,7 +531,7 @@ func (r LoadBalancerMonitorUpdateParamsType) IsKnown() bool { type LoadBalancerMonitorUpdateResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` - Result LoadBalancingMonitor `json:"result,required"` + Result Monitor `json:"result,required"` // Whether the API call was successful Success LoadBalancerMonitorUpdateResponseEnvelopeSuccess `json:"success,required"` JSON loadBalancerMonitorUpdateResponseEnvelopeJSON `json:"-"` @@ -703,7 +702,7 @@ func (r LoadBalancerMonitorEditParamsType) IsKnown() bool { type LoadBalancerMonitorEditResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` - Result LoadBalancingMonitor `json:"result,required"` + Result Monitor `json:"result,required"` // Whether the API call was successful Success LoadBalancerMonitorEditResponseEnvelopeSuccess `json:"success,required"` JSON loadBalancerMonitorEditResponseEnvelopeJSON `json:"-"` @@ -746,7 +745,7 @@ func (r LoadBalancerMonitorEditResponseEnvelopeSuccess) IsKnown() bool { type LoadBalancerMonitorGetResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` - Result LoadBalancingMonitor `json:"result,required"` + Result Monitor `json:"result,required"` // Whether the API call was successful Success LoadBalancerMonitorGetResponseEnvelopeSuccess `json:"success,required"` JSON loadBalancerMonitorGetResponseEnvelopeJSON `json:"-"` diff --git a/user/loadbalancerpool.go b/user/loadbalancerpool.go index 9a943f2c23a..03b2176825e 100644 --- a/user/loadbalancerpool.go +++ b/user/loadbalancerpool.go @@ -39,7 +39,7 @@ func NewLoadBalancerPoolService(opts ...option.RequestOption) (r *LoadBalancerPo } // Create a new pool. -func (r *LoadBalancerPoolService) New(ctx context.Context, body LoadBalancerPoolNewParams, opts ...option.RequestOption) (res *LoadBalancingPool, err error) { +func (r *LoadBalancerPoolService) New(ctx context.Context, body LoadBalancerPoolNewParams, opts ...option.RequestOption) (res *Pool, err error) { opts = append(r.Options[:], opts...) var env LoadBalancerPoolNewResponseEnvelope path := "user/load_balancers/pools" @@ -52,7 +52,7 @@ func (r *LoadBalancerPoolService) New(ctx context.Context, body LoadBalancerPool } // Modify a configured pool. -func (r *LoadBalancerPoolService) Update(ctx context.Context, poolID string, body LoadBalancerPoolUpdateParams, opts ...option.RequestOption) (res *LoadBalancingPool, err error) { +func (r *LoadBalancerPoolService) Update(ctx context.Context, poolID string, body LoadBalancerPoolUpdateParams, opts ...option.RequestOption) (res *Pool, err error) { opts = append(r.Options[:], opts...) var env LoadBalancerPoolUpdateResponseEnvelope path := fmt.Sprintf("user/load_balancers/pools/%s", poolID) @@ -65,7 +65,7 @@ func (r *LoadBalancerPoolService) Update(ctx context.Context, poolID string, bod } // List configured pools. -func (r *LoadBalancerPoolService) List(ctx context.Context, query LoadBalancerPoolListParams, opts ...option.RequestOption) (res *pagination.SinglePage[LoadBalancingPool], err error) { +func (r *LoadBalancerPoolService) List(ctx context.Context, query LoadBalancerPoolListParams, opts ...option.RequestOption) (res *pagination.SinglePage[Pool], err error) { var raw *http.Response opts = append(r.Options, opts...) opts = append([]option.RequestOption{option.WithResponseInto(&raw)}, opts...) @@ -83,7 +83,7 @@ func (r *LoadBalancerPoolService) List(ctx context.Context, query LoadBalancerPo } // List configured pools. -func (r *LoadBalancerPoolService) ListAutoPaging(ctx context.Context, query LoadBalancerPoolListParams, opts ...option.RequestOption) *pagination.SinglePageAutoPager[LoadBalancingPool] { +func (r *LoadBalancerPoolService) ListAutoPaging(ctx context.Context, query LoadBalancerPoolListParams, opts ...option.RequestOption) *pagination.SinglePageAutoPager[Pool] { return pagination.NewSinglePageAutoPager(r.List(ctx, query, opts...)) } @@ -101,7 +101,7 @@ func (r *LoadBalancerPoolService) Delete(ctx context.Context, poolID string, bod } // Apply changes to an existing pool, overwriting the supplied properties. -func (r *LoadBalancerPoolService) Edit(ctx context.Context, poolID string, body LoadBalancerPoolEditParams, opts ...option.RequestOption) (res *LoadBalancingPool, err error) { +func (r *LoadBalancerPoolService) Edit(ctx context.Context, poolID string, body LoadBalancerPoolEditParams, opts ...option.RequestOption) (res *Pool, err error) { opts = append(r.Options[:], opts...) var env LoadBalancerPoolEditResponseEnvelope path := fmt.Sprintf("user/load_balancers/pools/%s", poolID) @@ -114,7 +114,7 @@ func (r *LoadBalancerPoolService) Edit(ctx context.Context, poolID string, body } // Fetch a single configured pool. -func (r *LoadBalancerPoolService) Get(ctx context.Context, poolID string, opts ...option.RequestOption) (res *LoadBalancingPool, err error) { +func (r *LoadBalancerPoolService) Get(ctx context.Context, poolID string, opts ...option.RequestOption) (res *Pool, err error) { opts = append(r.Options[:], opts...) var env LoadBalancerPoolGetResponseEnvelope path := fmt.Sprintf("user/load_balancers/pools/%s", poolID) @@ -166,12 +166,12 @@ func (r *LoadBalancerPoolService) References(ctx context.Context, poolID string, return } -type LoadBalancingPool struct { +type Pool struct { ID string `json:"id"` // A list of regions from which to run health checks. Null means every Cloudflare // data center. - CheckRegions []LoadBalancingPoolCheckRegion `json:"check_regions,nullable"` - CreatedOn time.Time `json:"created_on" format:"date-time"` + CheckRegions []PoolCheckRegion `json:"check_regions,nullable"` + CreatedOn time.Time `json:"created_on" format:"date-time"` // A human-readable description of the pool. Description string `json:"description"` // This field shows up only if the pool is disabled. This field is set with the @@ -185,7 +185,7 @@ type LoadBalancingPool struct { // decimal degrees. If this is set, longitude must also be set. Latitude float64 `json:"latitude"` // Configures load shedding policies and percentages for the pool. - LoadShedding LoadBalancingPoolLoadShedding `json:"load_shedding"` + LoadShedding PoolLoadShedding `json:"load_shedding"` // The longitude of the data center containing the origins used in this pool in // decimal degrees. If this is set, latitude must also be set. Longitude float64 `json:"longitude"` @@ -208,19 +208,18 @@ type LoadBalancingPool struct { NotificationEmail string `json:"notification_email"` // Filter pool and origin health notifications by resource type or health status. // Use null to reset. - NotificationFilter LoadBalancingPoolNotificationFilter `json:"notification_filter,nullable"` + NotificationFilter PoolNotificationFilter `json:"notification_filter,nullable"` // Configures origin steering for the pool. Controls how origins are selected for // new sessions and traffic without session affinity. - OriginSteering LoadBalancingPoolOriginSteering `json:"origin_steering"` + OriginSteering PoolOriginSteering `json:"origin_steering"` // The list of origins within this pool. Traffic directed at this pool is balanced // across all currently healthy origins, provided the pool itself is healthy. - Origins []LoadBalancingPoolOrigin `json:"origins"` - JSON loadBalancingPoolJSON `json:"-"` + Origins []PoolOrigin `json:"origins"` + JSON poolJSON `json:"-"` } -// loadBalancingPoolJSON contains the JSON metadata for the struct -// [LoadBalancingPool] -type loadBalancingPoolJSON struct { +// poolJSON contains the JSON metadata for the struct [Pool] +type poolJSON struct { ID apijson.Field CheckRegions apijson.Field CreatedOn apijson.Field @@ -242,11 +241,11 @@ type loadBalancingPoolJSON struct { ExtraFields map[string]apijson.Field } -func (r *LoadBalancingPool) UnmarshalJSON(data []byte) (err error) { +func (r *Pool) UnmarshalJSON(data []byte) (err error) { return apijson.UnmarshalRoot(data, r) } -func (r loadBalancingPoolJSON) RawJSON() string { +func (r poolJSON) RawJSON() string { return r.raw } @@ -255,35 +254,35 @@ func (r loadBalancingPoolJSON) RawJSON() string { // OC: Oceania, ME: Middle East, NAF: North Africa, SAF: South Africa, SAS: // Southern Asia, SEAS: South East Asia, NEAS: North East Asia, ALL_REGIONS: all // regions (ENTERPRISE customers only). -type LoadBalancingPoolCheckRegion string +type PoolCheckRegion string const ( - LoadBalancingPoolCheckRegionWnam LoadBalancingPoolCheckRegion = "WNAM" - LoadBalancingPoolCheckRegionEnam LoadBalancingPoolCheckRegion = "ENAM" - LoadBalancingPoolCheckRegionWeu LoadBalancingPoolCheckRegion = "WEU" - LoadBalancingPoolCheckRegionEeu LoadBalancingPoolCheckRegion = "EEU" - LoadBalancingPoolCheckRegionNsam LoadBalancingPoolCheckRegion = "NSAM" - LoadBalancingPoolCheckRegionSsam LoadBalancingPoolCheckRegion = "SSAM" - LoadBalancingPoolCheckRegionOc LoadBalancingPoolCheckRegion = "OC" - LoadBalancingPoolCheckRegionMe LoadBalancingPoolCheckRegion = "ME" - LoadBalancingPoolCheckRegionNaf LoadBalancingPoolCheckRegion = "NAF" - LoadBalancingPoolCheckRegionSaf LoadBalancingPoolCheckRegion = "SAF" - LoadBalancingPoolCheckRegionSas LoadBalancingPoolCheckRegion = "SAS" - LoadBalancingPoolCheckRegionSeas LoadBalancingPoolCheckRegion = "SEAS" - LoadBalancingPoolCheckRegionNeas LoadBalancingPoolCheckRegion = "NEAS" - LoadBalancingPoolCheckRegionAllRegions LoadBalancingPoolCheckRegion = "ALL_REGIONS" + PoolCheckRegionWnam PoolCheckRegion = "WNAM" + PoolCheckRegionEnam PoolCheckRegion = "ENAM" + PoolCheckRegionWeu PoolCheckRegion = "WEU" + PoolCheckRegionEeu PoolCheckRegion = "EEU" + PoolCheckRegionNsam PoolCheckRegion = "NSAM" + PoolCheckRegionSsam PoolCheckRegion = "SSAM" + PoolCheckRegionOc PoolCheckRegion = "OC" + PoolCheckRegionMe PoolCheckRegion = "ME" + PoolCheckRegionNaf PoolCheckRegion = "NAF" + PoolCheckRegionSaf PoolCheckRegion = "SAF" + PoolCheckRegionSas PoolCheckRegion = "SAS" + PoolCheckRegionSeas PoolCheckRegion = "SEAS" + PoolCheckRegionNeas PoolCheckRegion = "NEAS" + PoolCheckRegionAllRegions PoolCheckRegion = "ALL_REGIONS" ) -func (r LoadBalancingPoolCheckRegion) IsKnown() bool { +func (r PoolCheckRegion) IsKnown() bool { switch r { - case LoadBalancingPoolCheckRegionWnam, LoadBalancingPoolCheckRegionEnam, LoadBalancingPoolCheckRegionWeu, LoadBalancingPoolCheckRegionEeu, LoadBalancingPoolCheckRegionNsam, LoadBalancingPoolCheckRegionSsam, LoadBalancingPoolCheckRegionOc, LoadBalancingPoolCheckRegionMe, LoadBalancingPoolCheckRegionNaf, LoadBalancingPoolCheckRegionSaf, LoadBalancingPoolCheckRegionSas, LoadBalancingPoolCheckRegionSeas, LoadBalancingPoolCheckRegionNeas, LoadBalancingPoolCheckRegionAllRegions: + case PoolCheckRegionWnam, PoolCheckRegionEnam, PoolCheckRegionWeu, PoolCheckRegionEeu, PoolCheckRegionNsam, PoolCheckRegionSsam, PoolCheckRegionOc, PoolCheckRegionMe, PoolCheckRegionNaf, PoolCheckRegionSaf, PoolCheckRegionSas, PoolCheckRegionSeas, PoolCheckRegionNeas, PoolCheckRegionAllRegions: return true } return false } // Configures load shedding policies and percentages for the pool. -type LoadBalancingPoolLoadShedding struct { +type PoolLoadShedding struct { // The percent of traffic to shed from the pool, according to the default policy. // Applies to new sessions and traffic without session affinity. DefaultPercent float64 `json:"default_percent"` @@ -291,19 +290,19 @@ type LoadBalancingPoolLoadShedding struct { // given percent of requests. A hash policy computes a hash over the // CF-Connecting-IP address and sheds all requests originating from a percent of // IPs. - DefaultPolicy LoadBalancingPoolLoadSheddingDefaultPolicy `json:"default_policy"` + DefaultPolicy PoolLoadSheddingDefaultPolicy `json:"default_policy"` // The percent of existing sessions to shed from the pool, according to the session // policy. SessionPercent float64 `json:"session_percent"` // Only the hash policy is supported for existing sessions (to avoid exponential // decay). - SessionPolicy LoadBalancingPoolLoadSheddingSessionPolicy `json:"session_policy"` - JSON loadBalancingPoolLoadSheddingJSON `json:"-"` + SessionPolicy PoolLoadSheddingSessionPolicy `json:"session_policy"` + JSON poolLoadSheddingJSON `json:"-"` } -// loadBalancingPoolLoadSheddingJSON contains the JSON metadata for the struct -// [LoadBalancingPoolLoadShedding] -type loadBalancingPoolLoadSheddingJSON struct { +// poolLoadSheddingJSON contains the JSON metadata for the struct +// [PoolLoadShedding] +type poolLoadSheddingJSON struct { DefaultPercent apijson.Field DefaultPolicy apijson.Field SessionPercent apijson.Field @@ -312,11 +311,11 @@ type loadBalancingPoolLoadSheddingJSON struct { ExtraFields map[string]apijson.Field } -func (r *LoadBalancingPoolLoadShedding) UnmarshalJSON(data []byte) (err error) { +func (r *PoolLoadShedding) UnmarshalJSON(data []byte) (err error) { return apijson.UnmarshalRoot(data, r) } -func (r loadBalancingPoolLoadSheddingJSON) RawJSON() string { +func (r poolLoadSheddingJSON) RawJSON() string { return r.raw } @@ -324,16 +323,16 @@ func (r loadBalancingPoolLoadSheddingJSON) RawJSON() string { // given percent of requests. A hash policy computes a hash over the // CF-Connecting-IP address and sheds all requests originating from a percent of // IPs. -type LoadBalancingPoolLoadSheddingDefaultPolicy string +type PoolLoadSheddingDefaultPolicy string const ( - LoadBalancingPoolLoadSheddingDefaultPolicyRandom LoadBalancingPoolLoadSheddingDefaultPolicy = "random" - LoadBalancingPoolLoadSheddingDefaultPolicyHash LoadBalancingPoolLoadSheddingDefaultPolicy = "hash" + PoolLoadSheddingDefaultPolicyRandom PoolLoadSheddingDefaultPolicy = "random" + PoolLoadSheddingDefaultPolicyHash PoolLoadSheddingDefaultPolicy = "hash" ) -func (r LoadBalancingPoolLoadSheddingDefaultPolicy) IsKnown() bool { +func (r PoolLoadSheddingDefaultPolicy) IsKnown() bool { switch r { - case LoadBalancingPoolLoadSheddingDefaultPolicyRandom, LoadBalancingPoolLoadSheddingDefaultPolicyHash: + case PoolLoadSheddingDefaultPolicyRandom, PoolLoadSheddingDefaultPolicyHash: return true } return false @@ -341,15 +340,15 @@ func (r LoadBalancingPoolLoadSheddingDefaultPolicy) IsKnown() bool { // Only the hash policy is supported for existing sessions (to avoid exponential // decay). -type LoadBalancingPoolLoadSheddingSessionPolicy string +type PoolLoadSheddingSessionPolicy string const ( - LoadBalancingPoolLoadSheddingSessionPolicyHash LoadBalancingPoolLoadSheddingSessionPolicy = "hash" + PoolLoadSheddingSessionPolicyHash PoolLoadSheddingSessionPolicy = "hash" ) -func (r LoadBalancingPoolLoadSheddingSessionPolicy) IsKnown() bool { +func (r PoolLoadSheddingSessionPolicy) IsKnown() bool { switch r { - case LoadBalancingPoolLoadSheddingSessionPolicyHash: + case PoolLoadSheddingSessionPolicyHash: return true } return false @@ -357,92 +356,92 @@ func (r LoadBalancingPoolLoadSheddingSessionPolicy) IsKnown() bool { // Filter pool and origin health notifications by resource type or health status. // Use null to reset. -type LoadBalancingPoolNotificationFilter struct { +type PoolNotificationFilter struct { // Filter options for a particular resource type (pool or origin). Use null to // reset. - Origin LoadBalancingPoolNotificationFilterOrigin `json:"origin,nullable"` + Origin PoolNotificationFilterOrigin `json:"origin,nullable"` // Filter options for a particular resource type (pool or origin). Use null to // reset. - Pool LoadBalancingPoolNotificationFilterPool `json:"pool,nullable"` - JSON loadBalancingPoolNotificationFilterJSON `json:"-"` + Pool PoolNotificationFilterPool `json:"pool,nullable"` + JSON poolNotificationFilterJSON `json:"-"` } -// loadBalancingPoolNotificationFilterJSON contains the JSON metadata for the -// struct [LoadBalancingPoolNotificationFilter] -type loadBalancingPoolNotificationFilterJSON struct { +// poolNotificationFilterJSON contains the JSON metadata for the struct +// [PoolNotificationFilter] +type poolNotificationFilterJSON struct { Origin apijson.Field Pool apijson.Field raw string ExtraFields map[string]apijson.Field } -func (r *LoadBalancingPoolNotificationFilter) UnmarshalJSON(data []byte) (err error) { +func (r *PoolNotificationFilter) UnmarshalJSON(data []byte) (err error) { return apijson.UnmarshalRoot(data, r) } -func (r loadBalancingPoolNotificationFilterJSON) RawJSON() string { +func (r poolNotificationFilterJSON) RawJSON() string { return r.raw } // Filter options for a particular resource type (pool or origin). Use null to // reset. -type LoadBalancingPoolNotificationFilterOrigin struct { +type PoolNotificationFilterOrigin struct { // If set true, disable notifications for this type of resource (pool or origin). Disable bool `json:"disable"` // If present, send notifications only for this health status (e.g. false for only // DOWN events). Use null to reset (all events). - Healthy bool `json:"healthy,nullable"` - JSON loadBalancingPoolNotificationFilterOriginJSON `json:"-"` + Healthy bool `json:"healthy,nullable"` + JSON poolNotificationFilterOriginJSON `json:"-"` } -// loadBalancingPoolNotificationFilterOriginJSON contains the JSON metadata for the -// struct [LoadBalancingPoolNotificationFilterOrigin] -type loadBalancingPoolNotificationFilterOriginJSON struct { +// poolNotificationFilterOriginJSON contains the JSON metadata for the struct +// [PoolNotificationFilterOrigin] +type poolNotificationFilterOriginJSON struct { Disable apijson.Field Healthy apijson.Field raw string ExtraFields map[string]apijson.Field } -func (r *LoadBalancingPoolNotificationFilterOrigin) UnmarshalJSON(data []byte) (err error) { +func (r *PoolNotificationFilterOrigin) UnmarshalJSON(data []byte) (err error) { return apijson.UnmarshalRoot(data, r) } -func (r loadBalancingPoolNotificationFilterOriginJSON) RawJSON() string { +func (r poolNotificationFilterOriginJSON) RawJSON() string { return r.raw } // Filter options for a particular resource type (pool or origin). Use null to // reset. -type LoadBalancingPoolNotificationFilterPool struct { +type PoolNotificationFilterPool struct { // If set true, disable notifications for this type of resource (pool or origin). Disable bool `json:"disable"` // If present, send notifications only for this health status (e.g. false for only // DOWN events). Use null to reset (all events). - Healthy bool `json:"healthy,nullable"` - JSON loadBalancingPoolNotificationFilterPoolJSON `json:"-"` + Healthy bool `json:"healthy,nullable"` + JSON poolNotificationFilterPoolJSON `json:"-"` } -// loadBalancingPoolNotificationFilterPoolJSON contains the JSON metadata for the -// struct [LoadBalancingPoolNotificationFilterPool] -type loadBalancingPoolNotificationFilterPoolJSON struct { +// poolNotificationFilterPoolJSON contains the JSON metadata for the struct +// [PoolNotificationFilterPool] +type poolNotificationFilterPoolJSON struct { Disable apijson.Field Healthy apijson.Field raw string ExtraFields map[string]apijson.Field } -func (r *LoadBalancingPoolNotificationFilterPool) UnmarshalJSON(data []byte) (err error) { +func (r *PoolNotificationFilterPool) UnmarshalJSON(data []byte) (err error) { return apijson.UnmarshalRoot(data, r) } -func (r loadBalancingPoolNotificationFilterPoolJSON) RawJSON() string { +func (r poolNotificationFilterPoolJSON) RawJSON() string { return r.raw } // Configures origin steering for the pool. Controls how origins are selected for // new sessions and traffic without session affinity. -type LoadBalancingPoolOriginSteering struct { +type PoolOriginSteering struct { // The type of origin steering policy to use. // // - `"random"`: Select an origin randomly. @@ -456,23 +455,23 @@ type LoadBalancingPoolOriginSteering struct { // weights, as well as each origin's number of open connections. Origins with // more open connections are weighted proportionately less relative to others. // Supported for HTTP/1 and HTTP/2 connections. - Policy LoadBalancingPoolOriginSteeringPolicy `json:"policy"` - JSON loadBalancingPoolOriginSteeringJSON `json:"-"` + Policy PoolOriginSteeringPolicy `json:"policy"` + JSON poolOriginSteeringJSON `json:"-"` } -// loadBalancingPoolOriginSteeringJSON contains the JSON metadata for the struct -// [LoadBalancingPoolOriginSteering] -type loadBalancingPoolOriginSteeringJSON struct { +// poolOriginSteeringJSON contains the JSON metadata for the struct +// [PoolOriginSteering] +type poolOriginSteeringJSON struct { Policy apijson.Field raw string ExtraFields map[string]apijson.Field } -func (r *LoadBalancingPoolOriginSteering) UnmarshalJSON(data []byte) (err error) { +func (r *PoolOriginSteering) UnmarshalJSON(data []byte) (err error) { return apijson.UnmarshalRoot(data, r) } -func (r loadBalancingPoolOriginSteeringJSON) RawJSON() string { +func (r poolOriginSteeringJSON) RawJSON() string { return r.raw } @@ -489,24 +488,24 @@ func (r loadBalancingPoolOriginSteeringJSON) RawJSON() string { // weights, as well as each origin's number of open connections. Origins with // more open connections are weighted proportionately less relative to others. // Supported for HTTP/1 and HTTP/2 connections. -type LoadBalancingPoolOriginSteeringPolicy string +type PoolOriginSteeringPolicy string const ( - LoadBalancingPoolOriginSteeringPolicyRandom LoadBalancingPoolOriginSteeringPolicy = "random" - LoadBalancingPoolOriginSteeringPolicyHash LoadBalancingPoolOriginSteeringPolicy = "hash" - LoadBalancingPoolOriginSteeringPolicyLeastOutstandingRequests LoadBalancingPoolOriginSteeringPolicy = "least_outstanding_requests" - LoadBalancingPoolOriginSteeringPolicyLeastConnections LoadBalancingPoolOriginSteeringPolicy = "least_connections" + PoolOriginSteeringPolicyRandom PoolOriginSteeringPolicy = "random" + PoolOriginSteeringPolicyHash PoolOriginSteeringPolicy = "hash" + PoolOriginSteeringPolicyLeastOutstandingRequests PoolOriginSteeringPolicy = "least_outstanding_requests" + PoolOriginSteeringPolicyLeastConnections PoolOriginSteeringPolicy = "least_connections" ) -func (r LoadBalancingPoolOriginSteeringPolicy) IsKnown() bool { +func (r PoolOriginSteeringPolicy) IsKnown() bool { switch r { - case LoadBalancingPoolOriginSteeringPolicyRandom, LoadBalancingPoolOriginSteeringPolicyHash, LoadBalancingPoolOriginSteeringPolicyLeastOutstandingRequests, LoadBalancingPoolOriginSteeringPolicyLeastConnections: + case PoolOriginSteeringPolicyRandom, PoolOriginSteeringPolicyHash, PoolOriginSteeringPolicyLeastOutstandingRequests, PoolOriginSteeringPolicyLeastConnections: return true } return false } -type LoadBalancingPoolOrigin struct { +type PoolOrigin struct { // The IP address (IPv4 or IPv6) of the origin, or its publicly addressable // hostname. Hostnames entered here should resolve directly to the origin, and not // be a hostname proxied by Cloudflare. To set an internal/reserved address, @@ -521,7 +520,7 @@ type LoadBalancingPoolOrigin struct { Enabled bool `json:"enabled"` // The request header is used to pass additional information with an HTTP request. // Currently supported header is 'Host'. - Header LoadBalancingPoolOriginsHeader `json:"header"` + Header PoolOriginsHeader `json:"header"` // A human-identifiable name for the origin. Name string `json:"name"` // The virtual network subnet ID the origin belongs in. Virtual network must also @@ -535,13 +534,12 @@ type LoadBalancingPoolOrigin struct { // origin's outstanding requests. // - `origin_steering.policy="least_connections"`: Use weight to scale the origin's // open connections. - Weight float64 `json:"weight"` - JSON loadBalancingPoolOriginJSON `json:"-"` + Weight float64 `json:"weight"` + JSON poolOriginJSON `json:"-"` } -// loadBalancingPoolOriginJSON contains the JSON metadata for the struct -// [LoadBalancingPoolOrigin] -type loadBalancingPoolOriginJSON struct { +// poolOriginJSON contains the JSON metadata for the struct [PoolOrigin] +type poolOriginJSON struct { Address apijson.Field DisabledAt apijson.Field Enabled apijson.Field @@ -553,36 +551,36 @@ type loadBalancingPoolOriginJSON struct { ExtraFields map[string]apijson.Field } -func (r *LoadBalancingPoolOrigin) UnmarshalJSON(data []byte) (err error) { +func (r *PoolOrigin) UnmarshalJSON(data []byte) (err error) { return apijson.UnmarshalRoot(data, r) } -func (r loadBalancingPoolOriginJSON) RawJSON() string { +func (r poolOriginJSON) RawJSON() string { return r.raw } // The request header is used to pass additional information with an HTTP request. // Currently supported header is 'Host'. -type LoadBalancingPoolOriginsHeader struct { +type PoolOriginsHeader struct { // The 'Host' header allows to override the hostname set in the HTTP request. // Current support is 1 'Host' header override per origin. - Host []string `json:"Host"` - JSON loadBalancingPoolOriginsHeaderJSON `json:"-"` + Host []string `json:"Host"` + JSON poolOriginsHeaderJSON `json:"-"` } -// loadBalancingPoolOriginsHeaderJSON contains the JSON metadata for the struct -// [LoadBalancingPoolOriginsHeader] -type loadBalancingPoolOriginsHeaderJSON struct { +// poolOriginsHeaderJSON contains the JSON metadata for the struct +// [PoolOriginsHeader] +type poolOriginsHeaderJSON struct { Host apijson.Field raw string ExtraFields map[string]apijson.Field } -func (r *LoadBalancingPoolOriginsHeader) UnmarshalJSON(data []byte) (err error) { +func (r *PoolOriginsHeader) UnmarshalJSON(data []byte) (err error) { return apijson.UnmarshalRoot(data, r) } -func (r loadBalancingPoolOriginsHeaderJSON) RawJSON() string { +func (r poolOriginsHeaderJSON) RawJSON() string { return r.raw } @@ -960,7 +958,7 @@ func (r LoadBalancerPoolNewParamsOriginSteeringPolicy) IsKnown() bool { type LoadBalancerPoolNewResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` - Result LoadBalancingPool `json:"result,required"` + Result Pool `json:"result,required"` // Whether the API call was successful Success LoadBalancerPoolNewResponseEnvelopeSuccess `json:"success,required"` JSON loadBalancerPoolNewResponseEnvelopeJSON `json:"-"` @@ -1282,7 +1280,7 @@ func (r LoadBalancerPoolUpdateParamsOriginSteeringPolicy) IsKnown() bool { type LoadBalancerPoolUpdateResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` - Result LoadBalancingPool `json:"result,required"` + Result Pool `json:"result,required"` // Whether the API call was successful Success LoadBalancerPoolUpdateResponseEnvelopeSuccess `json:"success,required"` JSON loadBalancerPoolUpdateResponseEnvelopeJSON `json:"-"` @@ -1670,7 +1668,7 @@ func (r LoadBalancerPoolEditParamsOriginsHeader) MarshalJSON() (data []byte, err type LoadBalancerPoolEditResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` - Result LoadBalancingPool `json:"result,required"` + Result Pool `json:"result,required"` // Whether the API call was successful Success LoadBalancerPoolEditResponseEnvelopeSuccess `json:"success,required"` JSON loadBalancerPoolEditResponseEnvelopeJSON `json:"-"` @@ -1713,7 +1711,7 @@ func (r LoadBalancerPoolEditResponseEnvelopeSuccess) IsKnown() bool { type LoadBalancerPoolGetResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` - Result LoadBalancingPool `json:"result,required"` + Result Pool `json:"result,required"` // Whether the API call was successful Success LoadBalancerPoolGetResponseEnvelopeSuccess `json:"success,required"` JSON loadBalancerPoolGetResponseEnvelopeJSON `json:"-"` diff --git a/vectorize/aliases.go b/vectorize/aliases.go index 783dc6c6b3c..fcac60c8c52 100644 --- a/vectorize/aliases.go +++ b/vectorize/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/waiting_rooms/aliases.go b/waiting_rooms/aliases.go index 75897812747..8f80b909b4a 100644 --- a/waiting_rooms/aliases.go +++ b/waiting_rooms/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/warp_connector/aliases.go b/warp_connector/aliases.go index 0fb7efecb89..980049476b1 100644 --- a/warp_connector/aliases.go +++ b/warp_connector/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/web3/aliases.go b/web3/aliases.go index ee5b85e6508..e08bec6c9bd 100644 --- a/web3/aliases.go +++ b/web3/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/workers/aliases.go b/workers/aliases.go index 35abf2ce0ea..eec9c514daf 100644 --- a/workers/aliases.go +++ b/workers/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/workers_for_platforms/aliases.go b/workers_for_platforms/aliases.go index 6148b6f5e31..0049d3f08f5 100644 --- a/workers_for_platforms/aliases.go +++ b/workers_for_platforms/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/zero_trust/aliases.go b/zero_trust/aliases.go index f3dd46d768c..d40b41c80a2 100644 --- a/zero_trust/aliases.go +++ b/zero_trust/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/zones/aliases.go b/zones/aliases.go index 33fd3aa2c60..677530a5063 100644 --- a/zones/aliases.go +++ b/zones/aliases.go @@ -12,16 +12,6 @@ type Error = apierror.Error // This is an alias to an internal type. type ErrorData = shared.ErrorData -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type Logging = shared.Logging - -// An object configuring the rule's logging behavior. -// -// This is an alias to an internal type. -type LoggingParam = shared.LoggingParam - // This is an alias to an internal type. type ResponseInfo = shared.ResponseInfo @@ -413,12 +403,6 @@ const UnnamedSchemaRef163Pingone = shared.UnnamedSchemaRef163Pingone // This is an alias to an internal value. const UnnamedSchemaRef163Yandex = shared.UnnamedSchemaRef163Yandex -// This is an alias to an internal type. -type UnnamedSchemaRef167 = shared.UnnamedSchemaRef167 - -// This is an alias to an internal type. -type UnnamedSchemaRef167Array = shared.UnnamedSchemaRef167Array - // This is an alias to an internal type. type UnnamedSchemaRef169 = shared.UnnamedSchemaRef169 diff --git a/zones/customnameserver.go b/zones/customnameserver.go index ed7e2fa2a7c..9802a99674b 100644 --- a/zones/customnameserver.go +++ b/zones/customnameserver.go @@ -52,7 +52,7 @@ func (r *CustomNameserverService) Update(ctx context.Context, params CustomNames } // Get metadata for account-level custom nameservers on a zone. -func (r *CustomNameserverService) Get(ctx context.Context, query CustomNameserverGetParams, opts ...option.RequestOption) (res *shared.UnnamedSchemaRef167, err error) { +func (r *CustomNameserverService) Get(ctx context.Context, query CustomNameserverGetParams, opts ...option.RequestOption) (res *CustomNameserverGetResponse, err error) { opts = append(r.Options[:], opts...) var env CustomNameserverGetResponseEnvelope path := fmt.Sprintf("zones/%s/custom_ns", query.ZoneID) @@ -89,6 +89,31 @@ type CustomNameserverUpdateResponseArray []interface{} func (r CustomNameserverUpdateResponseArray) ImplementsZonesCustomNameserverUpdateResponse() {} +// Union satisfied by [zones.CustomNameserverGetResponseUnknown], +// [zones.CustomNameserverGetResponseArray] or [shared.UnionString]. +type CustomNameserverGetResponse interface { + ImplementsZonesCustomNameserverGetResponse() +} + +func init() { + apijson.RegisterUnion( + reflect.TypeOf((*CustomNameserverGetResponse)(nil)).Elem(), + "", + apijson.UnionVariant{ + TypeFilter: gjson.JSON, + Type: reflect.TypeOf(CustomNameserverGetResponseArray{}), + }, + apijson.UnionVariant{ + TypeFilter: gjson.String, + Type: reflect.TypeOf(shared.UnionString("")), + }, + ) +} + +type CustomNameserverGetResponseArray []interface{} + +func (r CustomNameserverGetResponseArray) ImplementsZonesCustomNameserverGetResponse() {} + type CustomNameserverUpdateParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` @@ -184,9 +209,9 @@ type CustomNameserverGetParams struct { } type CustomNameserverGetResponseEnvelope struct { - Errors []shared.ResponseInfo `json:"errors,required"` - Messages []shared.ResponseInfo `json:"messages,required"` - Result shared.UnnamedSchemaRef167 `json:"result,required,nullable"` + Errors []shared.ResponseInfo `json:"errors,required"` + Messages []shared.ResponseInfo `json:"messages,required"` + Result CustomNameserverGetResponse `json:"result,required,nullable"` // Whether the API call was successful Success CustomNameserverGetResponseEnvelopeSuccess `json:"success,required"` // Whether zone uses account-level custom nameservers.