Skip to content

feat: Extend user path param with --current-user #550

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

Merged
gtema merged 1 commit into from
Sep 18, 2024
Merged

feat: Extend user path param with --current-user #550

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
294 changes: 179 additions & 115 deletions doc/src/osc.md
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions openstack_cli/src/identity/v3/domain/user/role/delete.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ use crate::OutputConfig;
use crate::StructTable;

use bytes::Bytes;
use eyre::OptionExt;
use http::Response;
use openstack_sdk::api::find_by_name;
use openstack_sdk::api::identity::v3::domain::find as find_domain;
Expand Down Expand Up @@ -107,6 +108,9 @@ struct UserInput {
/// User ID.
#[arg(long, help_heading = "Path parameters", value_name = "USER_ID")]
user_id: Option<String>,
/// Current authenticated user.
#[arg(long, help_heading = "Path parameters", action = clap::ArgAction::SetTrue)]
current_user: bool,
}
/// Role response representation
#[derive(Deserialize, Serialize, Clone, StructTable)]
Expand Down Expand Up @@ -194,6 +198,15 @@ impl RoleCommand {
))
}
};
} else if self.path.user.current_user {
ep_builder.user_id(
client
.get_auth_info()
.ok_or_eyre("Cannot determine current authentication information")?
.token
.user
.id,
);
}
ep_builder.id(&self.path.id);
// Set query parameters
Expand Down
13 changes: 13 additions & 0 deletions openstack_cli/src/identity/v3/domain/user/role/list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ use crate::OpenStackCliError;
use crate::OutputConfig;
use crate::StructTable;

use eyre::OptionExt;
use openstack_sdk::api::find_by_name;
use openstack_sdk::api::identity::v3::domain::find as find_domain;
use openstack_sdk::api::identity::v3::domain::user::role::list;
Expand Down Expand Up @@ -94,6 +95,9 @@ struct UserInput {
/// User ID.
#[arg(long, help_heading = "Path parameters", value_name = "USER_ID")]
user_id: Option<String>,
/// Current authenticated user.
#[arg(long, help_heading = "Path parameters", action = clap::ArgAction::SetTrue)]
current_user: bool,
}
/// Roles response representation
#[derive(Deserialize, Serialize, Clone, StructTable)]
Expand Down Expand Up @@ -199,6 +203,15 @@ impl RolesCommand {
))
}
};
} else if self.path.user.current_user {
ep_builder.user_id(
client
.get_auth_info()
.ok_or_eyre("Cannot determine current authentication information")?
.token
.user
.id,
);
}
// Set query parameters
// Set body parameters
Expand Down
13 changes: 13 additions & 0 deletions openstack_cli/src/identity/v3/domain/user/role/set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ use crate::OutputConfig;
use crate::StructTable;

use bytes::Bytes;
use eyre::OptionExt;
use http::Response;
use openstack_sdk::api::find_by_name;
use openstack_sdk::api::identity::v3::domain::find as find_domain;
Expand Down Expand Up @@ -107,6 +108,9 @@ struct UserInput {
/// User ID.
#[arg(long, help_heading = "Path parameters", value_name = "USER_ID")]
user_id: Option<String>,
/// Current authenticated user.
#[arg(long, help_heading = "Path parameters", action = clap::ArgAction::SetTrue)]
current_user: bool,
}
/// Role response representation
#[derive(Deserialize, Serialize, Clone, StructTable)]
Expand Down Expand Up @@ -194,6 +198,15 @@ impl RoleCommand {
))
}
};
} else if self.path.user.current_user {
ep_builder.user_id(
client
.get_auth_info()
.ok_or_eyre("Cannot determine current authentication information")?
.token
.user
.id,
);
}
ep_builder.id(&self.path.id);
// Set query parameters
Expand Down
13 changes: 13 additions & 0 deletions openstack_cli/src/identity/v3/domain/user/role/show.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ use crate::OutputConfig;
use crate::StructTable;

use bytes::Bytes;
use eyre::OptionExt;
use http::Response;
use openstack_sdk::api::find_by_name;
use openstack_sdk::api::identity::v3::domain::find as find_domain;
Expand Down Expand Up @@ -105,6 +106,9 @@ struct UserInput {
/// User ID.
#[arg(long, help_heading = "Path parameters", value_name = "USER_ID")]
user_id: Option<String>,
/// Current authenticated user.
#[arg(long, help_heading = "Path parameters", action = clap::ArgAction::SetTrue)]
current_user: bool,
}
/// Role response representation
#[derive(Deserialize, Serialize, Clone, StructTable)]
Expand Down Expand Up @@ -192,6 +196,15 @@ impl RoleCommand {
))
}
};
} else if self.path.user.current_user {
ep_builder.user_id(
client
.get_auth_info()
.ok_or_eyre("Cannot determine current authentication information")?
.token
.user
.id,
);
}
ep_builder.id(&self.path.id);
// Set query parameters
Expand Down
4 changes: 4 additions & 0 deletions openstack_cli/src/identity/v3/group/user/delete.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ use crate::OutputConfig;
use crate::StructTable;

