Commit generated code to avoid development sluggishness

Instead of running build.rs on every save, this should make development
nicer

Author: omertuc

Cargo.toml

@@ -51,3 +51,5 @@ prost = "0.12.1"
 [build-dependencies]
 prost-build = "0.12.1"
 
+[features]
+generate = []

build.rs

@@ -3,12 +3,21 @@ extern crate prost_build;
 use std::io::Result;
 
 fn main() -> Result<()> {
+    if cfg!(feature = "generate") {
+        generate_protobuf_code()?
+    }
+    Ok(())
+}
+
+fn generate_protobuf_code() -> Result<()> {
     let mut prost_build = prost_build::Config::new();
 
     prost_build.type_attribute(".", "#[derive(serde::Serialize, serde::Deserialize)]");
     prost_build.type_attribute(".", "#[serde(rename_all = \"camelCase\")]");
 
-    prost_build.include_file("_includes.rs");
+    prost_build.out_dir("src/protobuf_gen");
+
+    prost_build.include_file("protobufs.rs");
 
     prost_build.compile_protos(
         &[

reproto.sh

@@ -7,15 +7,23 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 rm -rf "$SCRIPT_DIR/src/protobuf"
 mkdir -p "$SCRIPT_DIR/src/protobuf"
 
-OPENSHIFT_API_DIR="${OPENSHIFT_API_DIR:-"$SCRIPT_DIR/../api"}"
+OPENSHIFT_API_DIR=${OPENSHIFT_API_DIR:-"$SCRIPT_DIR/../api"}
 
-pushd OPENSHIFT_API_DIR >/dev/null
-find k8s.io -name 'generated.proto' -exec cp --parents {} ~/repos/recert/src/protobuf ';'
+pushd "${OPENSHIFT_API_DIR}/vendor" >/dev/null
+    find k8s.io -name 'generated.proto' -exec cp --parents {} "$SCRIPT_DIR"/src/protobuf ';'
+popd
 
+pushd "${OPENSHIFT_API_DIR}" >/dev/null
 for dir in */; do
 	if ! [[ "$dir" == "vendor/" || "$dir" == "tests/" || "$dir" == "tools/" ]]; then
-        find "$dir" -name 'generated.proto' -exec cp --parents {} ~/repos/recert/src/protobuf ';'
+        find "$dir" -name 'generated.proto' -exec cp --parents {} "$SCRIPT_DIR"/src/protobuf ';'
 	fi
 done
-
 popd >/dev/null
+
+pushd "$SCRIPT_DIR"
+cargo build --release --features generate
+popd
+
+
+

src/etcd_encoding.rs

@@ -1,22 +1,18 @@
-use self::k8s_etcd_protobuf::k8s::io::apimachinery::pkg::runtime::TypeMeta;
-use anyhow::{bail, Context, Result};
-use k8s_etcd_protobuf::github::com::openshift::api::route::v1::Route;
-use k8s_etcd_protobuf::k8s::io::{
-    api::{
-        admissionregistration::v1::{MutatingWebhookConfiguration, ValidatingWebhookConfiguration},
-        apps::v1::{DaemonSet, Deployment},
-        core::v1::{ConfigMap, Secret},
+use super::protobuf_gen::{
+    github::com::openshift::api::route::v1::Route,
+    k8s::io::{
+        api::{
+            admissionregistration::v1::{MutatingWebhookConfiguration, ValidatingWebhookConfiguration},
+            apps::v1::{DaemonSet, Deployment},
+            core::v1::{ConfigMap, Secret},
+        },
+        apimachinery::pkg::runtime::{TypeMeta, Unknown},
     },
-    apimachinery::pkg::runtime::Unknown,
 };
+use anyhow::{bail, Context, Result};
 use prost::Message;
 use serde_json::Value;
 
-mod k8s_etcd_protobuf {
-    #![allow(clippy::all)]
-    include!(concat!(env!("OUT_DIR"), "/_includes.rs"));
-}
-
 macro_rules! k8s_type {
     ($name:ident, $type:ident) => {
         #[derive(serde::Serialize, serde::Deserialize)]

src/main.rs

@@ -18,6 +18,7 @@ mod file_utils;
 mod json_tools;
 mod k8s_etcd;
 mod ocp_postprocess;
+mod protobuf_gen;
 mod rsa_key_pool;
 mod rules;
 mod runtime;