diff --git a/3rdparty/BuildDms/CMakeLists.txt b/3rdparty/BuildDms/CMakeLists.txt index cccc12be202147574c31705f453ad6147628e4b4..0af27dbcf176ce50ed0a3f9d5c09ff6549a47c9f 100644 --- a/3rdparty/BuildDms/CMakeLists.txt +++ b/3rdparty/BuildDms/CMakeLists.txt @@ -8,12 +8,13 @@ set (CMAKE_CXX_STANDARD_REQUIRED ON) include_directories(${dmsCMakeDir}/src/core) include_directories(${dmsCMakeDir}/src/lib) +include_directories(${dmsCMakeDir}/src/lib/cloud) include_directories(${dmsCMakeDir}/src/lib/cloud/providers) +include_directories(${dmsCMakeDir}/src/lib/cloud/providers/gcs-accessor) # retrieve sources file(GLOB SRC_CORE ${dmsCMakeDir}/src/core/*.cc) -file(GLOB SRC_LIB_ACCESSORS ${dmsCMakeDir}/src/lib/accessors/*.cc) -file(GLOB SRC_LIB_PROVIDERS ${dmsCMakeDir}/src/lib/cloud/providers/*.cc) +file(GLOB SRC_LIB_PROVIDERS ${dmsCMakeDir}/src/lib/cloud/*.cc ${dmsCMakeDir}/src/lib/cloud/providers/gcs-accessor/*.cc) file(GLOB SRC_LIB_HTTP ${dmsCMakeDir}/src/lib/http/*.cc) file(GLOB SRC_LIB_JSON ${dmsCMakeDir}/src/lib/json/*.cpp) file(GLOB SRC_LIB_AUTH ${dmsCMakeDir}/src/lib/auth/*.cc) diff --git a/CMake/Fetch3rdPartyInBuild.cmake b/CMake/Fetch3rdPartyInBuild.cmake index 9b787782cb4d344f6debf9373f4b72d32a38108d..22d31bd85786f068fccfaf0fef022abd31138f97 100644 --- a/CMake/Fetch3rdPartyInBuild.cmake +++ b/CMake/Fetch3rdPartyInBuild.cmake @@ -105,7 +105,7 @@ function(Fetch3rdParty) Fetch3rdParty_Package(google-cloud-cpp 1.14.0 https://codeload.github.com/googleapis/google-cloud-cpp/tar.gz/v1.14.0 SHA256=839b2d4dcb36a671734dac6b30ea8c298bbeaafcf7a45ee4a7d7aa5986b16569) Fetch3rdParty_Package(libxml2 2.9.12a https://codeload.github.com/GNOME/libxml2/tar.gz/v2.9.12 SHA256=8a4ddd706419c210b30b8978a51388937fd9362c34fc9a3d69e4fcc6f8055ee0) Fetch3rdParty_Package(azure-sdk-for-cpp 12.0.0b11 https://codeload.github.com/Azure/azure-sdk-for-cpp/tar.gz/azure-storage-blobs_12.0.0-beta.11 SHA256=b111636335340e3e7a5675351216dde606b8345b9906ed2f42ff8a794f5f2375) - Fetch3rdParty_Package(dms b015ea6ec https://community.opengroup.org/osdu/platform/domain-data-mgmt-services/seismic/seismic-dms-suite/seismic-store-cpp-lib/-/archive/b015ea6ec113d95d9ca00bb48e0ab76e646c2aea/seismic-store-cpp-lib-master.tar.gz SHA256=77cc6d08a3978bafee309e8b0f43f95431d2154619b140392a7ee0a27985a49c) + Fetch3rdParty_Package(dms 70892e2e3 https://community.opengroup.org/osdu/platform/domain-data-mgmt-services/seismic/seismic-dms-suite/seismic-store-cpp-lib/-/archive/70892e2e344693652992cda34e362774952a34cd/seismic-store-cpp-lib-master.tar.gz SHA256=f421b2fd2cbfe116ade2b6b109d9adaa417a1d27516afab0a70f3518b7b93a17) #Fetch3rdParty_Git(dms git git@community.opengroup.org:osdu/platform/domain-data-mgmt-services/seismic/seismic-dms-suite/seismic-store-cpp-lib.git master) Fetch3rdParty_File(testng java 6.14.3 jar https://repo1.maven.org/maven2/org/testng/testng/6.14.3/testng-6.14.3.jar MD5=9f17a8f9e99165e148c42b21f4b63d7c) Fetch3rdParty_File(jcommander java 1.72 jar https://repo1.maven.org/maven2/com/beust/jcommander/1.72/jcommander-1.72.jar MD5=9fde6bc0ba1032eceb7267fd1ad1657b) diff --git a/docs/connection.rst b/docs/connection.rst index 6f1a9ed58614700f694fe16f0c94373984e8115c..23b4465f4bc4d7656d62f729a83377ba4a8979b8 100644 --- a/docs/connection.rst +++ b/docs/connection.rst @@ -99,6 +99,9 @@ It is the access_token member of the return that will be used as the sdtoken unt NOTE: Key values for `sd` can use `snake_case` instead of `CammelCase` to match the look and feel of the response from the token provider. +If the seismic dms service is targeting AWS, please make sure to set the +AWS_REGION environment variable to the correct region. + ``azureSAS`` will accept the following keys - Suffix