2.0.0-rc (#9)
Some checks failed
BlockStorage/repertory_osx/pipeline/head This commit looks good
BlockStorage/repertory_windows/pipeline/head This commit looks good
BlockStorage/repertory/pipeline/head There was a failure building this commit
BlockStorage/repertory_linux_builds/pipeline/head This commit looks good
BlockStorage/repertory_osx_builds/pipeline/head There was a failure building this commit
Some checks failed
BlockStorage/repertory_osx/pipeline/head This commit looks good
BlockStorage/repertory_windows/pipeline/head This commit looks good
BlockStorage/repertory/pipeline/head There was a failure building this commit
BlockStorage/repertory_linux_builds/pipeline/head This commit looks good
BlockStorage/repertory_osx_builds/pipeline/head There was a failure building this commit
### Issues
* \#1 \[bug\] Unable to mount S3 due to 'item_not_found' exception
* \#2 Require bucket name for S3 mounts
* \#3 \[bug\] File size is not being updated in S3 mount
* \#4 Upgrade to libfuse-3.x.x
* \#5 Switch to renterd for Sia support
* \#6 Switch to cpp-httplib to further reduce dependencies
* \#7 Remove global_data and calculate used disk space per provider
* \#8 Switch to libcurl for S3 mount support
### Changes from v1.x.x
* Added read-only encrypt provider
* Pass-through mount point that transparently encrypts source data using `XChaCha20-Poly1305`
* Added S3 encryption support via `XChaCha20-Poly1305`
* Added replay protection to remote mounts
* Added support base64 writes in remote FUSE
* Created static linked Linux binaries for `amd64` and `aarch64` using `musl-libc`
* Removed legacy Sia renter support
* Removed Skynet support
* Fixed multiple remote mount WinFSP API issues on \*NIX servers
* Implemented chunked read and write
* Writes for non-cached files are performed in chunks of 8Mib
* Removed `repertory-ui` support
* Removed `FreeBSD` support
* Switched to `libsodium` over `CryptoPP`
* Switched to `XChaCha20-Poly1305` for remote mounts
* Updated `GoogleTest` to v1.14.0
* Updated `JSON for Modern C++` to v3.11.2
* Updated `OpenSSL` to v1.1.1w
* Updated `RocksDB` to v8.5.3
* Updated `WinFSP` to 2023
* Updated `boost` to v1.78.0
* Updated `cURL` to v8.3.0
* Updated `zlib` to v1.3
* Use `upload_manager` for all providers
* Adds a delay to uploads to prevent excessive API calls
* Supports re-upload after mount restart for incomplete uploads
* NOTE: Uploads for all providers are full file (no resume support)
* Multipart upload support is planned for S3
Reviewed-on: #9
This commit is contained in:
@@ -1,79 +1,185 @@
|
||||
/*
|
||||
Copyright <2018-2022> <scott.e.graves@protonmail.com>
|
||||
Copyright <2018-2023> <scott.e.graves@protonmail.com>
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
|
||||
associated documentation files (the "Software"), to deal in the Software without restriction,
|
||||
including without limitation the rights to use, copy, modify, merge, publish, distribute,
|
||||
sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or
|
||||
substantial portions of the Software.
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
|
||||
NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
||||
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
|
||||
OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
*/
|
||||
#ifndef TESTS_MOCKS_MOCK_S3_COMM_HPP_
|
||||
#define TESTS_MOCKS_MOCK_S3_COMM_HPP_
|
||||
#ifdef REPERTORY_ENABLE_S3_TESTING
|
||||
#if defined(REPERTORY_ENABLE_S3) && defined(REPERTORY_ENABLE_S3_TESTING)
|
||||
|
||||
#include "test_common.hpp"
|
||||
|
||||
#include "comm/i_s3_comm.hpp"
|
||||
#include "types/repertory.hpp"
|
||||
|
||||
namespace repertory {
|
||||
/* class mock_s3_comm final : public i_s3_comm { */
|
||||
/* private: */
|
||||
/* S3Config s3_config_; */
|
||||
/* */
|
||||
/* public: */
|
||||
/* MOCK_METHOD1(create_bucket, api_error(const std::string &api_path)); */
|
||||
/* MOCK_CONST_METHOD1(Exists, bool(const std::string &api_path)); */
|
||||
/* */
|
||||
/* MOCK_CONST_METHOD3(get_bucket_name_and_object_name, */
|
||||
/* void(const std::string &api_path, std::string &bucketName, */
|
||||
/* std::string &objectName)); */
|
||||
/* */
|
||||
/* MOCK_CONST_METHOD2(get_directory_item_count, */
|
||||
/* std::size_t(const std::string &api_path, */
|
||||
/* const MetaProviderCallback &metaProviderCallback)); */
|
||||
/* */
|
||||
/* MOCK_CONST_METHOD3(get_directory_items, */
|
||||
/* api_error(const std::string &api_path, */
|
||||
/* const MetaProviderCallback &metaProviderCallback, */
|
||||
/* directory_item_list &list)); */
|
||||
/* */
|
||||
/* S3Config GetS3Config() override { return s3Config_; } */
|
||||
/* */
|
||||
/* S3Config GetS3Config() const override { return s3Config_; } */
|
||||
/* */
|
||||
/* MOCK_CONST_METHOD2(GetFile, api_error(const std::string &api_path, ApiFile &apiFile)); */
|
||||
/* */
|
||||
/* MOCK_CONST_METHOD1(get_file_list, api_error(ApiFileList &apiFileList)); */
|
||||
/* */
|
||||
/* bool IsOnline() const override { return true; } */
|
||||
/* */
|
||||
/* MOCK_CONST_METHOD5(read_file_bytes, */
|
||||
/* api_error(const std::string &path, const std::size_t &size, */
|
||||
/* const std::uint64_t &offset, std::vector<char> &data, */
|
||||
/* const bool &stop_requested)); */
|
||||
/* */
|
||||
/* MOCK_METHOD1(remove_bucket, api_error(const std::string &api_path)); */
|
||||
/* */
|
||||
/* MOCK_METHOD1(RemoveFile, api_error(const std::string &api_path)); */
|
||||
/* */
|
||||
/* MOCK_METHOD2(RenameFile, */
|
||||
/* api_error(const std::string &api_path, const std::string &newApiFilePath));
|
||||
*/
|
||||
/* */
|
||||
/* void SetS3Config(S3Config s3Config) { s3Config_ = std::move(s3Config); } */
|
||||
/* */
|
||||
/* MOCK_METHOD3(upload_file, api_error(const std::string &api_path, */
|
||||
/* const std::string &sourcePath, const bool
|
||||
* &stop_requested)); */
|
||||
/* }; */
|
||||
class mock_s3_comm final : public i_s3_comm {
|
||||
public:
|
||||
mock_s3_comm(s3_config cfg) : s3_config_(cfg) {}
|
||||
|
||||
private:
|
||||
s3_config s3_config_;
|
||||
|
||||
public:
|
||||
// [[nodiscard]] virtual api_error create_directory(const std::string
|
||||
// &api_path) = 0;
|
||||
//
|
||||
MOCK_METHOD(api_error, create_directory, (const std::string &api_path),
|
||||
(override));
|
||||
|
||||
// [[nodiscard]] virtual api_error directory_exists(const std::string
|
||||
// &api_path) const = 0;
|
||||
//
|
||||
MOCK_METHOD(api_error, directory_exists, (const std::string &api_path),
|
||||
(const, override));
|
||||
|
||||
// [[nodiscard]] virtual api_error file_exists(const std::string &api_path,
|
||||
// const get_key_callback
|
||||
// &get_key) const = 0;
|
||||
MOCK_METHOD(api_error, file_exists,
|
||||
(const std::string &api_path, const get_key_callback &get_key),
|
||||
(const, override));
|
||||
|
||||
// [[nodiscard]] virtual std::size_t
|
||||
// get_directory_item_count(const std::string &api_path,
|
||||
// meta_provider_callback meta_provider) const
|
||||
// = 0;
|
||||
//
|
||||
MOCK_METHOD(std::size_t, get_directory_item_count,
|
||||
(const std::string &api_path,
|
||||
meta_provider_callback meta_provider),
|
||||
(const, override));
|
||||
|
||||
// [[nodiscard]] virtual api_error get_directory_items(const std::string
|
||||
// &api_path,
|
||||
// const
|
||||
// meta_provider_callback
|
||||
// &meta_provider,
|
||||
// directory_item_list
|
||||
// &list) const = 0;
|
||||
//
|
||||
MOCK_METHOD(api_error, get_directory_items,
|
||||
(const std::string &api_path,
|
||||
meta_provider_callback meta_provider,
|
||||
directory_item_list &list),
|
||||
(const, override));
|
||||
|
||||
// [[nodiscard]] virtual api_error
|
||||
// get_directory_list(api_file_list &list) const = 0;
|
||||
//
|
||||
MOCK_METHOD(api_error, get_directory_list, (api_file_list & list),
|
||||
(const, override));
|
||||
|
||||
// [[nodiscard]] virtual api_error get_file(const std::string &api_path,
|
||||
// const get_key_callback &get_key,
|
||||
// const get_name_callback &get_name,
|
||||
// const get_token_callback
|
||||
// &get_token, api_file &file) const
|
||||
// = 0;
|
||||
//
|
||||
MOCK_METHOD(api_error, get_file,
|
||||
(const std::string &api_path, const get_key_callback &get_key,
|
||||
const get_name_callback &get_name,
|
||||
const get_token_callback &get_token, api_file &file),
|
||||
(const, override));
|
||||
|
||||
// [[nodiscard]] virtual api_error
|
||||
// get_file_list(const get_api_file_token_callback &get_api_file_token,
|
||||
// const get_name_callback &get_name, api_file_list &list) const
|
||||
// = 0;
|
||||
//
|
||||
MOCK_METHOD(api_error, get_file_list,
|
||||
(const get_api_file_token_callback &get_api_file_token,
|
||||
const get_name_callback &get_name, api_file_list &list),
|
||||
(const, override));
|
||||
|
||||
// [[nodiscard]] virtual api_error get_object_list(std::vector<directory_item>
|
||||
// &list) const = 0;
|
||||
//
|
||||
MOCK_METHOD(api_error, get_object_list, (std::vector<directory_item> & list),
|
||||
(const, override));
|
||||
|
||||
// virtual std::string get_object_name(const std::string &api_path,
|
||||
// const get_key_callback &get_key) const
|
||||
// = 0;
|
||||
//
|
||||
MOCK_METHOD(std::string, get_object_name,
|
||||
(const std::string &api_path, const get_key_callback &get_key),
|
||||
(const, override));
|
||||
|
||||
[[nodiscard]] s3_config get_s3_config() override { return s3_config_; }
|
||||
|
||||
[[nodiscard]] s3_config get_s3_config() const override { return s3_config_; }
|
||||
|
||||
// [[nodiscard]] virtual bool is_online() const = 0;
|
||||
//
|
||||
MOCK_METHOD(bool, is_online, (), (const, override));
|
||||
|
||||
// [[nodiscard]] virtual api_error
|
||||
// read_file_bytes(const std::string &api_path, std::size_t size, const
|
||||
// std::uint64_t &offset,
|
||||
// data_buffer &data, const get_key_callback &get_key,
|
||||
// const get_size_callback &get_size, const get_token_callback
|
||||
// &get_token, stop_type &stop_requested) const = 0;
|
||||
//
|
||||
MOCK_METHOD(api_error, read_file_bytes,
|
||||
(const std::string &api_path, std::size_t size,
|
||||
std::uint64_t offset, data_buffer &data,
|
||||
const get_key_callback &get_key,
|
||||
const get_size_callback &get_size,
|
||||
const get_token_callback &get_token, stop_type &stop_requested),
|
||||
(const, override));
|
||||
|
||||
// [[nodiscard]] virtual api_error remove_directory(const std::string
|
||||
// &api_path) = 0;
|
||||
//
|
||||
MOCK_METHOD(api_error, remove_directory, (const std::string &api_path),
|
||||
(override));
|
||||
|
||||
// [[nodiscard]] virtual api_error remove_file(const std::string &api_path,
|
||||
// const get_key_callback
|
||||
// &get_key) = 0;
|
||||
//
|
||||
MOCK_METHOD(api_error, remove_file,
|
||||
(const std::string &api_path, const get_key_callback &get_key),
|
||||
(override));
|
||||
|
||||
// [[nodiscard]] virtual api_error rename_file(const std::string &api_path,
|
||||
// const std::string
|
||||
// &new_api_path) = 0;
|
||||
//
|
||||
MOCK_METHOD(api_error, rename_file,
|
||||
(const std::string &api_path, const std::string &new_api_path),
|
||||
(override));
|
||||
|
||||
// [[nodiscard]] virtual api_error
|
||||
// upload_file(const std::string &api_path, const std::string &source_path,
|
||||
// const std::string &encryption_token, const get_key_callback
|
||||
// &get_key, const set_key_callback &set_key, stop_type
|
||||
// &stop_requested) = 0;
|
||||
MOCK_METHOD(api_error, upload_file,
|
||||
(const std::string &api_path, const std::string &source_path,
|
||||
const std::string &encryption_token,
|
||||
const get_key_callback &get_key, const set_key_callback &set_key,
|
||||
stop_type &stop_requested),
|
||||
(override));
|
||||
};
|
||||
} // namespace repertory
|
||||
|
||||
#endif // REPERTORY_ENABLE_S3_TESTING
|
||||
|
||||
Reference in New Issue
Block a user