Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Open Subsurface Data Universe Software
Platform
Domain Data Mgmt Services
Seismic
Seismic DMS Suite
seismic-dms-service
Commits
978fb7b3
Commit
978fb7b3
authored
Nov 20, 2021
by
Dmitriy Rudko
💬
Browse files
fix: Merge branch 'feature/rudkodm/switch_partition_to_msi' into Azure/OSDU-Seismic-DDMS-M8-Master
parents
c4c7e96c
3e15960a
Pipeline
#78182
failed with stages
in 13 minutes and 37 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
NOTICE
View file @
978fb7b3
...
...
@@ -269,7 +269,7 @@ The following software have components provided under the terms of this license:
- inherits (from https://www.npmjs.com/package/inherits)
- ini (from https://www.npmjs.com/package/ini)
- isexe (from https://www.npmjs.com/package/isexe)
- json-stringify-safe (from https://
github.com/isaacs
/json-stringify-safe)
- json-stringify-safe (from https://
www.npmjs.com/package
/json-stringify-safe)
- jwtproxy (from https://www.npmjs.com/package/jwtproxy)
- lockfile (from https://www.npmjs.com/package/lockfile)
- log-driver (from https://www.npmjs.com/package/log-driver)
...
...
@@ -284,7 +284,7 @@ The following software have components provided under the terms of this license:
- npm-normalize-package-bin (from https://www.npmjs.com/package/npm-normalize-package-bin)
- npm-packlist (from https://www.npmjs.com/package/npm-packlist)
- npmlog (from https://www.npmjs.com/package/npmlog)
- once (from https://
github.com/isaacs/once#readm
e)
- once (from https://
www.npmjs.com/package/onc
e)
- osenv (from https://www.npmjs.com/package/osenv)
- pseudomap (from https://www.npmjs.com/package/pseudomap)
- request-promise (from https://www.npmjs.com/package/request-promise)
...
...
@@ -438,7 +438,7 @@ The following software have components provided under the terms of this license:
- chownr (from https://www.npmjs.com/package/chownr)
- cliui (from https://www.npmjs.com/package/cliui)
- cliui (from https://www.npmjs.com/package/cliui)
- code-point-at (from https://
github.com/sindresorhus
/code-point-at)
- code-point-at (from https://
www.npmjs.com/package
/code-point-at)
- color (from https://www.npmjs.com/package/color)
- color-convert (from https://www.npmjs.com/package/color-convert)
- color-convert (from https://www.npmjs.com/package/color-convert)
...
...
@@ -600,14 +600,14 @@ The following software have components provided under the terms of this license:
- isarray (from https://www.npmjs.com/package/isarray)
- isexe (from https://www.npmjs.com/package/isexe)
- isstream (from https://github.com/rvagg/isstream)
- jmespath (from https://github.com/jmespath/jmespath.py)
- jmespath (from https://www.npmjs.com/package/jmespath)
- jmespath (from https://github.com/jmespath/jmespath.py)
- jsbn (from https://www.npmjs.com/package/jsbn)
- json-bigint (from https://www.npmjs.com/package/json-bigint)
- json-bigint (from https://www.npmjs.com/package/json-bigint)
- json-schema (from https://www.npmjs.com/package/json-schema)
- json-schema-traverse (from https://www.npmjs.com/package/json-schema-traverse)
- json-stringify-safe (from https://
github.com/isaacs
/json-stringify-safe)
- json-stringify-safe (from https://
www.npmjs.com/package
/json-stringify-safe)
- jsonfile (from https://www.npmjs.com/package/jsonfile)
- jsonwebtoken (from https://www.npmjs.com/package/jsonwebtoken)
- jsprim (from https://www.npmjs.com/package/jsprim)
...
...
@@ -696,7 +696,7 @@ The following software have components provided under the terms of this license:
- object.assign (from https://www.npmjs.com/package/object.assign)
- object.getownpropertydescriptors (from https://www.npmjs.com/package/object.getownpropertydescriptors)
- on-finished (from https://www.npmjs.com/package/on-finished)
- once (from https://
github.com/isaacs/once#readm
e)
- once (from https://
www.npmjs.com/package/onc
e)
- one-time (from https://www.npmjs.com/package/one-time)
- onetime (from https://www.npmjs.com/package/onetime)
- open (from https://www.npmjs.com/package/open)
...
...
@@ -783,7 +783,7 @@ The following software have components provided under the terms of this license:
- split-array-stream (from https://www.npmjs.com/package/split-array-stream)
- sshpk (from https://www.npmjs.com/package/sshpk)
- stack-chain (from https://www.npmjs.com/package/stack-chain)
- stack-trace (from https://
github.com/felixge/node-
stack-trace)
- stack-trace (from https://
www.npmjs.com/package/
stack-trace)
- standard-as-callback (from https://www.npmjs.com/package/standard-as-callback)
- statuses (from https://www.npmjs.com/package/statuses)
- stealthy-require (from https://www.npmjs.com/package/stealthy-require)
...
...
src/cloud/providers/azure/dataecosystem.ts
View file @
978fb7b3
...
...
@@ -55,12 +55,13 @@ export class AzureDataEcosystemServices extends AbstractDataEcosystemCore {
}
public
static
async
getPartitionConfiguration
(
dataPartitionID
:
string
):
Promise
<
any
>
{
const
credentials
=
AzureCredentials
.
getCredential
()
const
aud
=
AzureConfig
.
SP_APP_RESOURCE_ID
;
const
accessToken
=
(
await
credentials
.
getToken
(
`
${
aud
}
/.default`
)).
token
const
options
=
{
headers
:
{
'
Accept
'
:
'
application/json
'
,
'
Authorization
'
:
'
Bearer
'
+
(
await
AzureCredentials
.
getAzureServicePrincipalAccessToken
(
AzureConfig
.
SP_CLIENT_ID
,
AzureConfig
.
SP_CLIENT_SECRET
,
AzureConfig
.
SP_TENANT_ID
,
AzureConfig
.
SP_APP_RESOURCE_ID
)).
access_token
,
'
Authorization
'
:
`Bearer
${
accessToken
}
`
,
'
Content-Type
'
:
'
application/json
'
},
url
:
AzureConfig
.
DES_SERVICE_HOST_PARTITION
+
'
/api/partition/v1/partitions/
'
+
dataPartitionID
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment