Merge pull request #7 from cbgbt/sdk-vended-models

Use bottlerocket-settings-sdk for settings models needed in core-kit

sources/api/bootstrap-containers/Cargo.toml

@@ -13,12 +13,16 @@ exclude = ["README.md"]
 base64 = "0.21"
 constants = { path = "../../constants", version = "0.1" }
 log = "0.4"
-modeled-types = { path = "../../models/modeled-types", version = "0.1" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
 simplelog = "0.12"
 snafu = "0.8"
 toml = "0.8"
 
+[dependencies.bottlerocket-modeled-types]
+git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
+tag = "bottlerocket-settings-models-v0.1.0"
+version = "0.1.0"
+
 [build-dependencies]
 generate-readme = { version = "0.1", path = "../../generate-readme" }

sources/api/bootstrap-containers/src/main.rs

@@ -87,7 +87,7 @@ use std::path::{Path, PathBuf};
 use std::process::{self, Command};
 use std::str::FromStr;
 
-use modeled_types::{BootstrapContainerMode, Identifier, Url, ValidBase64};
+use bottlerocket_modeled_types::{BootstrapContainerMode, Identifier, Url, ValidBase64};
 
 const ENV_FILE_DIR: &str = "/etc/bootstrap-containers";
 const DROPIN_FILE_DIR: &str = "/etc/systemd/system";
@@ -607,7 +607,9 @@ mod error {
 
         // `try_from` in `BootstrapContainerMode` already returns a useful error message
         #[snafu(display("Failed to parse mode: {}", source))]
-        BootstrapContainerMode { source: modeled_types::error::Error },
+        BootstrapContainerMode {
+            source: bottlerocket_modeled_types::error::Error,
+        },
 
         #[snafu(display("'{}' failed - stderr: {}",
                         bin_path, String::from_utf8_lossy(&output.stderr)))]

sources/api/bork/Cargo.toml

@@ -11,3 +11,8 @@ exclude = ["README.md"]
 [dependencies]
 rand = "0.8"
 serde_json = "1"
+
+[dependencies.settings-extension-updates]
+git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
+tag = "bottlerocket-settings-models-v0.1.0"
+version = "0.1.0"

sources/api/certdog/Cargo.toml

@@ -14,12 +14,16 @@ argh = "0.1"
 base64 = "0.21"
 constants = { path = "../../constants", version = "0.1" }
 log = "0.4"
-modeled-types = { path = "../../models/modeled-types", version = "0.1" }
 serde = { version = "1.0", features = ["derive"] }
 simplelog = "0.12"
 snafu = "0.8"
 toml = "0.8"
-x509-parser = "0.15"
+x509-parser = "0.16"
+
+[dependencies.bottlerocket-modeled-types]
+git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
+tag = "bottlerocket-settings-models-v0.1.0"
+version = "0.1.0"
 
 [dev-dependencies]
 tempfile = "3"

sources/api/certdog/src/main.rs

@@ -20,7 +20,7 @@ use std::io::{BufRead, Seek};
 use std::path::{Path, PathBuf};
 use std::process;
 
-use modeled_types::{Identifier, PemCertificateString};
+use bottlerocket_modeled_types::{Identifier, PemCertificateString};
 
 // Default location of the config file
 const DEFAULT_CONFIG_FILE: &str = "/etc/certdog.toml";
