Skip to content

fix(cloudflare/rulesets): putPhas redirect status_code is a number #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sam-goodwin merged 1 commit into from
Jul 15, 2026
Merged

fix(cloudflare/rulesets): putPhas redirect status_code is a number #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions packages/cloudflare/patches/rulesets/putPhas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,20 @@
}
]
},
"request": {
"properties": {
"rules[].action_parameters.from_value.status_code": {
"type": "number"
}
}
},
"response": {
"properties": {
"rules": {
"optional": true
},
"rules[].action_parameters.from_value.status_code": {
"appendUnion": [{ "kind": "primitive", "value": "number" }]
}
}
}
Expand Down
30 changes: 17 additions & 13 deletions packages/cloudflare/specs/cloudflare/rulesets.openapi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4678,12 +4678,6 @@ paths:
description: Whether to keep the query string of the original request.
status_code:
type: number
enum:
- 301
- 302
- 303
- 307
- 308
description: The status code to use for the redirect.
required:
- target_url
Expand Down Expand Up @@ -7985,13 +7979,23 @@ paths:
type: boolean
description: Whether to keep the query string of the original request.
status_code:
type: number
enum:
- 301
- 302
- 303
- 307
- 308
oneOf:
- type: number
enum:
- 301
- type: number
enum:
- 302
- type: number
enum:
- 303
- type: number
enum:
- 307
- type: number
enum:
- 308
- type: number
description: The status code to use for the redirect.
required:
- target_url
Expand Down
158 changes: 138 additions & 20 deletions packages/cloudflare/src/services/rulesets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4540,23 +4540,15 @@ interface FromValue2 {
/** Whether to keep the query string of the original request. */
preserveQueryString?: boolean | null;
/** The status code to use for the redirect. */
statusCode?: "301" | "302" | "303" | "307" | "308" | (string & {}) | null;
statusCode?: number | null;
}
const FromValue2 = /*@__PURE__*/ /*#__PURE__*/ Schema.suspend(() =>
Schema.Struct({
targetUrl: TargetURL,
preserveQueryString: Schema.optional(
Schema.Union([Schema.Boolean, Schema.Null]),
),
statusCode: Schema.optional(
Schema.Union([
Schema.Union([
Schema.Literals(["301", "302", "303", "307", "308"]),
Schema.String,
]),
Schema.Null,
]),
),
statusCode: Schema.optional(Schema.Union([Schema.Number, Schema.Null])),
}).pipe(
Schema.encodeKeys({
targetUrl: "target_url",
Expand All @@ -4573,7 +4565,7 @@ interface ActionParameters13 {
fromValue?: {
targetUrl: { expression?: string | null; value?: string | null };
preserveQueryString?: boolean | null;
statusCode?: "301" | "302" | "303" | "307" | "308" | (string & {}) | null;
statusCode?: number | null;
} | null;
}
const ActionParameters13 = /*@__PURE__*/ /*#__PURE__*/ Schema.suspend(() =>
Expand All @@ -4596,7 +4588,7 @@ interface RedirectRuleParam {
fromValue?: {
targetUrl: { expression?: string | null; value?: string | null };
preserveQueryString?: boolean | null;
statusCode?: "301" | "302" | "303" | "307" | "308" | (string & {}) | null;
statusCode?: number | null;
} | null;
} | null;
/** An informative description of the rule. */
Expand Down Expand Up @@ -5577,6 +5569,57 @@ const SkipRuleParam = /*@__PURE__*/ /*#__PURE__*/ Schema.suspend(() =>
),
) as unknown as Schema.Codec<SkipRuleParam>;

interface FromValue3 {
/** A URL to redirect the request to. */
targetUrl: { expression?: string | null; value?: string | null };
/** Whether to keep the query string of the original request. */
preserveQueryString?: boolean | null;
/** The status code to use for the redirect. */
statusCode?: "301" | "302" | "303" | "307" | "308" | (string & {}) | null;
}
const FromValue3 = /*@__PURE__*/ /*#__PURE__*/ Schema.suspend(() =>
Schema.Struct({
targetUrl: TargetURL,
preserveQueryString: Schema.optional(
Schema.Union([Schema.Boolean, Schema.Null]),
),
statusCode: Schema.optional(
Schema.Union([
Schema.Union([
Schema.Literals(["301", "302", "303", "307", "308"]),
Schema.String,
]),
Schema.Null,
]),
),
}).pipe(
Schema.encodeKeys({
targetUrl: "target_url",
preserveQueryString: "preserve_query_string",
statusCode: "status_code",
}),
),
) as unknown as Schema.Codec<FromValue3>;

interface ActionParameters15 {
/** A redirect based on a bulk list lookup. */
fromList?: { key: string; name: string } | null;
/** A redirect based on the request properties. */
fromValue?: {
targetUrl: { expression?: string | null; value?: string | null };
preserveQueryString?: boolean | null;
statusCode?: "301" | "302" | "303" | "307" | "308" | (string & {}) | null;
} | null;
}
const ActionParameters15 = /*@__PURE__*/ /*#__PURE__*/ Schema.suspend(() =>
Schema.Struct({
fromList: Schema.optional(Schema.Union([FromList, Schema.Null])),
fromValue: Schema.optional(Schema.Union([FromValue3, Schema.Null])),
}).pipe(
Schema.encodeKeys({ fromList: "from_list", fromValue: "from_value" }),
),
) as unknown as Schema.Codec<ActionParameters15>;

interface RedirectRule2 {
/** The timestamp of when the rule was last modified. */
lastUpdated: string;
Expand Down Expand Up @@ -5633,7 +5676,7 @@ const RedirectRule2 = /*@__PURE__*/ /*#__PURE__*/ Schema.suspend(() =>
Schema.Union([Schema.Literal("redirect"), Schema.Null]),
),
actionParameters: Schema.optional(
Schema.Union([ActionParameters13, Schema.Null]),
Schema.Union([ActionParameters15, Schema.Null]),
),
categories: Schema.optional(
Schema.Union([Schema.Array(Schema.String), Schema.Null]),
Expand Down Expand Up @@ -5797,6 +5840,81 @@ const ListRulesetsResponseResultInfo =
),
) as unknown as Schema.Codec<ListRulesetsResponseResultInfo>;

interface RedirectRuleParam2 {
/** The unique ID of the rule. */
id?: string | null;
/** The action to perform when the rule matches. */
action?: "redirect" | null;
/** The parameters configuring the rule's action. */
actionParameters?: {
fromList?: { key: string; name: string } | null;
fromValue?: {
targetUrl: { expression?: string | null; value?: string | null };
preserveQueryString?: boolean | null;
statusCode?: "301" | "302" | "303" | "307" | "308" | (string & {}) | null;
} | null;
} | null;
/** An informative description of the rule. */
description?: string | null;
/** Whether the rule should be executed. */
enabled?: boolean | null;
/** Configuration for exposed credential checking. */
exposedCredentialCheck?: {
passwordExpression: string;
usernameExpression: string;
} | null;
/** The expression defining which traffic will match the rule. */
expression?: string | null;
/** An object configuring the rule's logging behavior. */
logging?: { enabled: boolean } | null;
/** An object configuring the rule's rate limit behavior. */
ratelimit?: {
characteristics: string[];
period: number;
countingExpression?: string | null;
mitigationTimeout?: number | null;
requestsPerPeriod?: number | null;
requestsToOrigin?: boolean | null;
scorePerPeriod?: number | null;
scoreResponseHeaderName?: string | null;
} | null;
/** The reference of the rule (the rule's ID by default). */
ref?: string | null;
}
const RedirectRuleParam2 = /*@__PURE__*/ /*#__PURE__*/ Schema.suspend(() =>
Schema.Struct({
id: Schema.optional(Schema.Union([Schema.String, Schema.Null])),
action: Schema.optional(
Schema.Union([Schema.Literal("redirect"), Schema.Null]),
),
actionParameters: Schema.optional(
Schema.Union([ActionParameters15, Schema.Null]),
),
description: Schema.optional(Schema.Union([Schema.String, Schema.Null])),
enabled: Schema.optional(Schema.Union([Schema.Boolean, Schema.Null])),
exposedCredentialCheck: Schema.optional(
Schema.Union([ExposedCredentialCheck, Schema.Null]),
),
expression: Schema.optional(Schema.Union([Schema.String, Schema.Null])),
logging: Schema.optional(Schema.Union([Logging, Schema.Null])),
ratelimit: Schema.optional(Schema.Union([Ratelimit, Schema.Null])),
ref: Schema.optional(Schema.Union([Schema.String, Schema.Null])),
}).pipe(
Schema.encodeKeys({
id: "id",
action: "action",
actionParameters: "action_parameters",
description: "description",
enabled: "enabled",
exposedCredentialCheck: "exposed_credential_check",
expression: "expression",
logging: "logging",
ratelimit: "ratelimit",
ref: "ref",
}),
),
) as unknown as Schema.Codec<RedirectRuleParam2>;

// =============================================================================
// Pha
// =============================================================================
Expand Down Expand Up @@ -7271,7 +7389,7 @@ interface PutPhasBaseRequest {
fromValue?: {
targetUrl: { expression?: string; value?: string };
preserveQueryString?: boolean;
statusCode?: "301" | "302" | "303" | "307" | "308" | (string & {});
statusCode?: number;
};
};
description?: string;
Expand Down Expand Up @@ -8177,7 +8295,7 @@ export interface PutPhasResponse {
| "303"
| "307"
| "308"
| (string & {})
| number
| null;
} | null;
} | null;
Expand Down Expand Up @@ -8800,7 +8918,7 @@ export const PutPhasResponse = /*@__PURE__*/ /*#__PURE__*/ Schema.suspend(() =>
LogRule,
LogCustomFieldRule,
ManagedChallengeRule,
RedirectRule2,
RedirectRule,
RewriteRule,
RouteRule,
ScoreRule,
Expand Down Expand Up @@ -10121,7 +10239,7 @@ const CreateRuleBaseFields = {
ActionParametersAsset,
ActionParameters,
ActionParameters4,
ActionParameters13,
ActionParameters15,
ActionParameters14,
ActionParameters7,
ActionParameters9,
Expand Down Expand Up @@ -11648,7 +11766,7 @@ const PatchRuleBaseFields = {
ActionParametersAsset,
ActionParameters,
ActionParameters4,
ActionParameters13,
ActionParameters15,
ActionParameters14,
ActionParameters7,
ActionParameters9,
Expand Down Expand Up @@ -15525,7 +15643,7 @@ const CreateRulesetBaseFields = {
LogRuleParam,
LogCustomFieldRuleParam,
ManagedChallengeRuleParam,
RedirectRuleParam,
RedirectRuleParam2,
RewriteRuleParam,
RouteRuleParam,
ScoreRuleParam,
Expand Down Expand Up @@ -17516,7 +17634,7 @@ const UpdateRulesetBaseFields = {
LogRuleParam,
LogCustomFieldRuleParam,
ManagedChallengeRuleParam,
RedirectRuleParam,
RedirectRuleParam2,
RewriteRuleParam,
RouteRuleParam,
ScoreRuleParam,
Expand Down
Loading