Merge pull request #3738 from sam-berning/aws-settings-extension

settings: add aws settings extension
bottlerocket-os · Feb 9, 2024 · a7703c5 · a7703c5
2 parents 12393ac + 6f870f0
commit a7703c5
Show file tree

Hide file tree

Showing 24 changed files with 256 additions and 51 deletions.
diff --git a/packages/settings-aws/Cargo.toml b/packages/settings-aws/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "settings-aws"
+version = "0.1.0"
+edition = "2021"
+publish = false
+build = "../build.rs"
+
+[lib]
+path = "../packages.rs"
+
+[package.metadata.build-package]
+source-groups = [
+    "settings-extensions/aws"
+]
+
+# RPM BuildRequires
+[build-dependencies]
+glibc = { path = "../glibc" }
+
+# RPM Requires
+[dependencies]
diff --git a/packages/settings-aws/settings-aws.spec b/packages/settings-aws/settings-aws.spec
@@ -0,0 +1,39 @@
+%global _cross_first_party 1
+%undefine _debugsource_packages
+
+%global extension_name aws
+
+Name: %{_cross_os}settings-%{extension_name}
+Version: 0.0
+Release: 0%{?dist}
+Summary: settings-%{extension_name}
+License: Apache-2.0 OR MIT
+URL: https://github.com/bottlerocket-os/bottlerocket
+
+BuildRequires: %{_cross_os}glibc-devel
+
+%description
+%{summary}.
+
+%prep
+%setup -T -c
+%cargo_prep
+
+%build
+%cargo_build --manifest-path %{_builddir}/sources/Cargo.toml \
+    -p settings-extension-%{extension_name}
+
+%install
+install -d %{buildroot}%{_cross_libexecdir}
+install -p -m 0755 \
+    ${HOME}/.cache/%{__cargo_target}/release/settings-extension-%{extension_name} \
+    %{buildroot}%{_cross_libexecdir}
+
+install -d %{buildroot}%{_cross_libexecdir}/settings
+ln -sf \
+    ../settings-extension-%{extension_name} \
+    %{buildroot}%{_cross_libexecdir}/settings/%{extension_name}
+
+%files
+%{_cross_libexecdir}/settings-extension-%{extension_name}
+%{_cross_libexecdir}/settings/%{extension_name}
diff --git a/sources/Cargo.lock b/sources/Cargo.lock
diff --git a/sources/Cargo.toml b/sources/Cargo.toml
@@ -84,6 +84,7 @@ members = [
 
     "models",
 
+    "settings-extensions/aws",
     "settings-extensions/container-registry",
     "settings-extensions/kernel",
     "settings-extensions/motd",

diff --git a/sources/models/Cargo.toml b/sources/models/Cargo.toml
@@ -18,6 +18,7 @@ serde = { version = "1", features = ["derive"] }
 toml = "0.5"
 
 # settings extensions
+settings-extension-aws = { path = "../settings-extensions/aws", version = "0.1" }
 settings-extension-container-registry = { path = "../settings-extensions/container-registry", version = "0.1" }
 settings-extension-kernel = { path = "../settings-extensions/kernel", version = "0.1" }
 settings-extension-motd = { path = "../settings-extensions/motd", version = "0.1" }

diff --git a/sources/models/src/aws-dev/mod.rs b/sources/models/src/aws-dev/mod.rs
@@ -2,8 +2,8 @@ use model_derive::model;
 use std::collections::HashMap;
 
 use crate::{
-    AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
-    HostContainer, MetricsSettings, NetworkSettings, OciHooks, PemCertificate,
+    BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings, HostContainer,
+    MetricsSettings, NetworkSettings, OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -19,7 +19,7 @@ struct Settings {
     network: NetworkSettings,
     kernel: settings_extension_kernel::KernelSettingsV1,
     boot: BootSettings,
-    aws: AwsSettings,
+    aws: settings_extension_aws::AwsSettingsV1,
     metrics: MetricsSettings,
     pki: HashMap<Identifier, PemCertificate>,
     container_registry: settings_extension_container_registry::RegistrySettingsV1,

diff --git a/sources/models/src/aws-ecs-1-nvidia/mod.rs b/sources/models/src/aws-ecs-1-nvidia/mod.rs
@@ -2,9 +2,8 @@ use model_derive::model;
 use std::collections::HashMap;
 
 use crate::{
-    AutoScalingSettings, AwsSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
-    ECSSettings, HostContainer, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
-    PemCertificate,
+    AutoScalingSettings, BootstrapContainer, CloudFormationSettings, DnsSettings, ECSSettings,
+    HostContainer, MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -19,7 +18,7 @@ struct Settings {
     ntp: settings_extension_ntp::NtpSettingsV1,
     network: NetworkSettings,
     kernel: settings_extension_kernel::KernelSettingsV1,
-    aws: AwsSettings,
+    aws: settings_extension_aws::AwsSettingsV1,
     ecs: ECSSettings,
     metrics: MetricsSettings,
     pki: HashMap<Identifier, PemCertificate>,

diff --git a/sources/models/src/aws-ecs-1/mod.rs b/sources/models/src/aws-ecs-1/mod.rs
@@ -2,9 +2,8 @@ use model_derive::model;
 use std::collections::HashMap;
 
 use crate::{
-    AutoScalingSettings, AwsSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
-    ECSSettings, HostContainer, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
-    PemCertificate,
+    AutoScalingSettings, BootstrapContainer, CloudFormationSettings, DnsSettings, ECSSettings,
+    HostContainer, MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -19,7 +18,7 @@ struct Settings {
     ntp: settings_extension_ntp::NtpSettingsV1,
     network: NetworkSettings,
     kernel: settings_extension_kernel::KernelSettingsV1,
-    aws: AwsSettings,
+    aws: settings_extension_aws::AwsSettingsV1,
     ecs: ECSSettings,
     metrics: MetricsSettings,
     pki: HashMap<Identifier, PemCertificate>,

diff --git a/sources/models/src/aws-ecs-2-nvidia/mod.rs b/sources/models/src/aws-ecs-2-nvidia/mod.rs
@@ -2,9 +2,9 @@ use model_derive::model;
 use std::collections::HashMap;
 
 use crate::{
-    AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
-    DnsSettings, ECSSettings, HostContainer, MetricsSettings, NetworkSettings, OciDefaults,
-    OciHooks, PemCertificate,
+    AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
+    ECSSettings, HostContainer, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
+    PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -20,7 +20,7 @@ struct Settings {
     network: NetworkSettings,
     kernel: settings_extension_kernel::KernelSettingsV1,
     boot: BootSettings,
-    aws: AwsSettings,
+    aws: settings_extension_aws::AwsSettingsV1,
     ecs: ECSSettings,
     metrics: MetricsSettings,
     pki: HashMap<Identifier, PemCertificate>,

diff --git a/sources/models/src/aws-ecs-2/mod.rs b/sources/models/src/aws-ecs-2/mod.rs
@@ -2,9 +2,9 @@ use model_derive::model;
 use std::collections::HashMap;
 
 use crate::{
-    AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
-    DnsSettings, ECSSettings, HostContainer, MetricsSettings, NetworkSettings, OciDefaults,
-    OciHooks, PemCertificate,
+    AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
+    ECSSettings, HostContainer, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
+    PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -20,7 +20,7 @@ struct Settings {
     network: NetworkSettings,
     kernel: settings_extension_kernel::KernelSettingsV1,
     boot: BootSettings,
-    aws: AwsSettings,
+    aws: settings_extension_aws::AwsSettingsV1,
     ecs: ECSSettings,
     metrics: MetricsSettings,
     pki: HashMap<Identifier, PemCertificate>,

diff --git a/sources/models/src/aws-k8s-1.24-nvidia/mod.rs b/sources/models/src/aws-k8s-1.24-nvidia/mod.rs
@@ -1,7 +1,7 @@
 use crate::{
-    AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
-    DnsSettings, HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults,
-    OciHooks, PemCertificate,
+    AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
+    HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
+    PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -21,7 +21,7 @@ struct Settings {
     network: NetworkSettings,
     kernel: settings_extension_kernel::KernelSettingsV1,
     boot: BootSettings,
-    aws: AwsSettings,
+    aws: settings_extension_aws::AwsSettingsV1,
     metrics: MetricsSettings,
     pki: HashMap<Identifier, PemCertificate>,
     container_registry: settings_extension_container_registry::RegistrySettingsV1,

diff --git a/sources/models/src/aws-k8s-1.24/mod.rs b/sources/models/src/aws-k8s-1.24/mod.rs
@@ -1,5 +1,5 @@
 use crate::{
-    AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
+    AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, MetricsSettings,
     NetworkSettings, OciDefaults, OciHooks, PemCertificate,
 };
@@ -21,7 +21,7 @@ struct Settings {
     network: NetworkSettings,
     kernel: settings_extension_kernel::KernelSettingsV1,
     boot: BootSettings,
-    aws: AwsSettings,
+    aws: settings_extension_aws::AwsSettingsV1,
     metrics: MetricsSettings,
     pki: HashMap<Identifier, PemCertificate>,
     container_registry: settings_extension_container_registry::RegistrySettingsV1,

diff --git a/sources/models/src/aws-k8s-1.25-nvidia/mod.rs b/sources/models/src/aws-k8s-1.25-nvidia/mod.rs
@@ -1,7 +1,7 @@
 use crate::{
-    AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
-    DnsSettings, HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults,
-    OciHooks, PemCertificate,
+    AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
+    HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
+    PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -21,7 +21,7 @@ struct Settings {
     network: NetworkSettings,
     kernel: settings_extension_kernel::KernelSettingsV1,
     boot: BootSettings,
-    aws: AwsSettings,
+    aws: settings_extension_aws::AwsSettingsV1,
     metrics: MetricsSettings,
     pki: HashMap<Identifier, PemCertificate>,
     container_registry: settings_extension_container_registry::RegistrySettingsV1,

diff --git a/sources/models/src/aws-k8s-1.25/mod.rs b/sources/models/src/aws-k8s-1.25/mod.rs
@@ -1,5 +1,5 @@
 use crate::{
-    AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
+    AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, MetricsSettings,
     NetworkSettings, OciDefaults, OciHooks, PemCertificate,
 };
@@ -21,7 +21,7 @@ struct Settings {
     network: NetworkSettings,
     kernel: settings_extension_kernel::KernelSettingsV1,
     boot: BootSettings,
-    aws: AwsSettings,
+    aws: settings_extension_aws::AwsSettingsV1,
     metrics: MetricsSettings,
     pki: HashMap<Identifier, PemCertificate>,
     container_registry: settings_extension_container_registry::RegistrySettingsV1,

diff --git a/sources/models/src/aws-k8s-1.26-nvidia/mod.rs b/sources/models/src/aws-k8s-1.26-nvidia/mod.rs
@@ -1,7 +1,7 @@
 use crate::{
-    AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
-    DnsSettings, HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults,
-    OciHooks, PemCertificate,
+    AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
+    HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
+    PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -21,7 +21,7 @@ struct Settings {
     network: NetworkSettings,
     kernel: settings_extension_kernel::KernelSettingsV1,
     boot: BootSettings,
-    aws: AwsSettings,
+    aws: settings_extension_aws::AwsSettingsV1,
     metrics: MetricsSettings,
     pki: HashMap<Identifier, PemCertificate>,
     container_registry: settings_extension_container_registry::RegistrySettingsV1,

diff --git a/sources/models/src/aws-k8s-1.26/mod.rs b/sources/models/src/aws-k8s-1.26/mod.rs
@@ -1,5 +1,5 @@
 use crate::{
-    AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
+    AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, MetricsSettings,
     NetworkSettings, OciDefaults, OciHooks, PemCertificate,
 };
@@ -21,7 +21,7 @@ struct Settings {
     network: NetworkSettings,
     kernel: settings_extension_kernel::KernelSettingsV1,
     boot: BootSettings,
-    aws: AwsSettings,
+    aws: settings_extension_aws::AwsSettingsV1,
     metrics: MetricsSettings,
     pki: HashMap<Identifier, PemCertificate>,
     container_registry: settings_extension_container_registry::RegistrySettingsV1,

diff --git a/sources/models/src/aws-k8s-1.29-nvidia/mod.rs b/sources/models/src/aws-k8s-1.29-nvidia/mod.rs
@@ -1,7 +1,7 @@
 use crate::{
-    AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
-    DnsSettings, HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults,
-    OciHooks, PemCertificate,
+    AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
+    HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
+    PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -21,7 +21,7 @@ struct Settings {
     network: NetworkSettings,
     kernel: settings_extension_kernel::KernelSettingsV1,
     boot: BootSettings,
-    aws: AwsSettings,
+    aws: settings_extension_aws::AwsSettingsV1,
     metrics: MetricsSettings,
     pki: HashMap<Identifier, PemCertificate>,
     container_registry: settings_extension_container_registry::RegistrySettingsV1,

diff --git a/sources/models/src/aws-k8s-1.29/mod.rs b/sources/models/src/aws-k8s-1.29/mod.rs
@@ -1,5 +1,5 @@
 use crate::{
-    AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
+    AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, MetricsSettings,
     NetworkSettings, OciDefaults, OciHooks, PemCertificate,
 };
@@ -21,7 +21,7 @@ struct Settings {
     network: NetworkSettings,
     kernel: settings_extension_kernel::KernelSettingsV1,
     boot: BootSettings,
-    aws: AwsSettings,
+    aws: settings_extension_aws::AwsSettingsV1,
     metrics: MetricsSettings,
     pki: HashMap<Identifier, PemCertificate>,
     container_registry: settings_extension_container_registry::RegistrySettingsV1,

diff --git a/sources/models/src/metal-k8s-1.29/mod.rs b/sources/models/src/metal-k8s-1.29/mod.rs
@@ -2,9 +2,8 @@ use model_derive::model;
 use std::collections::HashMap;
 
 use crate::{
-    AwsSettings, BootSettings, BootstrapContainer, ContainerRuntimeSettings, DnsSettings,
-    HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
-    PemCertificate,
+    BootSettings, BootstrapContainer, ContainerRuntimeSettings, DnsSettings, HostContainer,
+    KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -21,7 +20,7 @@ struct Settings {
     network: NetworkSettings,
     kernel: settings_extension_kernel::KernelSettingsV1,
     boot: BootSettings,
-    aws: AwsSettings,
+    aws: settings_extension_aws::AwsSettingsV1,
     metrics: MetricsSettings,
     pki: HashMap<Identifier, PemCertificate>,
     container_registry: settings_extension_container_registry::RegistrySettingsV1,

diff --git a/sources/models/src/vmware-k8s-1.29/mod.rs b/sources/models/src/vmware-k8s-1.29/mod.rs
@@ -2,9 +2,8 @@ use model_derive::model;
 use std::collections::HashMap;
 
 use crate::{
-    AwsSettings, BootSettings, BootstrapContainer, ContainerRuntimeSettings, DnsSettings,
-    HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
-    PemCertificate,
+    BootSettings, BootstrapContainer, ContainerRuntimeSettings, DnsSettings, HostContainer,
+    KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -20,7 +19,7 @@ struct Settings {
     ntp: settings_extension_ntp::NtpSettingsV1,
     network: NetworkSettings,
     kernel: settings_extension_kernel::KernelSettingsV1,
-    aws: AwsSettings,
+    aws: settings_extension_aws::AwsSettingsV1,
     boot: BootSettings,
     metrics: MetricsSettings,
     pki: HashMap<Identifier, PemCertificate>,