chore: restructure & get rid of dead_code exclusions

basically all of the logic is now in a chisel_operator lib target, which our entrypoints import from
this gets rust_analyzer to handle the dead code warnings properly

Author: lleyton

Cargo.toml

@@ -58,7 +58,3 @@ hyper-rustls = { version = "0.24.2", features = ["http2", "webpki-roots", "webpk
 # tonic = { version = "0.8.3" }
 # tracing-opentelemetry = "0.18.0"
 # opentelemetry_api = "0.18.0"
-
-[[bin]]
-name = "crdgen"
-path = "src/crdgen.rs"

src/crdgen.rs renamed to src/bin/crdgen.rs

@@ -1,13 +1,8 @@
+use chisel_operator::ops;
 use kube::CustomResourceExt;
 use std::fs::File;
 use std::io::prelude::*;
 
-mod cloud;
-mod daemon;
-mod deployment;
-mod error;
-mod ops;
-
 // todo: Make this a cargo xtask, maybe?
 
 fn main() {

src/cloud/aws.rs

@@ -8,11 +8,11 @@ use aws_config::{BehaviorVersion, Region};
 use aws_sdk_ec2::types::{Tag, TagSpecification};
 use aws_smithy_runtime::client::http::hyper_014::HyperClientBuilder;
 use base64::Engine;
-use color_eyre::eyre::{anyhow, Error};
+use color_eyre::eyre::anyhow;
 use k8s_openapi::api::core::v1::Secret;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use tracing::{debug, info, warn};
+use tracing::{debug, warn};
 
 const DEFAULT_SIZE: &str = "t2.micro";
 const UBUNTU_AMI_SSM_KEY: &str =

src/cloud/mod.rs

@@ -19,7 +19,6 @@ pub enum CloudProvider {
 }
 
 // This code was actually used, weirdly enough
-#[allow(dead_code)]
 pub const CHISEL_PORT: u16 = 9090;
 
 #[async_trait]

src/daemon.rs

@@ -51,7 +51,7 @@ use crate::ops::{
     EXIT_NODE_NAME_LABEL, EXIT_NODE_PROVISIONER_LABEL,
 };
 use crate::{deployment::create_owned_deployment, error::ReconcileError};
-#[allow(dead_code)]
+
 pub const EXIT_NODE_FINALIZER: &str = "exitnode.chisel-operator.io/finalizer";
 pub const SVCS_FINALIZER: &str = "service.chisel-operator.io/finalizer";
 
@@ -69,7 +69,6 @@ pub const SVCS_FINALIZER: &str = "service.chisel-operator.io/finalizer";
 // }
 
 // this is actually used to pass clients around
-#[allow(dead_code)]
 pub struct Context {
     pub client: Client,
 }
@@ -130,10 +129,9 @@ async fn check_service_managed(service: &Service) -> bool {
 
 // Let's not use magic values, so we can change this later or if someone wants to fork this for something else
 
-#[allow(dead_code)]
 const OPERATOR_CLASS: &str = "chisel-operator.io/chisel-operator-class";
-#[allow(dead_code)]
 const OPERATOR_MANAGER: &str = "chisel-operator";
+
 #[instrument(skip(ctx))]
 async fn select_exit_node_local(
     ctx: Arc<Context>,

src/deployment.rs

@@ -62,7 +62,6 @@ fn convert_service_port(svcport: ServicePort) -> String {
 /// The function `generate_remote_arg` is returning a `String`. The `String`
 /// contains the formatted remote argument which is a combination of the `lb_ip` and `chisel_port`
 /// values obtained from the `node` parameter.
-#[allow(dead_code)]
 pub fn generate_remote_arg(node: &ExitNode) -> String {
     // todo: what about ECDSA keys?
 
@@ -86,7 +85,6 @@ pub fn generate_remote_arg(node: &ExitNode) -> String {
 ///
 /// a `Result` containing a `Vec` of `String`s. The `Vec` contains arguments for a tunnel, which are
 /// generated based on the input `Service`.
-#[allow(dead_code)]
 pub fn generate_tunnel_args(svc: &Service) -> Result<Vec<String>, ReconcileError> {
     // We can unwrap safely since Service is guaranteed to have a name
     let service_name = svc.metadata.name.clone().unwrap();

src/error.rs

@@ -1,7 +1,6 @@
 use thiserror::Error;
 
 #[derive(Error, Debug)]
-#[allow(dead_code)] // all these errors are used
 pub enum ReconcileError {
     #[error("Kube Error: {0}")]
     KubeError(#[from] kube::Error),

src/lib.rs

@@ -0,0 +1,5 @@
+pub mod cloud;
+pub mod daemon;
+pub mod deployment;
+pub mod error;
+pub mod ops;

src/main.rs

@@ -1,5 +1,6 @@
 use std::env;
 
+use chisel_operator::daemon;
 use color_eyre::Result;
 use tracing::info;
 // use opentelemetry::sdk::export::metrics::StdoutExporterBuilder;
@@ -10,11 +11,6 @@ use tracing::info;
 // use tracing::info;
 use tracing_subscriber::{prelude::*, EnvFilter, Registry};
 // Main entrypoint for operator
-mod cloud;
-mod daemon;
-mod deployment;
-mod error;
-mod ops;
 
 // TODO: OpenTelemetry is broken
 

src/ops.rs

@@ -10,7 +10,7 @@ use kube::{core::ObjectMeta, Api, CustomResource};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use tracing::debug;
-#[allow(dead_code)]
+
 pub const EXIT_NODE_NAME_LABEL: &str = "chisel-operator.io/exit-node-name";
 pub const EXIT_NODE_PROVISIONER_LABEL: &str = "chisel-operator.io/exit-node-provisioner";
 
@@ -149,7 +149,6 @@ pub enum ExitNodeProvisionerSpec {
 }
 
 impl ExitNodeProvisionerSpec {
-    #[allow(dead_code)] // this one is actually used lol
     pub fn get_inner(self) -> Box<(dyn Provisioner + Send + Sync)> {
         // Can we somehow not have to match on this?
         match self {
@@ -165,7 +164,6 @@ pub trait ProvisionerSecret {
 }
 
 impl ExitNodeProvisioner {
-    #[allow(dead_code)] // this is used in daemon.rs
     pub async fn find_secret(&self) -> Result<Option<Secret>> {
         let secret_name = match &self.spec {
             ExitNodeProvisionerSpec::DigitalOcean(a) => a.auth.clone(),