Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sources: move settings-sdk to workspace dependencies #4099

Merged
merged 1 commit into from
Jul 29, 2024
Merged

sources: move settings-sdk to workspace dependencies #4099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions sources/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 2 additions & 10 deletions sources/api/schnauzer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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"] }
Expand Down
11 changes: 2 additions & 9 deletions sources/models/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
6 changes: 2 additions & 4 deletions sources/settings-defaults/aws-dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions sources/settings-defaults/aws-ecs-1-nvidia/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions sources/settings-defaults/aws-ecs-1/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions sources/settings-defaults/aws-ecs-2-nvidia/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions sources/settings-defaults/aws-ecs-2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions sources/settings-defaults/aws-k8s-1.24-nvidia/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions sources/settings-defaults/aws-k8s-1.24/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions sources/settings-defaults/aws-k8s-1.25-nvidia/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions sources/settings-defaults/aws-k8s-1.25/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions sources/settings-defaults/aws-k8s-1.26-nvidia/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions sources/settings-defaults/aws-k8s-1.26/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions sources/settings-defaults/aws-k8s-1.30-nvidia/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions sources/settings-defaults/aws-k8s-1.30/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions sources/settings-defaults/metal-dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions sources/settings-defaults/metal-k8s-1.30/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions sources/settings-defaults/vmware-dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions sources/settings-defaults/vmware-k8s-1.30/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 2 additions & 9 deletions sources/settings-plugins/aws-dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 2 additions & 9 deletions sources/settings-plugins/aws-ecs-1/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 2 additions & 9 deletions sources/settings-plugins/aws-ecs-2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 2 additions & 9 deletions sources/settings-plugins/aws-k8s/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 2 additions & 9 deletions sources/settings-plugins/metal-dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 2 additions & 9 deletions sources/settings-plugins/metal-k8s/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 2 additions & 9 deletions sources/settings-plugins/vmware-dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 2 additions & 9 deletions sources/settings-plugins/vmware-k8s/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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