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
System
File
Commits
13e88f8f
Commit
13e88f8f
authored
Aug 18, 2020
by
Erik Leckner
Browse files
file-azure
parent
0a3205c8
Pipeline
#6123
passed with stage
in 4 minutes and 43 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
provider/file-azure/src/main/java/org/opengroup/osdu/file/provider/azure/repository/StorageRepository.java
View file @
13e88f8f
...
...
@@ -44,14 +44,10 @@ public class StorageRepository implements IStorageRepository {
@Inject
final
Storage
storage
;
@Value
(
"${azure.storage.account}"
)
private
static
String
azureStorageAccount
;
private
String
storageAccount
;
private
String
storageAccount
=
getStorageAccount
();
public
StorageRepository
(
Storage
storage
)
{
this
.
storage
=
storage
;
this
.
storageAccount
=
getStorageAccount
();
}
@Override
...
...
@@ -74,7 +70,7 @@ public class StorageRepository implements IStorageRepository {
}
public
static
String
getStorageAccount
()
{
return
azureStorageAccount
;
return
System
.
getProperty
(
"AZURE_STORAGE_ACCOUNT"
,
System
.
getenv
(
"AZURE_STORAGE_ACCOUNT"
))
;
}
private
URI
getObjectUri
(
Blob
blob
)
{
...
...
provider/file-azure/src/main/java/org/opengroup/osdu/file/provider/azure/storage/StorageImpl.java
View file @
13e88f8f
...
...
@@ -97,10 +97,10 @@ public class StorageImpl implements Storage {
return
null
;
}
@SneakyThrows
@Override
public
URL
signUrl
(
BlobInfo
blobInfo
,
long
duration
,
TimeUnit
timeUnit
)
{
URL
url
=
null
;
try
{
log
.
debug
(
"Signing the blob in container {} for path {}"
,
blobInfo
.
getContainer
(),
blobInfo
.
getName
());
System
.
out
.
println
(
String
.
format
(
"Signing the blob in container %s for path %s"
,
blobInfo
.
getContainer
(),
blobInfo
.
getName
()));
...
...
provider/file-azure/src/main/resources/application.properties
View file @
13e88f8f
...
...
@@ -23,8 +23,8 @@ azure.cosmosdb.database=${cosmosdb_database}
azure.keyvault.url
=
${keyvault_url}
# Azure Blob Storage configuration
file.location.containerName
=
o
des-os-file-temp
file.location.userId
=
common
-user
file.location.containerName
=
o
sdu-container
file.location.userId
=
osdu
-user
azure.storage.account
=
${AZURE_STORAGE_ACCOUNT}
...
...
Write
Preview
Supports
Markdown
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