use bytes::Bytes;
use eyre::OptionExt;
use http::Response;
use openstack_sdk::api::find_by_name;
use openstack_sdk::api::identity::v3::group::user::delete;
Expand Down Expand Up @@ -89,6 +90,9 @@ struct UserInput {
/// User ID.
#[arg(long, help_heading = "Path parameters", value_name = "USER_ID")]
user_id: Option<String>,
/// Current authenticated user.
#[arg(long, help_heading = "Path parameters", action = clap::ArgAction::SetTrue)]
current_user: bool,
}
/// User response representation
#[derive(Deserialize, Serialize, Clone, StructTable)]
Expand Down
4 changes: 4 additions & 0 deletions openstack_cli/src/identity/v3/group/user/set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ use crate::OutputConfig;
use crate::StructTable;

use bytes::Bytes;
use eyre::OptionExt;
use http::Response;
use openstack_sdk::api::find_by_name;
use openstack_sdk::api::identity::v3::group::user::set;
Expand Down Expand Up @@ -89,6 +90,9 @@ struct UserInput {
/// User ID.
#[arg(long, help_heading = "Path parameters", value_name = "USER_ID")]
user_id: Option<String>,
/// Current authenticated user.
#[arg(long, help_heading = "Path parameters", action = clap::ArgAction::SetTrue)]
current_user: bool,
}
/// User response representation
#[derive(Deserialize, Serialize, Clone, StructTable)]
Expand Down
4 changes: 4 additions & 0 deletions openstack_cli/src/identity/v3/group/user/show.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ use crate::OutputConfig;
use crate::StructTable;

use bytes::Bytes;
use eyre::OptionExt;
use http::Response;
use openstack_sdk::api::find_by_name;
use openstack_sdk::api::identity::v3::group::user::get;
Expand Down Expand Up @@ -87,6 +88,9 @@ struct UserInput {
/// User ID.
#[arg(long, help_heading = "Path parameters", value_name = "USER_ID")]
user_id: Option<String>,
/// Current authenticated user.
#[arg(long, help_heading = "Path parameters", action = clap::ArgAction::SetTrue)]
current_user: bool,
}
/// User response representation
#[derive(Deserialize, Serialize, Clone, StructTable)]
Expand Down
1 change: 1 addition & 0 deletions openstack_cli/src/identity/v3/os_inherit/domain/group/role/inherited_to_project/delete.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ use crate::OutputConfig;
use crate::StructTable;

use bytes::Bytes;
use eyre::OptionExt;
use http::Response;
use openstack_sdk::api::find_by_name;
use openstack_sdk::api::identity::v3::domain::find as find_domain;
Expand Down
1 change: 1 addition & 0 deletions openstack_cli/src/identity/v3/os_inherit/domain/group/role/inherited_to_project/get.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ use crate::OpenStackCliError;
use crate::OutputConfig;
use crate::StructTable;

use eyre::OptionExt;
use openstack_sdk::api::find_by_name;
use openstack_sdk::api::identity::v3::domain::find as find_domain;
use openstack_sdk::api::identity::v3::os_inherit::domain::group::role::inherited_to_project::get;
Expand Down
1 change: 1 addition & 0 deletions ...rc/identity/v3/os_inherit/domain/group/role/inherited_to_project/inherited_to_projects.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ use crate::StructTable;

use crate::common::parse_json;
use crate::common::parse_key_val;
use eyre::OptionExt;
use openstack_sdk::api::find_by_name;
use openstack_sdk::api::identity::v3::domain::find as find_domain;
use openstack_sdk::api::identity::v3::os_inherit::domain::group::role::inherited_to_project::inherited_to_projects;
Expand Down
13 changes: 13 additions & 0 deletions openstack_cli/src/identity/v3/os_inherit/domain/user/role/inherited_to_project/delete.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ use crate::OutputConfig;
use crate::StructTable;

use bytes::Bytes;
use eyre::OptionExt;
use http::Response;
use openstack_sdk::api::find_by_name;
use openstack_sdk::api::identity::v3::domain::find as find_domain;
Expand Down Expand Up @@ -108,6 +109,9 @@ struct UserInput {
/// User ID.
#[arg(long, help_heading = "Path parameters", value_name = "USER_ID")]
user_id: Option<String>,
/// Current authenticated user.
#[arg(long, help_heading = "Path parameters", action = clap::ArgAction::SetTrue)]
current_user: bool,
}
/// InheritedToProject response representation
#[derive(Deserialize, Serialize, Clone, StructTable)]
Expand Down Expand Up @@ -195,6 +199,15 @@ impl InheritedToProjectCommand {
))
}
};
} else if self.path.user.current_user {
ep_builder.user_id(
client
.get_auth_info()
.ok_or_eyre("Cannot determine current authentication information")?
.token
.user
.id,
);
}
ep_builder.role_id(&self.path.role_id);
// Set query parameters
Expand Down
13 changes: 13 additions & 0 deletions openstack_cli/src/identity/v3/os_inherit/domain/user/role/inherited_to_project/get.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ use crate::OpenStackCliError;
use crate::OutputConfig;
use crate::StructTable;

