Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
129 changes: 129 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 16 additions & 47 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,60 +2,27 @@
resolver = "3"
members = [
"cli-core",
"cli-cmd/api",
"cli-cmd/auth",
"cli-cmd/block-storage",
"cli-cmd/catalog",
"cli-cmd/compute",
"cli-cmd/container-infrastructure-management",
"cli-cmd/dns",
"cli-cmd/identity",
"cli-cmd/image",
"cli-cmd/load-balancer",
"cli-cmd/network",
"cli-cmd/object-store",
"cli-cmd/placement",
"cli-cmd/*",
"openstack_sdk",
"openstack_cli",
"openstack_tui",
"openstack_types",
"sdk/auth-core",
"sdk/auth-application-credential",
"sdk/auth-federation",
"sdk/auth-jwt",
"sdk/auth-multifactor",
"sdk/auth-oidcaccesstoken",
"sdk/auth-passkey",
"sdk/auth-password",
"sdk/auth-receipt",
"sdk/auth-token",
"sdk/auth-totp",
"sdk/auth-websso",
"sdk/core",
"sdk/block-storage",
"sdk/container-infrastructure-management",
"sdk/compute",
"sdk/dns",
"sdk/identity",
"sdk/image",
"sdk/load-balancer",
"sdk/network",
"sdk/object-store",
"sdk/placement",
"sdk/*",
"xtask",
"fuzz",
"types/*",
]
# webauthn-rs should not land in the default members since it pulls openssl that
# is not available for alpine
default-members = [
"sdk/auth-core",
"sdk/auth-core",
"sdk/auth-application-credential",
"sdk/auth-multifactor",
"sdk/auth-oidcaccesstoken",
"sdk/auth-password",
"sdk/auth-multifactor",
"sdk/auth-oidcaccesstoken",
"sdk/auth-password",
"sdk/auth-receipt",
"sdk/auth-totp",
"sdk/auth-websso",
"sdk/auth-totp",
"sdk/auth-websso",
"sdk/core",
"sdk/block-storage",
"sdk/container-infrastructure-management",
Expand All @@ -67,8 +34,9 @@ default-members = [
"sdk/network",
"sdk/object-store",
"sdk/placement",
"cli-core",
"cli-cmd/*",
"cli-core",
"cli-cmd/*",
"types/*",
"openstack_*"]

[workspace.package]
Expand All @@ -80,12 +48,12 @@ homepage = "https://github.com/gtema/openstack"
repository = "https://github.com/gtema/openstack"

[workspace.dependencies]
async-trait = { version = "^0.1" } #, optional = true }
async-trait = { version = "^0.1" }
base64 = "0.22"
bytes = "^1.11"
chrono = { version = "^0.4", default-features = false, features = ["clock", "serde"] }
clap = { version = "^4.6", features = ["cargo", "color", "derive", "env"] }
clap_complete = { version = "^4.6", features = ["unstable-dynamic"] }
clap_complete = { version = "^4.6" }
color-eyre = { version = "^0.6", features = ["default", "issue-url", "track-caller"] }
config = { version = "^0.15", default-features = false }
derive_builder = { version = "^0.20" }
Expand Down Expand Up @@ -116,7 +84,7 @@ serde_urlencoded = "^0.7"
strip-ansi-escapes = "^0.2"
structable = { version = "^0.3" }
tempfile = "^3.27"
tokio = { version = "^1.50", features = ["fs", "macros", "net", "sync", "rt-multi-thread", "io-std", "signal"]}
tokio = { version = "^1.50", default-features = false, features = ["macros"]}
tokio-util = { version="^0.7", features = ["io", "compat"]}
thiserror = { version = "^2.0" }
tracing = "^0.1"
Expand All @@ -126,6 +94,7 @@ tracing-test = { version = "^0.2" }
url = { version = "^2.5", features = ["serde"] }
webauthn-authenticator-rs = { version = "0.5", features = ["ctap2", "mozilla", "ui-cli"]}
webauthn-rs-proto = { version = "0.5" }
uuid = { version = "1.23" }

[profile.dev]
debug = 0
Expand Down
2 changes: 1 addition & 1 deletion openstack_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ _test_net_vpn = []

[dependencies]
clap = { workspace = true, features = ["color", "derive", "env"] }
clap_complete = { workspace = true }
clap_complete = { workspace = true, features = ["unstable-dynamic"] }
color-eyre = { workspace = true }
dialoguer = { workspace = true, features=["fuzzy-select"] }
eyre = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion openstack_sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ secrecy.workspace = true
serde.workspace = true
serde_json.workspace = true
thiserror.workspace = true
tokio.workspace = true
tokio = { workspace = true, features = ["rt-multi-thread"] }
tokio-util.workspace = true
tracing.workspace = true

Expand Down
32 changes: 21 additions & 11 deletions openstack_types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,32 @@ default = [
"object_store",
"placement",
]
block_storage = []
compute = []
container_infra = []
dns = []
identity = []
image = []
load_balancer = []
network = []
object_store = []
placement = []
block_storage = ["dep:openstack-types-block-storage"]
compute = ["dep:openstack-types-compute"]
container_infra = ["dep:openstack-types-container-infrastructure-management"]
dns = ["dep:openstack-types-dns"]
identity = ["dep:openstack-types-identity"]
image = ["dep:openstack-types-image"]
load_balancer = ["dep:openstack-types-load-balancer"]
network = ["dep:openstack-types-network"]
object_store = ["dep:openstack-types-object-store"]
placement = ["dep:openstack-types-placement"]
# include openapi specs
openapi = []
keystone_ng = []

[dependencies]
chrono = { workspace= true }
openstack-types-block-storage = { path = "../types/block-storage/", version = "0.1", optional = true}
openstack-types-compute = { path = "../types/compute/", version = "0.1", optional = true}
openstack-types-container-infrastructure-management = { path = "../types/container-infrastructure-management/", version = "0.1", optional = true}
openstack-types-dns = { path = "../types/dns/", version = "0.1", optional = true}
openstack-types-identity = { path = "../types/identity/", version = "0.1", optional = true}
openstack-types-image = { path = "../types/image/", version = "0.1", optional = true}
openstack-types-load-balancer = { path = "../types/load-balancer/", version = "0.1", optional = true}
openstack-types-network = { path = "../types/network/", version = "0.1", optional = true}
openstack-types-object-store = { path = "../types/object-store/", version = "0.1", optional = true}
openstack-types-placement = { path = "../types/placement/", version = "0.1", optional = true}
serde = { workspace = true }
serde_json = { workspace = true }
structable = { workspace = true }
Expand All @@ -49,7 +59,7 @@ openstack_sdk = { path = "../openstack_sdk" }
reqwest.workspace = true
tokio.workspace = true
url.workspace = true
uuid = { version = "1.23", features = ["v4"] }
uuid = { workspace = true, features = ["v4"] }

[[test]]
name = "mocked"
Expand Down
2 changes: 1 addition & 1 deletion sdk/auth-websso/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ serde_json.workspace = true
serde_urlencoded.workspace = true
reqwest = { workspace = true, features = ["form"] }
thiserror.workspace = true
tokio.workspace = true
tokio = { workspace = true, features = ["signal"] }
tokio-util.workspace = true
tracing.workspace = true
url.workspace = true
Expand Down
22 changes: 22 additions & 0 deletions types/block-storage/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[package]
name = "openstack-types-block-storage"
description = "OpenStack API Types"
version = "0.1.0"
license.workspace = true
edition.workspace = true
authors.workspace = true
rust-version.workspace = true
homepage.workspace = true
repository.workspace = true

[dependencies]
chrono = { workspace= true }
openstack-types-core = { path = "../core" }
serde = { workspace = true }
serde_json = { workspace = true }
structable = { workspace = true }

[dev-dependencies]

[lints]
workspace = true
15 changes: 15 additions & 0 deletions types/block-storage/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
// SPDX-License-Identifier: Apache-2.0

//! # OpenStack Block Storage API response types
22 changes: 22 additions & 0 deletions types/compute/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[package]
name = "openstack-types-compute"
description = "OpenStack API Types"
version = "0.1.0"
license.workspace = true
edition.workspace = true
authors.workspace = true
rust-version.workspace = true
homepage.workspace = true
repository.workspace = true

[dependencies]
chrono = { workspace= true }
openstack-types-core = { path = "../core" }
serde = { workspace = true }
serde_json = { workspace = true }
structable = { workspace = true }

[dev-dependencies]

[lints]
workspace = true
Loading
Loading