OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-31 17:17:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cloud: Use separate files for Osdu and Sumo tokens.

Browse Source
This commit is contained in:
Kristian Bendiksen committed 2024-07-13 12:07:49 +02:00
1 parent 8ddcbe7368
commit 3e2af38c90
8 files changed
+99 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/Application/Tools/Cloud/RiaOsduConnector.cpp
+8 -7
View File
@@ -1,4 +1,5 @@
#include "RiaOsduConnector.h"
#include "RiaCloudDefines.h"
#include "RiaFileDownloader.h"
#include "RiaLogging.h"
#include "RiaOsduDefines.h"
@@ -86,7 +87,7 @@ void RiaOsduConnector::requestFieldsByName( const QString& fieldName )
void RiaOsduConnector::requestFieldsByName( const QString& server, const QString& dataPartitionId, const QString& token, const QString& fieldName )
{
std::map<QString, QString> params;
params["kind"] = RiaDefines::osduFieldKind();
params["kind"] = RiaOsduDefines::osduFieldKind();
params["limit"] = "10000";
params["query"] = "data.FieldName:" + fieldName;
@@ -122,7 +123,7 @@ void RiaOsduConnector::requestWellsByFieldId( const QString& fieldId )
void RiaOsduConnector::requestWellsByFieldId( const QString& server, const QString& dataPartitionId, const QString& token, const QString& fieldId )
{
std::map<QString, QString> params;
params["kind"] = RiaDefines::osduWellKind();
params["kind"] = RiaOsduDefines::osduWellKind();
params["limit"] = "10000";
params["query"] = QString( "nested(data.GeoContexts, (FieldID:\"%1\"))" ).arg( fieldId );
@@ -158,7 +159,7 @@ void RiaOsduConnector::requestWellboresByWellId( const QString& wellId )
void RiaOsduConnector::requestWellboresByWellId( const QString& server, const QString& dataPartitionId, const QString& token, const QString& wellId )
{
std::map<QString, QString> params;
params["kind"] = RiaDefines::osduWellboreKind();
params["kind"] = RiaOsduDefines::osduWellboreKind();
params["limit"] = "10000";
params["query"] = "data.WellID: \"" + wellId + "\"";
@@ -212,7 +213,7 @@ void RiaOsduConnector::requestWellLogsByWellboreId( const QString& server,
const QString& wellboreId )
{
std::map<QString, QString> params;
params["kind"] = RiaDefines::osduWellLogKind();
params["kind"] = RiaOsduDefines::osduWellLogKind();
params["limit"] = "10000";
params["query"] = "data.WellboreID: \"" + wellboreId + "\"";
@@ -251,7 +252,7 @@ void RiaOsduConnector::requestWellboreTrajectoryByWellboreId( const QString& ser
const QString& wellboreId )
{
std::map<QString, QString> params;
params["kind"] = RiaDefines::osduWellboreTrajectoryKind();
params["kind"] = RiaOsduDefines::osduWellboreTrajectoryKind();
params["limit"] = "10000";
params["query"] = "data.WellboreID: \"" + wellboreId + "\"";
@@ -316,7 +317,7 @@ QNetworkReply* RiaOsduConnector::makeSearchRequest( const std::map<QString, QStr
QNetworkRequest m_networkRequest;
m_networkRequest.setUrl( QUrl( constructSearchUrl( server ) ) );
addStandardHeader( m_networkRequest, token, dataPartitionId, RiaDefines::contentTypeJson() );
addStandardHeader( m_networkRequest, token, dataPartitionId, RiaCloudDefines::contentTypeJson() );
QJsonObject obj;
for ( auto [key, value] : parameters )
@@ -755,7 +756,7 @@ void RiaOsduConnector::requestParquetData( const QString& url, const QString& da
{
RiaLogging::info( "Requesting download of parquet from: " + url );
auto reply = makeDownloadRequest( url, dataPartitionId, token, RiaDefines::contentTypeParquet() );
auto reply = makeDownloadRequest( url, dataPartitionId, token, RiaCloudDefines::contentTypeParquet() );
connect( reply,
&QNetworkReply::finished,
ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp
+10 -9
View File
@@ -18,6 +18,7 @@
#include "RiaSumoConnector.h"
#include "RiaCloudDefines.h"
#include "RiaConnectorTools.h"
#include "RiaFileDownloader.h"
#include "RiaLogging.h"
@@ -95,7 +96,7 @@ void RiaSumoConnector::requestCasesForField( const QString& fieldName )
QNetworkRequest m_networkRequest;
m_networkRequest.setUrl( QUrl( constructSearchUrl( m_server ) ) );
addStandardHeader( m_networkRequest, token(), RiaDefines::contentTypeJson() );
addStandardHeader( m_networkRequest, token(), RiaCloudDefines::contentTypeJson() );
QString payloadTemplate = R"(
{
@@ -156,7 +157,7 @@ void RiaSumoConnector::requestAssets()
QNetworkRequest m_networkRequest;
m_networkRequest.setUrl( QUrl( m_server + "/api/v1/userpermissions" ) );
addStandardHeader( m_networkRequest, token(), RiaDefines::contentTypeJson() );
addStandardHeader( m_networkRequest, token(), RiaCloudDefines::contentTypeJson() );
auto reply = m_networkAccessManager->get( m_networkRequest );
@@ -218,7 +219,7 @@ void RiaSumoConnector::requestEnsembleByCasesId( const SumoCaseId& caseId )
QNetworkRequest m_networkRequest;
m_networkRequest.setUrl( QUrl( m_server + "/api/v1/search" ) );
addStandardHeader( m_networkRequest, token(), RiaDefines::contentTypeJson() );
addStandardHeader( m_networkRequest, token(), RiaCloudDefines::contentTypeJson() );
auto payload = payloadTemplate.arg( caseId.get() );
auto reply = m_networkAccessManager->post( m_networkRequest, payload.toUtf8() );
@@ -291,7 +292,7 @@ void RiaSumoConnector::requestVectorNamesForEnsemble( const SumoCaseId& caseId,
QNetworkRequest m_networkRequest;
m_networkRequest.setUrl( QUrl( m_server + "/api/v1/search" ) );
addStandardHeader( m_networkRequest, token(), RiaDefines::contentTypeJson() );
addStandardHeader( m_networkRequest, token(), RiaCloudDefines::contentTypeJson() );
auto payload = payloadTemplate.arg( caseId.get() ).arg( ensembleName );
auto reply = m_networkAccessManager->post( m_networkRequest, payload.toUtf8() );
@@ -360,7 +361,7 @@ void RiaSumoConnector::requestRealizationIdsForEnsemble( const SumoCaseId& caseI
QNetworkRequest m_networkRequest;
m_networkRequest.setUrl( QUrl( m_server + "/api/v1/search" ) );
addStandardHeader( m_networkRequest, token(), RiaDefines::contentTypeJson() );
addStandardHeader( m_networkRequest, token(), RiaCloudDefines::contentTypeJson() );
auto payload = payloadTemplate.arg( caseId.get() ).arg( ensembleName );
auto reply = m_networkAccessManager->post( m_networkRequest, payload.toUtf8() );
@@ -423,7 +424,7 @@ void RiaSumoConnector::requestBlobIdForEnsemble( const SumoCaseId& caseId, const
QNetworkRequest m_networkRequest;
m_networkRequest.setUrl( QUrl( m_server + "/api/v1/search" ) );
addStandardHeader( m_networkRequest, token(), RiaDefines::contentTypeJson() );
addStandardHeader( m_networkRequest, token(), RiaCloudDefines::contentTypeJson() );
auto payload = payloadTemplate.arg( caseId.get() ).arg( ensembleName ).arg( vectorName );
auto reply = m_networkAccessManager->post( m_networkRequest, payload.toUtf8() );
@@ -469,7 +470,7 @@ void RiaSumoConnector::requestBlobDownload( const QString& blobId )
// did not work. Use ManualRedirectPolicy instead, and inspect the reply for the redirection target.
networkRequest.setAttribute( QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::ManualRedirectPolicy );
addStandardHeader( networkRequest, token(), RiaDefines::contentTypeJson() );
addStandardHeader( networkRequest, token(), RiaCloudDefines::contentTypeJson() );
auto reply = m_networkAccessManager->get( networkRequest );
@@ -592,7 +593,7 @@ QNetworkReply* RiaSumoConnector::makeRequest( const std::map<QString, QString>&
QNetworkRequest m_networkRequest;
m_networkRequest.setUrl( QUrl( constructSearchUrl( server ) ) );
addStandardHeader( m_networkRequest, token, RiaDefines::contentTypeJson() );
addStandardHeader( m_networkRequest, token, RiaCloudDefines::contentTypeJson() );
QJsonObject obj;
for ( auto [key, value] : parameters )
@@ -841,7 +842,7 @@ void RiaSumoConnector::requestParquetData( const QString& url, const QString& to
{
RiaLogging::info( "Requesting download of parquet from: " + url );
auto reply = makeDownloadRequest( url, token, RiaDefines::contentTypeJson() );
auto reply = makeDownloadRequest( url, token, RiaCloudDefines::contentTypeJson() );
connect( reply,
&QNetworkReply::finished,
[this, reply, url]()