diff --git a/Cargo.toml b/Cargo.toml index d3383fd6..0ce19e64 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -79,3 +79,6 @@ settings-extension-oci-defaults = { path = "./bottlerocket-settings-models/setti settings-extension-oci-hooks = { path = "./bottlerocket-settings-models/settings-extensions/oci-hooks", version = "0.1" } settings-extension-pki = { path = "./bottlerocket-settings-models/settings-extensions/pki", version = "0.1" } settings-extension-updates = { path = "./bottlerocket-settings-models/settings-extensions/updates", version = "0.1" } + +[workspace.lints.clippy] +indexing_slicing = "deny" diff --git a/bottlerocket-defaults-helper/Cargo.toml b/bottlerocket-defaults-helper/Cargo.toml index a3449e58..73d9cdd7 100644 --- a/bottlerocket-defaults-helper/Cargo.toml +++ b/bottlerocket-defaults-helper/Cargo.toml @@ -15,3 +15,6 @@ authors = [ snafu = "0.8" toml = "0.8" walkdir = "2" + +[lints] +workspace = true diff --git a/bottlerocket-settings-derive/Cargo.toml b/bottlerocket-settings-derive/Cargo.toml index fd2afad4..0165730b 100644 --- a/bottlerocket-settings-derive/Cargo.toml +++ b/bottlerocket-settings-derive/Cargo.toml @@ -14,3 +14,6 @@ darling = "0.20.8" proc-macro2 = "1.0.81" quote = "1.0.36" syn = "2.0.60" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/model-derive/Cargo.toml b/bottlerocket-settings-models/model-derive/Cargo.toml index ed9a0629..24d076f1 100644 --- a/bottlerocket-settings-models/model-derive/Cargo.toml +++ b/bottlerocket-settings-models/model-derive/Cargo.toml @@ -16,3 +16,6 @@ proc-macro = true darling = "0.20" quote = "1" syn = { version = "2", default-features = false, features = ["full", "parsing", "printing", "proc-macro", "visit-mut"] } + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/modeled-types/Cargo.toml b/bottlerocket-settings-models/modeled-types/Cargo.toml index f7a65b87..eade9233 100644 --- a/bottlerocket-settings-models/modeled-types/Cargo.toml +++ b/bottlerocket-settings-models/modeled-types/Cargo.toml @@ -24,3 +24,6 @@ serde_plain = "1" snafu = "0.8" url = "2" x509-parser = "0.16" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/modeled-types/src/shared.rs b/bottlerocket-settings-models/modeled-types/src/shared.rs index cbd2a30f..44ca998d 100644 --- a/bottlerocket-settings-models/modeled-types/src/shared.rs +++ b/bottlerocket-settings-models/modeled-types/src/shared.rs @@ -550,7 +550,7 @@ impl TryFrom for semver::Version { fn try_from(input: FriendlyVersion) -> Result { // If the string begins with a 'v', skip it before conversion let version = if input.inner.starts_with('v') { - &input.inner[1..] + input.inner.get(1..).unwrap_or_default() } else { &input.inner }; diff --git a/bottlerocket-settings-models/scalar-derive/Cargo.toml b/bottlerocket-settings-models/scalar-derive/Cargo.toml index 68a91330..db57ae26 100644 --- a/bottlerocket-settings-models/scalar-derive/Cargo.toml +++ b/bottlerocket-settings-models/scalar-derive/Cargo.toml @@ -20,3 +20,6 @@ bottlerocket-scalar.workspace = true serde = { version = "1", features = ["derive"] } serde_plain = "1" syn = { version = "2", default-features = false, features = ["full", "parsing", "printing", "proc-macro", "visit-mut"] } + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/scalar/Cargo.toml b/bottlerocket-settings-models/scalar/Cargo.toml index 9e6902b8..d915a459 100644 --- a/bottlerocket-settings-models/scalar/Cargo.toml +++ b/bottlerocket-settings-models/scalar/Cargo.toml @@ -11,3 +11,6 @@ exclude = ["README.md"] [dependencies] serde = "1" serde_plain = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/autoscaling/Cargo.toml b/bottlerocket-settings-models/settings-extensions/autoscaling/Cargo.toml index 6e627dc7..36b38756 100644 --- a/bottlerocket-settings-models/settings-extensions/autoscaling/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/autoscaling/Cargo.toml @@ -13,3 +13,6 @@ bottlerocket-settings-sdk.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/aws/Cargo.toml b/bottlerocket-settings-models/settings-extensions/aws/Cargo.toml index 1ead3bd3..ca385d1c 100644 --- a/bottlerocket-settings-models/settings-extensions/aws/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/aws/Cargo.toml @@ -13,3 +13,6 @@ bottlerocket-settings-sdk.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/bootstrap-containers/Cargo.toml b/bottlerocket-settings-models/settings-extensions/bootstrap-containers/Cargo.toml index c7d3da25..39ada37f 100644 --- a/bottlerocket-settings-models/settings-extensions/bootstrap-containers/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/bootstrap-containers/Cargo.toml @@ -13,3 +13,6 @@ bottlerocket-settings-sdk.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/cloudformation/Cargo.toml b/bottlerocket-settings-models/settings-extensions/cloudformation/Cargo.toml index 71a52072..d45246d8 100644 --- a/bottlerocket-settings-models/settings-extensions/cloudformation/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/cloudformation/Cargo.toml @@ -13,3 +13,6 @@ bottlerocket-settings-sdk.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/container-registry/Cargo.toml b/bottlerocket-settings-models/settings-extensions/container-registry/Cargo.toml index 05559891..e8e1dc2c 100644 --- a/bottlerocket-settings-models/settings-extensions/container-registry/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/container-registry/Cargo.toml @@ -13,3 +13,6 @@ bottlerocket-settings-sdk.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/container-runtime/Cargo.toml b/bottlerocket-settings-models/settings-extensions/container-runtime/Cargo.toml index 493f26d8..a0d3cdfc 100644 --- a/bottlerocket-settings-models/settings-extensions/container-runtime/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/container-runtime/Cargo.toml @@ -13,3 +13,6 @@ bottlerocket-settings-sdk.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/dns/Cargo.toml b/bottlerocket-settings-models/settings-extensions/dns/Cargo.toml index bde5c5c4..5af8453c 100644 --- a/bottlerocket-settings-models/settings-extensions/dns/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/dns/Cargo.toml @@ -13,3 +13,6 @@ bottlerocket-settings-sdk.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/ecs/Cargo.toml b/bottlerocket-settings-models/settings-extensions/ecs/Cargo.toml index dc90aeab..6a1b9cf4 100644 --- a/bottlerocket-settings-models/settings-extensions/ecs/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/ecs/Cargo.toml @@ -13,3 +13,6 @@ bottlerocket-settings-sdk.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/host-containers/Cargo.toml b/bottlerocket-settings-models/settings-extensions/host-containers/Cargo.toml index 13250a4b..5e27e530 100644 --- a/bottlerocket-settings-models/settings-extensions/host-containers/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/host-containers/Cargo.toml @@ -13,3 +13,6 @@ bottlerocket-settings-sdk.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/kernel/Cargo.toml b/bottlerocket-settings-models/settings-extensions/kernel/Cargo.toml index 9f10437c..1c36500a 100644 --- a/bottlerocket-settings-models/settings-extensions/kernel/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/kernel/Cargo.toml @@ -13,3 +13,6 @@ bottlerocket-settings-sdk.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/metrics/Cargo.toml b/bottlerocket-settings-models/settings-extensions/metrics/Cargo.toml index 67296434..c06268a6 100644 --- a/bottlerocket-settings-models/settings-extensions/metrics/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/metrics/Cargo.toml @@ -13,3 +13,6 @@ bottlerocket-settings-sdk.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/motd/Cargo.toml b/bottlerocket-settings-models/settings-extensions/motd/Cargo.toml index faa957ae..f55d3ed7 100644 --- a/bottlerocket-settings-models/settings-extensions/motd/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/motd/Cargo.toml @@ -12,3 +12,6 @@ bottlerocket-string-impls-for.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/network/Cargo.toml b/bottlerocket-settings-models/settings-extensions/network/Cargo.toml index 597d3f29..7bf87bd5 100644 --- a/bottlerocket-settings-models/settings-extensions/network/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/network/Cargo.toml @@ -13,3 +13,6 @@ bottlerocket-settings-sdk.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/ntp/Cargo.toml b/bottlerocket-settings-models/settings-extensions/ntp/Cargo.toml index efe87a68..58b8f0ce 100644 --- a/bottlerocket-settings-models/settings-extensions/ntp/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/ntp/Cargo.toml @@ -13,3 +13,6 @@ bottlerocket-settings-sdk.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/nvidia-container-runtime/Cargo.toml b/bottlerocket-settings-models/settings-extensions/nvidia-container-runtime/Cargo.toml index 3699c6d7..3997ced5 100644 --- a/bottlerocket-settings-models/settings-extensions/nvidia-container-runtime/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/nvidia-container-runtime/Cargo.toml @@ -13,3 +13,6 @@ bottlerocket-settings-sdk.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/oci-defaults/Cargo.toml b/bottlerocket-settings-models/settings-extensions/oci-defaults/Cargo.toml index 0143a3a4..77b4b8ef 100644 --- a/bottlerocket-settings-models/settings-extensions/oci-defaults/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/oci-defaults/Cargo.toml @@ -14,3 +14,6 @@ env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" toml = "0.8" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/oci-hooks/Cargo.toml b/bottlerocket-settings-models/settings-extensions/oci-hooks/Cargo.toml index 02415f44..ea777436 100644 --- a/bottlerocket-settings-models/settings-extensions/oci-hooks/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/oci-hooks/Cargo.toml @@ -13,3 +13,6 @@ bottlerocket-settings-sdk.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/pki/Cargo.toml b/bottlerocket-settings-models/settings-extensions/pki/Cargo.toml index 7c2b90d1..8e44909e 100644 --- a/bottlerocket-settings-models/settings-extensions/pki/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/pki/Cargo.toml @@ -13,3 +13,6 @@ bottlerocket-settings-sdk.workspace = true env_logger = "0.10" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-extensions/updates/Cargo.toml b/bottlerocket-settings-models/settings-extensions/updates/Cargo.toml index bbcabca8..7553edbf 100644 --- a/bottlerocket-settings-models/settings-extensions/updates/Cargo.toml +++ b/bottlerocket-settings-models/settings-extensions/updates/Cargo.toml @@ -14,3 +14,6 @@ env_logger = "0.10" rand = "0.8" serde = { version = "1", features = ["derive"] } serde_json = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/settings-models/Cargo.toml b/bottlerocket-settings-models/settings-models/Cargo.toml index 0d5e95ee..96b11c70 100644 --- a/bottlerocket-settings-models/settings-models/Cargo.toml +++ b/bottlerocket-settings-models/settings-models/Cargo.toml @@ -44,3 +44,6 @@ settings-extension-oci-defaults.workspace = true settings-extension-oci-hooks.workspace = true settings-extension-pki.workspace = true settings-extension-updates.workspace = true + +[lints] +workspace = true diff --git a/bottlerocket-settings-models/string-impls-for/Cargo.toml b/bottlerocket-settings-models/string-impls-for/Cargo.toml index 55430ab6..8a258dc9 100644 --- a/bottlerocket-settings-models/string-impls-for/Cargo.toml +++ b/bottlerocket-settings-models/string-impls-for/Cargo.toml @@ -10,3 +10,6 @@ exclude = ["README.md"] [dependencies] serde = "1" + +[lints] +workspace = true diff --git a/bottlerocket-settings-plugin/Cargo.toml b/bottlerocket-settings-plugin/Cargo.toml index e59f703e..0213bd98 100644 --- a/bottlerocket-settings-plugin/Cargo.toml +++ b/bottlerocket-settings-plugin/Cargo.toml @@ -12,3 +12,6 @@ lazy_static = "1.4.0" serde = "1.0.198" serde_json = "1.0.116" bottlerocket-settings-derive.workspace = true + +[lints] +workspace = true diff --git a/bottlerocket-settings-sdk/Cargo.toml b/bottlerocket-settings-sdk/Cargo.toml index 51fe1357..91e0340a 100644 --- a/bottlerocket-settings-sdk/Cargo.toml +++ b/bottlerocket-settings-sdk/Cargo.toml @@ -29,3 +29,6 @@ extension = [] # Enable Bottlerocket settings extensions CLI proto1. proto1 = [] + +[lints] +workspace = true diff --git a/bottlerocket-template-helper/Cargo.toml b/bottlerocket-template-helper/Cargo.toml index 15319337..13294bb9 100644 --- a/bottlerocket-template-helper/Cargo.toml +++ b/bottlerocket-template-helper/Cargo.toml @@ -23,3 +23,6 @@ syn = { version = "2", default-features = false, features = ["full", "parsing", [dev-dependencies] anyhow = "1" bottlerocket-settings-sdk.workspace = true + +[lints] +workspace = true diff --git a/deny.toml b/deny.toml index a1ddd2d7..a853789f 100644 --- a/deny.toml +++ b/deny.toml @@ -7,7 +7,7 @@ confidence-threshold = 0.93 # Commented license types are allowed but not currently used allow = [ "Apache-2.0", - # "BSD-2-Clause", + "BSD-2-Clause", "BSD-3-Clause", "BSL-1.0", # "CC0-1.0", @@ -21,30 +21,10 @@ allow = [ exceptions = [ { name = "generational-arena", allow = ["MPL-2.0"] }, { name = "unicode-ident", allow = ["MIT", "Apache-2.0", "Unicode-DFS-2016"] }, - { name = "icu_collections", allow = ["Unicode-3.0"] }, - { name = "icu_locid", allow = ["Unicode-3.0"] }, - { name = "icu_locid_transform", allow = ["Unicode-3.0"] }, - { name = "icu_locid_transform_data", allow = ["Unicode-3.0"] }, - { name = "icu_normalizer", allow = ["Unicode-3.0"] }, - { name = "icu_normalizer_data", allow = ["Unicode-3.0"] }, - { name = "icu_properties", allow = ["Unicode-3.0"] }, - { name = "icu_properties_data", allow = ["Unicode-3.0"] }, - { name = "icu_provider", allow = ["Unicode-3.0"] }, - { name = "icu_provider_macros", allow = ["Unicode-3.0"] }, - { name = "litemap", allow = ["Unicode-3.0"] }, - { name = "tinystr", allow = ["Unicode-3.0"] }, - { name = "writeable", allow = ["Unicode-3.0"] }, - { name = "yoke", allow = ["Unicode-3.0"] }, - { name = "yoke-derive", allow = ["Unicode-3.0"] }, - { name = "zerofrom", allow = ["Unicode-3.0"] }, - { name = "zerofrom-derive", allow = ["Unicode-3.0"] }, - { name = "zerovec", allow = ["Unicode-3.0"] }, - { name = "zerovec-derive", allow = ["Unicode-3.0"] }, ] [bans] # Deny multiple versions or wildcard dependencies. -multiple-versions = "deny" wildcards = "deny" skip = [