Removing comments from enum files

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

Author: dawid-nowak

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

@@ -9,25 +9,13 @@ mod prelude {
     pub use std::collections::BTreeMap;
 }
 use self::prelude::*;
-/// 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 GRPCFilterType {
     ResponseHeaderModifier,
     RequestHeaderModifier,
     RequestMirror,
     ExtensionRef,
 }
-/// 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 HTTPFilterType {
     RequestHeaderModifier,
@@ -38,60 +26,35 @@ pub enum HTTPFilterType {
     UrlRewrite,
     ExtensionRef,
 }
-/// 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,
 }
-/// CookieConfig provides configuration settings that are specific
-/// to cookie-based session persistence.
-///
-/// Support: Core
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
 pub enum PersistenceCookieConfigLifetime {
     Permanent,
     Session,
 }
-/// 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,
 }
-/// 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 RequestRedirectScheme {
     #[serde(rename = "http")]
     Http,
     #[serde(rename = "https")]
     Https,
 }
-/// SessionPersistence defines and configures session persistence
-/// for the route rule.
-///
-/// Support: Extended
-///
-///
 #[derive(Serialize, Deserialize, Clone, Debug, JsonSchema, PartialEq)]
 pub enum SessionPersistenceType {
     Cookie,

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

@@ -9,25 +9,13 @@ mod prelude {
     pub use std::collections::BTreeMap;
 }
 use self::prelude::*;
-/// 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 GRPCFilterType {
     ResponseHeaderModifier,
     RequestHeaderModifier,
     RequestMirror,
     ExtensionRef,
 }
-/// 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 HTTPFilterType {
     RequestHeaderModifier,
@@ -38,38 +26,23 @@ pub enum HTTPFilterType {
     UrlRewrite,
     ExtensionRef,
 }
-/// 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,
 }
-/// 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,
 }
-/// 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 RequestRedirectScheme {
     #[serde(rename = "http")]

type-reducer/src/lib.rs

@@ -95,7 +95,7 @@ pub fn write_type_names_to_file(
     Ok(())
 }
 
-pub fn delete_replaced_structs(file: File, type_names: Vec<String>) -> File {
+pub fn delete_replaced_types(file: File, type_names: Vec<String>) -> File {
     let File {
         shebang,
         attrs,
@@ -179,7 +179,7 @@ pub fn find_similar_types(
     }
 }
 
-pub fn prune_replaced_structs(
+pub fn prune_replaced_types(
     renaming_visitor: &mut StructEnumFieldsRenamer,
     visitors: Vec<(String, File)>,
 ) -> Vec<(String, String, bool)> {
@@ -189,7 +189,7 @@ pub fn prune_replaced_structs(
             renaming_visitor.changed = false;
             renaming_visitor.visit_file_mut(&mut f);
             let new_file =
-                delete_replaced_structs(f, renaming_visitor.names.keys().cloned().collect());
+                delete_replaced_types(f, renaming_visitor.names.keys().cloned().collect());
             (
                 name,
                 prettyplease::unparse(&new_file),
@@ -303,5 +303,11 @@ pub fn create_common_type_struct(s: &ItemStruct, type_new_name: &str) -> ItemStr
 pub fn create_common_type_enum(s: &ItemEnum, type_new_name: &str) -> ItemEnum {
     let mut new_enum = s.clone();
     new_enum.ident = Ident::new(type_new_name, Span::call_site());
+    new_enum.attrs = s
+        .attrs
+        .iter()
+        .filter(|&a| a.meta.path().get_ident() != Some(&Ident::new("doc", Span::call_site())))
+        .cloned()
+        .collect();
     new_enum
 }

type-reducer/src/main.rs

@@ -140,9 +140,6 @@ fn handle_reduce_types(
                 return None;
             }
 
-            // let type_new_name =
-            //     create_struct_type_name_substitute(&current_pass_type_name_substitutes, v);
-
             if let Some((i, s)) = v.first() {
                 let new_struct = create_common_type_struct(
                     s,
@@ -176,9 +173,6 @@ fn handle_reduce_types(
             );
             let mapped_type_names = v.iter().map(|v| v.0.to_string()).collect::<Vec<_>>();
 
-            // let type_new_name =
-            //     create_enum_type_name_substitute(&current_pass_type_name_substitutes, v);
-
             if let Some((i, s)) = v.first() {
                 let new_enum = create_common_type_enum(
                     s,
@@ -212,7 +206,7 @@ fn handle_reduce_types(
 
     write_type_names_to_file(&renaming_visitor.names)?;
 
-    let unparsed_files = prune_replaced_structs(&mut renaming_visitor, visitors);
+    let unparsed_files = prune_replaced_types(&mut renaming_visitor, visitors);
 
     recreate_project_files(
         out_dir,

update.sh

@@ -201,4 +201,7 @@ sed -i '/#\[kube(status = "GRPCRouteStatus")\]/c\#\[kube(status = "RouteStatus")
 sed -i '/#\[kube(status = "HTTPRouteStatus")\]/c\#\[kube(status = "RouteStatus")\]' $APIS_DIR/experimental/httproutes.rs
 sed -i '/#\[kube(status = "TLSRouteStatus")\]/c\#\[kube(status = "RouteStatus")\]' $APIS_DIR/experimental/tlsroutes.rs
 sed -i '/#\[kube(status = "UDPRouteStatus")\]/c\#\[kube(status = "RouteStatus")\]' $APIS_DIR/experimental/udproutes.rs
-sed -i '/#\[kube(status = "TCPRouteStatus")\]/c\#\[kube(status = "RouteStatus")\]' $APIS_DIR/experimental/tcproutes.rs
+sed -i '/#\[kube(status = "TCPRouteStatus")\]/c\#\[kube(status = "RouteStatus")\]' $APIS_DIR/experimental/tcproutes.rs
+
+
+cargo fmt