Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
knowledge-platform
Commits
d6397594
Commit
d6397594
authored
2 years ago
by
shishir suman
Browse files
Options
Download
Patches
Plain Diff
configuration changes
parent
9cf5ae02
release-5.1.0-content
Gcloud_copy
Gcloud_fix
Remove_unwantedCode_Gcloud_fix
bulk-upload-comptenecy-mapping
bulk-upload-excelsheet
bulk-upload-test_excel
bulk_upload
master
poc_bulk_upload
rahul_bulk_upload_postgres
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
platform-modules/mimetype-manager/src/main/scala/org/sunbird/cloudstore/StorageService.scala
+7
-5
...rc/main/scala/org/sunbird/cloudstore/StorageService.scala
with
7 additions
and
5 deletions
+7
-5
platform-modules/mimetype-manager/src/main/scala/org/sunbird/cloudstore/StorageService.scala
+
7
−
5
View file @
d6397594
...
...
@@ -93,15 +93,17 @@ class StorageService {
def
getSignedURL
(
key
:
String
,
ttl
:
Option
[
Int
],
permission
:
Option
[
String
])
:
String
=
{
storageType
match
{
case
"gcloud"
=>
getGCPSignedURL
(
Platform
.
config
.
getString
(
"gcloud_private_bucket_project_client_id"
),
Platform
.
config
.
getString
(
"gcloud_client_key"
),
Platform
.
config
.
getString
(
"gcloud_private_secret"
),
Platform
.
config
.
getString
(
"gcloud_private_bucket_project_key_id"
),
Platform
.
config
.
getString
(
"gcloud_private_bucket_projectId"
),
key
,
ttl
.
get
)
case
"gcloud"
=>
getGCPSignedURL
(
key
,
ttl
.
get
)
case
_
=>
getService
.
getSignedURL
(
getContainerName
,
key
,
ttl
,
permission
)
}
}
def
getGCPSignedURL
(
clientId
:
String
,
clientEmail
:
String
,
privateKeyPkcs8
:
String
,
privateKeyIds
:
String
,
projectId
:
String
,
objectName
:
String
,
ttl
:
Long
)
:
String
=
{
def
getGCPSignedURL
(
objectName
:
String
,
ttl
:
Long
)
:
String
=
{
val
clientId
=
Platform
.
config
.
getString
(
"gcloud_private_bucket_project_client_id"
)
val
clientEmail
=
Platform
.
config
.
getString
(
"gcloud_client_key"
)
val
privateKeyPkcs8
=
Platform
.
config
.
getString
(
"gcloud_private_secret"
)
val
privateKeyIds
=
Platform
.
config
.
getString
(
"gcloud_private_bucket_project_key_id"
)
val
projectId
=
Platform
.
config
.
getString
(
"gcloud_private_bucket_projectId"
)
val
credentials
=
ServiceAccountCredentials
.
fromPkcs8
(
clientId
,
clientEmail
,
privateKeyPkcs8
,
privateKeyIds
,
new
java
.
util
.
ArrayList
[
String
]())
println
(
"credentials : "
,
credentials
)
val
storage
=
StorageOptions
.
newBuilder
.
setProjectId
(
projectId
).
setCredentials
(
credentials
).
build
.
getService
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets