Skip to content

Commit 49e8cc9

Browse files
committed
chore: run generators
Signed-off-by: Shane Utt <[email protected]>
1 parent 13f7654 commit 49e8cc9

File tree

12 files changed

+2901
-477
lines changed

12 files changed

+2901
-477
lines changed

gateway-api/src/apis/experimental/common.rs

Lines changed: 64 additions & 178 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@ mod prelude {
1010
}
1111
use self::prelude::*;
1212
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
13-
pub enum GRPCFilterType {
14-
ResponseHeaderModifier,
15-
RequestHeaderModifier,
16-
RequestMirror,
17-
ExtensionRef,
18-
}
19-
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
2013
pub enum GatewayDefaultScope {
2114
All,
2215
None,
@@ -27,74 +20,67 @@ pub enum GatewayTlsFrontendDefaultValidationMode {
2720
AllowInsecureFallback,
2821
}
2922
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
30-
pub enum HTTPFilterType {
31-
RequestHeaderModifier,
23+
pub enum GrpcRouteRulesBackendRefsFiltersType {
3224
ResponseHeaderModifier,
25+
RequestHeaderModifier,
3326
RequestMirror,
34-
RequestRedirect,
35-
#[serde(rename = "URLRewrite")]
36-
UrlRewrite,
3727
ExtensionRef,
38-
#[serde(rename = "CORS")]
39-
Cors,
40-
ExternalAuth,
4128
}
4229
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
43-
pub enum HTTPRouteRulesBackendRefsFiltersExternalAuthProtocol {
30+
pub enum HttpRouteRulesBackendRefsFiltersExternalAuthProtocol {
4431
#[serde(rename = "HTTP")]
4532
Http,
4633
#[serde(rename = "GRPC")]
4734
Grpc,
4835
}
4936
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
50-
pub enum HeaderMatchType {
51-
Exact,
52-
RegularExpression,
37+
pub enum HttpRouteRulesBackendRefsFiltersRequestRedirectPathType {
38+
ReplaceFullPath,
39+
ReplacePrefixMatch,
5340
}
5441
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
55-
pub enum PersistenceCookieConfigLifetime {
56-
Permanent,
57-
Session,
42+
pub enum HttpRouteRulesBackendRefsFiltersRequestRedirectScheme {
43+
#[serde(rename = "http")]
44+
Http,
45+
#[serde(rename = "https")]
46+
Https,
5847
}
5948
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
60-
pub enum RedirectStatusCode {
49+
pub enum HttpRouteRulesBackendRefsFiltersRequestRedirectStatusCode {
6150
#[serde(rename = "301")]
6251
r#_301,
6352
#[serde(rename = "302")]
6453
r#_302,
6554
}
6655
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
67-
pub enum RequestOperationType {
68-
ReplaceFullPath,
69-
ReplacePrefixMatch,
56+
pub enum HttpRouteRulesBackendRefsFiltersType {
57+
RequestHeaderModifier,
58+
ResponseHeaderModifier,
59+
RequestMirror,
60+
RequestRedirect,
61+
#[serde(rename = "URLRewrite")]
62+
UrlRewrite,
63+
ExtensionRef,
64+
#[serde(rename = "CORS")]
65+
Cors,
66+
ExternalAuth,
7067
}
7168
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
72-
pub enum RequestRedirectScheme {
73-
#[serde(rename = "http")]
74-
Http,
75-
#[serde(rename = "https")]
76-
Https,
69+
pub enum HttpRouteRulesMatchesHeadersType {
70+
Exact,
71+
RegularExpression,
72+
}
73+
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
74+
pub enum HttpRouteRulesSessionPersistenceCookieConfigLifetimeType {
75+
Permanent,
76+
Session,
7777
}
7878
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
79-
pub enum SessionPersistenceType {
79+
pub enum HttpRouteRulesSessionPersistenceType {
8080
Cookie,
8181
Header,
8282
}
8383
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
84-
pub struct BackendReference {
85-
#[serde(default, skip_serializing_if = "Option::is_none")]
86-
pub group: Option<String>,
87-
#[serde(default, skip_serializing_if = "Option::is_none")]
88-
pub kind: Option<String>,
89-
pub name: String,
90-
#[serde(default, skip_serializing_if = "Option::is_none")]
91-
pub namespace: Option<String>,
92-
#[serde(default, skip_serializing_if = "Option::is_none")]
93-
pub port: Option<i32>,
94-
#[serde(default, skip_serializing_if = "Option::is_none")]
95-
pub weight: Option<i32>,
96-
}
97-
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
9884
pub struct BackendTlsClientCertificateReference {
9985
#[serde(default, skip_serializing_if = "Option::is_none")]
10086
pub group: Option<String>,
@@ -118,12 +104,25 @@ pub struct GatewayInfrastructureParametersReference {
118104
pub name: String,
119105
}
120106
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
121-
pub struct HTTPHeader {
107+
pub struct HttpRouteParentRefs {
108+
#[serde(default, skip_serializing_if = "Option::is_none")]
109+
pub group: Option<String>,
110+
#[serde(default, skip_serializing_if = "Option::is_none")]
111+
pub kind: Option<String>,
122112
pub name: String,
123-
pub value: String,
113+
#[serde(default, skip_serializing_if = "Option::is_none")]
114+
pub namespace: Option<String>,
115+
#[serde(default, skip_serializing_if = "Option::is_none")]
116+
pub port: Option<i32>,
117+
#[serde(
118+
default,
119+
skip_serializing_if = "Option::is_none",
120+
rename = "sectionName"
121+
)]
122+
pub section_name: Option<String>,
124123
}
125124
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
126-
pub struct HTTPRouteRulesBackendRefsFiltersExternalAuthBackendRef {
125+
pub struct HttpRouteRulesBackendRefsFiltersExternalAuthBackendRef {
127126
#[serde(default, skip_serializing_if = "Option::is_none")]
128127
pub group: Option<String>,
129128
#[serde(default, skip_serializing_if = "Option::is_none")]
@@ -135,12 +134,12 @@ pub struct HTTPRouteRulesBackendRefsFiltersExternalAuthBackendRef {
135134
pub port: Option<i32>,
136135
}
137136
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
138-
pub struct HTTPRouteRulesBackendRefsFiltersExternalAuthForwardBody {
137+
pub struct HttpRouteRulesBackendRefsFiltersExternalAuthForwardBody {
139138
#[serde(default, skip_serializing_if = "Option::is_none", rename = "maxSize")]
140139
pub max_size: Option<i64>,
141140
}
142141
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
143-
pub struct HTTPRouteRulesBackendRefsFiltersExternalAuthGrpc {
142+
pub struct HttpRouteRulesBackendRefsFiltersExternalAuthGrpc {
144143
#[serde(
145144
default,
146145
skip_serializing_if = "Option::is_none",
@@ -149,7 +148,7 @@ pub struct HTTPRouteRulesBackendRefsFiltersExternalAuthGrpc {
149148
pub allowed_headers: Option<Vec<String>>,
150149
}
151150
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
152-
pub struct HTTPRouteRulesBackendRefsFiltersExternalAuthHttp {
151+
pub struct HttpRouteRulesBackendRefsFiltersExternalAuthHttp {
153152
#[serde(
154153
default,
155154
skip_serializing_if = "Option::is_none",
@@ -166,6 +165,17 @@ pub struct HTTPRouteRulesBackendRefsFiltersExternalAuthHttp {
166165
pub path: Option<String>,
167166
}
168167
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
168+
pub struct HttpRouteRulesBackendRefsFiltersRequestHeaderModifierAdd {
169+
pub name: String,
170+
pub value: String,
171+
}
172+
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
173+
pub struct HttpRouteRulesBackendRefsFiltersRequestMirrorFraction {
174+
#[serde(default, skip_serializing_if = "Option::is_none")]
175+
pub denominator: Option<i32>,
176+
pub numerator: i32,
177+
}
178+
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
169179
pub struct Kind {
170180
#[serde(default, skip_serializing_if = "Option::is_none")]
171181
pub group: Option<String>,
@@ -180,7 +190,7 @@ pub struct ParametersReference {
180190
pub namespace: Option<String>,
181191
}
182192
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
183-
pub struct ParentReference {
193+
pub struct TcpRouteRulesBackendRefs {
184194
#[serde(default, skip_serializing_if = "Option::is_none")]
185195
pub group: Option<String>,
186196
#[serde(default, skip_serializing_if = "Option::is_none")]
@@ -190,130 +200,6 @@ pub struct ParentReference {
190200
pub namespace: Option<String>,
191201
#[serde(default, skip_serializing_if = "Option::is_none")]
192202
pub port: Option<i32>,
193-
#[serde(
194-
default,
195-
skip_serializing_if = "Option::is_none",
196-
rename = "sectionName"
197-
)]
198-
pub section_name: Option<String>,
199-
}
200-
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
201-
pub struct RequestMirrorFraction {
202-
#[serde(default, skip_serializing_if = "Option::is_none")]
203-
pub denominator: Option<i32>,
204-
pub numerator: i32,
205-
}
206-
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
207-
pub struct CommonRouteRule {
208-
#[serde(rename = "backendRefs")]
209-
pub backend_refs: Vec<BackendReference>,
210-
#[serde(default, skip_serializing_if = "Option::is_none")]
211-
pub name: Option<String>,
212-
}
213-
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
214-
pub struct HeaderMatch {
215-
pub name: String,
216-
#[serde(default, skip_serializing_if = "Option::is_none", rename = "type")]
217-
pub r#type: Option<HeaderMatchType>,
218-
pub value: String,
219-
}
220-
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
221-
pub struct HeaderModifier {
222-
#[serde(default, skip_serializing_if = "Option::is_none")]
223-
pub add: Option<Vec<HTTPHeader>>,
224-
#[serde(default, skip_serializing_if = "Option::is_none")]
225-
pub remove: Option<Vec<String>>,
226203
#[serde(default, skip_serializing_if = "Option::is_none")]
227-
pub set: Option<Vec<HTTPHeader>>,
228-
}
229-
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
230-
pub struct ParentRouteStatus {
231-
pub conditions: Vec<Condition>,
232-
#[serde(rename = "controllerName")]
233-
pub controller_name: String,
234-
#[serde(rename = "parentRef")]
235-
pub parent_ref: ParentReference,
236-
}
237-
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
238-
pub struct RequestRedirectPath {
239-
#[serde(
240-
default,
241-
skip_serializing_if = "Option::is_none",
242-
rename = "replaceFullPath"
243-
)]
244-
pub replace_full_path: Option<String>,
245-
#[serde(
246-
default,
247-
skip_serializing_if = "Option::is_none",
248-
rename = "replacePrefixMatch"
249-
)]
250-
pub replace_prefix_match: Option<String>,
251-
#[serde(rename = "type")]
252-
pub r#type: RequestOperationType,
253-
}
254-
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
255-
pub struct SessionPersistenceCookieConfig {
256-
#[serde(
257-
default,
258-
skip_serializing_if = "Option::is_none",
259-
rename = "lifetimeType"
260-
)]
261-
pub lifetime_type: Option<PersistenceCookieConfigLifetime>,
262-
}
263-
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
264-
pub struct RequestRedirect {
265-
#[serde(default, skip_serializing_if = "Option::is_none")]
266-
pub hostname: Option<String>,
267-
#[serde(default, skip_serializing_if = "Option::is_none")]
268-
pub path: Option<RequestRedirectPath>,
269-
#[serde(default, skip_serializing_if = "Option::is_none")]
270-
pub port: Option<i32>,
271-
#[serde(default, skip_serializing_if = "Option::is_none")]
272-
pub scheme: Option<RequestRedirectScheme>,
273-
#[serde(
274-
default,
275-
skip_serializing_if = "Option::is_none",
276-
rename = "statusCode"
277-
)]
278-
pub status_code: Option<i64>,
279-
}
280-
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
281-
pub struct HTTPRouteUrlRewrite {
282-
#[serde(default, skip_serializing_if = "Option::is_none")]
283-
pub hostname: Option<String>,
284-
#[serde(default, skip_serializing_if = "Option::is_none")]
285-
pub path: Option<RequestRedirectPath>,
286-
}
287-
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
288-
pub struct RouteStatus {
289-
pub parents: Vec<ParentRouteStatus>,
290-
}
291-
#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
292-
pub struct SessionPersistence {
293-
#[serde(
294-
default,
295-
skip_serializing_if = "Option::is_none",
296-
rename = "absoluteTimeout"
297-
)]
298-
pub absolute_timeout: Option<String>,
299-
#[serde(
300-
default,
301-
skip_serializing_if = "Option::is_none",
302-
rename = "cookieConfig"
303-
)]
304-
pub cookie_config: Option<SessionPersistenceCookieConfig>,
305-
#[serde(
306-
default,
307-
skip_serializing_if = "Option::is_none",
308-
rename = "idleTimeout"
309-
)]
310-
pub idle_timeout: Option<String>,
311-
#[serde(
312-
default,
313-
skip_serializing_if = "Option::is_none",
314-
rename = "sessionName"
315-
)]
316-
pub session_name: Option<String>,
317-
#[serde(default, skip_serializing_if = "Option::is_none", rename = "type")]
318-
pub r#type: Option<SessionPersistenceType>,
204+
pub weight: Option<i32>,
319205
}

gateway-api/src/apis/experimental/constants.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ impl std::fmt::Display for ListenerConditionReason {
9191
write!(f, "{:?}", self)
9292
}
9393
}
94-
9594
#[derive(Debug, PartialEq, Eq)]
9695
pub enum RouteConditionType {
9796
Accepted,
@@ -102,7 +101,6 @@ impl std::fmt::Display for RouteConditionType {
102101
write!(f, "{:?}", self)
103102
}
104103
}
105-
106104
#[derive(Debug, PartialEq, Eq)]
107105
pub enum RouteConditionReason {
108106
Accepted,

gateway-api/src/apis/experimental/enum_defaults.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,3 @@ impl Default for RequestOperationType {
1818
RequestOperationType::ReplaceFullPath
1919
}
2020
}
21-
22-
impl Default for HTTPRouteRulesBackendRefsFiltersExternalAuthProtocol {
23-
fn default() -> Self {
24-
HTTPRouteRulesBackendRefsFiltersExternalAuthProtocol::Http
25-
}
26-
}

0 commit comments

Comments
 (0)