@@ -304,12 +304,12 @@ type Result<T> = std::result::Result<T, error::Error>;
 #[cfg(test)]
 mod test_certdog {
     use super::*;
-    use modeled_types::{Identifier, PemCertificateString};
+    use bottlerocket_modeled_types::{Identifier, PemCertificateString};
     use std::collections::HashMap;
     use std::convert::TryFrom;
     use std::fs::File;
 
-    static TEST_PEM: &str = include_str!("../../../models/tests/data/test-pem");
+    static TEST_PEM: &str = include_str!("../tests/data/test-pem");
 
     #[test]
     fn bundles_splitted() {

sources/api/corndog/Cargo.toml

@@ -11,12 +11,16 @@ exclude = ["README.md"]
 
 [dependencies]
 log = "0.4"
-modeled-types = { path = "../../models/modeled-types", version = "0.1" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
 simplelog = "0.12"
 snafu = "0.8"
 toml = "0.8"
 
+[dependencies.bottlerocket-modeled-types]
+git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
+tag = "bottlerocket-settings-models-v0.1.0"
+version = "0.1.0"
+
 [build-dependencies]
 generate-readme = { version = "0.1", path = "../../generate-readme" }

sources/api/corndog/src/main.rs

@@ -5,8 +5,8 @@ It sets kernel-related settings, for example:
 * lockdown mode, based on the value of `settings.kernel.lockdown`
 */
 
+use bottlerocket_modeled_types::{Lockdown, SysctlKey};
 use log::{debug, error, info, trace, warn};
-use modeled_types::{Lockdown, SysctlKey};
 use serde::{Deserialize, Serialize};
 use simplelog::{Config as LogConfig, LevelFilter, SimpleLogger};
 use snafu::ResultExt;

sources/api/host-containers/Cargo.toml

@@ -13,12 +13,16 @@ exclude = ["README.md"]
 base64 = "0.21"
 constants = { path = "../../constants", version = "0.1" }
 log = "0.4"
-modeled-types = { path = "../../models/modeled-types", version = "0.1" }
 serde = { version = "1", features = ["derive"] }
 simplelog = "0.12"
 snafu = "0.8"
 toml = "0.8"
 
+[dependencies.bottlerocket-modeled-types]
+git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
+tag = "bottlerocket-settings-models-v0.1.0"
+version = "0.1.0"
+
 [dev-dependencies]
 tempfile = "3"
 

sources/api/host-containers/src/config.rs

@@ -1,4 +1,4 @@
-use modeled_types::{Identifier, Url, ValidBase64};
+use bottlerocket_modeled_types::{Identifier, Url, ValidBase64};
 use serde::Deserialize;
 use std::collections::HashMap;
 

sources/api/host-containers/src/main.rs

@@ -27,7 +27,7 @@ use std::path::{Path, PathBuf};
 use std::process::{self, Command};
 use std::str::FromStr;
 
-use modeled_types::Identifier;
+use bottlerocket_modeled_types::Identifier;
 
 const ENV_FILE_DIR: &str = "/etc/host-containers";
 const CONFIG_FILE: &str = "/etc/host-containers/host-containers.toml";
@@ -496,7 +496,7 @@ fn main() {
 #[cfg(test)]
 mod test {
     use super::*;
-    use modeled_types::{Identifier, Url, ValidBase64};
+    use bottlerocket_modeled_types::{Identifier, Url, ValidBase64};
 
     #[test]
     fn test_get_host_containers() {

sources/api/pluto/Cargo.toml

@@ -18,7 +18,6 @@ http = "0.2"
 hyper = "0.14"
 hyper-rustls = { version = "0.24", default-features = false, features = ["http2", "native-tokio", "tls12", "logging"] }
 imdsclient = { path = "../../imdsclient", version = "0.1" }
-modeled-types = { path = "../../models/modeled-types", version = "0.1" }
 aws-config = "1"
 aws-sdk-eks = "1"
 aws-sdk-ec2 = "1"
@@ -34,5 +33,10 @@ tokio-rustls = "0.24"
 url = "2"
 log = "0.4.21"
 
+[dependencies.bottlerocket-modeled-types]
+git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
+tag = "bottlerocket-settings-models-v0.1.0"
+version = "0.1.0"
+
 [build-dependencies]
 generate-readme = { version = "0.1", path = "../../generate-readme" }

sources/api/pluto/src/api.rs

@@ -18,7 +18,7 @@ pub(crate) struct AwsK8sInfo {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub(crate) cluster_name: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub(crate) cluster_dns_ip: Option<modeled_types::KubernetesClusterDnsIp>,
+    pub(crate) cluster_dns_ip: Option<bottlerocket_modeled_types::KubernetesClusterDnsIp>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub(crate) node_ip: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -44,7 +44,7 @@ pub(crate) struct Kubernetes {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub(crate) cluster_name: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub(crate) cluster_dns_ip: Option<modeled_types::KubernetesClusterDnsIp>,
+    pub(crate) cluster_dns_ip: Option<bottlerocket_modeled_types::KubernetesClusterDnsIp>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub(crate) node_ip: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]

sources/api/pluto/src/main.rs

@@ -39,8 +39,8 @@ mod hyper_proxy;
 mod proxy;
 
 use api::AwsK8sInfo;
+use bottlerocket_modeled_types::KubernetesClusterDnsIp;
 use imdsclient::ImdsClient;
-use modeled_types::KubernetesClusterDnsIp;
 use snafu::{ensure, OptionExt, ResultExt};
 use std::fs::File;
 use std::io::{BufRead, BufReader};

sources/api/prairiedog/Cargo.toml

@@ -14,7 +14,6 @@ bytes = "1"
 constants = { path = "../../constants", version = "0.1" }
 log = "0.4"
 nix = "0.26"
-modeled-types = { path = "../../models/modeled-types", version = "0.1" }
 schnauzer = { path = "../schnauzer", version = "0.1" }
 signpost = { path = "../../updater/signpost", version = "0.1" }
 simplelog = "0.12"
@@ -23,6 +22,11 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 toml = "0.8"
 
+[dependencies.bottlerocket-modeled-types]
+git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
+tag = "bottlerocket-settings-models-v0.1.0"
+version = "0.1.0"
+
 [dev-dependencies]
 maplit = "1"
 

sources/api/prairiedog/src/bootconfig.rs

@@ -1,7 +1,7 @@
 use crate::error;
 use crate::error::Result;
 use crate::initrd::generate_initrd;
-use modeled_types::{BootConfigKey, BootConfigValue};
+use bottlerocket_modeled_types::{BootConfigKey, BootConfigValue};
 use serde::{Deserialize, Serialize};
 use snafu::{ensure, ResultExt};
 use std::collections::HashMap;
@@ -352,8 +352,8 @@ mod boot_settings_tests {
         boot_config_to_boot_settings_json, boot_settings_change_requires_reboot,
         serialize_boot_settings_to_boot_config, DEFAULT_BOOTCONFIG_STR,
     };
+    use bottlerocket_modeled_types::{BootConfigKey, BootConfigValue};
     use maplit::hashmap;
-    use modeled_types::{BootConfigKey, BootConfigValue};
     use serde_json::json;
     use serde_json::value::Value;
     use std::collections::HashMap;

sources/api/prairiedog/src/error.rs

@@ -77,13 +77,17 @@ pub(super) enum Error {
     InvalidBootConfig,
 
     #[snafu(display("Failed to parse boot config key: {}", source))]
-    ParseBootConfigKey { source: modeled_types::error::Error },
+    ParseBootConfigKey {
+        source: bottlerocket_modeled_types::error::Error,
+    },
 
     #[snafu(display("Invalid boot config value '{}'. Boot config values may only contain ASCII printable characters except for delimiters such as ';', '\n', ',', '#', and '}}'", input))]
     InvalidBootConfigValue { input: String },
 
     #[snafu(display("Failed to parse boot config value: {}", source))]
-    ParseBootConfigValue { source: modeled_types::error::Error },
+    ParseBootConfigValue {
+        source: bottlerocket_modeled_types::error::Error,
+    },
 
     #[snafu(display("Unsupported boot config key '{}'. `BootSettings` currently only supports boot configuration for 'kernel' and 'init'", key))]
     UnsupportedBootConfigKey { key: String },

sources/api/schnauzer/Cargo.toml

@@ -42,6 +42,16 @@ tokio = { version = "~1.32", default-features = false, features = ["macros", "rt
 toml = "0.8"
 url = "2"
 
+[dependencies.bottlerocket-modeled-types]
+git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
+tag = "bottlerocket-settings-models-v0.1.0"
+version = "0.1.0"
+
+[dependencies.settings-extension-oci-defaults]
+git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
+tag = "bottlerocket-settings-models-v0.1.0"
+version = "0.1.0"
+
 [dev-dependencies]
 # Workaround to enable a feature during integration tests.
 schnauzer = { path = ".", version = "0.1.0", features = ["testfakes"] }

sources/api/schnauzer/src/helpers.rs

@@ -3,17 +3,17 @@
 // text at render time.
 
 use base64::Engine;
+use bottlerocket_modeled_types::{OciDefaultsCapability, OciDefaultsResourceLimitType};
 use dns_lookup::lookup_host;
 use handlebars::{
     handlebars_helper, Context, Handlebars, Helper, HelperDef, Output, RenderContext, RenderError,
     Renderable,
 };
 use lazy_static::lazy_static;
-use model::modeled_types::{OciDefaultsCapability, OciDefaultsResourceLimitType};
-use model::OciDefaultsResourceLimit;
 use serde::Deserialize;
 use serde_json::value::Value;
 use serde_plain::derive_fromstr_from_deserialize;
+use settings_extension_oci_defaults::OciDefaultsResourceLimitV1;
 use snafu::{OptionExt, ResultExt};
 use std::borrow::Borrow;
 use std::collections::HashMap;
@@ -1269,7 +1269,7 @@ pub fn localhost_aliases(
 
     let mut results: Vec<String> = vec![];
 
-    let hosts: Option<model::modeled_types::EtcHostsEntries> = (!hosts_value.is_null())
+    let hosts: Option<bottlerocket_modeled_types::EtcHostsEntries> = (!hosts_value.is_null())
         .then(|| {
             serde_json::from_value(hosts_value.clone()).context(
                 error::UnparseableTemplateValueSnafu {
@@ -1348,12 +1348,14 @@ pub fn etc_hosts_entries(
     // Otherwise we need to generate /etc/hosts lines, ignoring loopback.
     let mut result_lines: Vec<String> = Vec::new();
 
-    let hosts: model::modeled_types::EtcHostsEntries = serde_json::from_value(hosts_value.clone())
-        .context(error::UnparseableTemplateValueSnafu {
-            expected: "EtcHostsEntries",
-            value: hosts_value.to_owned(),
-            template: template_name.to_owned(),
-        })?;
+    let hosts: bottlerocket_modeled_types::EtcHostsEntries = serde_json::from_value(
+        hosts_value.clone(),
+    )
+    .context(error::UnparseableTemplateValueSnafu {
+        expected: "EtcHostsEntries",
+        value: hosts_value.to_owned(),
+        template: template_name.to_owned(),
+    })?;
     trace!("Hosts from template: {:?}", hosts);
 
     hosts
@@ -1571,7 +1573,7 @@ impl Runtime {
     fn get_resource_limits(
         &self,
         rlimit_type: &OciDefaultsResourceLimitType,
-        values: &OciDefaultsResourceLimit,
+        values: &OciDefaultsResourceLimitV1,
     ) -> String {
         match self {
             Self::Docker => Docker::get_resource_limits(rlimit_type, values),
@@ -1592,7 +1594,7 @@ impl Docker {
     /// Formats resource limits for Docker
     fn get_resource_limits(
         rlimit_type: &OciDefaultsResourceLimitType,
-        values: &OciDefaultsResourceLimit,
+        values: &OciDefaultsResourceLimitV1,
     ) -> String {
         format!(
             r#" "{}":{{ "Name": "{}", "Hard": {}, "Soft": {} }}"#,
@@ -1634,7 +1636,7 @@ impl Containerd {
     /// Formats resource limits for Containerd
     fn get_resource_limits(
         rlimit_type: &OciDefaultsResourceLimitType,
-        values: &OciDefaultsResourceLimit,
+        values: &OciDefaultsResourceLimitV1,
     ) -> String {
         format!(
             r#"{{ "type": "{}", "hard": {}, "soft": {} }}"#,
@@ -1777,7 +1779,7 @@ fn oci_spec_capabilities(value: &Value) -> Result<String, RenderError> {
 /// the settings data from the datastore (`settings.oci-defaults.resource-limits`).
 fn oci_spec_resource_limits(
     value: &Value,
-) -> Result<HashMap<OciDefaultsResourceLimitType, OciDefaultsResourceLimit>, RenderError> {
+) -> Result<HashMap<OciDefaultsResourceLimitType, OciDefaultsResourceLimitV1>, RenderError> {
     Ok(serde_json::from_value(value.clone())?)
 }
 
@@ -1921,7 +1923,7 @@ fn kube_cpu_helper(num_cores: usize) -> Result<String, TemplateHelperError> {
 /// If `configured_hosts` is set, the hostname will be considered resolvable if it is listed as an alias for any given IP address.
 fn hostname_resolveable(
     hostname: &str,
-    configured_hosts: Option<&model::modeled_types::EtcHostsEntries>,
+    configured_hosts: Option<&bottlerocket_modeled_types::EtcHostsEntries>,
 ) -> bool {
     // If the hostname is in our configured hosts, then it *will* be resolvable when /etc/hosts is rendered.
     // Note that DNS search paths in /etc/resolv.conf are not relevant here, as they are not checked when searching /etc/hosts.
@@ -2842,7 +2844,7 @@ mod test_etc_hosts_helpers {
         assert!(hostname_resolveable(
             "unresolveable.irrelevanthostname.tld",
             Some(
-                &serde_json::from_str::<model::modeled_types::EtcHostsEntries>(
+                &serde_json::from_str::<bottlerocket_modeled_types::EtcHostsEntries>(
                     r#"[["10.0.0.1", ["unresolveable.irrelevanthostname.tld"]]]"#
                 )
                 .unwrap()

sources/api/simple-settings-plugin/Cargo.toml

@@ -23,3 +23,8 @@ serde_json = "1.0.116"
 git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
 tag = "bottlerocket-settings-plugin-v0.1.0"
 version = "0.1.0"
+
+[dependencies.bottlerocket-settings-models]
+git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
+tag = "bottlerocket-settings-models-v0.1.0"
+version = "0.1.0"