Removal of intermediate dervied types, fixing bugs

Signed-off-by: Dawid Nowak <[email protected]>

Author: dawid-nowak

gateway-api/src/apis/processed/common_types.rs

@@ -15,7 +15,7 @@ pub struct HTTPHeader {
     pub value: String,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct MirrorBackendRef {
+pub struct RouteRef {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub group: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -25,21 +25,11 @@ pub struct MirrorBackendRef {
     pub namespace: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub port: Option<i32>,
+    #[serde(default, skip_serializing_if = "Option::is_none", rename = "sectionName")]
+    pub section_name: Option<String>,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct Kind {
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub group: Option<String>,
-    pub kind: String,
-}
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct GatewayAddress {
-    #[serde(default, skip_serializing_if = "Option::is_none", rename = "type")]
-    pub r#type: Option<String>,
-    pub value: String,
-}
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct RouteRef {
+pub struct RequestMirrorRef {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub group: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -49,29 +39,32 @@ pub struct RouteRef {
     pub namespace: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub port: Option<i32>,
-    #[serde(default, skip_serializing_if = "Option::is_none", rename = "sectionName")]
-    pub section_name: Option<String>,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct ExtensionBackendRef {
+pub struct Kind {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub group: Option<String>,
+    pub kind: String,
+}
+#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
+pub struct GatewayInfrastructureParametersRef {
     pub group: String,
     pub kind: String,
     pub name: String,
 }
-/// GRPCHeaderMatch describes how to select a gRPC route by matching gRPC request
-/// headers.
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
-pub enum HeaderMatchesType {
-    Exact,
-    RegularExpression,
+#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
+pub struct GatewayAddress {
+    #[serde(default, skip_serializing_if = "Option::is_none", rename = "type")]
+    pub r#type: Option<String>,
+    pub value: String,
 }
 /// Path defines parameters used to modify the path of the incoming request.
 /// The modified path is then used to construct the `Location` header. When
 /// empty, the request path is used as-is.
 ///
 /// Support: Extended
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
-pub enum HTTPPathType {
+pub enum RequestOperationType {
     ReplaceFullPath,
     ReplacePrefixMatch,
 }
@@ -86,57 +79,60 @@ pub enum RedirectStatusCode {
     #[serde(rename = "302")]
     r#_302,
 }
-/// HTTPRouteFilter defines processing steps that must be completed during the
-/// request or response lifecycle. HTTPRouteFilters are meant as an extension
+/// GRPCHeaderMatch describes how to select a gRPC route by matching gRPC request
+/// headers.
+#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
+pub enum HeaderMatchType {
+    Exact,
+    RegularExpression,
+}
+/// GRPCRouteFilter defines processing steps that must be completed during the
+/// request or response lifecycle. GRPCRouteFilters are meant as an extension
 /// point to express processing that may be done in Gateway implementations. Some
 /// examples include request or response modification, implementing
 /// authentication strategies, rate-limiting, and traffic shaping. API
 /// guarantee/conformance is defined based on the type of the filter.
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
-pub enum HTTPFilterType {
-    RequestHeaderModifier,
+pub enum GRPCFilterType {
     ResponseHeaderModifier,
+    RequestHeaderModifier,
     RequestMirror,
-    RequestRedirect,
-    #[serde(rename = "URLRewrite")]
-    UrlRewrite,
     ExtensionRef,
 }
 /// RequestRedirect defines a schema for a filter that responds to the
 /// request with an HTTP redirection.
 ///
 /// Support: Core
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
-pub enum HTTPRedirectScheme {
+pub enum RequestRedirectScheme {
     #[serde(rename = "http")]
     Http,
     #[serde(rename = "https")]
     Https,
 }
-/// GRPCRouteFilter defines processing steps that must be completed during the
-/// request or response lifecycle. GRPCRouteFilters are meant as an extension
+/// HTTPRouteFilter defines processing steps that must be completed during the
+/// request or response lifecycle. HTTPRouteFilters are meant as an extension
 /// point to express processing that may be done in Gateway implementations. Some
 /// examples include request or response modification, implementing
 /// authentication strategies, rate-limiting, and traffic shaping. API
 /// guarantee/conformance is defined based on the type of the filter.
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
-pub enum GRPCFilterType {
-    ResponseHeaderModifier,
+pub enum HTTPFilterType {
     RequestHeaderModifier,
+    ResponseHeaderModifier,
     RequestMirror,
+    RequestRedirect,
+    #[serde(rename = "URLRewrite")]
+    UrlRewrite,
     ExtensionRef,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct ParentsRouteStatus {
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub conditions: Option<Vec<Condition>>,
-    #[serde(rename = "controllerName")]
-    pub controller_name: String,
-    #[serde(rename = "parentRef")]
-    pub parent_ref: RouteRef,
+pub struct RequestMirror {
+    #[serde(rename = "backendRef")]
+    pub backend_ref: RequestMirrorRef,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct HTTPPathModifier {
+pub struct RequestRedirectPath {
     #[serde(
         default,
         skip_serializing_if = "Option::is_none",
@@ -150,7 +146,14 @@ pub struct HTTPPathModifier {
     )]
     pub replace_prefix_match: Option<String>,
     #[serde(rename = "type")]
-    pub r#type: HTTPPathType,
+    pub r#type: RequestOperationType,
+}
+#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
+pub struct MatchingHeaders {
+    pub name: String,
+    #[serde(default, skip_serializing_if = "Option::is_none", rename = "type")]
+    pub r#type: Option<HeaderMatchType>,
+    pub value: String,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
 pub struct HeaderModifier {
@@ -162,81 +165,39 @@ pub struct HeaderModifier {
     pub set: Option<Vec<HTTPHeader>>,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct RequestMirrorModifier {
-    #[serde(rename = "backendRef")]
-    pub backend_ref: MirrorBackendRef,
+pub struct ParentRouteStatus {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub conditions: Option<Vec<Condition>>,
+    #[serde(rename = "controllerName")]
+    pub controller_name: String,
+    #[serde(rename = "parentRef")]
+    pub parent_ref: RouteRef,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct HTTPRequestRewrite {
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub hostname: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub path: Option<HTTPPathModifier>,
+pub struct RouteStatus {
+    pub parents: Vec<ParentRouteStatus>,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct HTTPRequestRedirect {
+pub struct HTTPRouteRequestRedirect {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub hostname: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub path: Option<HTTPPathModifier>,
+    pub path: Option<RequestRedirectPath>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub port: Option<i32>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub scheme: Option<HTTPRedirectScheme>,
+    pub scheme: Option<RequestRedirectScheme>,
     #[serde(default, skip_serializing_if = "Option::is_none", rename = "statusCode")]
     pub status_code: Option<i64>,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct GRPCRouteFilter {
-    #[serde(default, skip_serializing_if = "Option::is_none", rename = "extensionRef")]
-    pub extension_ref: Option<ExtensionBackendRef>,
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        rename = "requestHeaderModifier"
-    )]
-    pub request_header_modifier: Option<HeaderModifier>,
-    #[serde(default, skip_serializing_if = "Option::is_none", rename = "requestMirror")]
-    pub request_mirror: Option<RequestMirrorModifier>,
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        rename = "responseHeaderModifier"
-    )]
-    pub response_header_modifier: Option<HeaderModifier>,
-    #[serde(rename = "type")]
-    pub r#type: GRPCFilterType,
+pub struct HTTPRouteUrlRewrite {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub hostname: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub path: Option<RequestRedirectPath>,
 }
 
 
 // Next attempt 
 
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct HTTPRouteFilter {
-    #[serde(default, skip_serializing_if = "Option::is_none", rename = "extensionRef")]
-    pub extension_ref: Option<ExtensionBackendRef>,
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        rename = "requestHeaderModifier"
-    )]
-    pub request_header_modifier: Option<HeaderModifier>,
-    #[serde(default, skip_serializing_if = "Option::is_none", rename = "requestMirror")]
-    pub request_mirror: Option<RequestMirrorModifier>,
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        rename = "requestRedirect"
-    )]
-    pub request_redirect: Option<HTTPRequestRedirect>,
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        rename = "responseHeaderModifier"
-    )]
-    pub response_header_modifier: Option<HeaderModifier>,
-    #[serde(rename = "type")]
-    pub r#type: HTTPFilterType,
-    #[serde(default, skip_serializing_if = "Option::is_none", rename = "urlRewrite")]
-    pub url_rewrite: Option<HTTPRequestRewrite>,
-}

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

@@ -13,8 +13,8 @@ impl Default for HTTPFilterType {
     }
 }
 
-impl Default for HTTPPathType {
+impl Default for RequestOperationType {
     fn default() -> Self {
-        HTTPPathType::ReplaceFullPath
+        RequestOperationType::ReplaceFullPath
     }
 }

gateway-api/src/apis/processed/gateways.rs

@@ -226,26 +226,6 @@ pub struct GatewayInfrastructure {
     #[serde(default, skip_serializing_if = "Option::is_none", rename = "parametersRef")]
     pub parameters_ref: Option<GatewayInfrastructureParametersRef>,
 }
-/// ParametersRef is a reference to a resource that contains the configuration
-/// parameters corresponding to the Gateway. This is optional if the
-/// controller does not require any additional configuration.
-///
-/// This follows the same semantics as GatewayClass's `parametersRef`, but on a per-Gateway basis
-///
-/// The Gateway's GatewayClass may provide its own `parametersRef`. When both are specified,
-/// the merging behavior is implementation specific.
-/// It is generally recommended that GatewayClass provides defaults that can be overridden by a Gateway.
-///
-/// Support: Implementation-specific
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct GatewayInfrastructureParametersRef {
-    /// Group is the group of the referent.
-    pub group: String,
-    /// Kind is kind of the referent.
-    pub kind: String,
-    /// Name is the name of the referent.
-    pub name: String,
-}
 /// Listener embodies the concept of a logical endpoint where a Gateway accepts
 /// network connections.
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]