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

@@ -10,12 +10,30 @@ mod prelude {
 }
 use self::prelude::*;
 #[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 GatewayInfrastructureParametersRef {
+    pub group: String,
+    pub kind: String,
+    pub name: 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 HTTPHeader {
     pub name: String,
     pub value: String,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct MirrorBackendRef {
+pub struct RequestMirrorRef {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub group: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -27,18 +45,6 @@ pub struct MirrorBackendRef {
     pub port: Option<i32>,
 }
 #[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 {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub group: Option<String>,
@@ -52,40 +58,6 @@ pub struct RouteRef {
     #[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 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,
-}
-/// 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 {
-    ReplaceFullPath,
-    ReplacePrefixMatch,
-}
-/// 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 RedirectStatusCode {
-    #[serde(rename = "301")]
-    r#_301,
-    #[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
 /// point to express processing that may be done in Gateway implementations. Some
@@ -102,17 +74,6 @@ pub enum HTTPFilterType {
     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 {
-    #[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
 /// point to express processing that may be done in Gateway implementations. Some
@@ -126,17 +87,47 @@ pub enum GRPCFilterType {
     RequestMirror,
     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,
+/// 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 RequestRedirectScheme {
+    #[serde(rename = "http")]
+    Http,
+    #[serde(rename = "https")]
+    Https,
+}
+/// 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,
+}
+/// 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 RequestOperationType {
+    ReplaceFullPath,
+    ReplacePrefixMatch,
+}
+/// 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 RedirectStatusCode {
+    #[serde(rename = "301")]
+    r#_301,
+    #[serde(rename = "302")]
+    r#_302,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct HTTPPathModifier {
+pub struct RequestRedirectPath {
     #[serde(
         default,
         skip_serializing_if = "Option::is_none",
@@ -150,54 +141,74 @@ 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 HeaderModifier {
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub add: Option<Vec<HTTPHeader>>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub remove: Option<Vec<String>>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub set: Option<Vec<HTTPHeader>>,
+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 RequestMirrorModifier {
+pub struct RequestMirror {
     #[serde(rename = "backendRef")]
-    pub backend_ref: MirrorBackendRef,
+    pub backend_ref: RequestMirrorRef,
 }
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct HTTPRequestRewrite {
+pub struct ParentRouteStatus {
     #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub hostname: Option<String>,
+    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 HeaderModifier {
     #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub path: Option<HTTPPathModifier>,
+    pub add: Option<Vec<HTTPHeader>>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub remove: Option<Vec<String>>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub set: Option<Vec<HTTPHeader>>,
 }
 #[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 RouteStatus {
+    pub parents: Vec<ParentRouteStatus>,
+}
+#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
+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>,
+}
+#[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>,
+    pub extension_ref: Option<GatewayInfrastructureParametersRef>,
     #[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>,
+    pub request_mirror: Option<RequestMirror>,
     #[serde(
         default,
         skip_serializing_if = "Option::is_none",
@@ -211,32 +222,3 @@ pub struct GRPCRouteFilter {
 
 // 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)]

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

@@ -27,7 +27,7 @@ use self::prelude::*;
     plural = "grpcroutes"
 )]
 #[kube(namespaced)]
-#[kube(status = "GRPCRouteStatus")]
+#[kube(status = "RouteStatus")]
 #[kube(derive = "Default")]
 #[kube(derive = "PartialEq")]
 pub struct GRPCRouteSpec {
@@ -373,30 +373,12 @@ pub struct GRPCRouteRulesMatches {
     /// ANDed together, meaning, a request MUST match all the specified headers
     /// to select the route.
     #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub headers: Option<Vec<GRPCRouteRulesMatchesHeaders>>,
+    pub headers: Option<Vec<MatchingHeaders>>,
     /// Method specifies a gRPC request service/method matcher. If this field is
     /// not specified, all services and methods will match.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub method: Option<GRPCRouteRulesMatchesMethod>,
 }
-/// GRPCHeaderMatch describes how to select a gRPC route by matching gRPC request
-/// headers.
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct GRPCRouteRulesMatchesHeaders {
-    /// Name is the name of the gRPC Header to be matched.
-    ///
-    /// If multiple entries specify equivalent header names, only the first
-    /// entry with an equivalent name MUST be considered for a match. Subsequent
-    /// entries with an equivalent header name MUST be ignored. Due to the
-    /// case-insensitivity of header names, "foo" and "Foo" are considered
-    /// equivalent.
-    pub name: String,
-    /// Type specifies how to match against the value of the header.
-    #[serde(default, skip_serializing_if = "Option::is_none", rename = "type")]
-    pub r#type: Option<HeaderMatchesType>,
-    /// Value is the value of the gRPC Header to be matched.
-    pub value: String,
-}
 /// Method specifies a gRPC request service/method matcher. If this field is
 /// not specified, all services and methods will match.
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
@@ -420,24 +402,5 @@ pub struct GRPCRouteRulesMatchesMethod {
     ///
     /// Support: Implementation-specific (RegularExpression)
     #[serde(default, skip_serializing_if = "Option::is_none", rename = "type")]
-    pub r#type: Option<HeaderMatchesType>,
-}
-/// Status defines the current state of GRPCRoute.
-#[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, Default, PartialEq)]
-pub struct GRPCRouteStatus {
-    /// Parents is a list of parent resources (usually Gateways) that are
-    /// associated with the route, and the status of the route with respect to
-    /// each parent. When this route attaches to a parent, the controller that
-    /// manages the parent must add an entry to this list when the controller
-    /// first sees the route and should update the entry as appropriate when the
-    /// route or gateway is modified.
-    ///
-    /// Note that parent references that cannot be resolved by an implementation
-    /// of this API will not be added to this list. Implementations of this API
-    /// can only populate Route status for the Gateways/parent resources they are
-    /// responsible for.
-    ///
-    /// A maximum of 32 Gateways will be represented in this list. An empty list
-    /// means the route has not been attached to any Gateway.
-    pub parents: Vec<ParentsRouteStatus>,
+    pub r#type: Option<HeaderMatchType>,
 }