From 04a64571ffd56f49a6956fbc27106c38b78c7efb Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 04:51:42 +0000 Subject: [PATCH] feat(api): update via SDK Studio (#1967) --- README.md | 2 +- accounts/aliases.go | 11 + acm/aliases.go | 11 + addressing/aliases.go | 11 + ai_gateway/aliases.go | 11 + alerting/aliases.go | 11 + aliases.go | 11 + api.md | 26 +- argo/aliases.go | 11 + audit_logs/aliases.go | 11 + billing/aliases.go | 11 + bot_management/aliases.go | 11 + brand_protection/aliases.go | 11 + cache/aliases.go | 11 + cache/cachereserve.go | 52 +-- calls/aliases.go | 11 + certificate_authorities/aliases.go | 11 + challenges/aliases.go | 11 + client_certificates/aliases.go | 11 + client_test.go | 12 +- cloudforce_one/aliases.go | 11 + custom_certificates/aliases.go | 11 + custom_hostnames/aliases.go | 11 + custom_nameservers/aliases.go | 11 + d1/aliases.go | 11 + dcv_delegation/aliases.go | 11 + diagnostics/aliases.go | 11 + dns/aliases.go | 11 + dns/record.go | 18 +- dns/record_test.go | 2 +- dnssec/aliases.go | 11 + durable_objects/aliases.go | 11 + email_routing/aliases.go | 11 + event_notifications/aliases.go | 11 + filters/aliases.go | 11 + firewall/aliases.go | 11 + healthchecks/aliases.go | 11 + hostnames/aliases.go | 11 + hyperdrive/aliases.go | 11 + images/aliases.go | 11 + intel/aliases.go | 11 + ips/aliases.go | 11 + keyless_certificates/aliases.go | 11 + kv/aliases.go | 11 + load_balancers/aliases.go | 11 + load_balancers/pool.go | 8 +- load_balancers/region.go | 4 + logpush/aliases.go | 11 + logs/aliases.go | 11 + magic_network_monitoring/aliases.go | 11 + magic_transit/aliases.go | 11 + managed_headers/aliases.go | 11 + memberships/aliases.go | 11 + mtls_certificates/aliases.go | 11 + origin_ca_certificates/aliases.go | 11 + origin_post_quantum_encryption/aliases.go | 11 + origin_tls_client_auth/aliases.go | 11 + page_shield/aliases.go | 11 + pagerules/aliases.go | 11 + pages/aliases.go | 11 + pcaps/aliases.go | 11 + plans/aliases.go | 11 + queues/aliases.go | 11 + r2/aliases.go | 11 + radar/aliases.go | 11 + rate_limits/aliases.go | 11 + rate_plans/aliases.go | 11 + registrar/aliases.go | 11 + request_tracers/aliases.go | 11 + rules/aliases.go | 11 + rulesets/aliases.go | 11 + rulesets/phase.go | 255 +------------- rulesets/phase_test.go | 8 +- rulesets/phaseversion.go | 139 +------- rulesets/phaseversion_test.go | 4 +- rulesets/rule.go | 218 +----------- rulesets/ruleset.go | 411 ++++------------------ rulesets/ruleset_test.go | 8 +- rulesets/version.go | 59 +--- rulesets/versionbytag.go | 59 +--- rum/aliases.go | 11 + secondary_dns/aliases.go | 11 + shared/shared.go | 16 + snippets/aliases.go | 11 + spectrum/aliases.go | 11 + speed/aliases.go | 11 + ssl/aliases.go | 11 + storage/aliases.go | 11 + stream/aliases.go | 11 + subscriptions/aliases.go | 11 + url_normalization/aliases.go | 11 + url_scanner/aliases.go | 11 + usage_test.go | 2 +- user/aliases.go | 11 + vectorize/aliases.go | 11 + waiting_rooms/aliases.go | 11 + warp_connector/aliases.go | 11 + web3/aliases.go | 11 + workers/aliases.go | 11 + workers_for_platforms/aliases.go | 11 + zero_trust/aliases.go | 11 + zones/aliases.go | 11 + zones/zone.go | 38 +- zones/zone_test.go | 2 +- 104 files changed, 1110 insertions(+), 1146 deletions(-) diff --git a/README.md b/README.md index 677ae4dd7ca..3626c222d27 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ func main() { ID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), }), Name: cloudflare.F("example.com"), - Type: cloudflare.F(zones.ZoneNewParamsTypeFull), + Type: cloudflare.F(zones.TypeFull), }) if err != nil { panic(err.Error()) diff --git a/accounts/aliases.go b/accounts/aliases.go index 7f3e80badb8..d5ea651b2d1 100644 --- a/accounts/aliases.go +++ b/accounts/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/acm/aliases.go b/acm/aliases.go index 4311264a107..d172c7f973e 100644 --- a/acm/aliases.go +++ b/acm/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/addressing/aliases.go b/addressing/aliases.go index 2e8c26ece32..986aa91a27d 100644 --- a/addressing/aliases.go +++ b/addressing/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/ai_gateway/aliases.go b/ai_gateway/aliases.go index 532fac2cb69..237b96aeae0 100644 --- a/ai_gateway/aliases.go +++ b/ai_gateway/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/alerting/aliases.go b/alerting/aliases.go index dea3ad5ce2a..582d2dfbdb6 100644 --- a/alerting/aliases.go +++ b/alerting/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/aliases.go b/aliases.go index 8ea4581af80..0f192d59585 100644 --- a/aliases.go +++ b/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/api.md b/api.md index 2cc0c5ce4b8..fb7649b427f 100644 --- a/api.md +++ b/api.md @@ -5,6 +5,7 @@ - shared.CertificateRequestType - shared.MemberParam - shared.PermissionGrantParam +- shared.SortDirection # Shared Response Types @@ -253,6 +254,10 @@ Methods: # Zones +Params Types: + +- zones.Type + Response Types: - zones.Zone @@ -1067,8 +1072,13 @@ Methods: ## Regions +Params Types: + +- load_balancers.RegionIDParam + Response Types: +- load_balancers.RegionID - load_balancers.RegionListResponseUnion - load_balancers.RegionGetResponseUnion @@ -1103,6 +1113,7 @@ Response Types: - cache.CacheReserve - cache.CacheReserveClear +- cache.State - cache.CacheReserveClearResponse - cache.CacheReserveEditResponse - cache.CacheReserveGetResponse @@ -2794,8 +2805,15 @@ Methods: # Rulesets +Params Types: + +- rulesets.Kind +- rulesets.Phase + Response Types: +- rulesets.Kind +- rulesets.Phase - rulesets.Ruleset - rulesets.RulesetNewResponse - rulesets.RulesetUpdateResponse @@ -2818,8 +2836,8 @@ Response Types: Methods: -- client.Rulesets.Phases.Update(ctx context.Context, rulesetPhase rulesets.PhaseUpdateParamsRulesetPhase, params rulesets.PhaseUpdateParams) (rulesets.PhaseUpdateResponse, error) -- client.Rulesets.Phases.Get(ctx context.Context, rulesetPhase rulesets.PhaseGetParamsRulesetPhase, query rulesets.PhaseGetParams) (rulesets.PhaseGetResponse, error) +- client.Rulesets.Phases.Update(ctx context.Context, rulesetPhase rulesets.Phase, params rulesets.PhaseUpdateParams) (rulesets.PhaseUpdateResponse, error) +- client.Rulesets.Phases.Get(ctx context.Context, rulesetPhase rulesets.Phase, query rulesets.PhaseGetParams) (rulesets.PhaseGetResponse, error) ### Versions @@ -2829,8 +2847,8 @@ Response Types: Methods: -- client.Rulesets.Phases.Versions.List(ctx context.Context, rulesetPhase rulesets.PhaseVersionListParamsRulesetPhase, query rulesets.PhaseVersionListParams) (pagination.SinglePage[rulesets.Ruleset], error) -- client.Rulesets.Phases.Versions.Get(ctx context.Context, rulesetPhase rulesets.PhaseVersionGetParamsRulesetPhase, rulesetVersion string, query rulesets.PhaseVersionGetParams) (rulesets.PhaseVersionGetResponse, error) +- client.Rulesets.Phases.Versions.List(ctx context.Context, rulesetPhase rulesets.Phase, query rulesets.PhaseVersionListParams) (pagination.SinglePage[rulesets.Ruleset], error) +- client.Rulesets.Phases.Versions.Get(ctx context.Context, rulesetPhase rulesets.Phase, rulesetVersion string, query rulesets.PhaseVersionGetParams) (rulesets.PhaseVersionGetResponse, error) ## Rules diff --git a/argo/aliases.go b/argo/aliases.go index 6209f47c245..20804e99df6 100644 --- a/argo/aliases.go +++ b/argo/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/audit_logs/aliases.go b/audit_logs/aliases.go index 957c68c3dce..56baddd2837 100644 --- a/audit_logs/aliases.go +++ b/audit_logs/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/billing/aliases.go b/billing/aliases.go index 3821bf55fae..e00d02c091a 100644 --- a/billing/aliases.go +++ b/billing/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/bot_management/aliases.go b/bot_management/aliases.go index 3409c87fb63..38cdc57343b 100644 --- a/bot_management/aliases.go +++ b/bot_management/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/brand_protection/aliases.go b/brand_protection/aliases.go index 5ae140bfcf2..028c9bf13a4 100644 --- a/brand_protection/aliases.go +++ b/brand_protection/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/cache/aliases.go b/cache/aliases.go index 78f320d929e..1d187d244cb 100644 --- a/cache/aliases.go +++ b/cache/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/cache/cachereserve.go b/cache/cachereserve.go index aabdf907074..caa471998e7 100644 --- a/cache/cachereserve.go +++ b/cache/cachereserve.go @@ -131,6 +131,22 @@ func (r CacheReserveClear) IsKnown() bool { return false } +// The current state of the Cache Reserve Clear operation. +type State string + +const ( + StateInProgress State = "In-progress" + StateCompleted State = "Completed" +) + +func (r State) IsKnown() bool { + switch r { + case StateInProgress, StateCompleted: + return true + } + return false +} + // You can use Cache Reserve Clear to clear your Cache Reserve, but you must first // disable Cache Reserve. In most cases, this will be accomplished within 24 hours. // You cannot re-enable Cache Reserve while this process is ongoing. Keep in mind @@ -143,7 +159,7 @@ type CacheReserveClearResponse struct { // The time that the latest Cache Reserve Clear operation started. StartTs time.Time `json:"start_ts,required" format:"date-time"` // The current state of the Cache Reserve Clear operation. - State CacheReserveClearResponseState `json:"state,required"` + State State `json:"state,required"` // The time that the latest Cache Reserve Clear operation completed. EndTs time.Time `json:"end_ts" format:"date-time"` JSON cacheReserveClearResponseJSON `json:"-"` @@ -169,22 +185,6 @@ func (r cacheReserveClearResponseJSON) RawJSON() string { return r.raw } -// The current state of the Cache Reserve Clear operation. -type CacheReserveClearResponseState string - -const ( - CacheReserveClearResponseStateInProgress CacheReserveClearResponseState = "In-progress" - CacheReserveClearResponseStateCompleted CacheReserveClearResponseState = "Completed" -) - -func (r CacheReserveClearResponseState) IsKnown() bool { - switch r { - case CacheReserveClearResponseStateInProgress, CacheReserveClearResponseStateCompleted: - return true - } - return false -} - // Increase cache lifetimes by automatically storing all cacheable files into // Cloudflare's persistent object storage buckets. Requires Cache Reserve // subscription. Note: using Tiered Cache with Cache Reserve is highly recommended @@ -297,7 +297,7 @@ type CacheReserveStatusResponse struct { // The time that the latest Cache Reserve Clear operation started. StartTs time.Time `json:"start_ts,required" format:"date-time"` // The current state of the Cache Reserve Clear operation. - State CacheReserveStatusResponseState `json:"state,required"` + State State `json:"state,required"` // The time that the latest Cache Reserve Clear operation completed. EndTs time.Time `json:"end_ts" format:"date-time"` JSON cacheReserveStatusResponseJSON `json:"-"` @@ -323,22 +323,6 @@ func (r cacheReserveStatusResponseJSON) RawJSON() string { return r.raw } -// The current state of the Cache Reserve Clear operation. -type CacheReserveStatusResponseState string - -const ( - CacheReserveStatusResponseStateInProgress CacheReserveStatusResponseState = "In-progress" - CacheReserveStatusResponseStateCompleted CacheReserveStatusResponseState = "Completed" -) - -func (r CacheReserveStatusResponseState) IsKnown() bool { - switch r { - case CacheReserveStatusResponseStateInProgress, CacheReserveStatusResponseStateCompleted: - return true - } - return false -} - type CacheReserveClearParams struct { // Identifier ZoneID param.Field[string] `path:"zone_id,required"` diff --git a/calls/aliases.go b/calls/aliases.go index 67b5f822c29..e18ab25a76f 100644 --- a/calls/aliases.go +++ b/calls/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/certificate_authorities/aliases.go b/certificate_authorities/aliases.go index c3a0c28b270..9cdc6da8597 100644 --- a/certificate_authorities/aliases.go +++ b/certificate_authorities/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/challenges/aliases.go b/challenges/aliases.go index cc401bcd772..e7865d17cdc 100644 --- a/challenges/aliases.go +++ b/challenges/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/client_certificates/aliases.go b/client_certificates/aliases.go index 3a2219f249c..c4ef11c0775 100644 --- a/client_certificates/aliases.go +++ b/client_certificates/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/client_test.go b/client_test.go index d190cfc9251..cf75e23d244 100644 --- a/client_test.go +++ b/client_test.go @@ -42,7 +42,7 @@ func TestUserAgentHeader(t *testing.T) { ID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), }), Name: cloudflare.F("example.com"), - Type: cloudflare.F(zones.ZoneNewParamsTypeFull), + Type: cloudflare.F(zones.TypeFull), }) if userAgent != fmt.Sprintf("Cloudflare/Go %s", internal.PackageVersion) { t.Errorf("Expected User-Agent to be correct, but got: %#v", userAgent) @@ -71,7 +71,7 @@ func TestRetryAfter(t *testing.T) { ID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), }), Name: cloudflare.F("example.com"), - Type: cloudflare.F(zones.ZoneNewParamsTypeFull), + Type: cloudflare.F(zones.TypeFull), }) if err == nil || res != nil { t.Error("Expected there to be a cancel error and for the response to be nil") @@ -103,7 +103,7 @@ func TestRetryAfterMs(t *testing.T) { ID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), }), Name: cloudflare.F("example.com"), - Type: cloudflare.F(zones.ZoneNewParamsTypeFull), + Type: cloudflare.F(zones.TypeFull), }) if err == nil || res != nil { t.Error("Expected there to be a cancel error and for the response to be nil") @@ -131,7 +131,7 @@ func TestContextCancel(t *testing.T) { ID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), }), Name: cloudflare.F("example.com"), - Type: cloudflare.F(zones.ZoneNewParamsTypeFull), + Type: cloudflare.F(zones.TypeFull), }) if err == nil || res != nil { t.Error("Expected there to be a cancel error and for the response to be nil") @@ -156,7 +156,7 @@ func TestContextCancelDelay(t *testing.T) { ID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), }), Name: cloudflare.F("example.com"), - Type: cloudflare.F(zones.ZoneNewParamsTypeFull), + Type: cloudflare.F(zones.TypeFull), }) if err == nil || res != nil { t.Error("expected there to be a cancel error and for the response to be nil") @@ -187,7 +187,7 @@ func TestContextDeadline(t *testing.T) { ID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), }), Name: cloudflare.F("example.com"), - Type: cloudflare.F(zones.ZoneNewParamsTypeFull), + Type: cloudflare.F(zones.TypeFull), }) if err == nil || res != nil { t.Error("expected there to be a deadline error and for the response to be nil") diff --git a/cloudforce_one/aliases.go b/cloudforce_one/aliases.go index 11fae414799..9de195f4325 100644 --- a/cloudforce_one/aliases.go +++ b/cloudforce_one/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/custom_certificates/aliases.go b/custom_certificates/aliases.go index d006093ba98..d836857b4cf 100644 --- a/custom_certificates/aliases.go +++ b/custom_certificates/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/custom_hostnames/aliases.go b/custom_hostnames/aliases.go index c66c380873c..66355fbf023 100644 --- a/custom_hostnames/aliases.go +++ b/custom_hostnames/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/custom_nameservers/aliases.go b/custom_nameservers/aliases.go index 6e5ebe57749..c2e65fec1cb 100644 --- a/custom_nameservers/aliases.go +++ b/custom_nameservers/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/d1/aliases.go b/d1/aliases.go index e7a05b3d353..6ca45d2b7b6 100644 --- a/d1/aliases.go +++ b/d1/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/dcv_delegation/aliases.go b/dcv_delegation/aliases.go index 6a35c890de6..64589d1c8bc 100644 --- a/dcv_delegation/aliases.go +++ b/dcv_delegation/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/diagnostics/aliases.go b/diagnostics/aliases.go index d52618cace6..18ae0a57562 100644 --- a/diagnostics/aliases.go +++ b/diagnostics/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/dns/aliases.go b/dns/aliases.go index 12d84b1ba10..a9f71097302 100644 --- a/dns/aliases.go +++ b/dns/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/dns/record.go b/dns/record.go index 86870a91a35..5593aac0ae7 100644 --- a/dns/record.go +++ b/dns/record.go @@ -3639,7 +3639,7 @@ type RecordListParams struct { // DNS record content. Content param.Field[string] `query:"content"` // Direction to order DNS records in. - Direction param.Field[RecordListParamsDirection] `query:"direction"` + Direction param.Field[shared.SortDirection] `query:"direction"` // Whether to match all search requirements or at least one (any). If set to `all`, // acts like a logical AND between filters. If set to `any`, acts like a logical OR // instead. Note that the interaction between tag filters is controlled by the @@ -3704,22 +3704,6 @@ func (r RecordListParamsComment) URLQuery() (v url.Values) { }) } -// Direction to order DNS records in. -type RecordListParamsDirection string - -const ( - RecordListParamsDirectionAsc RecordListParamsDirection = "asc" - RecordListParamsDirectionDesc RecordListParamsDirection = "desc" -) - -func (r RecordListParamsDirection) IsKnown() bool { - switch r { - case RecordListParamsDirectionAsc, RecordListParamsDirectionDesc: - return true - } - return false -} - // Whether to match all search requirements or at least one (any). If set to `all`, // acts like a logical AND between filters. If set to `any`, acts like a logical OR // instead. Note that the interaction between tag filters is controlled by the diff --git a/dns/record_test.go b/dns/record_test.go index 693fdea848a..b1b32f864a3 100644 --- a/dns/record_test.go +++ b/dns/record_test.go @@ -113,7 +113,7 @@ func TestRecordListWithOptionalParams(t *testing.T) { Endswith: cloudflare.F("o, world"), }), Content: cloudflare.F("127.0.0.1"), - Direction: cloudflare.F(dns.RecordListParamsDirectionAsc), + Direction: cloudflare.F(shared.SortDirectionAsc), Match: cloudflare.F(dns.RecordListParamsMatchAny), Name: cloudflare.F("example.com"), Order: cloudflare.F(dns.RecordListParamsOrderType), diff --git a/dnssec/aliases.go b/dnssec/aliases.go index f42ce38172e..7815bead076 100644 --- a/dnssec/aliases.go +++ b/dnssec/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/durable_objects/aliases.go b/durable_objects/aliases.go index 016f5b3d7ce..cab5083ba9d 100644 --- a/durable_objects/aliases.go +++ b/durable_objects/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/email_routing/aliases.go b/email_routing/aliases.go index 8c3853bb988..427c383fa0b 100644 --- a/email_routing/aliases.go +++ b/email_routing/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/event_notifications/aliases.go b/event_notifications/aliases.go index 34a7d1a7520..3bc83366e43 100644 --- a/event_notifications/aliases.go +++ b/event_notifications/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/filters/aliases.go b/filters/aliases.go index 811c09e9cc8..ad67b431907 100644 --- a/filters/aliases.go +++ b/filters/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/firewall/aliases.go b/firewall/aliases.go index 14680d77726..8f069993d77 100644 --- a/firewall/aliases.go +++ b/firewall/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/healthchecks/aliases.go b/healthchecks/aliases.go index ef5a7814291..d17b62e3db5 100644 --- a/healthchecks/aliases.go +++ b/healthchecks/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/hostnames/aliases.go b/hostnames/aliases.go index d085b9acd8b..b7f60a3475b 100644 --- a/hostnames/aliases.go +++ b/hostnames/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/hyperdrive/aliases.go b/hyperdrive/aliases.go index 8cba2ae9142..a786a9fcbb0 100644 --- a/hyperdrive/aliases.go +++ b/hyperdrive/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/images/aliases.go b/images/aliases.go index 38f71907d80..b3ed3249cea 100644 --- a/images/aliases.go +++ b/images/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/intel/aliases.go b/intel/aliases.go index 0011e18c5df..8f36b379469 100644 --- a/intel/aliases.go +++ b/intel/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/ips/aliases.go b/ips/aliases.go index 14be9f9db7e..3ca7ad37acd 100644 --- a/ips/aliases.go +++ b/ips/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/keyless_certificates/aliases.go b/keyless_certificates/aliases.go index 44c1fd223e8..8af37e4056e 100644 --- a/keyless_certificates/aliases.go +++ b/keyless_certificates/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/kv/aliases.go b/kv/aliases.go index 7dfac369062..9d9fa97e708 100644 --- a/kv/aliases.go +++ b/kv/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/load_balancers/aliases.go b/load_balancers/aliases.go index 233d856f7f8..0dc92366452 100644 --- a/load_balancers/aliases.go +++ b/load_balancers/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/load_balancers/pool.go b/load_balancers/pool.go index baa39410803..89919c993d9 100644 --- a/load_balancers/pool.go +++ b/load_balancers/pool.go @@ -131,8 +131,8 @@ type Pool struct { ID string `json:"id"` // A list of regions from which to run health checks. Null means every Cloudflare // data center. - CheckRegions []CheckRegion `json:"check_regions,nullable"` - CreatedOn time.Time `json:"created_on" format:"date-time"` + CheckRegions RegionID `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 @@ -333,7 +333,7 @@ type PoolUpdateParams struct { Origins param.Field[[]OriginParam] `json:"origins,required"` // A list of regions from which to run health checks. Null means every Cloudflare // data center. - CheckRegions param.Field[[]CheckRegion] `json:"check_regions"` + CheckRegions param.Field[RegionIDParam] `json:"check_regions"` // A human-readable description of the pool. Description param.Field[string] `json:"description"` // Whether to enable (the default) or disable this pool. Disabled pools will not @@ -485,7 +485,7 @@ type PoolEditParams struct { AccountID param.Field[string] `path:"account_id,required"` // A list of regions from which to run health checks. Null means every Cloudflare // data center. - CheckRegions param.Field[[]CheckRegion] `json:"check_regions"` + CheckRegions param.Field[RegionIDParam] `json:"check_regions"` // A human-readable description of the pool. Description param.Field[string] `json:"description"` // Whether to enable (the default) or disable this pool. Disabled pools will not diff --git a/load_balancers/region.go b/load_balancers/region.go index 2fbfc850f68..db4f3ae49c9 100644 --- a/load_balancers/region.go +++ b/load_balancers/region.go @@ -61,6 +61,10 @@ func (r *RegionService) Get(ctx context.Context, regionID RegionGetParamsRegionI return } +type RegionID []CheckRegion + +type RegionIDParam []CheckRegion + // Union satisfied by [load_balancers.RegionListResponseUnknown] or // [shared.UnionString]. type RegionListResponseUnion interface { diff --git a/logpush/aliases.go b/logpush/aliases.go index a2e7812f3bd..d1b5893bedb 100644 --- a/logpush/aliases.go +++ b/logpush/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/logs/aliases.go b/logs/aliases.go index fa4a0f0e543..e26c25714d8 100644 --- a/logs/aliases.go +++ b/logs/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/magic_network_monitoring/aliases.go b/magic_network_monitoring/aliases.go index f7609bcb25c..ace9a31e401 100644 --- a/magic_network_monitoring/aliases.go +++ b/magic_network_monitoring/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/magic_transit/aliases.go b/magic_transit/aliases.go index e49834fe63e..4652b55da75 100644 --- a/magic_transit/aliases.go +++ b/magic_transit/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/managed_headers/aliases.go b/managed_headers/aliases.go index 7ba59ad35a1..f5560e725e3 100644 --- a/managed_headers/aliases.go +++ b/managed_headers/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/memberships/aliases.go b/memberships/aliases.go index 31b6e73490c..0b05453e9c3 100644 --- a/memberships/aliases.go +++ b/memberships/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/mtls_certificates/aliases.go b/mtls_certificates/aliases.go index 0825314aaf9..5e90d9d6124 100644 --- a/mtls_certificates/aliases.go +++ b/mtls_certificates/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/origin_ca_certificates/aliases.go b/origin_ca_certificates/aliases.go index b9b1a32def6..7efc201b484 100644 --- a/origin_ca_certificates/aliases.go +++ b/origin_ca_certificates/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/origin_post_quantum_encryption/aliases.go b/origin_post_quantum_encryption/aliases.go index a0600a83e6a..a9bd97b758f 100644 --- a/origin_post_quantum_encryption/aliases.go +++ b/origin_post_quantum_encryption/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/origin_tls_client_auth/aliases.go b/origin_tls_client_auth/aliases.go index f9d38f7bfd4..cf7baaa66e5 100644 --- a/origin_tls_client_auth/aliases.go +++ b/origin_tls_client_auth/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/page_shield/aliases.go b/page_shield/aliases.go index 8b9e55badf6..1c012025569 100644 --- a/page_shield/aliases.go +++ b/page_shield/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/pagerules/aliases.go b/pagerules/aliases.go index a3e753fc5e3..41ab2ea28e0 100644 --- a/pagerules/aliases.go +++ b/pagerules/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/pages/aliases.go b/pages/aliases.go index 1d37a614cbf..54be946956c 100644 --- a/pages/aliases.go +++ b/pages/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/pcaps/aliases.go b/pcaps/aliases.go index 6e2ce5095d5..4f1ba029f9b 100644 --- a/pcaps/aliases.go +++ b/pcaps/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/plans/aliases.go b/plans/aliases.go index 40b225a8a7c..49d2495fb85 100644 --- a/plans/aliases.go +++ b/plans/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/queues/aliases.go b/queues/aliases.go index a7a7578696f..63fa7927766 100644 --- a/queues/aliases.go +++ b/queues/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/r2/aliases.go b/r2/aliases.go index 5172382de04..94dc84369ca 100644 --- a/r2/aliases.go +++ b/r2/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/radar/aliases.go b/radar/aliases.go index 94605c2c728..e14e58cd7bf 100644 --- a/radar/aliases.go +++ b/radar/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/rate_limits/aliases.go b/rate_limits/aliases.go index 977b324f07b..78d0c762475 100644 --- a/rate_limits/aliases.go +++ b/rate_limits/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/rate_plans/aliases.go b/rate_plans/aliases.go index 55d56093315..1c4f898e7f0 100644 --- a/rate_plans/aliases.go +++ b/rate_plans/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/registrar/aliases.go b/registrar/aliases.go index 7b63d010fc0..98eb12de4e7 100644 --- a/registrar/aliases.go +++ b/registrar/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/request_tracers/aliases.go b/request_tracers/aliases.go index 92b4e3fcd3b..33837b91327 100644 --- a/request_tracers/aliases.go +++ b/request_tracers/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/rules/aliases.go b/rules/aliases.go index 277fffe6830..64d53c4a13d 100644 --- a/rules/aliases.go +++ b/rules/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/rulesets/aliases.go b/rulesets/aliases.go index ce0883ffa15..d926a6da500 100644 --- a/rulesets/aliases.go +++ b/rulesets/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/rulesets/phase.go b/rulesets/phase.go index 832f27b8bd8..a679b30ee62 100644 --- a/rulesets/phase.go +++ b/rulesets/phase.go @@ -36,7 +36,7 @@ func NewPhaseService(opts ...option.RequestOption) (r *PhaseService) { } // Updates an account or zone entry point ruleset, creating a new version. -func (r *PhaseService) Update(ctx context.Context, rulesetPhase PhaseUpdateParamsRulesetPhase, params PhaseUpdateParams, opts ...option.RequestOption) (res *PhaseUpdateResponse, err error) { +func (r *PhaseService) Update(ctx context.Context, rulesetPhase Phase, params PhaseUpdateParams, opts ...option.RequestOption) (res *PhaseUpdateResponse, err error) { opts = append(r.Options[:], opts...) var env PhaseUpdateResponseEnvelope var accountOrZone string @@ -59,7 +59,7 @@ func (r *PhaseService) Update(ctx context.Context, rulesetPhase PhaseUpdateParam // Fetches the latest version of the account or zone entry point ruleset for a // given phase. -func (r *PhaseService) Get(ctx context.Context, rulesetPhase PhaseGetParamsRulesetPhase, query PhaseGetParams, opts ...option.RequestOption) (res *PhaseGetResponse, err error) { +func (r *PhaseService) Get(ctx context.Context, rulesetPhase Phase, query PhaseGetParams, opts ...option.RequestOption) (res *PhaseGetResponse, err error) { opts = append(r.Options[:], opts...) var env PhaseGetResponseEnvelope var accountOrZone string @@ -85,13 +85,13 @@ type PhaseUpdateResponse struct { // The unique ID of the ruleset. ID string `json:"id,required"` // The kind of the ruleset. - Kind PhaseUpdateResponseKind `json:"kind,required"` + Kind Kind `json:"kind,required"` // The timestamp of when the ruleset was last modified. LastUpdated time.Time `json:"last_updated,required" format:"date-time"` // The human-readable name of the ruleset. Name string `json:"name,required"` // The phase of the ruleset. - Phase PhaseUpdateResponsePhase `json:"phase,required"` + Phase Phase `json:"phase,required"` // The list of rules in the ruleset. Rules []PhaseUpdateResponseRule `json:"rules,required"` // The version of the ruleset. @@ -124,61 +124,6 @@ func (r phaseUpdateResponseJSON) RawJSON() string { return r.raw } -// The kind of the ruleset. -type PhaseUpdateResponseKind string - -const ( - PhaseUpdateResponseKindManaged PhaseUpdateResponseKind = "managed" - PhaseUpdateResponseKindCustom PhaseUpdateResponseKind = "custom" - PhaseUpdateResponseKindRoot PhaseUpdateResponseKind = "root" - PhaseUpdateResponseKindZone PhaseUpdateResponseKind = "zone" -) - -func (r PhaseUpdateResponseKind) IsKnown() bool { - switch r { - case PhaseUpdateResponseKindManaged, PhaseUpdateResponseKindCustom, PhaseUpdateResponseKindRoot, PhaseUpdateResponseKindZone: - return true - } - return false -} - -// The phase of the ruleset. -type PhaseUpdateResponsePhase string - -const ( - PhaseUpdateResponsePhaseDDoSL4 PhaseUpdateResponsePhase = "ddos_l4" - PhaseUpdateResponsePhaseDDoSL7 PhaseUpdateResponsePhase = "ddos_l7" - PhaseUpdateResponsePhaseHTTPConfigSettings PhaseUpdateResponsePhase = "http_config_settings" - PhaseUpdateResponsePhaseHTTPCustomErrors PhaseUpdateResponsePhase = "http_custom_errors" - PhaseUpdateResponsePhaseHTTPLogCustomFields PhaseUpdateResponsePhase = "http_log_custom_fields" - PhaseUpdateResponsePhaseHTTPRatelimit PhaseUpdateResponsePhase = "http_ratelimit" - PhaseUpdateResponsePhaseHTTPRequestCacheSettings PhaseUpdateResponsePhase = "http_request_cache_settings" - PhaseUpdateResponsePhaseHTTPRequestDynamicRedirect PhaseUpdateResponsePhase = "http_request_dynamic_redirect" - PhaseUpdateResponsePhaseHTTPRequestFirewallCustom PhaseUpdateResponsePhase = "http_request_firewall_custom" - PhaseUpdateResponsePhaseHTTPRequestFirewallManaged PhaseUpdateResponsePhase = "http_request_firewall_managed" - PhaseUpdateResponsePhaseHTTPRequestLateTransform PhaseUpdateResponsePhase = "http_request_late_transform" - PhaseUpdateResponsePhaseHTTPRequestOrigin PhaseUpdateResponsePhase = "http_request_origin" - PhaseUpdateResponsePhaseHTTPRequestRedirect PhaseUpdateResponsePhase = "http_request_redirect" - PhaseUpdateResponsePhaseHTTPRequestSanitize PhaseUpdateResponsePhase = "http_request_sanitize" - PhaseUpdateResponsePhaseHTTPRequestSBFM PhaseUpdateResponsePhase = "http_request_sbfm" - PhaseUpdateResponsePhaseHTTPRequestSelectConfiguration PhaseUpdateResponsePhase = "http_request_select_configuration" - PhaseUpdateResponsePhaseHTTPRequestTransform PhaseUpdateResponsePhase = "http_request_transform" - PhaseUpdateResponsePhaseHTTPResponseCompression PhaseUpdateResponsePhase = "http_response_compression" - PhaseUpdateResponsePhaseHTTPResponseFirewallManaged PhaseUpdateResponsePhase = "http_response_firewall_managed" - PhaseUpdateResponsePhaseHTTPResponseHeadersTransform PhaseUpdateResponsePhase = "http_response_headers_transform" - PhaseUpdateResponsePhaseMagicTransit PhaseUpdateResponsePhase = "magic_transit" - PhaseUpdateResponsePhaseMagicTransitIDsManaged PhaseUpdateResponsePhase = "magic_transit_ids_managed" - PhaseUpdateResponsePhaseMagicTransitManaged PhaseUpdateResponsePhase = "magic_transit_managed" -) - -func (r PhaseUpdateResponsePhase) IsKnown() bool { - switch r { - case PhaseUpdateResponsePhaseDDoSL4, PhaseUpdateResponsePhaseDDoSL7, PhaseUpdateResponsePhaseHTTPConfigSettings, PhaseUpdateResponsePhaseHTTPCustomErrors, PhaseUpdateResponsePhaseHTTPLogCustomFields, PhaseUpdateResponsePhaseHTTPRatelimit, PhaseUpdateResponsePhaseHTTPRequestCacheSettings, PhaseUpdateResponsePhaseHTTPRequestDynamicRedirect, PhaseUpdateResponsePhaseHTTPRequestFirewallCustom, PhaseUpdateResponsePhaseHTTPRequestFirewallManaged, PhaseUpdateResponsePhaseHTTPRequestLateTransform, PhaseUpdateResponsePhaseHTTPRequestOrigin, PhaseUpdateResponsePhaseHTTPRequestRedirect, PhaseUpdateResponsePhaseHTTPRequestSanitize, PhaseUpdateResponsePhaseHTTPRequestSBFM, PhaseUpdateResponsePhaseHTTPRequestSelectConfiguration, PhaseUpdateResponsePhaseHTTPRequestTransform, PhaseUpdateResponsePhaseHTTPResponseCompression, PhaseUpdateResponsePhaseHTTPResponseFirewallManaged, PhaseUpdateResponsePhaseHTTPResponseHeadersTransform, PhaseUpdateResponsePhaseMagicTransit, PhaseUpdateResponsePhaseMagicTransitIDsManaged, PhaseUpdateResponsePhaseMagicTransitManaged: - return true - } - return false -} - type PhaseUpdateResponseRule struct { // The action to perform when the rule matches. Action PhaseUpdateResponseRulesAction `json:"action"` @@ -364,13 +309,13 @@ type PhaseGetResponse struct { // The unique ID of the ruleset. ID string `json:"id,required"` // The kind of the ruleset. - Kind PhaseGetResponseKind `json:"kind,required"` + Kind Kind `json:"kind,required"` // The timestamp of when the ruleset was last modified. LastUpdated time.Time `json:"last_updated,required" format:"date-time"` // The human-readable name of the ruleset. Name string `json:"name,required"` // The phase of the ruleset. - Phase PhaseGetResponsePhase `json:"phase,required"` + Phase Phase `json:"phase,required"` // The list of rules in the ruleset. Rules []PhaseGetResponseRule `json:"rules,required"` // The version of the ruleset. @@ -403,61 +348,6 @@ func (r phaseGetResponseJSON) RawJSON() string { return r.raw } -// The kind of the ruleset. -type PhaseGetResponseKind string - -const ( - PhaseGetResponseKindManaged PhaseGetResponseKind = "managed" - PhaseGetResponseKindCustom PhaseGetResponseKind = "custom" - PhaseGetResponseKindRoot PhaseGetResponseKind = "root" - PhaseGetResponseKindZone PhaseGetResponseKind = "zone" -) - -func (r PhaseGetResponseKind) IsKnown() bool { - switch r { - case PhaseGetResponseKindManaged, PhaseGetResponseKindCustom, PhaseGetResponseKindRoot, PhaseGetResponseKindZone: - return true - } - return false -} - -// The phase of the ruleset. -type PhaseGetResponsePhase string - -const ( - PhaseGetResponsePhaseDDoSL4 PhaseGetResponsePhase = "ddos_l4" - PhaseGetResponsePhaseDDoSL7 PhaseGetResponsePhase = "ddos_l7" - PhaseGetResponsePhaseHTTPConfigSettings PhaseGetResponsePhase = "http_config_settings" - PhaseGetResponsePhaseHTTPCustomErrors PhaseGetResponsePhase = "http_custom_errors" - PhaseGetResponsePhaseHTTPLogCustomFields PhaseGetResponsePhase = "http_log_custom_fields" - PhaseGetResponsePhaseHTTPRatelimit PhaseGetResponsePhase = "http_ratelimit" - PhaseGetResponsePhaseHTTPRequestCacheSettings PhaseGetResponsePhase = "http_request_cache_settings" - PhaseGetResponsePhaseHTTPRequestDynamicRedirect PhaseGetResponsePhase = "http_request_dynamic_redirect" - PhaseGetResponsePhaseHTTPRequestFirewallCustom PhaseGetResponsePhase = "http_request_firewall_custom" - PhaseGetResponsePhaseHTTPRequestFirewallManaged PhaseGetResponsePhase = "http_request_firewall_managed" - PhaseGetResponsePhaseHTTPRequestLateTransform PhaseGetResponsePhase = "http_request_late_transform" - PhaseGetResponsePhaseHTTPRequestOrigin PhaseGetResponsePhase = "http_request_origin" - PhaseGetResponsePhaseHTTPRequestRedirect PhaseGetResponsePhase = "http_request_redirect" - PhaseGetResponsePhaseHTTPRequestSanitize PhaseGetResponsePhase = "http_request_sanitize" - PhaseGetResponsePhaseHTTPRequestSBFM PhaseGetResponsePhase = "http_request_sbfm" - PhaseGetResponsePhaseHTTPRequestSelectConfiguration PhaseGetResponsePhase = "http_request_select_configuration" - PhaseGetResponsePhaseHTTPRequestTransform PhaseGetResponsePhase = "http_request_transform" - PhaseGetResponsePhaseHTTPResponseCompression PhaseGetResponsePhase = "http_response_compression" - PhaseGetResponsePhaseHTTPResponseFirewallManaged PhaseGetResponsePhase = "http_response_firewall_managed" - PhaseGetResponsePhaseHTTPResponseHeadersTransform PhaseGetResponsePhase = "http_response_headers_transform" - PhaseGetResponsePhaseMagicTransit PhaseGetResponsePhase = "magic_transit" - PhaseGetResponsePhaseMagicTransitIDsManaged PhaseGetResponsePhase = "magic_transit_ids_managed" - PhaseGetResponsePhaseMagicTransitManaged PhaseGetResponsePhase = "magic_transit_managed" -) - -func (r PhaseGetResponsePhase) IsKnown() bool { - switch r { - case PhaseGetResponsePhaseDDoSL4, PhaseGetResponsePhaseDDoSL7, PhaseGetResponsePhaseHTTPConfigSettings, PhaseGetResponsePhaseHTTPCustomErrors, PhaseGetResponsePhaseHTTPLogCustomFields, PhaseGetResponsePhaseHTTPRatelimit, PhaseGetResponsePhaseHTTPRequestCacheSettings, PhaseGetResponsePhaseHTTPRequestDynamicRedirect, PhaseGetResponsePhaseHTTPRequestFirewallCustom, PhaseGetResponsePhaseHTTPRequestFirewallManaged, PhaseGetResponsePhaseHTTPRequestLateTransform, PhaseGetResponsePhaseHTTPRequestOrigin, PhaseGetResponsePhaseHTTPRequestRedirect, PhaseGetResponsePhaseHTTPRequestSanitize, PhaseGetResponsePhaseHTTPRequestSBFM, PhaseGetResponsePhaseHTTPRequestSelectConfiguration, PhaseGetResponsePhaseHTTPRequestTransform, PhaseGetResponsePhaseHTTPResponseCompression, PhaseGetResponsePhaseHTTPResponseFirewallManaged, PhaseGetResponsePhaseHTTPResponseHeadersTransform, PhaseGetResponsePhaseMagicTransit, PhaseGetResponsePhaseMagicTransitIDsManaged, PhaseGetResponsePhaseMagicTransitManaged: - return true - } - return false -} - type PhaseGetResponseRule struct { // The action to perform when the rule matches. Action PhaseGetResponseRulesAction `json:"action"` @@ -648,54 +538,17 @@ type PhaseUpdateParams struct { // An informative description of the ruleset. Description param.Field[string] `json:"description"` // The kind of the ruleset. - Kind param.Field[PhaseUpdateParamsKind] `json:"kind"` + Kind param.Field[Kind] `json:"kind"` // The human-readable name of the ruleset. Name param.Field[string] `json:"name"` // The phase of the ruleset. - Phase param.Field[PhaseUpdateParamsPhase] `json:"phase"` + Phase param.Field[Phase] `json:"phase"` } func (r PhaseUpdateParams) MarshalJSON() (data []byte, err error) { return apijson.MarshalRoot(r) } -// The phase of the ruleset. -type PhaseUpdateParamsRulesetPhase string - -const ( - PhaseUpdateParamsRulesetPhaseDDoSL4 PhaseUpdateParamsRulesetPhase = "ddos_l4" - PhaseUpdateParamsRulesetPhaseDDoSL7 PhaseUpdateParamsRulesetPhase = "ddos_l7" - PhaseUpdateParamsRulesetPhaseHTTPConfigSettings PhaseUpdateParamsRulesetPhase = "http_config_settings" - PhaseUpdateParamsRulesetPhaseHTTPCustomErrors PhaseUpdateParamsRulesetPhase = "http_custom_errors" - PhaseUpdateParamsRulesetPhaseHTTPLogCustomFields PhaseUpdateParamsRulesetPhase = "http_log_custom_fields" - PhaseUpdateParamsRulesetPhaseHTTPRatelimit PhaseUpdateParamsRulesetPhase = "http_ratelimit" - PhaseUpdateParamsRulesetPhaseHTTPRequestCacheSettings PhaseUpdateParamsRulesetPhase = "http_request_cache_settings" - PhaseUpdateParamsRulesetPhaseHTTPRequestDynamicRedirect PhaseUpdateParamsRulesetPhase = "http_request_dynamic_redirect" - PhaseUpdateParamsRulesetPhaseHTTPRequestFirewallCustom PhaseUpdateParamsRulesetPhase = "http_request_firewall_custom" - PhaseUpdateParamsRulesetPhaseHTTPRequestFirewallManaged PhaseUpdateParamsRulesetPhase = "http_request_firewall_managed" - PhaseUpdateParamsRulesetPhaseHTTPRequestLateTransform PhaseUpdateParamsRulesetPhase = "http_request_late_transform" - PhaseUpdateParamsRulesetPhaseHTTPRequestOrigin PhaseUpdateParamsRulesetPhase = "http_request_origin" - PhaseUpdateParamsRulesetPhaseHTTPRequestRedirect PhaseUpdateParamsRulesetPhase = "http_request_redirect" - PhaseUpdateParamsRulesetPhaseHTTPRequestSanitize PhaseUpdateParamsRulesetPhase = "http_request_sanitize" - PhaseUpdateParamsRulesetPhaseHTTPRequestSBFM PhaseUpdateParamsRulesetPhase = "http_request_sbfm" - PhaseUpdateParamsRulesetPhaseHTTPRequestSelectConfiguration PhaseUpdateParamsRulesetPhase = "http_request_select_configuration" - PhaseUpdateParamsRulesetPhaseHTTPRequestTransform PhaseUpdateParamsRulesetPhase = "http_request_transform" - PhaseUpdateParamsRulesetPhaseHTTPResponseCompression PhaseUpdateParamsRulesetPhase = "http_response_compression" - PhaseUpdateParamsRulesetPhaseHTTPResponseFirewallManaged PhaseUpdateParamsRulesetPhase = "http_response_firewall_managed" - PhaseUpdateParamsRulesetPhaseHTTPResponseHeadersTransform PhaseUpdateParamsRulesetPhase = "http_response_headers_transform" - PhaseUpdateParamsRulesetPhaseMagicTransit PhaseUpdateParamsRulesetPhase = "magic_transit" - PhaseUpdateParamsRulesetPhaseMagicTransitIDsManaged PhaseUpdateParamsRulesetPhase = "magic_transit_ids_managed" - PhaseUpdateParamsRulesetPhaseMagicTransitManaged PhaseUpdateParamsRulesetPhase = "magic_transit_managed" -) - -func (r PhaseUpdateParamsRulesetPhase) IsKnown() bool { - switch r { - case PhaseUpdateParamsRulesetPhaseDDoSL4, PhaseUpdateParamsRulesetPhaseDDoSL7, PhaseUpdateParamsRulesetPhaseHTTPConfigSettings, PhaseUpdateParamsRulesetPhaseHTTPCustomErrors, PhaseUpdateParamsRulesetPhaseHTTPLogCustomFields, PhaseUpdateParamsRulesetPhaseHTTPRatelimit, PhaseUpdateParamsRulesetPhaseHTTPRequestCacheSettings, PhaseUpdateParamsRulesetPhaseHTTPRequestDynamicRedirect, PhaseUpdateParamsRulesetPhaseHTTPRequestFirewallCustom, PhaseUpdateParamsRulesetPhaseHTTPRequestFirewallManaged, PhaseUpdateParamsRulesetPhaseHTTPRequestLateTransform, PhaseUpdateParamsRulesetPhaseHTTPRequestOrigin, PhaseUpdateParamsRulesetPhaseHTTPRequestRedirect, PhaseUpdateParamsRulesetPhaseHTTPRequestSanitize, PhaseUpdateParamsRulesetPhaseHTTPRequestSBFM, PhaseUpdateParamsRulesetPhaseHTTPRequestSelectConfiguration, PhaseUpdateParamsRulesetPhaseHTTPRequestTransform, PhaseUpdateParamsRulesetPhaseHTTPResponseCompression, PhaseUpdateParamsRulesetPhaseHTTPResponseFirewallManaged, PhaseUpdateParamsRulesetPhaseHTTPResponseHeadersTransform, PhaseUpdateParamsRulesetPhaseMagicTransit, PhaseUpdateParamsRulesetPhaseMagicTransitIDsManaged, PhaseUpdateParamsRulesetPhaseMagicTransitManaged: - return true - } - return false -} - type PhaseUpdateParamsRule struct { // The action to perform when the rule matches. Action param.Field[PhaseUpdateParamsRulesAction] `json:"action"` @@ -762,61 +615,6 @@ func (r PhaseUpdateParamsRulesAction) IsKnown() bool { return false } -// The kind of the ruleset. -type PhaseUpdateParamsKind string - -const ( - PhaseUpdateParamsKindManaged PhaseUpdateParamsKind = "managed" - PhaseUpdateParamsKindCustom PhaseUpdateParamsKind = "custom" - PhaseUpdateParamsKindRoot PhaseUpdateParamsKind = "root" - PhaseUpdateParamsKindZone PhaseUpdateParamsKind = "zone" -) - -func (r PhaseUpdateParamsKind) IsKnown() bool { - switch r { - case PhaseUpdateParamsKindManaged, PhaseUpdateParamsKindCustom, PhaseUpdateParamsKindRoot, PhaseUpdateParamsKindZone: - return true - } - return false -} - -// The phase of the ruleset. -type PhaseUpdateParamsPhase string - -const ( - PhaseUpdateParamsPhaseDDoSL4 PhaseUpdateParamsPhase = "ddos_l4" - PhaseUpdateParamsPhaseDDoSL7 PhaseUpdateParamsPhase = "ddos_l7" - PhaseUpdateParamsPhaseHTTPConfigSettings PhaseUpdateParamsPhase = "http_config_settings" - PhaseUpdateParamsPhaseHTTPCustomErrors PhaseUpdateParamsPhase = "http_custom_errors" - PhaseUpdateParamsPhaseHTTPLogCustomFields PhaseUpdateParamsPhase = "http_log_custom_fields" - PhaseUpdateParamsPhaseHTTPRatelimit PhaseUpdateParamsPhase = "http_ratelimit" - PhaseUpdateParamsPhaseHTTPRequestCacheSettings PhaseUpdateParamsPhase = "http_request_cache_settings" - PhaseUpdateParamsPhaseHTTPRequestDynamicRedirect PhaseUpdateParamsPhase = "http_request_dynamic_redirect" - PhaseUpdateParamsPhaseHTTPRequestFirewallCustom PhaseUpdateParamsPhase = "http_request_firewall_custom" - PhaseUpdateParamsPhaseHTTPRequestFirewallManaged PhaseUpdateParamsPhase = "http_request_firewall_managed" - PhaseUpdateParamsPhaseHTTPRequestLateTransform PhaseUpdateParamsPhase = "http_request_late_transform" - PhaseUpdateParamsPhaseHTTPRequestOrigin PhaseUpdateParamsPhase = "http_request_origin" - PhaseUpdateParamsPhaseHTTPRequestRedirect PhaseUpdateParamsPhase = "http_request_redirect" - PhaseUpdateParamsPhaseHTTPRequestSanitize PhaseUpdateParamsPhase = "http_request_sanitize" - PhaseUpdateParamsPhaseHTTPRequestSBFM PhaseUpdateParamsPhase = "http_request_sbfm" - PhaseUpdateParamsPhaseHTTPRequestSelectConfiguration PhaseUpdateParamsPhase = "http_request_select_configuration" - PhaseUpdateParamsPhaseHTTPRequestTransform PhaseUpdateParamsPhase = "http_request_transform" - PhaseUpdateParamsPhaseHTTPResponseCompression PhaseUpdateParamsPhase = "http_response_compression" - PhaseUpdateParamsPhaseHTTPResponseFirewallManaged PhaseUpdateParamsPhase = "http_response_firewall_managed" - PhaseUpdateParamsPhaseHTTPResponseHeadersTransform PhaseUpdateParamsPhase = "http_response_headers_transform" - PhaseUpdateParamsPhaseMagicTransit PhaseUpdateParamsPhase = "magic_transit" - PhaseUpdateParamsPhaseMagicTransitIDsManaged PhaseUpdateParamsPhase = "magic_transit_ids_managed" - PhaseUpdateParamsPhaseMagicTransitManaged PhaseUpdateParamsPhase = "magic_transit_managed" -) - -func (r PhaseUpdateParamsPhase) IsKnown() bool { - switch r { - case PhaseUpdateParamsPhaseDDoSL4, PhaseUpdateParamsPhaseDDoSL7, PhaseUpdateParamsPhaseHTTPConfigSettings, PhaseUpdateParamsPhaseHTTPCustomErrors, PhaseUpdateParamsPhaseHTTPLogCustomFields, PhaseUpdateParamsPhaseHTTPRatelimit, PhaseUpdateParamsPhaseHTTPRequestCacheSettings, PhaseUpdateParamsPhaseHTTPRequestDynamicRedirect, PhaseUpdateParamsPhaseHTTPRequestFirewallCustom, PhaseUpdateParamsPhaseHTTPRequestFirewallManaged, PhaseUpdateParamsPhaseHTTPRequestLateTransform, PhaseUpdateParamsPhaseHTTPRequestOrigin, PhaseUpdateParamsPhaseHTTPRequestRedirect, PhaseUpdateParamsPhaseHTTPRequestSanitize, PhaseUpdateParamsPhaseHTTPRequestSBFM, PhaseUpdateParamsPhaseHTTPRequestSelectConfiguration, PhaseUpdateParamsPhaseHTTPRequestTransform, PhaseUpdateParamsPhaseHTTPResponseCompression, PhaseUpdateParamsPhaseHTTPResponseFirewallManaged, PhaseUpdateParamsPhaseHTTPResponseHeadersTransform, PhaseUpdateParamsPhaseMagicTransit, PhaseUpdateParamsPhaseMagicTransitIDsManaged, PhaseUpdateParamsPhaseMagicTransitManaged: - return true - } - return false -} - // A response object. type PhaseUpdateResponseEnvelope struct { // A list of error messages. @@ -975,43 +773,6 @@ type PhaseGetParams struct { ZoneID param.Field[string] `path:"zone_id"` } -// The phase of the ruleset. -type PhaseGetParamsRulesetPhase string - -const ( - PhaseGetParamsRulesetPhaseDDoSL4 PhaseGetParamsRulesetPhase = "ddos_l4" - PhaseGetParamsRulesetPhaseDDoSL7 PhaseGetParamsRulesetPhase = "ddos_l7" - PhaseGetParamsRulesetPhaseHTTPConfigSettings PhaseGetParamsRulesetPhase = "http_config_settings" - PhaseGetParamsRulesetPhaseHTTPCustomErrors PhaseGetParamsRulesetPhase = "http_custom_errors" - PhaseGetParamsRulesetPhaseHTTPLogCustomFields PhaseGetParamsRulesetPhase = "http_log_custom_fields" - PhaseGetParamsRulesetPhaseHTTPRatelimit PhaseGetParamsRulesetPhase = "http_ratelimit" - PhaseGetParamsRulesetPhaseHTTPRequestCacheSettings PhaseGetParamsRulesetPhase = "http_request_cache_settings" - PhaseGetParamsRulesetPhaseHTTPRequestDynamicRedirect PhaseGetParamsRulesetPhase = "http_request_dynamic_redirect" - PhaseGetParamsRulesetPhaseHTTPRequestFirewallCustom PhaseGetParamsRulesetPhase = "http_request_firewall_custom" - PhaseGetParamsRulesetPhaseHTTPRequestFirewallManaged PhaseGetParamsRulesetPhase = "http_request_firewall_managed" - PhaseGetParamsRulesetPhaseHTTPRequestLateTransform PhaseGetParamsRulesetPhase = "http_request_late_transform" - PhaseGetParamsRulesetPhaseHTTPRequestOrigin PhaseGetParamsRulesetPhase = "http_request_origin" - PhaseGetParamsRulesetPhaseHTTPRequestRedirect PhaseGetParamsRulesetPhase = "http_request_redirect" - PhaseGetParamsRulesetPhaseHTTPRequestSanitize PhaseGetParamsRulesetPhase = "http_request_sanitize" - PhaseGetParamsRulesetPhaseHTTPRequestSBFM PhaseGetParamsRulesetPhase = "http_request_sbfm" - PhaseGetParamsRulesetPhaseHTTPRequestSelectConfiguration PhaseGetParamsRulesetPhase = "http_request_select_configuration" - PhaseGetParamsRulesetPhaseHTTPRequestTransform PhaseGetParamsRulesetPhase = "http_request_transform" - PhaseGetParamsRulesetPhaseHTTPResponseCompression PhaseGetParamsRulesetPhase = "http_response_compression" - PhaseGetParamsRulesetPhaseHTTPResponseFirewallManaged PhaseGetParamsRulesetPhase = "http_response_firewall_managed" - PhaseGetParamsRulesetPhaseHTTPResponseHeadersTransform PhaseGetParamsRulesetPhase = "http_response_headers_transform" - PhaseGetParamsRulesetPhaseMagicTransit PhaseGetParamsRulesetPhase = "magic_transit" - PhaseGetParamsRulesetPhaseMagicTransitIDsManaged PhaseGetParamsRulesetPhase = "magic_transit_ids_managed" - PhaseGetParamsRulesetPhaseMagicTransitManaged PhaseGetParamsRulesetPhase = "magic_transit_managed" -) - -func (r PhaseGetParamsRulesetPhase) IsKnown() bool { - switch r { - case PhaseGetParamsRulesetPhaseDDoSL4, PhaseGetParamsRulesetPhaseDDoSL7, PhaseGetParamsRulesetPhaseHTTPConfigSettings, PhaseGetParamsRulesetPhaseHTTPCustomErrors, PhaseGetParamsRulesetPhaseHTTPLogCustomFields, PhaseGetParamsRulesetPhaseHTTPRatelimit, PhaseGetParamsRulesetPhaseHTTPRequestCacheSettings, PhaseGetParamsRulesetPhaseHTTPRequestDynamicRedirect, PhaseGetParamsRulesetPhaseHTTPRequestFirewallCustom, PhaseGetParamsRulesetPhaseHTTPRequestFirewallManaged, PhaseGetParamsRulesetPhaseHTTPRequestLateTransform, PhaseGetParamsRulesetPhaseHTTPRequestOrigin, PhaseGetParamsRulesetPhaseHTTPRequestRedirect, PhaseGetParamsRulesetPhaseHTTPRequestSanitize, PhaseGetParamsRulesetPhaseHTTPRequestSBFM, PhaseGetParamsRulesetPhaseHTTPRequestSelectConfiguration, PhaseGetParamsRulesetPhaseHTTPRequestTransform, PhaseGetParamsRulesetPhaseHTTPResponseCompression, PhaseGetParamsRulesetPhaseHTTPResponseFirewallManaged, PhaseGetParamsRulesetPhaseHTTPResponseHeadersTransform, PhaseGetParamsRulesetPhaseMagicTransit, PhaseGetParamsRulesetPhaseMagicTransitIDsManaged, PhaseGetParamsRulesetPhaseMagicTransitManaged: - return true - } - return false -} - // A response object. type PhaseGetResponseEnvelope struct { // A list of error messages. diff --git a/rulesets/phase_test.go b/rulesets/phase_test.go index ff5ebbabcea..df14e32e1d3 100644 --- a/rulesets/phase_test.go +++ b/rulesets/phase_test.go @@ -30,7 +30,7 @@ func TestPhaseUpdateWithOptionalParams(t *testing.T) { ) _, err := client.Rulesets.Phases.Update( context.TODO(), - rulesets.PhaseUpdateParamsRulesetPhaseHTTPRequestFirewallCustom, + rulesets.PhaseHTTPRequestFirewallCustom, rulesets.PhaseUpdateParams{ Rules: cloudflare.F([]rulesets.PhaseUpdateParamsRuleUnion{rulesets.BlockRuleParam{ Action: cloudflare.F(rulesets.BlockRuleActionBlock), @@ -87,9 +87,9 @@ func TestPhaseUpdateWithOptionalParams(t *testing.T) { AccountID: cloudflare.F("string"), ZoneID: cloudflare.F("string"), Description: cloudflare.F("My ruleset to execute managed rulesets"), - Kind: cloudflare.F(rulesets.PhaseUpdateParamsKindRoot), + Kind: cloudflare.F(rulesets.KindRoot), Name: cloudflare.F("My ruleset"), - Phase: cloudflare.F(rulesets.PhaseUpdateParamsPhaseHTTPRequestFirewallCustom), + Phase: cloudflare.F(rulesets.PhaseHTTPRequestFirewallCustom), }, ) if err != nil { @@ -117,7 +117,7 @@ func TestPhaseGetWithOptionalParams(t *testing.T) { ) _, err := client.Rulesets.Phases.Get( context.TODO(), - rulesets.PhaseGetParamsRulesetPhaseHTTPRequestFirewallCustom, + rulesets.PhaseHTTPRequestFirewallCustom, rulesets.PhaseGetParams{ AccountID: cloudflare.F("string"), ZoneID: cloudflare.F("string"), diff --git a/rulesets/phaseversion.go b/rulesets/phaseversion.go index 0515679216b..5575db9bc82 100644 --- a/rulesets/phaseversion.go +++ b/rulesets/phaseversion.go @@ -36,7 +36,7 @@ func NewPhaseVersionService(opts ...option.RequestOption) (r *PhaseVersionServic } // Fetches the versions of an account or zone entry point ruleset. -func (r *PhaseVersionService) List(ctx context.Context, rulesetPhase PhaseVersionListParamsRulesetPhase, query PhaseVersionListParams, opts ...option.RequestOption) (res *pagination.SinglePage[Ruleset], err error) { +func (r *PhaseVersionService) List(ctx context.Context, rulesetPhase Phase, query PhaseVersionListParams, opts ...option.RequestOption) (res *pagination.SinglePage[Ruleset], err error) { var raw *http.Response opts = append(r.Options, opts...) opts = append([]option.RequestOption{option.WithResponseInto(&raw)}, opts...) @@ -63,12 +63,12 @@ func (r *PhaseVersionService) List(ctx context.Context, rulesetPhase PhaseVersio } // Fetches the versions of an account or zone entry point ruleset. -func (r *PhaseVersionService) ListAutoPaging(ctx context.Context, rulesetPhase PhaseVersionListParamsRulesetPhase, query PhaseVersionListParams, opts ...option.RequestOption) *pagination.SinglePageAutoPager[Ruleset] { +func (r *PhaseVersionService) ListAutoPaging(ctx context.Context, rulesetPhase Phase, query PhaseVersionListParams, opts ...option.RequestOption) *pagination.SinglePageAutoPager[Ruleset] { return pagination.NewSinglePageAutoPager(r.List(ctx, rulesetPhase, query, opts...)) } // Fetches a specific version of an account or zone entry point ruleset. -func (r *PhaseVersionService) Get(ctx context.Context, rulesetPhase PhaseVersionGetParamsRulesetPhase, rulesetVersion string, query PhaseVersionGetParams, opts ...option.RequestOption) (res *PhaseVersionGetResponse, err error) { +func (r *PhaseVersionService) Get(ctx context.Context, rulesetPhase Phase, rulesetVersion string, query PhaseVersionGetParams, opts ...option.RequestOption) (res *PhaseVersionGetResponse, err error) { opts = append(r.Options[:], opts...) var env PhaseVersionGetResponseEnvelope var accountOrZone string @@ -94,13 +94,13 @@ type PhaseVersionGetResponse struct { // The unique ID of the ruleset. ID string `json:"id,required"` // The kind of the ruleset. - Kind PhaseVersionGetResponseKind `json:"kind,required"` + Kind Kind `json:"kind,required"` // The timestamp of when the ruleset was last modified. LastUpdated time.Time `json:"last_updated,required" format:"date-time"` // The human-readable name of the ruleset. Name string `json:"name,required"` // The phase of the ruleset. - Phase PhaseVersionGetResponsePhase `json:"phase,required"` + Phase Phase `json:"phase,required"` // The list of rules in the ruleset. Rules []PhaseVersionGetResponseRule `json:"rules,required"` // The version of the ruleset. @@ -133,61 +133,6 @@ func (r phaseVersionGetResponseJSON) RawJSON() string { return r.raw } -// The kind of the ruleset. -type PhaseVersionGetResponseKind string - -const ( - PhaseVersionGetResponseKindManaged PhaseVersionGetResponseKind = "managed" - PhaseVersionGetResponseKindCustom PhaseVersionGetResponseKind = "custom" - PhaseVersionGetResponseKindRoot PhaseVersionGetResponseKind = "root" - PhaseVersionGetResponseKindZone PhaseVersionGetResponseKind = "zone" -) - -func (r PhaseVersionGetResponseKind) IsKnown() bool { - switch r { - case PhaseVersionGetResponseKindManaged, PhaseVersionGetResponseKindCustom, PhaseVersionGetResponseKindRoot, PhaseVersionGetResponseKindZone: - return true - } - return false -} - -// The phase of the ruleset. -type PhaseVersionGetResponsePhase string - -const ( - PhaseVersionGetResponsePhaseDDoSL4 PhaseVersionGetResponsePhase = "ddos_l4" - PhaseVersionGetResponsePhaseDDoSL7 PhaseVersionGetResponsePhase = "ddos_l7" - PhaseVersionGetResponsePhaseHTTPConfigSettings PhaseVersionGetResponsePhase = "http_config_settings" - PhaseVersionGetResponsePhaseHTTPCustomErrors PhaseVersionGetResponsePhase = "http_custom_errors" - PhaseVersionGetResponsePhaseHTTPLogCustomFields PhaseVersionGetResponsePhase = "http_log_custom_fields" - PhaseVersionGetResponsePhaseHTTPRatelimit PhaseVersionGetResponsePhase = "http_ratelimit" - PhaseVersionGetResponsePhaseHTTPRequestCacheSettings PhaseVersionGetResponsePhase = "http_request_cache_settings" - PhaseVersionGetResponsePhaseHTTPRequestDynamicRedirect PhaseVersionGetResponsePhase = "http_request_dynamic_redirect" - PhaseVersionGetResponsePhaseHTTPRequestFirewallCustom PhaseVersionGetResponsePhase = "http_request_firewall_custom" - PhaseVersionGetResponsePhaseHTTPRequestFirewallManaged PhaseVersionGetResponsePhase = "http_request_firewall_managed" - PhaseVersionGetResponsePhaseHTTPRequestLateTransform PhaseVersionGetResponsePhase = "http_request_late_transform" - PhaseVersionGetResponsePhaseHTTPRequestOrigin PhaseVersionGetResponsePhase = "http_request_origin" - PhaseVersionGetResponsePhaseHTTPRequestRedirect PhaseVersionGetResponsePhase = "http_request_redirect" - PhaseVersionGetResponsePhaseHTTPRequestSanitize PhaseVersionGetResponsePhase = "http_request_sanitize" - PhaseVersionGetResponsePhaseHTTPRequestSBFM PhaseVersionGetResponsePhase = "http_request_sbfm" - PhaseVersionGetResponsePhaseHTTPRequestSelectConfiguration PhaseVersionGetResponsePhase = "http_request_select_configuration" - PhaseVersionGetResponsePhaseHTTPRequestTransform PhaseVersionGetResponsePhase = "http_request_transform" - PhaseVersionGetResponsePhaseHTTPResponseCompression PhaseVersionGetResponsePhase = "http_response_compression" - PhaseVersionGetResponsePhaseHTTPResponseFirewallManaged PhaseVersionGetResponsePhase = "http_response_firewall_managed" - PhaseVersionGetResponsePhaseHTTPResponseHeadersTransform PhaseVersionGetResponsePhase = "http_response_headers_transform" - PhaseVersionGetResponsePhaseMagicTransit PhaseVersionGetResponsePhase = "magic_transit" - PhaseVersionGetResponsePhaseMagicTransitIDsManaged PhaseVersionGetResponsePhase = "magic_transit_ids_managed" - PhaseVersionGetResponsePhaseMagicTransitManaged PhaseVersionGetResponsePhase = "magic_transit_managed" -) - -func (r PhaseVersionGetResponsePhase) IsKnown() bool { - switch r { - case PhaseVersionGetResponsePhaseDDoSL4, PhaseVersionGetResponsePhaseDDoSL7, PhaseVersionGetResponsePhaseHTTPConfigSettings, PhaseVersionGetResponsePhaseHTTPCustomErrors, PhaseVersionGetResponsePhaseHTTPLogCustomFields, PhaseVersionGetResponsePhaseHTTPRatelimit, PhaseVersionGetResponsePhaseHTTPRequestCacheSettings, PhaseVersionGetResponsePhaseHTTPRequestDynamicRedirect, PhaseVersionGetResponsePhaseHTTPRequestFirewallCustom, PhaseVersionGetResponsePhaseHTTPRequestFirewallManaged, PhaseVersionGetResponsePhaseHTTPRequestLateTransform, PhaseVersionGetResponsePhaseHTTPRequestOrigin, PhaseVersionGetResponsePhaseHTTPRequestRedirect, PhaseVersionGetResponsePhaseHTTPRequestSanitize, PhaseVersionGetResponsePhaseHTTPRequestSBFM, PhaseVersionGetResponsePhaseHTTPRequestSelectConfiguration, PhaseVersionGetResponsePhaseHTTPRequestTransform, PhaseVersionGetResponsePhaseHTTPResponseCompression, PhaseVersionGetResponsePhaseHTTPResponseFirewallManaged, PhaseVersionGetResponsePhaseHTTPResponseHeadersTransform, PhaseVersionGetResponsePhaseMagicTransit, PhaseVersionGetResponsePhaseMagicTransitIDsManaged, PhaseVersionGetResponsePhaseMagicTransitManaged: - return true - } - return false -} - type PhaseVersionGetResponseRule struct { // The action to perform when the rule matches. Action PhaseVersionGetResponseRulesAction `json:"action"` @@ -375,43 +320,6 @@ type PhaseVersionListParams struct { ZoneID param.Field[string] `path:"zone_id"` } -// The phase of the ruleset. -type PhaseVersionListParamsRulesetPhase string - -const ( - PhaseVersionListParamsRulesetPhaseDDoSL4 PhaseVersionListParamsRulesetPhase = "ddos_l4" - PhaseVersionListParamsRulesetPhaseDDoSL7 PhaseVersionListParamsRulesetPhase = "ddos_l7" - PhaseVersionListParamsRulesetPhaseHTTPConfigSettings PhaseVersionListParamsRulesetPhase = "http_config_settings" - PhaseVersionListParamsRulesetPhaseHTTPCustomErrors PhaseVersionListParamsRulesetPhase = "http_custom_errors" - PhaseVersionListParamsRulesetPhaseHTTPLogCustomFields PhaseVersionListParamsRulesetPhase = "http_log_custom_fields" - PhaseVersionListParamsRulesetPhaseHTTPRatelimit PhaseVersionListParamsRulesetPhase = "http_ratelimit" - PhaseVersionListParamsRulesetPhaseHTTPRequestCacheSettings PhaseVersionListParamsRulesetPhase = "http_request_cache_settings" - PhaseVersionListParamsRulesetPhaseHTTPRequestDynamicRedirect PhaseVersionListParamsRulesetPhase = "http_request_dynamic_redirect" - PhaseVersionListParamsRulesetPhaseHTTPRequestFirewallCustom PhaseVersionListParamsRulesetPhase = "http_request_firewall_custom" - PhaseVersionListParamsRulesetPhaseHTTPRequestFirewallManaged PhaseVersionListParamsRulesetPhase = "http_request_firewall_managed" - PhaseVersionListParamsRulesetPhaseHTTPRequestLateTransform PhaseVersionListParamsRulesetPhase = "http_request_late_transform" - PhaseVersionListParamsRulesetPhaseHTTPRequestOrigin PhaseVersionListParamsRulesetPhase = "http_request_origin" - PhaseVersionListParamsRulesetPhaseHTTPRequestRedirect PhaseVersionListParamsRulesetPhase = "http_request_redirect" - PhaseVersionListParamsRulesetPhaseHTTPRequestSanitize PhaseVersionListParamsRulesetPhase = "http_request_sanitize" - PhaseVersionListParamsRulesetPhaseHTTPRequestSBFM PhaseVersionListParamsRulesetPhase = "http_request_sbfm" - PhaseVersionListParamsRulesetPhaseHTTPRequestSelectConfiguration PhaseVersionListParamsRulesetPhase = "http_request_select_configuration" - PhaseVersionListParamsRulesetPhaseHTTPRequestTransform PhaseVersionListParamsRulesetPhase = "http_request_transform" - PhaseVersionListParamsRulesetPhaseHTTPResponseCompression PhaseVersionListParamsRulesetPhase = "http_response_compression" - PhaseVersionListParamsRulesetPhaseHTTPResponseFirewallManaged PhaseVersionListParamsRulesetPhase = "http_response_firewall_managed" - PhaseVersionListParamsRulesetPhaseHTTPResponseHeadersTransform PhaseVersionListParamsRulesetPhase = "http_response_headers_transform" - PhaseVersionListParamsRulesetPhaseMagicTransit PhaseVersionListParamsRulesetPhase = "magic_transit" - PhaseVersionListParamsRulesetPhaseMagicTransitIDsManaged PhaseVersionListParamsRulesetPhase = "magic_transit_ids_managed" - PhaseVersionListParamsRulesetPhaseMagicTransitManaged PhaseVersionListParamsRulesetPhase = "magic_transit_managed" -) - -func (r PhaseVersionListParamsRulesetPhase) IsKnown() bool { - switch r { - case PhaseVersionListParamsRulesetPhaseDDoSL4, PhaseVersionListParamsRulesetPhaseDDoSL7, PhaseVersionListParamsRulesetPhaseHTTPConfigSettings, PhaseVersionListParamsRulesetPhaseHTTPCustomErrors, PhaseVersionListParamsRulesetPhaseHTTPLogCustomFields, PhaseVersionListParamsRulesetPhaseHTTPRatelimit, PhaseVersionListParamsRulesetPhaseHTTPRequestCacheSettings, PhaseVersionListParamsRulesetPhaseHTTPRequestDynamicRedirect, PhaseVersionListParamsRulesetPhaseHTTPRequestFirewallCustom, PhaseVersionListParamsRulesetPhaseHTTPRequestFirewallManaged, PhaseVersionListParamsRulesetPhaseHTTPRequestLateTransform, PhaseVersionListParamsRulesetPhaseHTTPRequestOrigin, PhaseVersionListParamsRulesetPhaseHTTPRequestRedirect, PhaseVersionListParamsRulesetPhaseHTTPRequestSanitize, PhaseVersionListParamsRulesetPhaseHTTPRequestSBFM, PhaseVersionListParamsRulesetPhaseHTTPRequestSelectConfiguration, PhaseVersionListParamsRulesetPhaseHTTPRequestTransform, PhaseVersionListParamsRulesetPhaseHTTPResponseCompression, PhaseVersionListParamsRulesetPhaseHTTPResponseFirewallManaged, PhaseVersionListParamsRulesetPhaseHTTPResponseHeadersTransform, PhaseVersionListParamsRulesetPhaseMagicTransit, PhaseVersionListParamsRulesetPhaseMagicTransitIDsManaged, PhaseVersionListParamsRulesetPhaseMagicTransitManaged: - return true - } - return false -} - type PhaseVersionGetParams struct { // The Account ID to use for this endpoint. Mutually exclusive with the Zone ID. AccountID param.Field[string] `path:"account_id"` @@ -419,43 +327,6 @@ type PhaseVersionGetParams struct { ZoneID param.Field[string] `path:"zone_id"` } -// The phase of the ruleset. -type PhaseVersionGetParamsRulesetPhase string - -const ( - PhaseVersionGetParamsRulesetPhaseDDoSL4 PhaseVersionGetParamsRulesetPhase = "ddos_l4" - PhaseVersionGetParamsRulesetPhaseDDoSL7 PhaseVersionGetParamsRulesetPhase = "ddos_l7" - PhaseVersionGetParamsRulesetPhaseHTTPConfigSettings PhaseVersionGetParamsRulesetPhase = "http_config_settings" - PhaseVersionGetParamsRulesetPhaseHTTPCustomErrors PhaseVersionGetParamsRulesetPhase = "http_custom_errors" - PhaseVersionGetParamsRulesetPhaseHTTPLogCustomFields PhaseVersionGetParamsRulesetPhase = "http_log_custom_fields" - PhaseVersionGetParamsRulesetPhaseHTTPRatelimit PhaseVersionGetParamsRulesetPhase = "http_ratelimit" - PhaseVersionGetParamsRulesetPhaseHTTPRequestCacheSettings PhaseVersionGetParamsRulesetPhase = "http_request_cache_settings" - PhaseVersionGetParamsRulesetPhaseHTTPRequestDynamicRedirect PhaseVersionGetParamsRulesetPhase = "http_request_dynamic_redirect" - PhaseVersionGetParamsRulesetPhaseHTTPRequestFirewallCustom PhaseVersionGetParamsRulesetPhase = "http_request_firewall_custom" - PhaseVersionGetParamsRulesetPhaseHTTPRequestFirewallManaged PhaseVersionGetParamsRulesetPhase = "http_request_firewall_managed" - PhaseVersionGetParamsRulesetPhaseHTTPRequestLateTransform PhaseVersionGetParamsRulesetPhase = "http_request_late_transform" - PhaseVersionGetParamsRulesetPhaseHTTPRequestOrigin PhaseVersionGetParamsRulesetPhase = "http_request_origin" - PhaseVersionGetParamsRulesetPhaseHTTPRequestRedirect PhaseVersionGetParamsRulesetPhase = "http_request_redirect" - PhaseVersionGetParamsRulesetPhaseHTTPRequestSanitize PhaseVersionGetParamsRulesetPhase = "http_request_sanitize" - PhaseVersionGetParamsRulesetPhaseHTTPRequestSBFM PhaseVersionGetParamsRulesetPhase = "http_request_sbfm" - PhaseVersionGetParamsRulesetPhaseHTTPRequestSelectConfiguration PhaseVersionGetParamsRulesetPhase = "http_request_select_configuration" - PhaseVersionGetParamsRulesetPhaseHTTPRequestTransform PhaseVersionGetParamsRulesetPhase = "http_request_transform" - PhaseVersionGetParamsRulesetPhaseHTTPResponseCompression PhaseVersionGetParamsRulesetPhase = "http_response_compression" - PhaseVersionGetParamsRulesetPhaseHTTPResponseFirewallManaged PhaseVersionGetParamsRulesetPhase = "http_response_firewall_managed" - PhaseVersionGetParamsRulesetPhaseHTTPResponseHeadersTransform PhaseVersionGetParamsRulesetPhase = "http_response_headers_transform" - PhaseVersionGetParamsRulesetPhaseMagicTransit PhaseVersionGetParamsRulesetPhase = "magic_transit" - PhaseVersionGetParamsRulesetPhaseMagicTransitIDsManaged PhaseVersionGetParamsRulesetPhase = "magic_transit_ids_managed" - PhaseVersionGetParamsRulesetPhaseMagicTransitManaged PhaseVersionGetParamsRulesetPhase = "magic_transit_managed" -) - -func (r PhaseVersionGetParamsRulesetPhase) IsKnown() bool { - switch r { - case PhaseVersionGetParamsRulesetPhaseDDoSL4, PhaseVersionGetParamsRulesetPhaseDDoSL7, PhaseVersionGetParamsRulesetPhaseHTTPConfigSettings, PhaseVersionGetParamsRulesetPhaseHTTPCustomErrors, PhaseVersionGetParamsRulesetPhaseHTTPLogCustomFields, PhaseVersionGetParamsRulesetPhaseHTTPRatelimit, PhaseVersionGetParamsRulesetPhaseHTTPRequestCacheSettings, PhaseVersionGetParamsRulesetPhaseHTTPRequestDynamicRedirect, PhaseVersionGetParamsRulesetPhaseHTTPRequestFirewallCustom, PhaseVersionGetParamsRulesetPhaseHTTPRequestFirewallManaged, PhaseVersionGetParamsRulesetPhaseHTTPRequestLateTransform, PhaseVersionGetParamsRulesetPhaseHTTPRequestOrigin, PhaseVersionGetParamsRulesetPhaseHTTPRequestRedirect, PhaseVersionGetParamsRulesetPhaseHTTPRequestSanitize, PhaseVersionGetParamsRulesetPhaseHTTPRequestSBFM, PhaseVersionGetParamsRulesetPhaseHTTPRequestSelectConfiguration, PhaseVersionGetParamsRulesetPhaseHTTPRequestTransform, PhaseVersionGetParamsRulesetPhaseHTTPResponseCompression, PhaseVersionGetParamsRulesetPhaseHTTPResponseFirewallManaged, PhaseVersionGetParamsRulesetPhaseHTTPResponseHeadersTransform, PhaseVersionGetParamsRulesetPhaseMagicTransit, PhaseVersionGetParamsRulesetPhaseMagicTransitIDsManaged, PhaseVersionGetParamsRulesetPhaseMagicTransitManaged: - return true - } - return false -} - // A response object. type PhaseVersionGetResponseEnvelope struct { // A list of error messages. diff --git a/rulesets/phaseversion_test.go b/rulesets/phaseversion_test.go index 34f90a3b313..4a5095a983d 100644 --- a/rulesets/phaseversion_test.go +++ b/rulesets/phaseversion_test.go @@ -30,7 +30,7 @@ func TestPhaseVersionListWithOptionalParams(t *testing.T) { ) _, err := client.Rulesets.Phases.Versions.List( context.TODO(), - rulesets.PhaseVersionListParamsRulesetPhaseHTTPRequestFirewallCustom, + rulesets.PhaseHTTPRequestFirewallCustom, rulesets.PhaseVersionListParams{ AccountID: cloudflare.F("string"), ZoneID: cloudflare.F("string"), @@ -61,7 +61,7 @@ func TestPhaseVersionGetWithOptionalParams(t *testing.T) { ) _, err := client.Rulesets.Phases.Versions.Get( context.TODO(), - rulesets.PhaseVersionGetParamsRulesetPhaseHTTPRequestFirewallCustom, + rulesets.PhaseHTTPRequestFirewallCustom, "1", rulesets.PhaseVersionGetParams{ AccountID: cloudflare.F("string"), diff --git a/rulesets/rule.go b/rulesets/rule.go index 3f6bb6ea599..1bbf4d3d4b8 100644 --- a/rulesets/rule.go +++ b/rulesets/rule.go @@ -4336,7 +4336,7 @@ func (r SkipRuleAction) IsKnown() bool { type SkipRuleActionParameters struct { // A list of phases to skip the execution of. This option is incompatible with the // ruleset and rulesets options. - Phases []SkipRuleActionParametersPhase `json:"phases"` + Phases []Phase `json:"phases"` // A list of legacy security products to skip the execution of. Products []SkipRuleActionParametersProduct `json:"products"` // A mapping of ruleset IDs to a list of rule IDs in that ruleset to skip the @@ -4371,43 +4371,6 @@ func (r skipRuleActionParametersJSON) RawJSON() string { return r.raw } -// A phase to skip the execution of. -type SkipRuleActionParametersPhase string - -const ( - SkipRuleActionParametersPhaseDDoSL4 SkipRuleActionParametersPhase = "ddos_l4" - SkipRuleActionParametersPhaseDDoSL7 SkipRuleActionParametersPhase = "ddos_l7" - SkipRuleActionParametersPhaseHTTPConfigSettings SkipRuleActionParametersPhase = "http_config_settings" - SkipRuleActionParametersPhaseHTTPCustomErrors SkipRuleActionParametersPhase = "http_custom_errors" - SkipRuleActionParametersPhaseHTTPLogCustomFields SkipRuleActionParametersPhase = "http_log_custom_fields" - SkipRuleActionParametersPhaseHTTPRatelimit SkipRuleActionParametersPhase = "http_ratelimit" - SkipRuleActionParametersPhaseHTTPRequestCacheSettings SkipRuleActionParametersPhase = "http_request_cache_settings" - SkipRuleActionParametersPhaseHTTPRequestDynamicRedirect SkipRuleActionParametersPhase = "http_request_dynamic_redirect" - SkipRuleActionParametersPhaseHTTPRequestFirewallCustom SkipRuleActionParametersPhase = "http_request_firewall_custom" - SkipRuleActionParametersPhaseHTTPRequestFirewallManaged SkipRuleActionParametersPhase = "http_request_firewall_managed" - SkipRuleActionParametersPhaseHTTPRequestLateTransform SkipRuleActionParametersPhase = "http_request_late_transform" - SkipRuleActionParametersPhaseHTTPRequestOrigin SkipRuleActionParametersPhase = "http_request_origin" - SkipRuleActionParametersPhaseHTTPRequestRedirect SkipRuleActionParametersPhase = "http_request_redirect" - SkipRuleActionParametersPhaseHTTPRequestSanitize SkipRuleActionParametersPhase = "http_request_sanitize" - SkipRuleActionParametersPhaseHTTPRequestSBFM SkipRuleActionParametersPhase = "http_request_sbfm" - SkipRuleActionParametersPhaseHTTPRequestSelectConfiguration SkipRuleActionParametersPhase = "http_request_select_configuration" - SkipRuleActionParametersPhaseHTTPRequestTransform SkipRuleActionParametersPhase = "http_request_transform" - SkipRuleActionParametersPhaseHTTPResponseCompression SkipRuleActionParametersPhase = "http_response_compression" - SkipRuleActionParametersPhaseHTTPResponseFirewallManaged SkipRuleActionParametersPhase = "http_response_firewall_managed" - SkipRuleActionParametersPhaseHTTPResponseHeadersTransform SkipRuleActionParametersPhase = "http_response_headers_transform" - SkipRuleActionParametersPhaseMagicTransit SkipRuleActionParametersPhase = "magic_transit" - SkipRuleActionParametersPhaseMagicTransitIDsManaged SkipRuleActionParametersPhase = "magic_transit_ids_managed" - SkipRuleActionParametersPhaseMagicTransitManaged SkipRuleActionParametersPhase = "magic_transit_managed" -) - -func (r SkipRuleActionParametersPhase) IsKnown() bool { - switch r { - case SkipRuleActionParametersPhaseDDoSL4, SkipRuleActionParametersPhaseDDoSL7, SkipRuleActionParametersPhaseHTTPConfigSettings, SkipRuleActionParametersPhaseHTTPCustomErrors, SkipRuleActionParametersPhaseHTTPLogCustomFields, SkipRuleActionParametersPhaseHTTPRatelimit, SkipRuleActionParametersPhaseHTTPRequestCacheSettings, SkipRuleActionParametersPhaseHTTPRequestDynamicRedirect, SkipRuleActionParametersPhaseHTTPRequestFirewallCustom, SkipRuleActionParametersPhaseHTTPRequestFirewallManaged, SkipRuleActionParametersPhaseHTTPRequestLateTransform, SkipRuleActionParametersPhaseHTTPRequestOrigin, SkipRuleActionParametersPhaseHTTPRequestRedirect, SkipRuleActionParametersPhaseHTTPRequestSanitize, SkipRuleActionParametersPhaseHTTPRequestSBFM, SkipRuleActionParametersPhaseHTTPRequestSelectConfiguration, SkipRuleActionParametersPhaseHTTPRequestTransform, SkipRuleActionParametersPhaseHTTPResponseCompression, SkipRuleActionParametersPhaseHTTPResponseFirewallManaged, SkipRuleActionParametersPhaseHTTPResponseHeadersTransform, SkipRuleActionParametersPhaseMagicTransit, SkipRuleActionParametersPhaseMagicTransitIDsManaged, SkipRuleActionParametersPhaseMagicTransitManaged: - return true - } - return false -} - // The name of a legacy security product to skip the execution of. type SkipRuleActionParametersProduct string @@ -4478,7 +4441,7 @@ func (r SkipRuleParam) implementsRulesetsPhaseUpdateParamsRuleUnion() {} type SkipRuleActionParametersParam struct { // A list of phases to skip the execution of. This option is incompatible with the // ruleset and rulesets options. - Phases param.Field[[]SkipRuleActionParametersPhase] `json:"phases"` + Phases param.Field[[]Phase] `json:"phases"` // A list of legacy security products to skip the execution of. Products param.Field[[]SkipRuleActionParametersProduct] `json:"products"` // A mapping of ruleset IDs to a list of rule IDs in that ruleset to skip the @@ -4501,13 +4464,13 @@ type RuleNewResponse struct { // The unique ID of the ruleset. ID string `json:"id,required"` // The kind of the ruleset. - Kind RuleNewResponseKind `json:"kind,required"` + Kind Kind `json:"kind,required"` // The timestamp of when the ruleset was last modified. LastUpdated time.Time `json:"last_updated,required" format:"date-time"` // The human-readable name of the ruleset. Name string `json:"name,required"` // The phase of the ruleset. - Phase RuleNewResponsePhase `json:"phase,required"` + Phase Phase `json:"phase,required"` // The list of rules in the ruleset. Rules []RuleNewResponseRule `json:"rules,required"` // The version of the ruleset. @@ -4539,61 +4502,6 @@ func (r ruleNewResponseJSON) RawJSON() string { return r.raw } -// The kind of the ruleset. -type RuleNewResponseKind string - -const ( - RuleNewResponseKindManaged RuleNewResponseKind = "managed" - RuleNewResponseKindCustom RuleNewResponseKind = "custom" - RuleNewResponseKindRoot RuleNewResponseKind = "root" - RuleNewResponseKindZone RuleNewResponseKind = "zone" -) - -func (r RuleNewResponseKind) IsKnown() bool { - switch r { - case RuleNewResponseKindManaged, RuleNewResponseKindCustom, RuleNewResponseKindRoot, RuleNewResponseKindZone: - return true - } - return false -} - -// The phase of the ruleset. -type RuleNewResponsePhase string - -const ( - RuleNewResponsePhaseDDoSL4 RuleNewResponsePhase = "ddos_l4" - RuleNewResponsePhaseDDoSL7 RuleNewResponsePhase = "ddos_l7" - RuleNewResponsePhaseHTTPConfigSettings RuleNewResponsePhase = "http_config_settings" - RuleNewResponsePhaseHTTPCustomErrors RuleNewResponsePhase = "http_custom_errors" - RuleNewResponsePhaseHTTPLogCustomFields RuleNewResponsePhase = "http_log_custom_fields" - RuleNewResponsePhaseHTTPRatelimit RuleNewResponsePhase = "http_ratelimit" - RuleNewResponsePhaseHTTPRequestCacheSettings RuleNewResponsePhase = "http_request_cache_settings" - RuleNewResponsePhaseHTTPRequestDynamicRedirect RuleNewResponsePhase = "http_request_dynamic_redirect" - RuleNewResponsePhaseHTTPRequestFirewallCustom RuleNewResponsePhase = "http_request_firewall_custom" - RuleNewResponsePhaseHTTPRequestFirewallManaged RuleNewResponsePhase = "http_request_firewall_managed" - RuleNewResponsePhaseHTTPRequestLateTransform RuleNewResponsePhase = "http_request_late_transform" - RuleNewResponsePhaseHTTPRequestOrigin RuleNewResponsePhase = "http_request_origin" - RuleNewResponsePhaseHTTPRequestRedirect RuleNewResponsePhase = "http_request_redirect" - RuleNewResponsePhaseHTTPRequestSanitize RuleNewResponsePhase = "http_request_sanitize" - RuleNewResponsePhaseHTTPRequestSBFM RuleNewResponsePhase = "http_request_sbfm" - RuleNewResponsePhaseHTTPRequestSelectConfiguration RuleNewResponsePhase = "http_request_select_configuration" - RuleNewResponsePhaseHTTPRequestTransform RuleNewResponsePhase = "http_request_transform" - RuleNewResponsePhaseHTTPResponseCompression RuleNewResponsePhase = "http_response_compression" - RuleNewResponsePhaseHTTPResponseFirewallManaged RuleNewResponsePhase = "http_response_firewall_managed" - RuleNewResponsePhaseHTTPResponseHeadersTransform RuleNewResponsePhase = "http_response_headers_transform" - RuleNewResponsePhaseMagicTransit RuleNewResponsePhase = "magic_transit" - RuleNewResponsePhaseMagicTransitIDsManaged RuleNewResponsePhase = "magic_transit_ids_managed" - RuleNewResponsePhaseMagicTransitManaged RuleNewResponsePhase = "magic_transit_managed" -) - -func (r RuleNewResponsePhase) IsKnown() bool { - switch r { - case RuleNewResponsePhaseDDoSL4, RuleNewResponsePhaseDDoSL7, RuleNewResponsePhaseHTTPConfigSettings, RuleNewResponsePhaseHTTPCustomErrors, RuleNewResponsePhaseHTTPLogCustomFields, RuleNewResponsePhaseHTTPRatelimit, RuleNewResponsePhaseHTTPRequestCacheSettings, RuleNewResponsePhaseHTTPRequestDynamicRedirect, RuleNewResponsePhaseHTTPRequestFirewallCustom, RuleNewResponsePhaseHTTPRequestFirewallManaged, RuleNewResponsePhaseHTTPRequestLateTransform, RuleNewResponsePhaseHTTPRequestOrigin, RuleNewResponsePhaseHTTPRequestRedirect, RuleNewResponsePhaseHTTPRequestSanitize, RuleNewResponsePhaseHTTPRequestSBFM, RuleNewResponsePhaseHTTPRequestSelectConfiguration, RuleNewResponsePhaseHTTPRequestTransform, RuleNewResponsePhaseHTTPResponseCompression, RuleNewResponsePhaseHTTPResponseFirewallManaged, RuleNewResponsePhaseHTTPResponseHeadersTransform, RuleNewResponsePhaseMagicTransit, RuleNewResponsePhaseMagicTransitIDsManaged, RuleNewResponsePhaseMagicTransitManaged: - return true - } - return false -} - type RuleNewResponseRule struct { // The action to perform when the rule matches. Action RuleNewResponseRulesAction `json:"action"` @@ -4779,13 +4687,13 @@ type RuleDeleteResponse struct { // The unique ID of the ruleset. ID string `json:"id,required"` // The kind of the ruleset. - Kind RuleDeleteResponseKind `json:"kind,required"` + Kind Kind `json:"kind,required"` // The timestamp of when the ruleset was last modified. LastUpdated time.Time `json:"last_updated,required" format:"date-time"` // The human-readable name of the ruleset. Name string `json:"name,required"` // The phase of the ruleset. - Phase RuleDeleteResponsePhase `json:"phase,required"` + Phase Phase `json:"phase,required"` // The list of rules in the ruleset. Rules []RuleDeleteResponseRule `json:"rules,required"` // The version of the ruleset. @@ -4818,61 +4726,6 @@ func (r ruleDeleteResponseJSON) RawJSON() string { return r.raw } -// The kind of the ruleset. -type RuleDeleteResponseKind string - -const ( - RuleDeleteResponseKindManaged RuleDeleteResponseKind = "managed" - RuleDeleteResponseKindCustom RuleDeleteResponseKind = "custom" - RuleDeleteResponseKindRoot RuleDeleteResponseKind = "root" - RuleDeleteResponseKindZone RuleDeleteResponseKind = "zone" -) - -func (r RuleDeleteResponseKind) IsKnown() bool { - switch r { - case RuleDeleteResponseKindManaged, RuleDeleteResponseKindCustom, RuleDeleteResponseKindRoot, RuleDeleteResponseKindZone: - return true - } - return false -} - -// The phase of the ruleset. -type RuleDeleteResponsePhase string - -const ( - RuleDeleteResponsePhaseDDoSL4 RuleDeleteResponsePhase = "ddos_l4" - RuleDeleteResponsePhaseDDoSL7 RuleDeleteResponsePhase = "ddos_l7" - RuleDeleteResponsePhaseHTTPConfigSettings RuleDeleteResponsePhase = "http_config_settings" - RuleDeleteResponsePhaseHTTPCustomErrors RuleDeleteResponsePhase = "http_custom_errors" - RuleDeleteResponsePhaseHTTPLogCustomFields RuleDeleteResponsePhase = "http_log_custom_fields" - RuleDeleteResponsePhaseHTTPRatelimit RuleDeleteResponsePhase = "http_ratelimit" - RuleDeleteResponsePhaseHTTPRequestCacheSettings RuleDeleteResponsePhase = "http_request_cache_settings" - RuleDeleteResponsePhaseHTTPRequestDynamicRedirect RuleDeleteResponsePhase = "http_request_dynamic_redirect" - RuleDeleteResponsePhaseHTTPRequestFirewallCustom RuleDeleteResponsePhase = "http_request_firewall_custom" - RuleDeleteResponsePhaseHTTPRequestFirewallManaged RuleDeleteResponsePhase = "http_request_firewall_managed" - RuleDeleteResponsePhaseHTTPRequestLateTransform RuleDeleteResponsePhase = "http_request_late_transform" - RuleDeleteResponsePhaseHTTPRequestOrigin RuleDeleteResponsePhase = "http_request_origin" - RuleDeleteResponsePhaseHTTPRequestRedirect RuleDeleteResponsePhase = "http_request_redirect" - RuleDeleteResponsePhaseHTTPRequestSanitize RuleDeleteResponsePhase = "http_request_sanitize" - RuleDeleteResponsePhaseHTTPRequestSBFM RuleDeleteResponsePhase = "http_request_sbfm" - RuleDeleteResponsePhaseHTTPRequestSelectConfiguration RuleDeleteResponsePhase = "http_request_select_configuration" - RuleDeleteResponsePhaseHTTPRequestTransform RuleDeleteResponsePhase = "http_request_transform" - RuleDeleteResponsePhaseHTTPResponseCompression RuleDeleteResponsePhase = "http_response_compression" - RuleDeleteResponsePhaseHTTPResponseFirewallManaged RuleDeleteResponsePhase = "http_response_firewall_managed" - RuleDeleteResponsePhaseHTTPResponseHeadersTransform RuleDeleteResponsePhase = "http_response_headers_transform" - RuleDeleteResponsePhaseMagicTransit RuleDeleteResponsePhase = "magic_transit" - RuleDeleteResponsePhaseMagicTransitIDsManaged RuleDeleteResponsePhase = "magic_transit_ids_managed" - RuleDeleteResponsePhaseMagicTransitManaged RuleDeleteResponsePhase = "magic_transit_managed" -) - -func (r RuleDeleteResponsePhase) IsKnown() bool { - switch r { - case RuleDeleteResponsePhaseDDoSL4, RuleDeleteResponsePhaseDDoSL7, RuleDeleteResponsePhaseHTTPConfigSettings, RuleDeleteResponsePhaseHTTPCustomErrors, RuleDeleteResponsePhaseHTTPLogCustomFields, RuleDeleteResponsePhaseHTTPRatelimit, RuleDeleteResponsePhaseHTTPRequestCacheSettings, RuleDeleteResponsePhaseHTTPRequestDynamicRedirect, RuleDeleteResponsePhaseHTTPRequestFirewallCustom, RuleDeleteResponsePhaseHTTPRequestFirewallManaged, RuleDeleteResponsePhaseHTTPRequestLateTransform, RuleDeleteResponsePhaseHTTPRequestOrigin, RuleDeleteResponsePhaseHTTPRequestRedirect, RuleDeleteResponsePhaseHTTPRequestSanitize, RuleDeleteResponsePhaseHTTPRequestSBFM, RuleDeleteResponsePhaseHTTPRequestSelectConfiguration, RuleDeleteResponsePhaseHTTPRequestTransform, RuleDeleteResponsePhaseHTTPResponseCompression, RuleDeleteResponsePhaseHTTPResponseFirewallManaged, RuleDeleteResponsePhaseHTTPResponseHeadersTransform, RuleDeleteResponsePhaseMagicTransit, RuleDeleteResponsePhaseMagicTransitIDsManaged, RuleDeleteResponsePhaseMagicTransitManaged: - return true - } - return false -} - type RuleDeleteResponseRule struct { // The action to perform when the rule matches. Action RuleDeleteResponseRulesAction `json:"action"` @@ -5058,13 +4911,13 @@ type RuleEditResponse struct { // The unique ID of the ruleset. ID string `json:"id,required"` // The kind of the ruleset. - Kind RuleEditResponseKind `json:"kind,required"` + Kind Kind `json:"kind,required"` // The timestamp of when the ruleset was last modified. LastUpdated time.Time `json:"last_updated,required" format:"date-time"` // The human-readable name of the ruleset. Name string `json:"name,required"` // The phase of the ruleset. - Phase RuleEditResponsePhase `json:"phase,required"` + Phase Phase `json:"phase,required"` // The list of rules in the ruleset. Rules []RuleEditResponseRule `json:"rules,required"` // The version of the ruleset. @@ -5097,61 +4950,6 @@ func (r ruleEditResponseJSON) RawJSON() string { return r.raw } -// The kind of the ruleset. -type RuleEditResponseKind string - -const ( - RuleEditResponseKindManaged RuleEditResponseKind = "managed" - RuleEditResponseKindCustom RuleEditResponseKind = "custom" - RuleEditResponseKindRoot RuleEditResponseKind = "root" - RuleEditResponseKindZone RuleEditResponseKind = "zone" -) - -func (r RuleEditResponseKind) IsKnown() bool { - switch r { - case RuleEditResponseKindManaged, RuleEditResponseKindCustom, RuleEditResponseKindRoot, RuleEditResponseKindZone: - return true - } - return false -} - -// The phase of the ruleset. -type RuleEditResponsePhase string - -const ( - RuleEditResponsePhaseDDoSL4 RuleEditResponsePhase = "ddos_l4" - RuleEditResponsePhaseDDoSL7 RuleEditResponsePhase = "ddos_l7" - RuleEditResponsePhaseHTTPConfigSettings RuleEditResponsePhase = "http_config_settings" - RuleEditResponsePhaseHTTPCustomErrors RuleEditResponsePhase = "http_custom_errors" - RuleEditResponsePhaseHTTPLogCustomFields RuleEditResponsePhase = "http_log_custom_fields" - RuleEditResponsePhaseHTTPRatelimit RuleEditResponsePhase = "http_ratelimit" - RuleEditResponsePhaseHTTPRequestCacheSettings RuleEditResponsePhase = "http_request_cache_settings" - RuleEditResponsePhaseHTTPRequestDynamicRedirect RuleEditResponsePhase = "http_request_dynamic_redirect" - RuleEditResponsePhaseHTTPRequestFirewallCustom RuleEditResponsePhase = "http_request_firewall_custom" - RuleEditResponsePhaseHTTPRequestFirewallManaged RuleEditResponsePhase = "http_request_firewall_managed" - RuleEditResponsePhaseHTTPRequestLateTransform RuleEditResponsePhase = "http_request_late_transform" - RuleEditResponsePhaseHTTPRequestOrigin RuleEditResponsePhase = "http_request_origin" - RuleEditResponsePhaseHTTPRequestRedirect RuleEditResponsePhase = "http_request_redirect" - RuleEditResponsePhaseHTTPRequestSanitize RuleEditResponsePhase = "http_request_sanitize" - RuleEditResponsePhaseHTTPRequestSBFM RuleEditResponsePhase = "http_request_sbfm" - RuleEditResponsePhaseHTTPRequestSelectConfiguration RuleEditResponsePhase = "http_request_select_configuration" - RuleEditResponsePhaseHTTPRequestTransform RuleEditResponsePhase = "http_request_transform" - RuleEditResponsePhaseHTTPResponseCompression RuleEditResponsePhase = "http_response_compression" - RuleEditResponsePhaseHTTPResponseFirewallManaged RuleEditResponsePhase = "http_response_firewall_managed" - RuleEditResponsePhaseHTTPResponseHeadersTransform RuleEditResponsePhase = "http_response_headers_transform" - RuleEditResponsePhaseMagicTransit RuleEditResponsePhase = "magic_transit" - RuleEditResponsePhaseMagicTransitIDsManaged RuleEditResponsePhase = "magic_transit_ids_managed" - RuleEditResponsePhaseMagicTransitManaged RuleEditResponsePhase = "magic_transit_managed" -) - -func (r RuleEditResponsePhase) IsKnown() bool { - switch r { - case RuleEditResponsePhaseDDoSL4, RuleEditResponsePhaseDDoSL7, RuleEditResponsePhaseHTTPConfigSettings, RuleEditResponsePhaseHTTPCustomErrors, RuleEditResponsePhaseHTTPLogCustomFields, RuleEditResponsePhaseHTTPRatelimit, RuleEditResponsePhaseHTTPRequestCacheSettings, RuleEditResponsePhaseHTTPRequestDynamicRedirect, RuleEditResponsePhaseHTTPRequestFirewallCustom, RuleEditResponsePhaseHTTPRequestFirewallManaged, RuleEditResponsePhaseHTTPRequestLateTransform, RuleEditResponsePhaseHTTPRequestOrigin, RuleEditResponsePhaseHTTPRequestRedirect, RuleEditResponsePhaseHTTPRequestSanitize, RuleEditResponsePhaseHTTPRequestSBFM, RuleEditResponsePhaseHTTPRequestSelectConfiguration, RuleEditResponsePhaseHTTPRequestTransform, RuleEditResponsePhaseHTTPResponseCompression, RuleEditResponsePhaseHTTPResponseFirewallManaged, RuleEditResponsePhaseHTTPResponseHeadersTransform, RuleEditResponsePhaseMagicTransit, RuleEditResponsePhaseMagicTransitIDsManaged, RuleEditResponsePhaseMagicTransitManaged: - return true - } - return false -} - type RuleEditResponseRule struct { // The action to perform when the rule matches. Action RuleEditResponseRulesAction `json:"action"` diff --git a/rulesets/ruleset.go b/rulesets/ruleset.go index 8a2364d370a..262f443c136 100644 --- a/rulesets/ruleset.go +++ b/rulesets/ruleset.go @@ -156,6 +156,61 @@ func (r *RulesetService) Get(ctx context.Context, rulesetID string, query Rulese return } +// The kind of the ruleset. +type Kind string + +const ( + KindManaged Kind = "managed" + KindCustom Kind = "custom" + KindRoot Kind = "root" + KindZone Kind = "zone" +) + +func (r Kind) IsKnown() bool { + switch r { + case KindManaged, KindCustom, KindRoot, KindZone: + return true + } + return false +} + +// The phase of the ruleset. +type Phase string + +const ( + PhaseDDoSL4 Phase = "ddos_l4" + PhaseDDoSL7 Phase = "ddos_l7" + PhaseHTTPConfigSettings Phase = "http_config_settings" + PhaseHTTPCustomErrors Phase = "http_custom_errors" + PhaseHTTPLogCustomFields Phase = "http_log_custom_fields" + PhaseHTTPRatelimit Phase = "http_ratelimit" + PhaseHTTPRequestCacheSettings Phase = "http_request_cache_settings" + PhaseHTTPRequestDynamicRedirect Phase = "http_request_dynamic_redirect" + PhaseHTTPRequestFirewallCustom Phase = "http_request_firewall_custom" + PhaseHTTPRequestFirewallManaged Phase = "http_request_firewall_managed" + PhaseHTTPRequestLateTransform Phase = "http_request_late_transform" + PhaseHTTPRequestOrigin Phase = "http_request_origin" + PhaseHTTPRequestRedirect Phase = "http_request_redirect" + PhaseHTTPRequestSanitize Phase = "http_request_sanitize" + PhaseHTTPRequestSBFM Phase = "http_request_sbfm" + PhaseHTTPRequestSelectConfiguration Phase = "http_request_select_configuration" + PhaseHTTPRequestTransform Phase = "http_request_transform" + PhaseHTTPResponseCompression Phase = "http_response_compression" + PhaseHTTPResponseFirewallManaged Phase = "http_response_firewall_managed" + PhaseHTTPResponseHeadersTransform Phase = "http_response_headers_transform" + PhaseMagicTransit Phase = "magic_transit" + PhaseMagicTransitIDsManaged Phase = "magic_transit_ids_managed" + PhaseMagicTransitManaged Phase = "magic_transit_managed" +) + +func (r Phase) IsKnown() bool { + switch r { + case PhaseDDoSL4, PhaseDDoSL7, PhaseHTTPConfigSettings, PhaseHTTPCustomErrors, PhaseHTTPLogCustomFields, PhaseHTTPRatelimit, PhaseHTTPRequestCacheSettings, PhaseHTTPRequestDynamicRedirect, PhaseHTTPRequestFirewallCustom, PhaseHTTPRequestFirewallManaged, PhaseHTTPRequestLateTransform, PhaseHTTPRequestOrigin, PhaseHTTPRequestRedirect, PhaseHTTPRequestSanitize, PhaseHTTPRequestSBFM, PhaseHTTPRequestSelectConfiguration, PhaseHTTPRequestTransform, PhaseHTTPResponseCompression, PhaseHTTPResponseFirewallManaged, PhaseHTTPResponseHeadersTransform, PhaseMagicTransit, PhaseMagicTransitIDsManaged, PhaseMagicTransitManaged: + return true + } + return false +} + // A ruleset object. type Ruleset struct { // The unique ID of the ruleset. @@ -167,12 +222,12 @@ type Ruleset struct { // An informative description of the ruleset. Description string `json:"description"` // The kind of the ruleset. - Kind RulesetKind `json:"kind"` + Kind Kind `json:"kind"` // The human-readable name of the ruleset. Name string `json:"name"` // The phase of the ruleset. - Phase RulesetPhase `json:"phase"` - JSON rulesetJSON `json:"-"` + Phase Phase `json:"phase"` + JSON rulesetJSON `json:"-"` } // rulesetJSON contains the JSON metadata for the struct [Ruleset] @@ -196,73 +251,18 @@ func (r rulesetJSON) RawJSON() string { return r.raw } -// The kind of the ruleset. -type RulesetKind string - -const ( - RulesetKindManaged RulesetKind = "managed" - RulesetKindCustom RulesetKind = "custom" - RulesetKindRoot RulesetKind = "root" - RulesetKindZone RulesetKind = "zone" -) - -func (r RulesetKind) IsKnown() bool { - switch r { - case RulesetKindManaged, RulesetKindCustom, RulesetKindRoot, RulesetKindZone: - return true - } - return false -} - -// The phase of the ruleset. -type RulesetPhase string - -const ( - RulesetPhaseDDoSL4 RulesetPhase = "ddos_l4" - RulesetPhaseDDoSL7 RulesetPhase = "ddos_l7" - RulesetPhaseHTTPConfigSettings RulesetPhase = "http_config_settings" - RulesetPhaseHTTPCustomErrors RulesetPhase = "http_custom_errors" - RulesetPhaseHTTPLogCustomFields RulesetPhase = "http_log_custom_fields" - RulesetPhaseHTTPRatelimit RulesetPhase = "http_ratelimit" - RulesetPhaseHTTPRequestCacheSettings RulesetPhase = "http_request_cache_settings" - RulesetPhaseHTTPRequestDynamicRedirect RulesetPhase = "http_request_dynamic_redirect" - RulesetPhaseHTTPRequestFirewallCustom RulesetPhase = "http_request_firewall_custom" - RulesetPhaseHTTPRequestFirewallManaged RulesetPhase = "http_request_firewall_managed" - RulesetPhaseHTTPRequestLateTransform RulesetPhase = "http_request_late_transform" - RulesetPhaseHTTPRequestOrigin RulesetPhase = "http_request_origin" - RulesetPhaseHTTPRequestRedirect RulesetPhase = "http_request_redirect" - RulesetPhaseHTTPRequestSanitize RulesetPhase = "http_request_sanitize" - RulesetPhaseHTTPRequestSBFM RulesetPhase = "http_request_sbfm" - RulesetPhaseHTTPRequestSelectConfiguration RulesetPhase = "http_request_select_configuration" - RulesetPhaseHTTPRequestTransform RulesetPhase = "http_request_transform" - RulesetPhaseHTTPResponseCompression RulesetPhase = "http_response_compression" - RulesetPhaseHTTPResponseFirewallManaged RulesetPhase = "http_response_firewall_managed" - RulesetPhaseHTTPResponseHeadersTransform RulesetPhase = "http_response_headers_transform" - RulesetPhaseMagicTransit RulesetPhase = "magic_transit" - RulesetPhaseMagicTransitIDsManaged RulesetPhase = "magic_transit_ids_managed" - RulesetPhaseMagicTransitManaged RulesetPhase = "magic_transit_managed" -) - -func (r RulesetPhase) IsKnown() bool { - switch r { - case RulesetPhaseDDoSL4, RulesetPhaseDDoSL7, RulesetPhaseHTTPConfigSettings, RulesetPhaseHTTPCustomErrors, RulesetPhaseHTTPLogCustomFields, RulesetPhaseHTTPRatelimit, RulesetPhaseHTTPRequestCacheSettings, RulesetPhaseHTTPRequestDynamicRedirect, RulesetPhaseHTTPRequestFirewallCustom, RulesetPhaseHTTPRequestFirewallManaged, RulesetPhaseHTTPRequestLateTransform, RulesetPhaseHTTPRequestOrigin, RulesetPhaseHTTPRequestRedirect, RulesetPhaseHTTPRequestSanitize, RulesetPhaseHTTPRequestSBFM, RulesetPhaseHTTPRequestSelectConfiguration, RulesetPhaseHTTPRequestTransform, RulesetPhaseHTTPResponseCompression, RulesetPhaseHTTPResponseFirewallManaged, RulesetPhaseHTTPResponseHeadersTransform, RulesetPhaseMagicTransit, RulesetPhaseMagicTransitIDsManaged, RulesetPhaseMagicTransitManaged: - return true - } - return false -} - // A ruleset object. type RulesetNewResponse struct { // The unique ID of the ruleset. ID string `json:"id,required"` // The kind of the ruleset. - Kind RulesetNewResponseKind `json:"kind,required"` + Kind Kind `json:"kind,required"` // The timestamp of when the ruleset was last modified. LastUpdated time.Time `json:"last_updated,required" format:"date-time"` // The human-readable name of the ruleset. Name string `json:"name,required"` // The phase of the ruleset. - Phase RulesetNewResponsePhase `json:"phase,required"` + Phase Phase `json:"phase,required"` // The list of rules in the ruleset. Rules []RulesetNewResponseRule `json:"rules,required"` // The version of the ruleset. @@ -295,61 +295,6 @@ func (r rulesetNewResponseJSON) RawJSON() string { return r.raw } -// The kind of the ruleset. -type RulesetNewResponseKind string - -const ( - RulesetNewResponseKindManaged RulesetNewResponseKind = "managed" - RulesetNewResponseKindCustom RulesetNewResponseKind = "custom" - RulesetNewResponseKindRoot RulesetNewResponseKind = "root" - RulesetNewResponseKindZone RulesetNewResponseKind = "zone" -) - -func (r RulesetNewResponseKind) IsKnown() bool { - switch r { - case RulesetNewResponseKindManaged, RulesetNewResponseKindCustom, RulesetNewResponseKindRoot, RulesetNewResponseKindZone: - return true - } - return false -} - -// The phase of the ruleset. -type RulesetNewResponsePhase string - -const ( - RulesetNewResponsePhaseDDoSL4 RulesetNewResponsePhase = "ddos_l4" - RulesetNewResponsePhaseDDoSL7 RulesetNewResponsePhase = "ddos_l7" - RulesetNewResponsePhaseHTTPConfigSettings RulesetNewResponsePhase = "http_config_settings" - RulesetNewResponsePhaseHTTPCustomErrors RulesetNewResponsePhase = "http_custom_errors" - RulesetNewResponsePhaseHTTPLogCustomFields RulesetNewResponsePhase = "http_log_custom_fields" - RulesetNewResponsePhaseHTTPRatelimit RulesetNewResponsePhase = "http_ratelimit" - RulesetNewResponsePhaseHTTPRequestCacheSettings RulesetNewResponsePhase = "http_request_cache_settings" - RulesetNewResponsePhaseHTTPRequestDynamicRedirect RulesetNewResponsePhase = "http_request_dynamic_redirect" - RulesetNewResponsePhaseHTTPRequestFirewallCustom RulesetNewResponsePhase = "http_request_firewall_custom" - RulesetNewResponsePhaseHTTPRequestFirewallManaged RulesetNewResponsePhase = "http_request_firewall_managed" - RulesetNewResponsePhaseHTTPRequestLateTransform RulesetNewResponsePhase = "http_request_late_transform" - RulesetNewResponsePhaseHTTPRequestOrigin RulesetNewResponsePhase = "http_request_origin" - RulesetNewResponsePhaseHTTPRequestRedirect RulesetNewResponsePhase = "http_request_redirect" - RulesetNewResponsePhaseHTTPRequestSanitize RulesetNewResponsePhase = "http_request_sanitize" - RulesetNewResponsePhaseHTTPRequestSBFM RulesetNewResponsePhase = "http_request_sbfm" - RulesetNewResponsePhaseHTTPRequestSelectConfiguration RulesetNewResponsePhase = "http_request_select_configuration" - RulesetNewResponsePhaseHTTPRequestTransform RulesetNewResponsePhase = "http_request_transform" - RulesetNewResponsePhaseHTTPResponseCompression RulesetNewResponsePhase = "http_response_compression" - RulesetNewResponsePhaseHTTPResponseFirewallManaged RulesetNewResponsePhase = "http_response_firewall_managed" - RulesetNewResponsePhaseHTTPResponseHeadersTransform RulesetNewResponsePhase = "http_response_headers_transform" - RulesetNewResponsePhaseMagicTransit RulesetNewResponsePhase = "magic_transit" - RulesetNewResponsePhaseMagicTransitIDsManaged RulesetNewResponsePhase = "magic_transit_ids_managed" - RulesetNewResponsePhaseMagicTransitManaged RulesetNewResponsePhase = "magic_transit_managed" -) - -func (r RulesetNewResponsePhase) IsKnown() bool { - switch r { - case RulesetNewResponsePhaseDDoSL4, RulesetNewResponsePhaseDDoSL7, RulesetNewResponsePhaseHTTPConfigSettings, RulesetNewResponsePhaseHTTPCustomErrors, RulesetNewResponsePhaseHTTPLogCustomFields, RulesetNewResponsePhaseHTTPRatelimit, RulesetNewResponsePhaseHTTPRequestCacheSettings, RulesetNewResponsePhaseHTTPRequestDynamicRedirect, RulesetNewResponsePhaseHTTPRequestFirewallCustom, RulesetNewResponsePhaseHTTPRequestFirewallManaged, RulesetNewResponsePhaseHTTPRequestLateTransform, RulesetNewResponsePhaseHTTPRequestOrigin, RulesetNewResponsePhaseHTTPRequestRedirect, RulesetNewResponsePhaseHTTPRequestSanitize, RulesetNewResponsePhaseHTTPRequestSBFM, RulesetNewResponsePhaseHTTPRequestSelectConfiguration, RulesetNewResponsePhaseHTTPRequestTransform, RulesetNewResponsePhaseHTTPResponseCompression, RulesetNewResponsePhaseHTTPResponseFirewallManaged, RulesetNewResponsePhaseHTTPResponseHeadersTransform, RulesetNewResponsePhaseMagicTransit, RulesetNewResponsePhaseMagicTransitIDsManaged, RulesetNewResponsePhaseMagicTransitManaged: - return true - } - return false -} - type RulesetNewResponseRule struct { // The action to perform when the rule matches. Action RulesetNewResponseRulesAction `json:"action"` @@ -535,13 +480,13 @@ type RulesetUpdateResponse struct { // The unique ID of the ruleset. ID string `json:"id,required"` // The kind of the ruleset. - Kind RulesetUpdateResponseKind `json:"kind,required"` + Kind Kind `json:"kind,required"` // The timestamp of when the ruleset was last modified. LastUpdated time.Time `json:"last_updated,required" format:"date-time"` // The human-readable name of the ruleset. Name string `json:"name,required"` // The phase of the ruleset. - Phase RulesetUpdateResponsePhase `json:"phase,required"` + Phase Phase `json:"phase,required"` // The list of rules in the ruleset. Rules []RulesetUpdateResponseRule `json:"rules,required"` // The version of the ruleset. @@ -574,61 +519,6 @@ func (r rulesetUpdateResponseJSON) RawJSON() string { return r.raw } -// The kind of the ruleset. -type RulesetUpdateResponseKind string - -const ( - RulesetUpdateResponseKindManaged RulesetUpdateResponseKind = "managed" - RulesetUpdateResponseKindCustom RulesetUpdateResponseKind = "custom" - RulesetUpdateResponseKindRoot RulesetUpdateResponseKind = "root" - RulesetUpdateResponseKindZone RulesetUpdateResponseKind = "zone" -) - -func (r RulesetUpdateResponseKind) IsKnown() bool { - switch r { - case RulesetUpdateResponseKindManaged, RulesetUpdateResponseKindCustom, RulesetUpdateResponseKindRoot, RulesetUpdateResponseKindZone: - return true - } - return false -} - -// The phase of the ruleset. -type RulesetUpdateResponsePhase string - -const ( - RulesetUpdateResponsePhaseDDoSL4 RulesetUpdateResponsePhase = "ddos_l4" - RulesetUpdateResponsePhaseDDoSL7 RulesetUpdateResponsePhase = "ddos_l7" - RulesetUpdateResponsePhaseHTTPConfigSettings RulesetUpdateResponsePhase = "http_config_settings" - RulesetUpdateResponsePhaseHTTPCustomErrors RulesetUpdateResponsePhase = "http_custom_errors" - RulesetUpdateResponsePhaseHTTPLogCustomFields RulesetUpdateResponsePhase = "http_log_custom_fields" - RulesetUpdateResponsePhaseHTTPRatelimit RulesetUpdateResponsePhase = "http_ratelimit" - RulesetUpdateResponsePhaseHTTPRequestCacheSettings RulesetUpdateResponsePhase = "http_request_cache_settings" - RulesetUpdateResponsePhaseHTTPRequestDynamicRedirect RulesetUpdateResponsePhase = "http_request_dynamic_redirect" - RulesetUpdateResponsePhaseHTTPRequestFirewallCustom RulesetUpdateResponsePhase = "http_request_firewall_custom" - RulesetUpdateResponsePhaseHTTPRequestFirewallManaged RulesetUpdateResponsePhase = "http_request_firewall_managed" - RulesetUpdateResponsePhaseHTTPRequestLateTransform RulesetUpdateResponsePhase = "http_request_late_transform" - RulesetUpdateResponsePhaseHTTPRequestOrigin RulesetUpdateResponsePhase = "http_request_origin" - RulesetUpdateResponsePhaseHTTPRequestRedirect RulesetUpdateResponsePhase = "http_request_redirect" - RulesetUpdateResponsePhaseHTTPRequestSanitize RulesetUpdateResponsePhase = "http_request_sanitize" - RulesetUpdateResponsePhaseHTTPRequestSBFM RulesetUpdateResponsePhase = "http_request_sbfm" - RulesetUpdateResponsePhaseHTTPRequestSelectConfiguration RulesetUpdateResponsePhase = "http_request_select_configuration" - RulesetUpdateResponsePhaseHTTPRequestTransform RulesetUpdateResponsePhase = "http_request_transform" - RulesetUpdateResponsePhaseHTTPResponseCompression RulesetUpdateResponsePhase = "http_response_compression" - RulesetUpdateResponsePhaseHTTPResponseFirewallManaged RulesetUpdateResponsePhase = "http_response_firewall_managed" - RulesetUpdateResponsePhaseHTTPResponseHeadersTransform RulesetUpdateResponsePhase = "http_response_headers_transform" - RulesetUpdateResponsePhaseMagicTransit RulesetUpdateResponsePhase = "magic_transit" - RulesetUpdateResponsePhaseMagicTransitIDsManaged RulesetUpdateResponsePhase = "magic_transit_ids_managed" - RulesetUpdateResponsePhaseMagicTransitManaged RulesetUpdateResponsePhase = "magic_transit_managed" -) - -func (r RulesetUpdateResponsePhase) IsKnown() bool { - switch r { - case RulesetUpdateResponsePhaseDDoSL4, RulesetUpdateResponsePhaseDDoSL7, RulesetUpdateResponsePhaseHTTPConfigSettings, RulesetUpdateResponsePhaseHTTPCustomErrors, RulesetUpdateResponsePhaseHTTPLogCustomFields, RulesetUpdateResponsePhaseHTTPRatelimit, RulesetUpdateResponsePhaseHTTPRequestCacheSettings, RulesetUpdateResponsePhaseHTTPRequestDynamicRedirect, RulesetUpdateResponsePhaseHTTPRequestFirewallCustom, RulesetUpdateResponsePhaseHTTPRequestFirewallManaged, RulesetUpdateResponsePhaseHTTPRequestLateTransform, RulesetUpdateResponsePhaseHTTPRequestOrigin, RulesetUpdateResponsePhaseHTTPRequestRedirect, RulesetUpdateResponsePhaseHTTPRequestSanitize, RulesetUpdateResponsePhaseHTTPRequestSBFM, RulesetUpdateResponsePhaseHTTPRequestSelectConfiguration, RulesetUpdateResponsePhaseHTTPRequestTransform, RulesetUpdateResponsePhaseHTTPResponseCompression, RulesetUpdateResponsePhaseHTTPResponseFirewallManaged, RulesetUpdateResponsePhaseHTTPResponseHeadersTransform, RulesetUpdateResponsePhaseMagicTransit, RulesetUpdateResponsePhaseMagicTransitIDsManaged, RulesetUpdateResponsePhaseMagicTransitManaged: - return true - } - return false -} - type RulesetUpdateResponseRule struct { // The action to perform when the rule matches. Action RulesetUpdateResponseRulesAction `json:"action"` @@ -814,13 +704,13 @@ type RulesetGetResponse struct { // The unique ID of the ruleset. ID string `json:"id,required"` // The kind of the ruleset. - Kind RulesetGetResponseKind `json:"kind,required"` + Kind Kind `json:"kind,required"` // The timestamp of when the ruleset was last modified. LastUpdated time.Time `json:"last_updated,required" format:"date-time"` // The human-readable name of the ruleset. Name string `json:"name,required"` // The phase of the ruleset. - Phase RulesetGetResponsePhase `json:"phase,required"` + Phase Phase `json:"phase,required"` // The list of rules in the ruleset. Rules []RulesetGetResponseRule `json:"rules,required"` // The version of the ruleset. @@ -853,61 +743,6 @@ func (r rulesetGetResponseJSON) RawJSON() string { return r.raw } -// The kind of the ruleset. -type RulesetGetResponseKind string - -const ( - RulesetGetResponseKindManaged RulesetGetResponseKind = "managed" - RulesetGetResponseKindCustom RulesetGetResponseKind = "custom" - RulesetGetResponseKindRoot RulesetGetResponseKind = "root" - RulesetGetResponseKindZone RulesetGetResponseKind = "zone" -) - -func (r RulesetGetResponseKind) IsKnown() bool { - switch r { - case RulesetGetResponseKindManaged, RulesetGetResponseKindCustom, RulesetGetResponseKindRoot, RulesetGetResponseKindZone: - return true - } - return false -} - -// The phase of the ruleset. -type RulesetGetResponsePhase string - -const ( - RulesetGetResponsePhaseDDoSL4 RulesetGetResponsePhase = "ddos_l4" - RulesetGetResponsePhaseDDoSL7 RulesetGetResponsePhase = "ddos_l7" - RulesetGetResponsePhaseHTTPConfigSettings RulesetGetResponsePhase = "http_config_settings" - RulesetGetResponsePhaseHTTPCustomErrors RulesetGetResponsePhase = "http_custom_errors" - RulesetGetResponsePhaseHTTPLogCustomFields RulesetGetResponsePhase = "http_log_custom_fields" - RulesetGetResponsePhaseHTTPRatelimit RulesetGetResponsePhase = "http_ratelimit" - RulesetGetResponsePhaseHTTPRequestCacheSettings RulesetGetResponsePhase = "http_request_cache_settings" - RulesetGetResponsePhaseHTTPRequestDynamicRedirect RulesetGetResponsePhase = "http_request_dynamic_redirect" - RulesetGetResponsePhaseHTTPRequestFirewallCustom RulesetGetResponsePhase = "http_request_firewall_custom" - RulesetGetResponsePhaseHTTPRequestFirewallManaged RulesetGetResponsePhase = "http_request_firewall_managed" - RulesetGetResponsePhaseHTTPRequestLateTransform RulesetGetResponsePhase = "http_request_late_transform" - RulesetGetResponsePhaseHTTPRequestOrigin RulesetGetResponsePhase = "http_request_origin" - RulesetGetResponsePhaseHTTPRequestRedirect RulesetGetResponsePhase = "http_request_redirect" - RulesetGetResponsePhaseHTTPRequestSanitize RulesetGetResponsePhase = "http_request_sanitize" - RulesetGetResponsePhaseHTTPRequestSBFM RulesetGetResponsePhase = "http_request_sbfm" - RulesetGetResponsePhaseHTTPRequestSelectConfiguration RulesetGetResponsePhase = "http_request_select_configuration" - RulesetGetResponsePhaseHTTPRequestTransform RulesetGetResponsePhase = "http_request_transform" - RulesetGetResponsePhaseHTTPResponseCompression RulesetGetResponsePhase = "http_response_compression" - RulesetGetResponsePhaseHTTPResponseFirewallManaged RulesetGetResponsePhase = "http_response_firewall_managed" - RulesetGetResponsePhaseHTTPResponseHeadersTransform RulesetGetResponsePhase = "http_response_headers_transform" - RulesetGetResponsePhaseMagicTransit RulesetGetResponsePhase = "magic_transit" - RulesetGetResponsePhaseMagicTransitIDsManaged RulesetGetResponsePhase = "magic_transit_ids_managed" - RulesetGetResponsePhaseMagicTransitManaged RulesetGetResponsePhase = "magic_transit_managed" -) - -func (r RulesetGetResponsePhase) IsKnown() bool { - switch r { - case RulesetGetResponsePhaseDDoSL4, RulesetGetResponsePhaseDDoSL7, RulesetGetResponsePhaseHTTPConfigSettings, RulesetGetResponsePhaseHTTPCustomErrors, RulesetGetResponsePhaseHTTPLogCustomFields, RulesetGetResponsePhaseHTTPRatelimit, RulesetGetResponsePhaseHTTPRequestCacheSettings, RulesetGetResponsePhaseHTTPRequestDynamicRedirect, RulesetGetResponsePhaseHTTPRequestFirewallCustom, RulesetGetResponsePhaseHTTPRequestFirewallManaged, RulesetGetResponsePhaseHTTPRequestLateTransform, RulesetGetResponsePhaseHTTPRequestOrigin, RulesetGetResponsePhaseHTTPRequestRedirect, RulesetGetResponsePhaseHTTPRequestSanitize, RulesetGetResponsePhaseHTTPRequestSBFM, RulesetGetResponsePhaseHTTPRequestSelectConfiguration, RulesetGetResponsePhaseHTTPRequestTransform, RulesetGetResponsePhaseHTTPResponseCompression, RulesetGetResponsePhaseHTTPResponseFirewallManaged, RulesetGetResponsePhaseHTTPResponseHeadersTransform, RulesetGetResponsePhaseMagicTransit, RulesetGetResponsePhaseMagicTransitIDsManaged, RulesetGetResponsePhaseMagicTransitManaged: - return true - } - return false -} - type RulesetGetResponseRule struct { // The action to perform when the rule matches. Action RulesetGetResponseRulesAction `json:"action"` @@ -1090,11 +925,11 @@ func (r RulesetGetResponseRulesAction) IsKnown() bool { type RulesetNewParams struct { // The kind of the ruleset. - Kind param.Field[RulesetNewParamsKind] `json:"kind,required"` + Kind param.Field[Kind] `json:"kind,required"` // The human-readable name of the ruleset. Name param.Field[string] `json:"name,required"` // The phase of the ruleset. - Phase param.Field[RulesetNewParamsPhase] `json:"phase,required"` + Phase param.Field[Phase] `json:"phase,required"` // The list of rules in the ruleset. Rules param.Field[[]RulesetNewParamsRuleUnion] `json:"rules,required"` // The Account ID to use for this endpoint. Mutually exclusive with the Zone ID. @@ -1109,61 +944,6 @@ func (r RulesetNewParams) MarshalJSON() (data []byte, err error) { return apijson.MarshalRoot(r) } -// The kind of the ruleset. -type RulesetNewParamsKind string - -const ( - RulesetNewParamsKindManaged RulesetNewParamsKind = "managed" - RulesetNewParamsKindCustom RulesetNewParamsKind = "custom" - RulesetNewParamsKindRoot RulesetNewParamsKind = "root" - RulesetNewParamsKindZone RulesetNewParamsKind = "zone" -) - -func (r RulesetNewParamsKind) IsKnown() bool { - switch r { - case RulesetNewParamsKindManaged, RulesetNewParamsKindCustom, RulesetNewParamsKindRoot, RulesetNewParamsKindZone: - return true - } - return false -} - -// The phase of the ruleset. -type RulesetNewParamsPhase string - -const ( - RulesetNewParamsPhaseDDoSL4 RulesetNewParamsPhase = "ddos_l4" - RulesetNewParamsPhaseDDoSL7 RulesetNewParamsPhase = "ddos_l7" - RulesetNewParamsPhaseHTTPConfigSettings RulesetNewParamsPhase = "http_config_settings" - RulesetNewParamsPhaseHTTPCustomErrors RulesetNewParamsPhase = "http_custom_errors" - RulesetNewParamsPhaseHTTPLogCustomFields RulesetNewParamsPhase = "http_log_custom_fields" - RulesetNewParamsPhaseHTTPRatelimit RulesetNewParamsPhase = "http_ratelimit" - RulesetNewParamsPhaseHTTPRequestCacheSettings RulesetNewParamsPhase = "http_request_cache_settings" - RulesetNewParamsPhaseHTTPRequestDynamicRedirect RulesetNewParamsPhase = "http_request_dynamic_redirect" - RulesetNewParamsPhaseHTTPRequestFirewallCustom RulesetNewParamsPhase = "http_request_firewall_custom" - RulesetNewParamsPhaseHTTPRequestFirewallManaged RulesetNewParamsPhase = "http_request_firewall_managed" - RulesetNewParamsPhaseHTTPRequestLateTransform RulesetNewParamsPhase = "http_request_late_transform" - RulesetNewParamsPhaseHTTPRequestOrigin RulesetNewParamsPhase = "http_request_origin" - RulesetNewParamsPhaseHTTPRequestRedirect RulesetNewParamsPhase = "http_request_redirect" - RulesetNewParamsPhaseHTTPRequestSanitize RulesetNewParamsPhase = "http_request_sanitize" - RulesetNewParamsPhaseHTTPRequestSBFM RulesetNewParamsPhase = "http_request_sbfm" - RulesetNewParamsPhaseHTTPRequestSelectConfiguration RulesetNewParamsPhase = "http_request_select_configuration" - RulesetNewParamsPhaseHTTPRequestTransform RulesetNewParamsPhase = "http_request_transform" - RulesetNewParamsPhaseHTTPResponseCompression RulesetNewParamsPhase = "http_response_compression" - RulesetNewParamsPhaseHTTPResponseFirewallManaged RulesetNewParamsPhase = "http_response_firewall_managed" - RulesetNewParamsPhaseHTTPResponseHeadersTransform RulesetNewParamsPhase = "http_response_headers_transform" - RulesetNewParamsPhaseMagicTransit RulesetNewParamsPhase = "magic_transit" - RulesetNewParamsPhaseMagicTransitIDsManaged RulesetNewParamsPhase = "magic_transit_ids_managed" - RulesetNewParamsPhaseMagicTransitManaged RulesetNewParamsPhase = "magic_transit_managed" -) - -func (r RulesetNewParamsPhase) IsKnown() bool { - switch r { - case RulesetNewParamsPhaseDDoSL4, RulesetNewParamsPhaseDDoSL7, RulesetNewParamsPhaseHTTPConfigSettings, RulesetNewParamsPhaseHTTPCustomErrors, RulesetNewParamsPhaseHTTPLogCustomFields, RulesetNewParamsPhaseHTTPRatelimit, RulesetNewParamsPhaseHTTPRequestCacheSettings, RulesetNewParamsPhaseHTTPRequestDynamicRedirect, RulesetNewParamsPhaseHTTPRequestFirewallCustom, RulesetNewParamsPhaseHTTPRequestFirewallManaged, RulesetNewParamsPhaseHTTPRequestLateTransform, RulesetNewParamsPhaseHTTPRequestOrigin, RulesetNewParamsPhaseHTTPRequestRedirect, RulesetNewParamsPhaseHTTPRequestSanitize, RulesetNewParamsPhaseHTTPRequestSBFM, RulesetNewParamsPhaseHTTPRequestSelectConfiguration, RulesetNewParamsPhaseHTTPRequestTransform, RulesetNewParamsPhaseHTTPResponseCompression, RulesetNewParamsPhaseHTTPResponseFirewallManaged, RulesetNewParamsPhaseHTTPResponseHeadersTransform, RulesetNewParamsPhaseMagicTransit, RulesetNewParamsPhaseMagicTransitIDsManaged, RulesetNewParamsPhaseMagicTransitManaged: - return true - } - return false -} - type RulesetNewParamsRule struct { // The action to perform when the rule matches. Action param.Field[RulesetNewParamsRulesAction] `json:"action"` @@ -1391,11 +1171,11 @@ type RulesetUpdateParams struct { // An informative description of the ruleset. Description param.Field[string] `json:"description"` // The kind of the ruleset. - Kind param.Field[RulesetUpdateParamsKind] `json:"kind"` + Kind param.Field[Kind] `json:"kind"` // The human-readable name of the ruleset. Name param.Field[string] `json:"name"` // The phase of the ruleset. - Phase param.Field[RulesetUpdateParamsPhase] `json:"phase"` + Phase param.Field[Phase] `json:"phase"` } func (r RulesetUpdateParams) MarshalJSON() (data []byte, err error) { @@ -1468,61 +1248,6 @@ func (r RulesetUpdateParamsRulesAction) IsKnown() bool { return false } -// The kind of the ruleset. -type RulesetUpdateParamsKind string - -const ( - RulesetUpdateParamsKindManaged RulesetUpdateParamsKind = "managed" - RulesetUpdateParamsKindCustom RulesetUpdateParamsKind = "custom" - RulesetUpdateParamsKindRoot RulesetUpdateParamsKind = "root" - RulesetUpdateParamsKindZone RulesetUpdateParamsKind = "zone" -) - -func (r RulesetUpdateParamsKind) IsKnown() bool { - switch r { - case RulesetUpdateParamsKindManaged, RulesetUpdateParamsKindCustom, RulesetUpdateParamsKindRoot, RulesetUpdateParamsKindZone: - return true - } - return false -} - -// The phase of the ruleset. -type RulesetUpdateParamsPhase string - -const ( - RulesetUpdateParamsPhaseDDoSL4 RulesetUpdateParamsPhase = "ddos_l4" - RulesetUpdateParamsPhaseDDoSL7 RulesetUpdateParamsPhase = "ddos_l7" - RulesetUpdateParamsPhaseHTTPConfigSettings RulesetUpdateParamsPhase = "http_config_settings" - RulesetUpdateParamsPhaseHTTPCustomErrors RulesetUpdateParamsPhase = "http_custom_errors" - RulesetUpdateParamsPhaseHTTPLogCustomFields RulesetUpdateParamsPhase = "http_log_custom_fields" - RulesetUpdateParamsPhaseHTTPRatelimit RulesetUpdateParamsPhase = "http_ratelimit" - RulesetUpdateParamsPhaseHTTPRequestCacheSettings RulesetUpdateParamsPhase = "http_request_cache_settings" - RulesetUpdateParamsPhaseHTTPRequestDynamicRedirect RulesetUpdateParamsPhase = "http_request_dynamic_redirect" - RulesetUpdateParamsPhaseHTTPRequestFirewallCustom RulesetUpdateParamsPhase = "http_request_firewall_custom" - RulesetUpdateParamsPhaseHTTPRequestFirewallManaged RulesetUpdateParamsPhase = "http_request_firewall_managed" - RulesetUpdateParamsPhaseHTTPRequestLateTransform RulesetUpdateParamsPhase = "http_request_late_transform" - RulesetUpdateParamsPhaseHTTPRequestOrigin RulesetUpdateParamsPhase = "http_request_origin" - RulesetUpdateParamsPhaseHTTPRequestRedirect RulesetUpdateParamsPhase = "http_request_redirect" - RulesetUpdateParamsPhaseHTTPRequestSanitize RulesetUpdateParamsPhase = "http_request_sanitize" - RulesetUpdateParamsPhaseHTTPRequestSBFM RulesetUpdateParamsPhase = "http_request_sbfm" - RulesetUpdateParamsPhaseHTTPRequestSelectConfiguration RulesetUpdateParamsPhase = "http_request_select_configuration" - RulesetUpdateParamsPhaseHTTPRequestTransform RulesetUpdateParamsPhase = "http_request_transform" - RulesetUpdateParamsPhaseHTTPResponseCompression RulesetUpdateParamsPhase = "http_response_compression" - RulesetUpdateParamsPhaseHTTPResponseFirewallManaged RulesetUpdateParamsPhase = "http_response_firewall_managed" - RulesetUpdateParamsPhaseHTTPResponseHeadersTransform RulesetUpdateParamsPhase = "http_response_headers_transform" - RulesetUpdateParamsPhaseMagicTransit RulesetUpdateParamsPhase = "magic_transit" - RulesetUpdateParamsPhaseMagicTransitIDsManaged RulesetUpdateParamsPhase = "magic_transit_ids_managed" - RulesetUpdateParamsPhaseMagicTransitManaged RulesetUpdateParamsPhase = "magic_transit_managed" -) - -func (r RulesetUpdateParamsPhase) IsKnown() bool { - switch r { - case RulesetUpdateParamsPhaseDDoSL4, RulesetUpdateParamsPhaseDDoSL7, RulesetUpdateParamsPhaseHTTPConfigSettings, RulesetUpdateParamsPhaseHTTPCustomErrors, RulesetUpdateParamsPhaseHTTPLogCustomFields, RulesetUpdateParamsPhaseHTTPRatelimit, RulesetUpdateParamsPhaseHTTPRequestCacheSettings, RulesetUpdateParamsPhaseHTTPRequestDynamicRedirect, RulesetUpdateParamsPhaseHTTPRequestFirewallCustom, RulesetUpdateParamsPhaseHTTPRequestFirewallManaged, RulesetUpdateParamsPhaseHTTPRequestLateTransform, RulesetUpdateParamsPhaseHTTPRequestOrigin, RulesetUpdateParamsPhaseHTTPRequestRedirect, RulesetUpdateParamsPhaseHTTPRequestSanitize, RulesetUpdateParamsPhaseHTTPRequestSBFM, RulesetUpdateParamsPhaseHTTPRequestSelectConfiguration, RulesetUpdateParamsPhaseHTTPRequestTransform, RulesetUpdateParamsPhaseHTTPResponseCompression, RulesetUpdateParamsPhaseHTTPResponseFirewallManaged, RulesetUpdateParamsPhaseHTTPResponseHeadersTransform, RulesetUpdateParamsPhaseMagicTransit, RulesetUpdateParamsPhaseMagicTransitIDsManaged, RulesetUpdateParamsPhaseMagicTransitManaged: - return true - } - return false -} - // A response object. type RulesetUpdateResponseEnvelope struct { // A list of error messages. diff --git a/rulesets/ruleset_test.go b/rulesets/ruleset_test.go index a58635743ff..2a247ef2333 100644 --- a/rulesets/ruleset_test.go +++ b/rulesets/ruleset_test.go @@ -29,9 +29,9 @@ func TestRulesetNewWithOptionalParams(t *testing.T) { option.WithAPIEmail("user@example.com"), ) _, err := client.Rulesets.New(context.TODO(), rulesets.RulesetNewParams{ - Kind: cloudflare.F(rulesets.RulesetNewParamsKindRoot), + Kind: cloudflare.F(rulesets.KindRoot), Name: cloudflare.F("My ruleset"), - Phase: cloudflare.F(rulesets.RulesetNewParamsPhaseHTTPRequestFirewallCustom), + Phase: cloudflare.F(rulesets.PhaseHTTPRequestFirewallCustom), Rules: cloudflare.F([]rulesets.RulesetNewParamsRuleUnion{rulesets.BlockRuleParam{ Action: cloudflare.F(rulesets.BlockRuleActionBlock), ActionParameters: cloudflare.F(rulesets.BlockRuleActionParametersParam{ @@ -170,9 +170,9 @@ func TestRulesetUpdateWithOptionalParams(t *testing.T) { AccountID: cloudflare.F("string"), ZoneID: cloudflare.F("string"), Description: cloudflare.F("My ruleset to execute managed rulesets"), - Kind: cloudflare.F(rulesets.RulesetUpdateParamsKindRoot), + Kind: cloudflare.F(rulesets.KindRoot), Name: cloudflare.F("My ruleset"), - Phase: cloudflare.F(rulesets.RulesetUpdateParamsPhaseHTTPRequestFirewallCustom), + Phase: cloudflare.F(rulesets.PhaseHTTPRequestFirewallCustom), }, ) if err != nil { diff --git a/rulesets/version.go b/rulesets/version.go index 3107bd4ac0a..a973e839699 100644 --- a/rulesets/version.go +++ b/rulesets/version.go @@ -113,13 +113,13 @@ type VersionGetResponse struct { // The unique ID of the ruleset. ID string `json:"id,required"` // The kind of the ruleset. - Kind VersionGetResponseKind `json:"kind,required"` + Kind Kind `json:"kind,required"` // The timestamp of when the ruleset was last modified. LastUpdated time.Time `json:"last_updated,required" format:"date-time"` // The human-readable name of the ruleset. Name string `json:"name,required"` // The phase of the ruleset. - Phase VersionGetResponsePhase `json:"phase,required"` + Phase Phase `json:"phase,required"` // The list of rules in the ruleset. Rules []VersionGetResponseRule `json:"rules,required"` // The version of the ruleset. @@ -152,61 +152,6 @@ func (r versionGetResponseJSON) RawJSON() string { return r.raw } -// The kind of the ruleset. -type VersionGetResponseKind string - -const ( - VersionGetResponseKindManaged VersionGetResponseKind = "managed" - VersionGetResponseKindCustom VersionGetResponseKind = "custom" - VersionGetResponseKindRoot VersionGetResponseKind = "root" - VersionGetResponseKindZone VersionGetResponseKind = "zone" -) - -func (r VersionGetResponseKind) IsKnown() bool { - switch r { - case VersionGetResponseKindManaged, VersionGetResponseKindCustom, VersionGetResponseKindRoot, VersionGetResponseKindZone: - return true - } - return false -} - -// The phase of the ruleset. -type VersionGetResponsePhase string - -const ( - VersionGetResponsePhaseDDoSL4 VersionGetResponsePhase = "ddos_l4" - VersionGetResponsePhaseDDoSL7 VersionGetResponsePhase = "ddos_l7" - VersionGetResponsePhaseHTTPConfigSettings VersionGetResponsePhase = "http_config_settings" - VersionGetResponsePhaseHTTPCustomErrors VersionGetResponsePhase = "http_custom_errors" - VersionGetResponsePhaseHTTPLogCustomFields VersionGetResponsePhase = "http_log_custom_fields" - VersionGetResponsePhaseHTTPRatelimit VersionGetResponsePhase = "http_ratelimit" - VersionGetResponsePhaseHTTPRequestCacheSettings VersionGetResponsePhase = "http_request_cache_settings" - VersionGetResponsePhaseHTTPRequestDynamicRedirect VersionGetResponsePhase = "http_request_dynamic_redirect" - VersionGetResponsePhaseHTTPRequestFirewallCustom VersionGetResponsePhase = "http_request_firewall_custom" - VersionGetResponsePhaseHTTPRequestFirewallManaged VersionGetResponsePhase = "http_request_firewall_managed" - VersionGetResponsePhaseHTTPRequestLateTransform VersionGetResponsePhase = "http_request_late_transform" - VersionGetResponsePhaseHTTPRequestOrigin VersionGetResponsePhase = "http_request_origin" - VersionGetResponsePhaseHTTPRequestRedirect VersionGetResponsePhase = "http_request_redirect" - VersionGetResponsePhaseHTTPRequestSanitize VersionGetResponsePhase = "http_request_sanitize" - VersionGetResponsePhaseHTTPRequestSBFM VersionGetResponsePhase = "http_request_sbfm" - VersionGetResponsePhaseHTTPRequestSelectConfiguration VersionGetResponsePhase = "http_request_select_configuration" - VersionGetResponsePhaseHTTPRequestTransform VersionGetResponsePhase = "http_request_transform" - VersionGetResponsePhaseHTTPResponseCompression VersionGetResponsePhase = "http_response_compression" - VersionGetResponsePhaseHTTPResponseFirewallManaged VersionGetResponsePhase = "http_response_firewall_managed" - VersionGetResponsePhaseHTTPResponseHeadersTransform VersionGetResponsePhase = "http_response_headers_transform" - VersionGetResponsePhaseMagicTransit VersionGetResponsePhase = "magic_transit" - VersionGetResponsePhaseMagicTransitIDsManaged VersionGetResponsePhase = "magic_transit_ids_managed" - VersionGetResponsePhaseMagicTransitManaged VersionGetResponsePhase = "magic_transit_managed" -) - -func (r VersionGetResponsePhase) IsKnown() bool { - switch r { - case VersionGetResponsePhaseDDoSL4, VersionGetResponsePhaseDDoSL7, VersionGetResponsePhaseHTTPConfigSettings, VersionGetResponsePhaseHTTPCustomErrors, VersionGetResponsePhaseHTTPLogCustomFields, VersionGetResponsePhaseHTTPRatelimit, VersionGetResponsePhaseHTTPRequestCacheSettings, VersionGetResponsePhaseHTTPRequestDynamicRedirect, VersionGetResponsePhaseHTTPRequestFirewallCustom, VersionGetResponsePhaseHTTPRequestFirewallManaged, VersionGetResponsePhaseHTTPRequestLateTransform, VersionGetResponsePhaseHTTPRequestOrigin, VersionGetResponsePhaseHTTPRequestRedirect, VersionGetResponsePhaseHTTPRequestSanitize, VersionGetResponsePhaseHTTPRequestSBFM, VersionGetResponsePhaseHTTPRequestSelectConfiguration, VersionGetResponsePhaseHTTPRequestTransform, VersionGetResponsePhaseHTTPResponseCompression, VersionGetResponsePhaseHTTPResponseFirewallManaged, VersionGetResponsePhaseHTTPResponseHeadersTransform, VersionGetResponsePhaseMagicTransit, VersionGetResponsePhaseMagicTransitIDsManaged, VersionGetResponsePhaseMagicTransitManaged: - return true - } - return false -} - type VersionGetResponseRule struct { // The action to perform when the rule matches. Action VersionGetResponseRulesAction `json:"action"` diff --git a/rulesets/versionbytag.go b/rulesets/versionbytag.go index 6ac3a82af3a..ca5d8523dac 100644 --- a/rulesets/versionbytag.go +++ b/rulesets/versionbytag.go @@ -52,13 +52,13 @@ type VersionByTagGetResponse struct { // The unique ID of the ruleset. ID string `json:"id,required"` // The kind of the ruleset. - Kind VersionByTagGetResponseKind `json:"kind,required"` + Kind Kind `json:"kind,required"` // The timestamp of when the ruleset was last modified. LastUpdated time.Time `json:"last_updated,required" format:"date-time"` // The human-readable name of the ruleset. Name string `json:"name,required"` // The phase of the ruleset. - Phase VersionByTagGetResponsePhase `json:"phase,required"` + Phase Phase `json:"phase,required"` // The list of rules in the ruleset. Rules []VersionByTagGetResponseRule `json:"rules,required"` // The version of the ruleset. @@ -91,61 +91,6 @@ func (r versionByTagGetResponseJSON) RawJSON() string { return r.raw } -// The kind of the ruleset. -type VersionByTagGetResponseKind string - -const ( - VersionByTagGetResponseKindManaged VersionByTagGetResponseKind = "managed" - VersionByTagGetResponseKindCustom VersionByTagGetResponseKind = "custom" - VersionByTagGetResponseKindRoot VersionByTagGetResponseKind = "root" - VersionByTagGetResponseKindZone VersionByTagGetResponseKind = "zone" -) - -func (r VersionByTagGetResponseKind) IsKnown() bool { - switch r { - case VersionByTagGetResponseKindManaged, VersionByTagGetResponseKindCustom, VersionByTagGetResponseKindRoot, VersionByTagGetResponseKindZone: - return true - } - return false -} - -// The phase of the ruleset. -type VersionByTagGetResponsePhase string - -const ( - VersionByTagGetResponsePhaseDDoSL4 VersionByTagGetResponsePhase = "ddos_l4" - VersionByTagGetResponsePhaseDDoSL7 VersionByTagGetResponsePhase = "ddos_l7" - VersionByTagGetResponsePhaseHTTPConfigSettings VersionByTagGetResponsePhase = "http_config_settings" - VersionByTagGetResponsePhaseHTTPCustomErrors VersionByTagGetResponsePhase = "http_custom_errors" - VersionByTagGetResponsePhaseHTTPLogCustomFields VersionByTagGetResponsePhase = "http_log_custom_fields" - VersionByTagGetResponsePhaseHTTPRatelimit VersionByTagGetResponsePhase = "http_ratelimit" - VersionByTagGetResponsePhaseHTTPRequestCacheSettings VersionByTagGetResponsePhase = "http_request_cache_settings" - VersionByTagGetResponsePhaseHTTPRequestDynamicRedirect VersionByTagGetResponsePhase = "http_request_dynamic_redirect" - VersionByTagGetResponsePhaseHTTPRequestFirewallCustom VersionByTagGetResponsePhase = "http_request_firewall_custom" - VersionByTagGetResponsePhaseHTTPRequestFirewallManaged VersionByTagGetResponsePhase = "http_request_firewall_managed" - VersionByTagGetResponsePhaseHTTPRequestLateTransform VersionByTagGetResponsePhase = "http_request_late_transform" - VersionByTagGetResponsePhaseHTTPRequestOrigin VersionByTagGetResponsePhase = "http_request_origin" - VersionByTagGetResponsePhaseHTTPRequestRedirect VersionByTagGetResponsePhase = "http_request_redirect" - VersionByTagGetResponsePhaseHTTPRequestSanitize VersionByTagGetResponsePhase = "http_request_sanitize" - VersionByTagGetResponsePhaseHTTPRequestSBFM VersionByTagGetResponsePhase = "http_request_sbfm" - VersionByTagGetResponsePhaseHTTPRequestSelectConfiguration VersionByTagGetResponsePhase = "http_request_select_configuration" - VersionByTagGetResponsePhaseHTTPRequestTransform VersionByTagGetResponsePhase = "http_request_transform" - VersionByTagGetResponsePhaseHTTPResponseCompression VersionByTagGetResponsePhase = "http_response_compression" - VersionByTagGetResponsePhaseHTTPResponseFirewallManaged VersionByTagGetResponsePhase = "http_response_firewall_managed" - VersionByTagGetResponsePhaseHTTPResponseHeadersTransform VersionByTagGetResponsePhase = "http_response_headers_transform" - VersionByTagGetResponsePhaseMagicTransit VersionByTagGetResponsePhase = "magic_transit" - VersionByTagGetResponsePhaseMagicTransitIDsManaged VersionByTagGetResponsePhase = "magic_transit_ids_managed" - VersionByTagGetResponsePhaseMagicTransitManaged VersionByTagGetResponsePhase = "magic_transit_managed" -) - -func (r VersionByTagGetResponsePhase) IsKnown() bool { - switch r { - case VersionByTagGetResponsePhaseDDoSL4, VersionByTagGetResponsePhaseDDoSL7, VersionByTagGetResponsePhaseHTTPConfigSettings, VersionByTagGetResponsePhaseHTTPCustomErrors, VersionByTagGetResponsePhaseHTTPLogCustomFields, VersionByTagGetResponsePhaseHTTPRatelimit, VersionByTagGetResponsePhaseHTTPRequestCacheSettings, VersionByTagGetResponsePhaseHTTPRequestDynamicRedirect, VersionByTagGetResponsePhaseHTTPRequestFirewallCustom, VersionByTagGetResponsePhaseHTTPRequestFirewallManaged, VersionByTagGetResponsePhaseHTTPRequestLateTransform, VersionByTagGetResponsePhaseHTTPRequestOrigin, VersionByTagGetResponsePhaseHTTPRequestRedirect, VersionByTagGetResponsePhaseHTTPRequestSanitize, VersionByTagGetResponsePhaseHTTPRequestSBFM, VersionByTagGetResponsePhaseHTTPRequestSelectConfiguration, VersionByTagGetResponsePhaseHTTPRequestTransform, VersionByTagGetResponsePhaseHTTPResponseCompression, VersionByTagGetResponsePhaseHTTPResponseFirewallManaged, VersionByTagGetResponsePhaseHTTPResponseHeadersTransform, VersionByTagGetResponsePhaseMagicTransit, VersionByTagGetResponsePhaseMagicTransitIDsManaged, VersionByTagGetResponsePhaseMagicTransitManaged: - return true - } - return false -} - type VersionByTagGetResponseRule struct { // The action to perform when the rule matches. Action VersionByTagGetResponseRulesAction `json:"action"` diff --git a/rum/aliases.go b/rum/aliases.go index a2abb297fdd..62d91bd1be0 100644 --- a/rum/aliases.go +++ b/rum/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/secondary_dns/aliases.go b/secondary_dns/aliases.go index 788e8f5103d..f1a24bdbfe8 100644 --- a/secondary_dns/aliases.go +++ b/secondary_dns/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/shared/shared.go b/shared/shared.go index 483abddce01..78be75f67db 100644 --- a/shared/shared.go +++ b/shared/shared.go @@ -643,3 +643,19 @@ func (r *Role) UnmarshalJSON(data []byte) (err error) { func (r roleJSON) RawJSON() string { return r.raw } + +// Direction to order DNS records in. +type SortDirection string + +const ( + SortDirectionAsc SortDirection = "asc" + SortDirectionDesc SortDirection = "desc" +) + +func (r SortDirection) IsKnown() bool { + switch r { + case SortDirectionAsc, SortDirectionDesc: + return true + } + return false +} diff --git a/snippets/aliases.go b/snippets/aliases.go index a3f652f2977..298459e47de 100644 --- a/snippets/aliases.go +++ b/snippets/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/spectrum/aliases.go b/spectrum/aliases.go index 53e9a837c17..bf743976cf2 100644 --- a/spectrum/aliases.go +++ b/spectrum/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/speed/aliases.go b/speed/aliases.go index 2e9ce227347..1bbe686c1cc 100644 --- a/speed/aliases.go +++ b/speed/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/ssl/aliases.go b/ssl/aliases.go index e04d4e3dbc3..472b2c411a3 100644 --- a/ssl/aliases.go +++ b/ssl/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/storage/aliases.go b/storage/aliases.go index 771f00c549e..33d610aecde 100644 --- a/storage/aliases.go +++ b/storage/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/stream/aliases.go b/stream/aliases.go index 0cdf7f1d29f..abd0ab7dd40 100644 --- a/stream/aliases.go +++ b/stream/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/subscriptions/aliases.go b/subscriptions/aliases.go index f28e9e089f1..6c00368ed7d 100644 --- a/subscriptions/aliases.go +++ b/subscriptions/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/url_normalization/aliases.go b/url_normalization/aliases.go index 46f97c9489d..f6212994491 100644 --- a/url_normalization/aliases.go +++ b/url_normalization/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/url_scanner/aliases.go b/url_scanner/aliases.go index 75bc9579e64..38a0806aec7 100644 --- a/url_scanner/aliases.go +++ b/url_scanner/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/usage_test.go b/usage_test.go index 91eaa496915..0d66ec4a335 100644 --- a/usage_test.go +++ b/usage_test.go @@ -31,7 +31,7 @@ func TestUsage(t *testing.T) { ID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), }), Name: cloudflare.F("example.com"), - Type: cloudflare.F(zones.ZoneNewParamsTypeFull), + Type: cloudflare.F(zones.TypeFull), }) if err != nil { t.Error(err) diff --git a/user/aliases.go b/user/aliases.go index 8dd5458e74b..362ab319802 100644 --- a/user/aliases.go +++ b/user/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/vectorize/aliases.go b/vectorize/aliases.go index 1d547d2ff1a..8ac7bae3106 100644 --- a/vectorize/aliases.go +++ b/vectorize/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/waiting_rooms/aliases.go b/waiting_rooms/aliases.go index c8d2243b906..11e5ff01117 100644 --- a/waiting_rooms/aliases.go +++ b/waiting_rooms/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/warp_connector/aliases.go b/warp_connector/aliases.go index 5adf06aabf7..beb247731f1 100644 --- a/warp_connector/aliases.go +++ b/warp_connector/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/web3/aliases.go b/web3/aliases.go index ac3f7bf9f5d..26f29f7a73f 100644 --- a/web3/aliases.go +++ b/web3/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/workers/aliases.go b/workers/aliases.go index aa231402118..e37d47a2c00 100644 --- a/workers/aliases.go +++ b/workers/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/workers_for_platforms/aliases.go b/workers_for_platforms/aliases.go index ab9fe62cf9f..16bc69b29fd 100644 --- a/workers_for_platforms/aliases.go +++ b/workers_for_platforms/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/zero_trust/aliases.go b/zero_trust/aliases.go index 798a2aa2f6e..d61f62238dc 100644 --- a/zero_trust/aliases.go +++ b/zero_trust/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/zones/aliases.go b/zones/aliases.go index cd2bc80f06b..9b52c9acf7d 100644 --- a/zones/aliases.go +++ b/zones/aliases.go @@ -142,3 +142,14 @@ type ResponseInfo = shared.ResponseInfo // This is an alias to an internal type. type Role = shared.Role + +// Direction to order DNS records in. +// +// This is an alias to an internal type. +type SortDirection = shared.SortDirection + +// This is an alias to an internal value. +const SortDirectionAsc = shared.SortDirectionAsc + +// This is an alias to an internal value. +const SortDirectionDesc = shared.SortDirectionDesc diff --git a/zones/zone.go b/zones/zone.go index 8a385926b9e..8a094c3e72c 100644 --- a/zones/zone.go +++ b/zones/zone.go @@ -122,6 +122,24 @@ func (r *ZoneService) Get(ctx context.Context, query ZoneGetParams, opts ...opti return } +// A full zone implies that DNS is hosted with Cloudflare. A partial zone is +// typically a partner-hosted zone or a CNAME setup. +type Type string + +const ( + TypeFull Type = "full" + TypePartial Type = "partial" + TypeSecondary Type = "secondary" +) + +func (r Type) IsKnown() bool { + switch r { + case TypeFull, TypePartial, TypeSecondary: + return true + } + return false +} + type Zone struct { // Identifier ID string `json:"id,required"` @@ -305,7 +323,7 @@ type ZoneNewParams struct { Name param.Field[string] `json:"name,required"` // A full zone implies that DNS is hosted with Cloudflare. A partial zone is // typically a partner-hosted zone or a CNAME setup. - Type param.Field[ZoneNewParamsType] `json:"type"` + Type param.Field[Type] `json:"type"` } func (r ZoneNewParams) MarshalJSON() (data []byte, err error) { @@ -321,24 +339,6 @@ func (r ZoneNewParamsAccount) MarshalJSON() (data []byte, err error) { return apijson.MarshalRoot(r) } -// A full zone implies that DNS is hosted with Cloudflare. A partial zone is -// typically a partner-hosted zone or a CNAME setup. -type ZoneNewParamsType string - -const ( - ZoneNewParamsTypeFull ZoneNewParamsType = "full" - ZoneNewParamsTypePartial ZoneNewParamsType = "partial" - ZoneNewParamsTypeSecondary ZoneNewParamsType = "secondary" -) - -func (r ZoneNewParamsType) IsKnown() bool { - switch r { - case ZoneNewParamsTypeFull, ZoneNewParamsTypePartial, ZoneNewParamsTypeSecondary: - return true - } - return false -} - type ZoneNewResponseEnvelope struct { Errors []shared.ResponseInfo `json:"errors,required"` Messages []shared.ResponseInfo `json:"messages,required"` diff --git a/zones/zone_test.go b/zones/zone_test.go index ce74a70244c..5235fb68f81 100644 --- a/zones/zone_test.go +++ b/zones/zone_test.go @@ -32,7 +32,7 @@ func TestZoneNewWithOptionalParams(t *testing.T) { ID: cloudflare.F("023e105f4ecef8ad9ca31a8372d0c353"), }), Name: cloudflare.F("example.com"), - Type: cloudflare.F(zones.ZoneNewParamsTypeFull), + Type: cloudflare.F(zones.TypeFull), }) if err != nil { var apierr *cloudflare.Error