Skip to content
Open
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
16 changes: 16 additions & 0 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ members = [
"crates/oauth2-key-driver-raft",
"crates/oauth2-session-driver-raft",
"crates/password-hashing",
"crates/policy-store-driver-sql",
"crates/resource-driver-sql",
"crates/role-driver-sql",
"crates/revoke-driver-sql",
Expand Down Expand Up @@ -146,6 +147,7 @@ openstack-keystone-password-hashing = { version = "0.1", path = "crates/password
openstack-keystone-identity-driver-ldap = { version = "0.1", path = "crates/identity-driver-ldap" }
openstack-keystone-identity-driver-sql = { version = "0.1", path = "crates/identity-driver-sql" }
openstack-keystone-idmapping-driver-sql = { version = "0.1", path = "crates/idmapping-driver-sql/" }
openstack-keystone-policy-store-driver-sql = { version = "0.1", path = "crates/policy-store-driver-sql/" }
openstack-keystone-resource-driver-sql = { version = "0.1", path = "crates/resource-driver-sql/" }
openstack-keystone-revoke-driver-sql = { version = "0.1", path = "crates/revoke-driver-sql/" }
openstack-keystone-role-driver-sql = { version = "0.1", path = "crates/role-driver-sql/" }
Expand Down
15 changes: 15 additions & 0 deletions crates/api-types/src/error_conv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ use openstack_keystone_core_types::identity::IdentityProviderError;
use openstack_keystone_core_types::mapping::MappingProviderError;
use openstack_keystone_core_types::oauth2_client::Oauth2ClientProviderError;
use openstack_keystone_core_types::oauth2_key::Oauth2KeyProviderError;
use openstack_keystone_core_types::policy_store::PolicyStoreProviderError;
use openstack_keystone_core_types::resource::ResourceProviderError;
use openstack_keystone_core_types::revoke::RevokeProviderError;
use openstack_keystone_core_types::role::RoleProviderError;
Expand Down Expand Up @@ -230,6 +231,20 @@ impl From<CredentialProviderError> for KeystoneApiError {
}
}

impl From<PolicyStoreProviderError> for KeystoneApiError {
fn from(value: PolicyStoreProviderError) -> Self {
match value {
ref err @ PolicyStoreProviderError::Conflict(..) => Self::Conflict(err.to_string()),
PolicyStoreProviderError::PolicyNotFound(x) => Self::NotFound {
resource: "policy".into(),
identifier: x,
},
PolicyStoreProviderError::Validation { source } => Self::BadRequest(source.to_string()),
other => Self::InternalError(other.to_string()),
}
}
}

impl From<CatalogProviderError> for KeystoneApiError {
fn from(value: CatalogProviderError) -> Self {
match value {
Expand Down
3 changes: 3 additions & 0 deletions crates/api-types/src/v3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ pub mod ec2tokens;
pub mod endpoint;
pub mod group;
pub mod os_ec2_credential;
pub mod policy;
pub mod project;
pub mod region;
pub mod role;
Expand All @@ -38,6 +39,8 @@ mod endpoint_conv;
#[cfg(feature = "conv")]
mod group_conv;
#[cfg(feature = "conv")]
mod policy_conv;
#[cfg(feature = "conv")]
mod project_conv;
#[cfg(feature = "conv")]
mod region_conv;
Expand Down
Loading
Loading