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
Security and Compliance
entitlements-ibm
Commits
4f818caf
Commit
4f818caf
authored
Feb 11, 2021
by
David Diederich
Browse files
Merge branch 'ibm-cherry-picks-for-0.5' into 'release/0.5'
Ibm cherry picks for 0.5 See merge request
!14
parents
930ca9d1
77923485
Pipeline
#26035
passed with stages
in 38 minutes and 46 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
4f818caf
...
...
@@ -25,4 +25,4 @@ include:
-
project
:
'
osdu/platform/ci-cd-pipelines'
ref
:
'
release/0.5'
file
:
'
cloud-providers/ibm.yml'
file
:
'
cloud-providers/ibm
-deploy-only
.yml'
src/main/java/org/opengroup/osdu/ibm/entitlements/api/EntitlementsApi.java
View file @
4f818caf
...
...
@@ -86,8 +86,8 @@ public class EntitlementsApi {
if
(
memberInfo
.
getRole
().
trim
().
isEmpty
())
{
throw
new
AppException
(
HttpStatus
.
BAD_REQUEST
.
value
(),
"Role cannot be empty"
,
"Role cannot be empty"
);
}
if
(!(
memberInfo
.
getRole
().
equals
IgnoreCase
(
"MEMBER"
)
||
memberInfo
.
getRole
().
equals
IgnoreCase
(
"OWNER"
)))
{
throw
new
AppException
(
HttpStatus
.
BAD_REQUEST
.
value
(),
"
Role need to be either MEMBER or OWNER
"
,
"Role need to be either MEMBER or OWNER"
);
if
(!(
memberInfo
.
getRole
().
equals
(
"MEMBER"
)
||
memberInfo
.
getRole
().
equals
(
"OWNER"
)))
{
throw
new
AppException
(
HttpStatus
.
BAD_REQUEST
.
value
(),
"
Invalid role provided
"
,
"Role need to be either MEMBER or OWNER"
);
}
try
{
...
...
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