use eyre::OptionExt;
use openstack_sdk::api::find_by_name;
use openstack_sdk::api::identity::v3::domain::find as find_domain;
use openstack_sdk::api::identity::v3::os_inherit::domain::user::role::inherited_to_project::get;
Expand Down Expand Up @@ -96,6 +97,9 @@ struct UserInput {
/// User ID.
#[arg(long, help_heading = "Path parameters", value_name = "USER_ID")]
user_id: Option<String>,
/// Current authenticated user.
#[arg(long, help_heading = "Path parameters", action = clap::ArgAction::SetTrue)]
current_user: bool,
}
/// Response data as HashMap type
#[derive(Deserialize, Serialize)]
Expand Down Expand Up @@ -197,6 +201,15 @@ impl InheritedToProjectCommand {
))
}
};
} else if self.path.user.current_user {
ep_builder.user_id(
client
.get_auth_info()
.ok_or_eyre("Cannot determine current authentication information")?
.token
.user
.id,
);
}
// Set query parameters
// Set body parameters
Expand Down
13 changes: 13 additions & 0 deletions ...src/identity/v3/os_inherit/domain/user/role/inherited_to_project/inherited_to_projects.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ use crate::StructTable;

use crate::common::parse_json;
use crate::common::parse_key_val;
use eyre::OptionExt;
use openstack_sdk::api::find_by_name;
use openstack_sdk::api::identity::v3::domain::find as find_domain;
use openstack_sdk::api::identity::v3::os_inherit::domain::user::role::inherited_to_project::inherited_to_projects;
Expand Down Expand Up @@ -111,6 +112,9 @@ struct UserInput {
/// User ID.
#[arg(long, help_heading = "Path parameters", value_name = "USER_ID")]
user_id: Option<String>,
/// Current authenticated user.
#[arg(long, help_heading = "Path parameters", action = clap::ArgAction::SetTrue)]
current_user: bool,
}
/// Response data as HashMap type
#[derive(Deserialize, Serialize)]
Expand Down Expand Up @@ -212,6 +216,15 @@ impl InheritedToProjectCommand {
))
}
};
} else if self.path.user.current_user {
ep_builder.user_id(
client
.get_auth_info()
.ok_or_eyre("Cannot determine current authentication information")?
.token
.user
.id,
);
}
ep_builder.role_id(&self.path.role_id);
// Set query parameters
Expand Down
13 changes: 13 additions & 0 deletions openstack_cli/src/identity/v3/os_inherit/project/user/role/inherited_to_project/delete.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ use crate::OutputConfig;
use crate::StructTable;

use bytes::Bytes;
use eyre::OptionExt;
use http::Response;
use openstack_sdk::api::find_by_name;
use openstack_sdk::api::identity::v3::os_inherit::project::user::role::inherited_to_project::delete;
Expand Down Expand Up @@ -100,6 +101,9 @@ struct UserInput {
/// User ID.
#[arg(long, help_heading = "Path parameters", value_name = "USER_ID")]
user_id: Option<String>,
/// Current authenticated user.
#[arg(long, help_heading = "Path parameters", action = clap::ArgAction::SetTrue)]
current_user: bool,
}
/// InheritedToProject response representation
#[derive(Deserialize, Serialize, Clone, StructTable)]
Expand Down Expand Up @@ -154,6 +158,15 @@ impl InheritedToProjectCommand {
))
}
};
} else if self.path.user.current_user {
ep_builder.user_id(
client
.get_auth_info()
.ok_or_eyre("Cannot determine current authentication information")?
.token
.user
.id,
);
}
ep_builder.role_id(&self.path.role_id);
// Set query parameters
Expand Down
13 changes: 13 additions & 0 deletions openstack_cli/src/identity/v3/os_inherit/project/user/role/inherited_to_project/get.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ use crate::OpenStackCliError;
use crate::OutputConfig;
use crate::StructTable;

use eyre::OptionExt;
use openstack_sdk::api::find_by_name;
use openstack_sdk::api::identity::v3::os_inherit::project::user::role::inherited_to_project::get;
use openstack_sdk::api::identity::v3::user::find as find_user;
Expand Down Expand Up @@ -99,6 +100,9 @@ struct UserInput {
/// User ID.
#[arg(long, help_heading = "Path parameters", value_name = "USER_ID")]
user_id: Option<String>,
/// Current authenticated user.
#[arg(long, help_heading = "Path parameters", action = clap::ArgAction::SetTrue)]
current_user: bool,
}
/// Response data as HashMap type
#[derive(Deserialize, Serialize)]
Expand Down Expand Up @@ -167,6 +171,15 @@ impl InheritedToProjectCommand {
))
}
};
} else if self.path.user.current_user {
ep_builder.user_id(
client
.get_auth_info()
.ok_or_eyre("Cannot determine current authentication information")?
.token
.user
.id,
);
}
ep_builder.role_id(&self.path.role_id);
// Set query parameters
Expand Down
Loading