From 303b74b816744175b030fce11d0566db098bf04c Mon Sep 17 00:00:00 2001 From: Sam Berning Date: Mon, 22 Jul 2024 22:41:44 +0000 Subject: [PATCH] sources: move settings-sdk to workspace dependencies Within the sources/ workspace, if a crate depends on one of the crates in bottlerocket-settings-sdk, we currently include a section with the full git URL, tag, and version in the crate's Cargo.toml. Because we can't have two versions of the same crate in a workspace, updating one of these Cargo.toml's (in order to test changes in a personal fork, or to bump the version, for example) requires updating all of the other crates that use that dependency. Making the crates in bottlerocket-settings-sdk workspace dependencies allows us to update to a different version of bottlerocket-settings-sdk by only changing one file. Signed-off-by: Sam Berning --- sources/Cargo.toml | 25 +++++++++++++++++++ sources/api/schnauzer/Cargo.toml | 12 ++------- sources/models/Cargo.toml | 11 ++------ sources/settings-defaults/aws-dev/Cargo.toml | 6 ++--- .../aws-ecs-1-nvidia/Cargo.toml | 6 ++--- .../settings-defaults/aws-ecs-1/Cargo.toml | 6 ++--- .../aws-ecs-2-nvidia/Cargo.toml | 6 ++--- .../settings-defaults/aws-ecs-2/Cargo.toml | 6 ++--- .../aws-k8s-1.24-nvidia/Cargo.toml | 6 ++--- .../settings-defaults/aws-k8s-1.24/Cargo.toml | 6 ++--- .../aws-k8s-1.25-nvidia/Cargo.toml | 6 ++--- .../settings-defaults/aws-k8s-1.25/Cargo.toml | 6 ++--- .../aws-k8s-1.26-nvidia/Cargo.toml | 6 ++--- .../settings-defaults/aws-k8s-1.26/Cargo.toml | 6 ++--- .../aws-k8s-1.30-nvidia/Cargo.toml | 6 ++--- .../settings-defaults/aws-k8s-1.30/Cargo.toml | 6 ++--- .../settings-defaults/metal-dev/Cargo.toml | 6 ++--- .../metal-k8s-1.30/Cargo.toml | 6 ++--- .../settings-defaults/vmware-dev/Cargo.toml | 6 ++--- .../vmware-k8s-1.30/Cargo.toml | 6 ++--- sources/settings-plugins/aws-dev/Cargo.toml | 11 ++------ sources/settings-plugins/aws-ecs-1/Cargo.toml | 11 ++------ sources/settings-plugins/aws-ecs-2/Cargo.toml | 11 ++------ sources/settings-plugins/aws-k8s/Cargo.toml | 11 ++------ sources/settings-plugins/metal-dev/Cargo.toml | 11 ++------ sources/settings-plugins/metal-k8s/Cargo.toml | 11 ++------ .../settings-plugins/vmware-dev/Cargo.toml | 11 ++------ .../settings-plugins/vmware-k8s/Cargo.toml | 11 ++------ 28 files changed, 79 insertions(+), 159 deletions(-) diff --git a/sources/Cargo.toml b/sources/Cargo.toml index 88712d49f9c..2e0593de267 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -53,5 +53,30 @@ members = [ "constants", ] +[workspace.dependencies.bottlerocket-defaults-helper] +git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" +tag = "bottlerocket-defaults-helper-v0.1.0" +version = "0.1.0" + +[workspace.dependencies.bottlerocket-modeled-types] +git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" +tag = "bottlerocket-settings-models-v0.1.0" +version = "0.1.0" + +[workspace.dependencies.bottlerocket-settings-models] +git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" +tag = "bottlerocket-settings-models-v0.1.0" +version = "0.1.0" + +[workspace.dependencies.bottlerocket-settings-plugin] +git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" +tag = "bottlerocket-settings-plugin-v0.1.0" +version = "0.1.0" + +[workspace.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" + [profile.release] debug = true diff --git a/sources/api/schnauzer/Cargo.toml b/sources/api/schnauzer/Cargo.toml index a2e88559127..3edb54bdd37 100644 --- a/sources/api/schnauzer/Cargo.toml +++ b/sources/api/schnauzer/Cargo.toml @@ -18,6 +18,7 @@ apiclient = { path = "../apiclient", version = "0.1" } argh = "0.1" async-trait = "0.1" base64 = "0.21" +bottlerocket-modeled-types.workspace = true cached = { version = "0.49", features = ["async"] } constants = { path = "../../constants", version = "0.1" } bottlerocket-release = { path = "../../bottlerocket-release", version = "0.1" } @@ -36,22 +37,13 @@ regex = "1" serde = { version = "1", features = ["derive"] } serde_json = "1" serde_plain = "1" +settings-extension-oci-defaults.workspace = true simplelog = "0.12" snafu = "0.8" tokio = { version = "~1.32", default-features = false, features = ["macros", "rt-multi-thread"] } # LTS 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/models/Cargo.toml b/sources/models/Cargo.toml index ab7e9b874d1..d2155c45963 100644 --- a/sources/models/Cargo.toml +++ b/sources/models/Cargo.toml @@ -17,15 +17,8 @@ serde_json = "1" toml = "0.8" # 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" +bottlerocket-settings-models.workspace = true +bottlerocket-settings-plugin.workspace = true [build-dependencies] generate-readme = { version = "0.1", path = "../generate-readme" } diff --git a/sources/settings-defaults/aws-dev/Cargo.toml b/sources/settings-defaults/aws-dev/Cargo.toml index e190ac8dd6f..3a36db636ae 100644 --- a/sources/settings-defaults/aws-dev/Cargo.toml +++ b/sources/settings-defaults/aws-dev/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/aws-ecs-1-nvidia/Cargo.toml b/sources/settings-defaults/aws-ecs-1-nvidia/Cargo.toml index de54bfca789..7a3a4f6b1db 100644 --- a/sources/settings-defaults/aws-ecs-1-nvidia/Cargo.toml +++ b/sources/settings-defaults/aws-ecs-1-nvidia/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/aws-ecs-1/Cargo.toml b/sources/settings-defaults/aws-ecs-1/Cargo.toml index eab288896b4..8b2273ede2b 100644 --- a/sources/settings-defaults/aws-ecs-1/Cargo.toml +++ b/sources/settings-defaults/aws-ecs-1/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/aws-ecs-2-nvidia/Cargo.toml b/sources/settings-defaults/aws-ecs-2-nvidia/Cargo.toml index 61f2514f3ba..af2d6e7bedf 100644 --- a/sources/settings-defaults/aws-ecs-2-nvidia/Cargo.toml +++ b/sources/settings-defaults/aws-ecs-2-nvidia/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/aws-ecs-2/Cargo.toml b/sources/settings-defaults/aws-ecs-2/Cargo.toml index 4166d3d53f7..f2779c15590 100644 --- a/sources/settings-defaults/aws-ecs-2/Cargo.toml +++ b/sources/settings-defaults/aws-ecs-2/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/Cargo.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/Cargo.toml index fe0c3f34ee8..c695762cae5 100644 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/Cargo.toml +++ b/sources/settings-defaults/aws-k8s-1.24-nvidia/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/aws-k8s-1.24/Cargo.toml b/sources/settings-defaults/aws-k8s-1.24/Cargo.toml index 5d315e411c1..aa4bcf7efc6 100644 --- a/sources/settings-defaults/aws-k8s-1.24/Cargo.toml +++ b/sources/settings-defaults/aws-k8s-1.24/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/aws-k8s-1.25-nvidia/Cargo.toml b/sources/settings-defaults/aws-k8s-1.25-nvidia/Cargo.toml index 412ef2497e5..c672aae1265 100644 --- a/sources/settings-defaults/aws-k8s-1.25-nvidia/Cargo.toml +++ b/sources/settings-defaults/aws-k8s-1.25-nvidia/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/aws-k8s-1.25/Cargo.toml b/sources/settings-defaults/aws-k8s-1.25/Cargo.toml index ca37703e46d..a7ad07ae01d 100644 --- a/sources/settings-defaults/aws-k8s-1.25/Cargo.toml +++ b/sources/settings-defaults/aws-k8s-1.25/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/aws-k8s-1.26-nvidia/Cargo.toml b/sources/settings-defaults/aws-k8s-1.26-nvidia/Cargo.toml index acb300023a3..bb6b9c90b60 100644 --- a/sources/settings-defaults/aws-k8s-1.26-nvidia/Cargo.toml +++ b/sources/settings-defaults/aws-k8s-1.26-nvidia/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/aws-k8s-1.26/Cargo.toml b/sources/settings-defaults/aws-k8s-1.26/Cargo.toml index b8947b9f14d..577f6f501d6 100644 --- a/sources/settings-defaults/aws-k8s-1.26/Cargo.toml +++ b/sources/settings-defaults/aws-k8s-1.26/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/aws-k8s-1.30-nvidia/Cargo.toml b/sources/settings-defaults/aws-k8s-1.30-nvidia/Cargo.toml index 9784cfabb25..0243d89c16f 100644 --- a/sources/settings-defaults/aws-k8s-1.30-nvidia/Cargo.toml +++ b/sources/settings-defaults/aws-k8s-1.30-nvidia/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/aws-k8s-1.30/Cargo.toml b/sources/settings-defaults/aws-k8s-1.30/Cargo.toml index 6605939c403..7ff527bb863 100644 --- a/sources/settings-defaults/aws-k8s-1.30/Cargo.toml +++ b/sources/settings-defaults/aws-k8s-1.30/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/metal-dev/Cargo.toml b/sources/settings-defaults/metal-dev/Cargo.toml index 0cd73a188ef..7948f479739 100644 --- a/sources/settings-defaults/metal-dev/Cargo.toml +++ b/sources/settings-defaults/metal-dev/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/metal-k8s-1.30/Cargo.toml b/sources/settings-defaults/metal-k8s-1.30/Cargo.toml index 0b481fa2bd4..84e1c8c089a 100644 --- a/sources/settings-defaults/metal-k8s-1.30/Cargo.toml +++ b/sources/settings-defaults/metal-k8s-1.30/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/vmware-dev/Cargo.toml b/sources/settings-defaults/vmware-dev/Cargo.toml index 82f8b30ade1..f205272cecf 100644 --- a/sources/settings-defaults/vmware-dev/Cargo.toml +++ b/sources/settings-defaults/vmware-dev/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/vmware-k8s-1.30/Cargo.toml b/sources/settings-defaults/vmware-k8s-1.30/Cargo.toml index da063aa5025..f07ee7145da 100644 --- a/sources/settings-defaults/vmware-k8s-1.30/Cargo.toml +++ b/sources/settings-defaults/vmware-k8s-1.30/Cargo.toml @@ -9,7 +9,5 @@ build = "../build-defaults.rs" [lib] path = "../defaults-toml.rs" -[build-dependencies.bottlerocket-defaults-helper] -git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" -tag = "bottlerocket-defaults-helper-v0.1.0" -version = "0.1.0" +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-plugins/aws-dev/Cargo.toml b/sources/settings-plugins/aws-dev/Cargo.toml index 2b2b52b98f0..c684380ceb4 100644 --- a/sources/settings-plugins/aws-dev/Cargo.toml +++ b/sources/settings-plugins/aws-dev/Cargo.toml @@ -15,12 +15,5 @@ serde = "1.0.198" serde_json = "1.0.116" # 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" +bottlerocket-settings-models.workspace = true +bottlerocket-settings-plugin.workspace = true diff --git a/sources/settings-plugins/aws-ecs-1/Cargo.toml b/sources/settings-plugins/aws-ecs-1/Cargo.toml index 1a519d0d3f4..adcc5bc1079 100644 --- a/sources/settings-plugins/aws-ecs-1/Cargo.toml +++ b/sources/settings-plugins/aws-ecs-1/Cargo.toml @@ -15,12 +15,5 @@ serde = "1.0.198" serde_json = "1.0.116" # 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" +bottlerocket-settings-models.workspace = true +bottlerocket-settings-plugin.workspace = true diff --git a/sources/settings-plugins/aws-ecs-2/Cargo.toml b/sources/settings-plugins/aws-ecs-2/Cargo.toml index 7606dda15a8..9ed4dae43aa 100644 --- a/sources/settings-plugins/aws-ecs-2/Cargo.toml +++ b/sources/settings-plugins/aws-ecs-2/Cargo.toml @@ -15,12 +15,5 @@ serde = "1.0.198" serde_json = "1.0.116" # 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" +bottlerocket-settings-models.workspace = true +bottlerocket-settings-plugin.workspace = true diff --git a/sources/settings-plugins/aws-k8s/Cargo.toml b/sources/settings-plugins/aws-k8s/Cargo.toml index a3ba64af6c1..a9ef230b9bc 100644 --- a/sources/settings-plugins/aws-k8s/Cargo.toml +++ b/sources/settings-plugins/aws-k8s/Cargo.toml @@ -15,12 +15,5 @@ serde = "1.0.198" serde_json = "1.0.116" # 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" +bottlerocket-settings-models.workspace = true +bottlerocket-settings-plugin.workspace = true diff --git a/sources/settings-plugins/metal-dev/Cargo.toml b/sources/settings-plugins/metal-dev/Cargo.toml index 471a95f2b10..8fcb6fe13cb 100644 --- a/sources/settings-plugins/metal-dev/Cargo.toml +++ b/sources/settings-plugins/metal-dev/Cargo.toml @@ -15,12 +15,5 @@ serde = "1.0.198" serde_json = "1.0.116" # 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" +bottlerocket-settings-models.workspace = true +bottlerocket-settings-plugin.workspace = true diff --git a/sources/settings-plugins/metal-k8s/Cargo.toml b/sources/settings-plugins/metal-k8s/Cargo.toml index 7413fd2db26..c3dbb2f3221 100644 --- a/sources/settings-plugins/metal-k8s/Cargo.toml +++ b/sources/settings-plugins/metal-k8s/Cargo.toml @@ -15,12 +15,5 @@ serde = "1.0.198" serde_json = "1.0.116" # 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" +bottlerocket-settings-models.workspace = true +bottlerocket-settings-plugin.workspace = true diff --git a/sources/settings-plugins/vmware-dev/Cargo.toml b/sources/settings-plugins/vmware-dev/Cargo.toml index 009c6597026..460742ddc95 100644 --- a/sources/settings-plugins/vmware-dev/Cargo.toml +++ b/sources/settings-plugins/vmware-dev/Cargo.toml @@ -15,12 +15,5 @@ serde = "1.0.198" serde_json = "1.0.116" # 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" +bottlerocket-settings-models.workspace = true +bottlerocket-settings-plugin.workspace = true diff --git a/sources/settings-plugins/vmware-k8s/Cargo.toml b/sources/settings-plugins/vmware-k8s/Cargo.toml index 3e5d470a072..083367e43ec 100644 --- a/sources/settings-plugins/vmware-k8s/Cargo.toml +++ b/sources/settings-plugins/vmware-k8s/Cargo.toml @@ -15,12 +15,5 @@ serde = "1.0.198" serde_json = "1.0.116" # 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" +bottlerocket-settings-models.workspace = true +bottlerocket-settings-plugin.workspace = true