-
Notifications
You must be signed in to change notification settings - Fork 512
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4050 from mgsharm/settings-extension
Settings extension
- Loading branch information
Showing
45 changed files
with
1,253 additions
and
176 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,24 @@ | ||
| use model_derive::model; | ||
| use std::collections::HashMap; | ||
|
|
||
| use crate::{AutoScalingSettings, BootstrapContainer, HostContainer, NetworkSettings, OciDefaults}; | ||
| use modeled_types::Identifier; | ||
|
|
||
| // Note: we have to use 'rename' here because the top-level Settings structure is the only one | ||
| // that uses its name in serialization; internal structures use the field name that points to it | ||
| #[model(rename = "settings", impl_default = true)] | ||
| struct Settings { | ||
| motd: settings_extension_motd::MotdV1, | ||
| updates: settings_extension_updates::UpdatesSettingsV1, | ||
| host_containers: HashMap<Identifier, HostContainer>, | ||
| bootstrap_containers: HashMap<Identifier, BootstrapContainer>, | ||
| host_containers: settings_extension_host_containers::HostContainersSettingsV1, | ||
| bootstrap_containers: settings_extension_bootstrap_containers::BootstrapContainersSettingsV1, | ||
| ntp: settings_extension_ntp::NtpSettingsV1, | ||
| network: NetworkSettings, | ||
| network: settings_extension_network::NetworkSettingsV1, | ||
| kernel: settings_extension_kernel::KernelSettingsV1, | ||
| aws: settings_extension_aws::AwsSettingsV1, | ||
| ecs: settings_extension_ecs::ECSSettingsV1, | ||
| metrics: settings_extension_metrics::MetricsSettingsV1, | ||
| pki: settings_extension_pki::PkiSettingsV1, | ||
| container_registry: settings_extension_container_registry::RegistrySettingsV1, | ||
| oci_defaults: OciDefaults, | ||
| oci_defaults: settings_extension_oci_defaults::OciDefaultsV1, | ||
| oci_hooks: settings_extension_oci_hooks::OciHooksSettingsV1, | ||
| cloudformation: settings_extension_cloudformation::CloudFormationSettingsV1, | ||
| autoscaling: AutoScalingSettings, | ||
| autoscaling: settings_extension_autoscaling::AutoScalingSettingsV1, | ||
| dns: settings_extension_dns::DnsSettingsV1, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,24 @@ | ||
| use model_derive::model; | ||
| use std::collections::HashMap; | ||
|
|
||
| use crate::{AutoScalingSettings, BootstrapContainer, HostContainer, NetworkSettings, OciDefaults}; | ||
| use modeled_types::Identifier; | ||
|
|
||
| // Note: we have to use 'rename' here because the top-level Settings structure is the only one | ||
| // that uses its name in serialization; internal structures use the field name that points to it | ||
| #[model(rename = "settings", impl_default = true)] | ||
| struct Settings { | ||
| motd: settings_extension_motd::MotdV1, | ||
| updates: settings_extension_updates::UpdatesSettingsV1, | ||
| host_containers: HashMap<Identifier, HostContainer>, | ||
| bootstrap_containers: HashMap<Identifier, BootstrapContainer>, | ||
| host_containers: settings_extension_host_containers::HostContainersSettingsV1, | ||
| bootstrap_containers: settings_extension_bootstrap_containers::BootstrapContainersSettingsV1, | ||
| ntp: settings_extension_ntp::NtpSettingsV1, | ||
| network: NetworkSettings, | ||
| network: settings_extension_network::NetworkSettingsV1, | ||
| kernel: settings_extension_kernel::KernelSettingsV1, | ||
| aws: settings_extension_aws::AwsSettingsV1, | ||
| ecs: settings_extension_ecs::ECSSettingsV1, | ||
| metrics: settings_extension_metrics::MetricsSettingsV1, | ||
| pki: settings_extension_pki::PkiSettingsV1, | ||
| container_registry: settings_extension_container_registry::RegistrySettingsV1, | ||
| oci_defaults: OciDefaults, | ||
| oci_defaults: settings_extension_oci_defaults::OciDefaultsV1, | ||
| oci_hooks: settings_extension_oci_hooks::OciHooksSettingsV1, | ||
| cloudformation: settings_extension_cloudformation::CloudFormationSettingsV1, | ||
| autoscaling: AutoScalingSettings, | ||
| autoscaling: settings_extension_autoscaling::AutoScalingSettingsV1, | ||
| dns: settings_extension_dns::DnsSettingsV1, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,27 @@ | ||
| use model_derive::model; | ||
| use std::collections::HashMap; | ||
|
|
||
| use crate::{ | ||
| AutoScalingSettings, BootSettings, BootstrapContainer, HostContainer, NetworkSettings, | ||
| OciDefaults, | ||
| }; | ||
| use modeled_types::Identifier; | ||
| use crate::BootSettings; | ||
|
|
||
| // Note: we have to use 'rename' here because the top-level Settings structure is the only one | ||
| // that uses its name in serialization; internal structures use the field name that points to it | ||
| #[model(rename = "settings", impl_default = true)] | ||
| struct Settings { | ||
| motd: settings_extension_motd::MotdV1, | ||
| updates: settings_extension_updates::UpdatesSettingsV1, | ||
| host_containers: HashMap<Identifier, HostContainer>, | ||
| bootstrap_containers: HashMap<Identifier, BootstrapContainer>, | ||
| host_containers: settings_extension_host_containers::HostContainersSettingsV1, | ||
| bootstrap_containers: settings_extension_bootstrap_containers::BootstrapContainersSettingsV1, | ||
| ntp: settings_extension_ntp::NtpSettingsV1, | ||
| network: NetworkSettings, | ||
| network: settings_extension_network::NetworkSettingsV1, | ||
| kernel: settings_extension_kernel::KernelSettingsV1, | ||
| boot: BootSettings, | ||
| aws: settings_extension_aws::AwsSettingsV1, | ||
| ecs: settings_extension_ecs::ECSSettingsV1, | ||
| metrics: settings_extension_metrics::MetricsSettingsV1, | ||
| pki: settings_extension_pki::PkiSettingsV1, | ||
| container_registry: settings_extension_container_registry::RegistrySettingsV1, | ||
| oci_defaults: OciDefaults, | ||
| oci_defaults: settings_extension_oci_defaults::OciDefaultsV1, | ||
| oci_hooks: settings_extension_oci_hooks::OciHooksSettingsV1, | ||
| cloudformation: settings_extension_cloudformation::CloudFormationSettingsV1, | ||
| autoscaling: AutoScalingSettings, | ||
| autoscaling: settings_extension_autoscaling::AutoScalingSettingsV1, | ||
| dns: settings_extension_dns::DnsSettingsV1, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,27 @@ | ||
| use model_derive::model; | ||
| use std::collections::HashMap; | ||
|
|
||
| use crate::{ | ||
| AutoScalingSettings, BootSettings, BootstrapContainer, HostContainer, NetworkSettings, | ||
| OciDefaults, | ||
| }; | ||
| use modeled_types::Identifier; | ||
| use crate::BootSettings; | ||
|
|
||
| // Note: we have to use 'rename' here because the top-level Settings structure is the only one | ||
| // that uses its name in serialization; internal structures use the field name that points to it | ||
| #[model(rename = "settings", impl_default = true)] | ||
| struct Settings { | ||
| motd: settings_extension_motd::MotdV1, | ||
| updates: settings_extension_updates::UpdatesSettingsV1, | ||
| host_containers: HashMap<Identifier, HostContainer>, | ||
| bootstrap_containers: HashMap<Identifier, BootstrapContainer>, | ||
| host_containers: settings_extension_host_containers::HostContainersSettingsV1, | ||
| bootstrap_containers: settings_extension_bootstrap_containers::BootstrapContainersSettingsV1, | ||
| ntp: settings_extension_ntp::NtpSettingsV1, | ||
| network: NetworkSettings, | ||
| network: settings_extension_network::NetworkSettingsV1, | ||
| kernel: settings_extension_kernel::KernelSettingsV1, | ||
| boot: BootSettings, | ||
| aws: settings_extension_aws::AwsSettingsV1, | ||
| ecs: settings_extension_ecs::ECSSettingsV1, | ||
| metrics: settings_extension_metrics::MetricsSettingsV1, | ||
| pki: settings_extension_pki::PkiSettingsV1, | ||
| container_registry: settings_extension_container_registry::RegistrySettingsV1, | ||
| oci_defaults: OciDefaults, | ||
| oci_defaults: settings_extension_oci_defaults::OciDefaultsV1, | ||
| oci_hooks: settings_extension_oci_hooks::OciHooksSettingsV1, | ||
| cloudformation: settings_extension_cloudformation::CloudFormationSettingsV1, | ||
| autoscaling: AutoScalingSettings, | ||
| autoscaling: settings_extension_autoscaling::AutoScalingSettingsV1, | ||
| dns: settings_extension_dns::DnsSettingsV1, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.