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.

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/pcloud): setup test for pcloud #4065

Closed
wants to merge 1 commit into from
Closed
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
32 changes: 32 additions & 0 deletions .github/services/pcloud/pcloud/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.

name: pcloud
description: 'Behavior test for Pcloud.'

runs:
using: "composite"
steps:
- name: Setup
uses: 1password/load-secrets-action@v1
with:
export-env: true
env:
OPENDAL_PCLOUD_ROOT: /
OPENDAL_PCLOUD_ENDPOINT: op://services/pcloud/endpoint
OPENDAL_PCLOUD_USERNAME: op://services/pcloud/username
OPENDAL_PCLOUD_PASSWORD: op://services/pcloud/password
2 changes: 2 additions & 0 deletions bindings/java/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ services-all = [
"services-onedrive",
"services-persy",
"services-postgresql",
"services-pcloud",
"services-koofr",
"services-mysql",
"services-redb",
Expand Down Expand Up @@ -135,6 +136,7 @@ services-mysql = ["opendal/services-mysql"]
services-onedrive = ["opendal/services-onedrive"]
services-persy = ["opendal/services-persy"]
services-postgresql = ["opendal/services-postgresql"]
services-pcloud = ["opendal/services-pcloud"]
services-redb = ["opendal/services-redb"]
services-redis = ["opendal/services-redis"]
services-rocksdb = ["opendal/services-rocksdb"]
Expand Down
2 changes: 2 additions & 0 deletions bindings/nodejs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ services-all = [
"services-onedrive",
"services-persy",
"services-postgresql",
"services-pcloud",
"services-mysql",
"services-redb",
"services-redis",
Expand Down Expand Up @@ -130,6 +131,7 @@ services-mysql = ["opendal/services-mysql"]
services-onedrive = ["opendal/services-onedrive"]
services-persy = ["opendal/services-persy"]
services-postgresql = ["opendal/services-postgresql"]
services-pcloud = ["opendal/services-pcloud"]
services-redb = ["opendal/services-redb"]
services-redis = ["opendal/services-redis"]
services-rocksdb = ["opendal/services-rocksdb"]
Expand Down
2 changes: 2 additions & 0 deletions bindings/python/Cargo.toml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest you should add this feature to bindings/java also?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ services-all = [
"services-onedrive",
"services-persy",
"services-postgresql",
"services-pcloud",
"services-mysql",
"services-redb",
"services-redis",
Expand Down Expand Up @@ -132,6 +133,7 @@ services-mysql = ["opendal/services-mysql"]
services-onedrive = ["opendal/services-onedrive"]
services-persy = ["opendal/services-persy"]
services-postgresql = ["opendal/services-postgresql"]
services-pcloud = ["opendal/services-pcloud"]
services-redb = ["opendal/services-redb"]
services-redis = ["opendal/services-redis"]
services-rocksdb = ["opendal/services-rocksdb"]
Expand Down
1 change: 1 addition & 0 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ default = [
"services-webdav",
"services-webhdfs",
"services-azfile",
"services-pcloud"
]

# Build test utils or not.
Expand Down
15 changes: 12 additions & 3 deletions core/src/services/pcloud/backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ use serde::Deserialize;

use super::core::*;
use super::error::parse_error;
use super::error::parse_result;
use super::error::PcloudError;
use super::lister::PcloudLister;
use super::writer::PcloudWriter;
Expand Down Expand Up @@ -277,6 +278,9 @@ impl Accessor for PcloudBackend {
let resp: StatResponse =
serde_json::from_slice(&bs).map_err(new_json_deserialize_error)?;
let result = resp.result;

parse_result(result)?;

if result == 2010 || result == 2055 || result == 2002 {
return Err(Error::new(ErrorKind::NotFound, &format!("{resp:?}")));
}
Expand Down Expand Up @@ -338,9 +342,10 @@ impl Accessor for PcloudBackend {
let resp: PcloudError =
serde_json::from_slice(&bs).map_err(new_json_deserialize_error)?;
let result = resp.result;

// pCloud returns 2005 or 2009 if the file or folder is not found
if result != 0 && result != 2005 && result != 2009 {
parse_result(result)?;
// pCloud returns 2005 if the folder is not found.
// And 2009 or 2002 if the file is not found.
if result != 0 && result != 2005 && result != 2009 && result != 2002 {
return Err(Error::new(ErrorKind::Unexpected, &format!("{resp:?}")));
}

Expand Down Expand Up @@ -372,6 +377,8 @@ impl Accessor for PcloudBackend {
let resp: PcloudError =
serde_json::from_slice(&bs).map_err(new_json_deserialize_error)?;
let result = resp.result;

parse_result(result)?;
if result == 2009 || result == 2010 || result == 2055 || result == 2002 {
return Err(Error::new(ErrorKind::NotFound, &format!("{resp:?}")));
}
Expand Down Expand Up @@ -402,6 +409,8 @@ impl Accessor for PcloudBackend {
let resp: PcloudError =
serde_json::from_slice(&bs).map_err(new_json_deserialize_error)?;
let result = resp.result;

parse_result(result)?;
if result == 2009 || result == 2010 || result == 2055 || result == 2002 {
return Err(Error::new(ErrorKind::NotFound, &format!("{resp:?}")));
}
Expand Down
92 changes: 60 additions & 32 deletions core/src/services/pcloud/core.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@ use std::fmt::Debug;
use std::fmt::Formatter;

use bytes::Bytes;
use http::header;
use http::Request;
use http::Response;
use http::StatusCode;
use serde::Deserialize;

use super::error::parse_error;
use super::error::parse_result;
use super::error::PcloudError;
use crate::raw::*;
use crate::*;
Expand Down Expand Up @@ -68,8 +70,8 @@ impl PcloudCore {
"{}/getfilelink?path=/{}&username={}&password={}",
self.endpoint,
percent_encode_path(&path),
self.username,
self.password
percent_encode_path(&self.username),
percent_encode_path(&self.password),
);

let req = Request::get(url);
Expand All @@ -88,6 +90,9 @@ impl PcloudCore {
let resp: GetFileLinkResponse =
serde_json::from_slice(&bs).map_err(new_json_deserialize_error)?;
let result = resp.result;

parse_result(result)?;

if result == 2010 || result == 2055 || result == 2002 {
return Err(Error::new(ErrorKind::NotFound, &format!("{resp:?}")));
}
Expand Down Expand Up @@ -136,6 +141,9 @@ impl PcloudCore {
let resp: PcloudError =
serde_json::from_slice(&bs).map_err(new_json_deserialize_error)?;
let result = resp.result;

parse_result(result)?;

if result == 2010 || result == 2055 || result == 2002 {
return Err(Error::new(ErrorKind::NotFound, &format!("{resp:?}")));
}
Expand All @@ -161,8 +169,8 @@ impl PcloudCore {
"{}/createfolderifnotexists?path=/{}&username={}&password={}",
self.endpoint,
percent_encode_path(path),
self.username,
self.password
percent_encode_path(&self.username),
percent_encode_path(&self.password),
);

let req = Request::post(url);
Expand All @@ -184,8 +192,8 @@ impl PcloudCore {
self.endpoint,
percent_encode_path(&from),
percent_encode_path(&to),
self.username,
self.password
percent_encode_path(&self.username),
percent_encode_path(&self.password),
);

let req = Request::post(url);
Expand All @@ -206,8 +214,8 @@ impl PcloudCore {
self.endpoint,
percent_encode_path(&from),
percent_encode_path(&to),
self.username,
self.password
percent_encode_path(&self.username),
percent_encode_path(&self.password),
);

let req = Request::post(url);
Expand All @@ -227,8 +235,8 @@ impl PcloudCore {
"{}/deletefolder?path=/{}&username={}&password={}",
self.endpoint,
percent_encode_path(&path),
self.username,
self.password
percent_encode_path(&self.username),
percent_encode_path(&self.password),
);

let req = Request::post(url);
Expand All @@ -248,8 +256,8 @@ impl PcloudCore {
"{}/deletefile?path=/{}&username={}&password={}",
self.endpoint,
percent_encode_path(&path),
self.username,
self.password
percent_encode_path(&self.username),
percent_encode_path(&self.password),
);

let req = Request::post(url);
Expand All @@ -271,8 +279,8 @@ impl PcloudCore {
self.endpoint,
percent_encode_path(&from),
percent_encode_path(&to),
self.username,
self.password
percent_encode_path(&self.username),
percent_encode_path(&self.password),
);

let req = Request::post(url);
Expand All @@ -294,8 +302,8 @@ impl PcloudCore {
self.endpoint,
percent_encode_path(&from),
percent_encode_path(&to),
self.username,
self.password
percent_encode_path(&self.username),
percent_encode_path(&self.password),
);

let req = Request::post(url);
Expand All @@ -317,8 +325,8 @@ impl PcloudCore {
"{}/stat?path=/{}&username={}&password={}",
self.endpoint,
percent_encode_path(path),
self.username,
self.password
percent_encode_path(&self.username),
percent_encode_path(&self.password),
);

let req = Request::post(url);
Expand All @@ -337,20 +345,28 @@ impl PcloudCore {
let (name, path) = (get_basename(&path), get_parent(&path).trim_end_matches('/'));

let url = format!(
"{}/uploadfile?path=/{}&filename={}&username={}&password={}",
"{}/uploadfile?path=/{}&nopartial=1&mtime={}&username={}&password={}",
self.endpoint,
percent_encode_path(path),
percent_encode_path(name),
self.username,
self.password
chrono::Local::now().timestamp(),
percent_encode_path(&self.username),
percent_encode_path(&self.password),
);

let req = Request::put(url);
let req = Request::post(url);

// set body
let req = req
.body(AsyncBody::Bytes(bs))
.map_err(new_request_build_error)?;
let file_part = FormDataPart::new("file")
.header(
header::CONTENT_DISPOSITION,
format!("form-data; name=\"file\"; filename=\"{name}\"")
.parse()
.unwrap(),
)
.content(bs);

let multipart = Multipart::new().part(file_part);

let req = multipart.apply(req)?;

self.send(req).await
}
Expand All @@ -366,8 +382,8 @@ impl PcloudCore {
"{}/listfolder?path={}&username={}&password={}",
self.endpoint,
percent_encode_path(path),
self.username,
self.password
percent_encode_path(&self.username),
percent_encode_path(&self.password),
);

let req = Request::get(url);
Expand Down Expand Up @@ -423,14 +439,14 @@ pub(super) fn parse_list_metadata(content: ListMetadata) -> Result<Metadata> {

#[derive(Debug, Deserialize)]
pub struct GetFileLinkResponse {
pub result: u64,
pub result: u32,
pub path: Option<String>,
pub hosts: Option<Vec<String>>,
}

#[derive(Debug, Deserialize)]
pub struct StatResponse {
pub result: u64,
pub result: u32,
pub metadata: Option<StatMetadata>,
}

Expand All @@ -445,7 +461,7 @@ pub struct StatMetadata {

#[derive(Debug, Deserialize)]
pub struct ListFolderResponse {
pub result: u64,
pub result: u32,
pub metadata: Option<ListMetadata>,
}

Expand All @@ -459,3 +475,15 @@ pub struct ListMetadata {
pub contenttype: Option<String>,
pub contents: Option<Vec<ListMetadata>>,
}

#[derive(Debug, Deserialize)]
pub struct UploadFileResponse {
pub result: u32,
pub metadata: Vec<StatMetadata>,
}

#[derive(Debug, Deserialize)]
pub struct UploadProgressResponse {
pub result: u32,
pub finished: Option<bool>,
}
Loading
Loading