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

rename accountURL for consistency #119

Merged
merged 11 commits into from
Oct 9, 2024
Merged
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
9 changes: 9 additions & 0 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ jobs:
# on Windows, we rely on vcpkg to pull in dependencies
shell: bash
run: |
# Temporary workaround for the vcpkg internal issue
# See https://github.com/microsoft/vcpkg/issues/41199#issuecomment-2378255699 for details
# shellcheck disable=SC2153
export SystemDrive=$SYSTEMDRIVE
# shellcheck disable=SC2153
export SystemRoot=$SYSTEMROOT
# shellcheck disable=SC2153
export windir=$WINDIR

vcpkg install azure-storage-blobs-cpp:x64-windows-static
vcpkg install azure-identity-cpp:x64-windows-static
vcpkg install rapidjson 'curl[ssl]' --triplet x64-windows-static
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15)
cmake_policy(SET CMP0091 NEW) # enable new "MSVC runtime library selection" (https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html)

project(libCZI
VERSION 0.62.4
VERSION 0.62.5
HOMEPAGE_URL "https://github.com/ZEISS/libczi"
DESCRIPTION "libCZI is an Open Source Cross-Platform C++ library to read and write CZI")

Expand Down
2 changes: 1 addition & 1 deletion Src/libCZI/Doc/stream_objects.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ The reader has multiple modes of operation - mainly differing in how the authent
key | description
-------------------|---------------------------------------------------
account | The storage-account name. It will be used to create the account-URL as https://<account>.blob.core.windows.net". This key is relevant for all authentication modes except "ConnectionString".
accountURL | The complete base-URL for the storage account. If this is given, then the key 'account' is ignored (and this URL is used instead). This key is relevant for all authentication modes except "ConnectionString".
accounturl | The complete base-URL for the storage account. If this is given, then the key 'account' is ignored (and this URL is used instead). This key is relevant for all authentication modes except "ConnectionString".
containername | The container name.
blobname | The name of the blob.
connectionstring | The connection string to access the blob store. This key is relevant only for authentication mode "ConnectionString".
Expand Down
3 changes: 2 additions & 1 deletion Src/libCZI/Doc/version-history.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ version history {#version_history}
0.62.1 | [114](https://github.com/ZEISS/libczi/pull/114) | improve build system fixing issues with msys2 and mingw-w64, cosmetic changes
0.62.2 | [115](https://github.com/ZEISS/libczi/pull/115) | enabling building with clang on windows
0.62.3 | [116](https://github.com/ZEISS/libczi/pull/116) | enable long paths on Windows for CZIcmd, add Windows-ARM64 build
0.62.4 | [117](https://github.com/ZEISS/libczi/pull/117) | fix build with private RapidJSON library
0.62.4 | [117](https://github.com/ZEISS/libczi/pull/117) | fix build with private RapidJSON library
0.62.5 | [119](https://github.com/ZEISS/libczi/pull/119) | fix a discrepancy between code and documentation
8 changes: 7 additions & 1 deletion Src/libCZI/StreamsLib/azureblobinputstream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
const Azure::Core::Http::HttpStatusCode code = download_response.RawResponse->GetStatusCode();

// TODO(JBL): I am not sure about what we can expect here as return code. The Azure SDK documentation is not very clear about this,
// at least I am not aware of an authorative text on this.
// at least I am not aware of an authoritative text on this.
if (code == Azure::Core::Http::HttpStatusCode::Ok || code == Azure::Core::Http::HttpStatusCode::PartialContent)
{
// the reported position should match the requested offset
Expand All @@ -210,6 +210,12 @@
*ptrBytesRead = download_response.Value.ContentRange.Length.Value();
}
}
else
{
ostringstream string_stream;
string_stream << "'DownloadTo' failed with status code " << static_cast<int>(code) << ".";
throw runtime_error(string_stream.str());
}

Check warning on line 218 in Src/libCZI/StreamsLib/azureblobinputstream.cpp

View check run for this annotation

Codecov / codecov/patch

Src/libCZI/StreamsLib/azureblobinputstream.cpp#L215-L218

Added lines #L215 - L218 were not covered by tests
}

/*static*/std::string AzureBlobInputStream::GetBuildInformation()
Expand Down
2 changes: 1 addition & 1 deletion Src/libCZI/StreamsLib/azureblobinputstream.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
/// | | This key is relevant for all authentication modes except
/// | | "ConnectionString".
/// +------------------+--------------------------------------------------------------------------
/// | acountURL | The complete base-URL for the storage account. If this is given, then the
/// | accounturl | The complete base-URL for the storage account. If this is given, then the
/// | | key 'account' is ignored (and this URL is used instead).
/// | | This key is relevant for all authentication modes except
/// | | "ConnectionString".
Expand Down
Loading