Allow innit to take in env variables

bin/innit/src/args.rs

@@ -8,6 +8,7 @@ use innit_server::{
     Config,
     ConfigError,
     ConfigFile,
+    Mode,
     StandardConfigFile,
 };
 use si_service::prelude::*;
@@ -78,6 +79,15 @@ pub(crate) struct Args {
     /// The address and port to bind the HTTP server to [example: 0.0.0.0:80]
     #[arg(long, env)]
     pub(crate) socket_addr: Option<String>,
+
+    /// Mode for parameter storage backend [options: env, ssm]
+    #[arg(
+        long = "mode",
+        env = "SI_INNIT_MODE",
+        default_value = "ssm",
+        hide_env_values = true
+    )]
+    pub(crate) mode: Mode,
 }
 
 impl TryFrom<Args> for Config {
@@ -91,6 +101,7 @@ impl TryFrom<Args> for Config {
             if let Some(socket_addr) = args.socket_addr {
                 config_map.set("socket_addr", socket_addr);
             }
+            config_map.set("mode", args.mode.to_string());
         })?
         .try_into()
     }

lib/bedrock-server/src/routes.rs

@@ -15,7 +15,7 @@ use serde_json::{
     Value,
     json,
 };
-use si_data_ssm::ParameterStoreClientError;
+use si_data_ssm::SsmParameterStoreClientError;
 use thiserror::Error;
 
 use super::{
@@ -62,7 +62,7 @@ pub fn public_routes(state: AppState) -> Router {
 #[derive(Debug, Error)]
 pub enum AppError {
     #[error("parameter store client error: {0}")]
-    ParameterStoreClient(#[from] ParameterStoreClientError),
+    ParameterStoreClient(#[from] SsmParameterStoreClientError),
     #[error("server error: {0}")]
     Server(#[from] ServerError),
 }

lib/innit-core/BUCK

@@ -4,12 +4,8 @@ rust_library(
     name = "innit-core",
     deps = [
         "//lib/config-file:config-file",
-
         "//third-party/rust:aws-sdk-ssm",
-        "//third-party/rust:chrono",
-        "//third-party/rust:serde",
-        "//third-party/rust:serde_json",
-        "//third-party/rust:ulid"
+        "//third-party/rust:serde"
     ],
     srcs = glob([
         "src/**/*.rs",

lib/innit-core/Cargo.toml

@@ -9,6 +9,5 @@ rust-version.workspace = true
 publish.workspace = true
 
 [dependencies]
-aws-sdk-ssm = { workspace = true }
 config-file = { path = "../../lib/config-file" }
 serde = { workspace = true }

lib/innit-core/src/lib.rs

@@ -1,7 +1,3 @@
-use aws_sdk_ssm::types::{
-    Parameter as AwsParameter,
-    ParameterType as AwsParameterType,
-};
 use config_file::parameter_provider::{
     Parameter as ParameterProviderParameter,
     ParameterType as ParameterProviderParameterType,
@@ -18,19 +14,6 @@ pub struct Parameter {
     pub r#type: Option<ParameterType>,
 }
 
-impl From<AwsParameter> for Parameter {
-    fn from(p: AwsParameter) -> Self {
-        Self {
-            name: p.name().unwrap_or_default().to_string(),
-            value: p.value().map(|s| s.to_string()),
-            r#type: p.r#type().map(|t| match t {
-                AwsParameterType::StringList => ParameterType::StringList,
-                _ => ParameterType::String,
-            }),
-        }
-    }
-}
-
 impl From<Parameter> for ParameterProviderParameter {
     fn from(p: Parameter) -> Self {
         Self {

lib/innit-server/BUCK

@@ -10,8 +10,9 @@ rust_library(
         "//lib/si-settings:si-settings",
         "//lib/si-std:si-std",
         "//lib/si-tls:si-tls",
-
         "//lib/telemetry-rs:telemetry",
+        "//third-party/rust:async-trait",
+        "//third-party/rust:aws-sdk-ssm",
         "//third-party/rust:axum",
         "//third-party/rust:dashmap",
         "//third-party/rust:derive_builder",
@@ -21,6 +22,7 @@ rust_library(
         "//third-party/rust:remain",
         "//third-party/rust:serde",
         "//third-party/rust:serde_json",
+        "//third-party/rust:strum",
         "//third-party/rust:thiserror",
         "//third-party/rust:tokio",
         "//third-party/rust:tokio-rustls",

lib/innit-server/Cargo.toml

@@ -9,6 +9,7 @@ rust-version.workspace = true
 publish.workspace = true
 
 [dependencies]
+async-trait = { workspace = true }
 axum = { workspace = true }
 buck2-resources = { path = "../../lib/buck2-resources" }
 dashmap = { workspace = true }
@@ -24,6 +25,7 @@ si-data-ssm = { path = "../../lib/si-data-ssm" }
 si-settings = { path = "../../lib/si-settings" }
 si-std = { path = "../../lib/si-std" }
 si-tls = { path = "../../lib/si-tls" }
+strum = { workspace = true }
 telemetry = { path = "../../lib/telemetry-rs" }
 thiserror = { workspace = true }
 tokio = { workspace = true }

lib/innit-server/src/app_state.rs

@@ -1,8 +1,10 @@
 use axum::extract::FromRef;
-use si_data_ssm::ParameterStoreClient;
 use tokio_util::sync::CancellationToken;
 
-use crate::parameter_cache::ParameterCache;
+use crate::{
+    parameter_cache::ParameterCache,
+    parameter_storage::ParameterStore,
+};
 
 #[remain::sorted]
 #[derive(Debug, Eq, PartialEq)]
@@ -11,20 +13,20 @@ pub enum ShutdownSource {}
 #[derive(Clone, Debug, FromRef)]
 pub struct AppState {
     pub parameter_cache: ParameterCache,
-    pub parameter_store_client: ParameterStoreClient,
+    pub parameter_storage: ParameterStore,
     shutdown_token: CancellationToken,
 }
 
 impl AppState {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
         parameter_cache: ParameterCache,
-        parameter_store_client: ParameterStoreClient,
+        parameter_storage: ParameterStore,
         shutdown_token: CancellationToken,
     ) -> Self {
         Self {
             parameter_cache,
-            parameter_store_client,
+            parameter_storage,
             shutdown_token,
         }
     }

lib/innit-server/src/config.rs

@@ -19,6 +19,10 @@ use si_std::{
     CanonicalFileError,
 };
 use si_tls::CertificateSource;
+use strum::{
+    Display,
+    EnumString,
+};
 use telemetry::prelude::*;
 use thiserror::Error;
 use ulid::Ulid;
@@ -49,7 +53,19 @@ impl ConfigError {
 
 type Result<T> = std::result::Result<T, ConfigError>;
 
-/// The config for the forklift server.
+#[remain::sorted]
+#[derive(
+    Debug, Default, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, EnumString, Display,
+)]
+#[serde(rename_all = "lowercase")]
+#[strum(serialize_all = "lowercase")]
+pub enum Mode {
+    Env,
+    #[default]
+    Ssm,
+}
+
+/// The config for the server.
 #[derive(Debug, Builder)]
 pub struct Config {
     #[builder(default = "default_cache_ttl()")]
@@ -78,6 +94,9 @@ pub struct Config {
 
     #[builder(default)]
     dev_mode: bool,
+
+    #[builder(default = "Mode::default()")]
+    mode: Mode,
 }
 
 impl StandardConfig for Config {
@@ -124,6 +143,10 @@ impl Config {
     pub fn client_ca_arns(&self) -> Option<&Vec<String>> {
         self.client_ca_arns.as_ref()
     }
+
+    pub fn mode(&self) -> Mode {
+        self.mode
+    }
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -147,6 +170,9 @@ pub struct ConfigFile {
 
     #[serde(default)]
     pub dev_mode: bool,
+
+    #[serde(default)]
+    mode: Mode,
 }
 
 impl Default for ConfigFile {
@@ -161,6 +187,7 @@ impl Default for ConfigFile {
             socket_addr: get_default_socket_addr(),
             test_endpoint: default_test_endpoint(),
             dev_mode: false,
+            mode: Mode::default(),
         }
     }
 }
@@ -182,6 +209,7 @@ impl TryFrom<ConfigFile> for Config {
         config.instance_id(value.instance_id);
         config.quiescent_period(Duration::from_secs(value.quiescent_period_secs));
         config.dev_mode(value.dev_mode);
+        config.mode(value.mode);
         config.build().map_err(Into::into)
     }
 }

lib/innit-server/src/lib.rs

@@ -3,6 +3,7 @@ mod app_state;
 mod config;
 mod middleware;
 mod parameter_cache;
+mod parameter_storage;
 mod routes;
 mod server;
 
@@ -11,8 +12,13 @@ pub use self::{
         Config,
         ConfigError,
         ConfigFile,
+        Mode,
         StandardConfigFile,
         detect_and_configure_development,
     },
+    parameter_storage::{
+        ParameterStore,
+        ParameterStoreKind,
+    },
     server::Server,
 };