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

feat(services/webdfs): Add user.name support for webhdfs #5567

Merged
merged 3 commits into from
Jan 22, 2025
Merged

feat(services/webdfs): Add user.name support for webhdfs #5567

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81af05b
feat(services/webdfs): Add user.name support for webhdfs
Xuanwo Jan 22, 2025
f4e1ee1
Add a test to cover
Xuanwo Jan 22, 2025
6952f66
Use root as test user
Xuanwo Jan 22, 2025
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
50 changes: 46 additions & 4 deletions core/src/services/webhdfs/backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,16 @@ impl WebhdfsBuilder {
self
}

/// Set the username of this backend,
/// used for authentication
///
pub fn username(mut self, username: &str) -> Self {
if !username.is_empty() {
self.config.user_name = Some(username.to_string());
}
self
}

/// Set the delegation token of this backend,
/// used for authentication
///
Expand Down Expand Up @@ -179,6 +189,7 @@ impl Builder for WebhdfsBuilder {
let backend = WebhdfsBackend {
root,
endpoint,
user_name: self.config.user_name,
auth,
client,
root_checker: OnceCell::new(),
Expand All @@ -195,6 +206,7 @@ impl Builder for WebhdfsBuilder {
pub struct WebhdfsBackend {
root: String,
endpoint: String,
user_name: Option<String>,
auth: Option<String>,
root_checker: OnceCell<()>,

Expand All @@ -212,6 +224,9 @@ impl WebhdfsBackend {
self.endpoint,
percent_encode_path(&p),
);
if let Some(user) = &self.user_name {
url += format!("&user.name={user}").as_str();
}
if let Some(auth) = &self.auth {
url += format!("&{auth}").as_str();
}
Expand All @@ -220,6 +235,7 @@ impl WebhdfsBackend {

req.body(Buffer::new()).map_err(new_request_build_error)
}

/// create object
pub async fn webhdfs_create_object_request(
&self,
Expand All @@ -235,6 +251,9 @@ impl WebhdfsBackend {
self.endpoint,
percent_encode_path(&p),
);
if let Some(user) = &self.user_name {
url += format!("&user.name={user}").as_str();
}
if let Some(auth) = &self.auth {
url += format!("&{auth}").as_str();
}
Expand Down Expand Up @@ -277,6 +296,9 @@ impl WebhdfsBackend {
self.endpoint,
percent_encode_path(&p),
);
if let Some(user) = &self.user_name {
url += format!("&user.name={user}").as_str();
}
if let Some(auth) = &self.auth {
url += &format!("&{auth}");
}
Expand Down Expand Up @@ -311,7 +333,9 @@ impl WebhdfsBackend {
percent_encode_path(&from),
percent_encode_path(&to)
);

if let Some(user) = &self.user_name {
url += format!("&user.name={user}").as_str();
}
if let Some(auth) = &self.auth {
url += &format!("&{auth}");
}
Expand All @@ -330,7 +354,9 @@ impl WebhdfsBackend {
body: Buffer,
) -> Result<Request<Buffer>> {
let mut url = location.to_string();

if let Some(user) = &self.user_name {
url += format!("&user.name={user}").as_str();
}
if let Some(auth) = &self.auth {
url += &format!("&{auth}");
}
Expand Down Expand Up @@ -362,7 +388,9 @@ impl WebhdfsBackend {
percent_encode_path(&p),
percent_encode_path(&sources),
);

if let Some(user) = &self.user_name {
url += format!("&user.name={user}").as_str();
}
if let Some(auth) = &self.auth {
url += &format!("&{auth}");
}
Expand All @@ -379,6 +407,9 @@ impl WebhdfsBackend {
self.endpoint,
percent_encode_path(&p),
);
if let Some(user) = &self.user_name {
url += format!("&user.name={user}").as_str();
}
if let Some(auth) = &self.auth {
url += &format!("&{auth}");
}
Expand All @@ -404,6 +435,9 @@ impl WebhdfsBackend {
self.endpoint,
percent_encode_path(&p),
);
if let Some(user) = &self.user_name {
url += format!("&user.name={user}").as_str();
}
if let Some(auth) = &self.auth {
url += format!("&{auth}").as_str();
}
Expand All @@ -429,6 +463,9 @@ impl WebhdfsBackend {
if !start_after.is_empty() {
url += format!("&startAfter={}", start_after).as_str();
}
if let Some(user) = &self.user_name {
url += format!("&user.name={user}").as_str();
}
if let Some(auth) = &self.auth {
url += format!("&{auth}").as_str();
}
Expand All @@ -455,7 +492,9 @@ impl WebhdfsBackend {
self.endpoint,
percent_encode_path(&p),
);

if let Some(user) = &self.user_name {
url += format!("&user.name={user}").as_str();
}
if let Some(auth) = &self.auth {
url += format!("&{auth}").as_str();
}
Expand All @@ -474,6 +513,9 @@ impl WebhdfsBackend {
self.endpoint,
percent_encode_path(&p),
);
if let Some(user) = &self.user_name {
url += format!("&user.name={user}").as_str();
}
if let Some(auth) = &self.auth {
url += format!("&{auth}").as_str();
}
Expand Down
3 changes: 3 additions & 0 deletions core/src/services/webhdfs/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ pub struct WebhdfsConfig {
pub root: Option<String>,
/// Endpoint for webhdfs.
pub endpoint: Option<String>,
/// Name of the user for webhdfs.
pub user_name: Option<String>,
/// Delegation token for webhdfs.
pub delegation: Option<String>,
/// Disable batch listing
Expand All @@ -43,6 +45,7 @@ impl Debug for WebhdfsConfig {
f.debug_struct("WebhdfsConfig")
.field("root", &self.root)
.field("endpoint", &self.endpoint)
.field("user_name", &self.user_name)
.field("atomic_write_dir", &self.atomic_write_dir)
.finish_non_exhaustive()
}
Expand Down
Loading