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

Use settings models vended by bottlerocket-settings-sdk
bottlerocket-os · Jun 20, 2024 · a9d39ea · a9d39ea
2 parents f36b20a 468f205
commit a9d39ea
Show file tree

Hide file tree

Showing 136 changed files with 391 additions and 9,239 deletions.
diff --git a/sources/Cargo.lock b/sources/Cargo.lock
diff --git a/sources/Cargo.toml b/sources/Cargo.toml
@@ -34,25 34,6 @@ members = [
  "settings-defaults/vmware-dev",
  "settings-defaults/vmware-k8s-1.30",
 
- "settings-extensions/autoscaling",
- "settings-extensions/aws",
- "settings-extensions/bootstrap-containers",
- "settings-extensions/cloudformation",
- "settings-extensions/container-registry",
- "settings-extensions/container-runtime",
- "settings-extensions/dns",
- "settings-extensions/ecs",
- "settings-extensions/host-containers",
- "settings-extensions/kernel",
- "settings-extensions/metrics",
- "settings-extensions/motd",
- "settings-extensions/network",
- "settings-extensions/ntp",
- "settings-extensions/oci-defaults",
- "settings-extensions/oci-hooks",
- "settings-extensions/pki",
- "settings-extensions/updates",
-
  # (all previous migrations archived; add new ones after this line)
  "settings-migrations/v1.21.0/pluto-remove-generators-v0-1-0",
  "settings-migrations/v1.21.0/pod-infra-container-image-affected-services",

diff --git a/sources/api/schnauzer/Cargo.toml b/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"] }

diff --git a/sources/api/schnauzer/src/helpers.rs b/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;
@@ -1263,7 1263,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 {
@@ -1342,12 1342,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
@@ -1565,7 1567,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),
@@ -1586,7 1588,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": {} }}"#,
@@ -1628,7 1630,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": {} }}"#,
@@ -1771,7 1773,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())?)
 }
 
@@ -1915,7 1917,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.
@@ -2836,7 2838,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()

diff --git a/sources/models/Cargo.toml b/sources/models/Cargo.toml
@@ -12,38 12,21 @@ exclude = ["README.md"]
 [dependencies]
 bottlerocket-release = { path = "../bottlerocket-release", version = "0.1" }
 libc = "0.2"
-model-derive = { path = "model-derive", version = "0.1" }
-modeled-types = { path = "modeled-types", version = "0.1" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 toml = "0.8"
 
-# settings extensions
-settings-extension-autoscaling = { path = "../settings-extensions/autoscaling", version = "0.1" }
-settings-extension-aws = { path = "../settings-extensions/aws", version = "0.1" }
-settings-extension-bootstrap-containers = { path = "../settings-extensions/bootstrap-containers", version = "0.1" }
-settings-extension-cloudformation = { path = "../settings-extensions/cloudformation", version = "0.1" }
-settings-extension-container-registry = { path = "../settings-extensions/container-registry", version = "0.1" }
-settings-extension-container-runtime = { path = "../settings-extensions/container-runtime", version = "0.1" }
-settings-extension-dns = { path = "../settings-extensions/dns", version = "0.1" }
-settings-extension-ecs = { path = "../settings-extensions/ecs", version = "0.1" }
-settings-extension-host-containers = { path = "../settings-extensions/host-containers", version = "0.1" }
-settings-extension-kernel = { path = "../settings-extensions/kernel", version = "0.1" }
-settings-extension-metrics = { path = "../settings-extensions/metrics", version = "0.1" }
-settings-extension-motd = { path = "../settings-extensions/motd", version = "0.1" }
-settings-extension-network = { path = "../settings-extensions/network", version = "0.1" }
-settings-extension-ntp = { path = "../settings-extensions/ntp", version = "0.1" }
-settings-extension-oci-defaults = { path = "../settings-extensions/oci-defaults", version = "0.1" }
-settings-extension-oci-hooks = { path = "../settings-extensions/oci-hooks", version = "0.1" }
-settings-extension-pki = { path = "../settings-extensions/pki", version = "0.1" }
-settings-extension-updates = { path = "../settings-extensions/updates", version = "0.1" }
-
 # settings plugins
 [dependencies.bottlerocket-settings-plugin]
 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"
 
 [build-dependencies]
 generate-readme = { version = "0.1", path = "../generate-readme" }
 

diff --git a/sources/models/model-derive/Cargo.toml b/sources/models/model-derive/Cargo.toml
diff --git a/sources/models/model-derive/README.md b/sources/models/model-derive/README.md
diff --git a/sources/models/model-derive/README.tpl b/sources/models/model-derive/README.tpl
diff --git a/sources/models/model-derive/build.rs b/sources/models/model-derive/build.rs