Restructure to enable multiple providers. Add basic command options.

Signed-off-by: Michael Nelson <[email protected]>

Author: absoludity

cmd/oci-catalog/Cargo.lock

@@ -7,11 +7,14 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-tonic = "0.9"
+clap = { version = "4.3", features = ["derive", "env"] }
+env_logger = "0.10"
+futures-core = "0.3"
+log = "0.4"
 prost = "0.11"
 tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
 tokio-stream = "0.1"
-futures-core = "0.3"
+tonic = "0.9"
 reqwest = "0.11"
 
 [build-dependencies]

cmd/oci-catalog/Cargo.toml

@@ -1,7 +1,17 @@
 // Copyright 2023 the Kubeapps contributors.
 // SPDX-License-Identifier: Apache-2.0
 
+use std::env;
+
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     tonic_build::compile_protos("proto/ocicatalog.proto")?;
+
+    // If the binary is built with the ENV var "OCI_CATALOG_VERSION",
+    // the value will be available at buildime. Otherwise, it becomes "devel"
+    // We use this ENV var to display a custom version when passing the "-- version"
+    // flag
+    let version = env::var("OCI_CATALOG_VERSION").unwrap_or("devel".to_string());
+    println!("cargo:rustc-env=OCI_CATALOG_VERSION={}", version);
+
     Ok(())
 }

cmd/oci-catalog/build.rs

@@ -0,0 +1,34 @@
+// Copyright 2023 the Kubeapps contributors.
+// SPDX-License-Identifier: Apache-2.0
+
+use clap;
+
+#[derive(clap::Parser, Debug)]
+#[command(version = env!("OCI_CATALOG_VERSION"))]
+/// A service that returns catalog information for an OCI repository.
+///
+/// The OCI Catalog service uses a strategy pattern to enable listing catalog
+/// information for different OCI provider registries, until a standard is set
+/// for requesting namespaced repositories of a registry in the OCI Distribution
+/// specification.
+pub struct Options {
+    #[arg(
+        short = 'p',
+        long = "port",
+        env = "OCI_CATALOG_PORT",
+        default_value = "50001",
+        help = "Specify the port on which oci-catalog gRPC service listens."
+    )]
+    pub port: u16,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_cli() {
+        use clap::CommandFactory;
+        Options::command().debug_assert();
+    }
+}