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
Kelly Domico
OS Core Lib Azure
Commits
1b54a891
Commit
1b54a891
authored
Sep 10, 2020
by
Kishore Battula
Browse files
Merge branch 'haaggarw/BugFixTenantFactoryImpl' into 'master'
Adding serviceprincipal attribute in TenantInfo See merge request
!29
parents
66ab7e59
99520c03
Changes
3
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
1b54a891
...
...
@@ -21,7 +21,7 @@
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
core-lib-azure
</artifactId>
<packaging>
jar
</packaging>
<version>
0.0.2
7
</version>
<version>
0.0.2
8
</version>
<name>
core-lib-azure
</name>
<properties>
...
...
src/main/java/org/opengroup/osdu/azure/multitenancy/TenantFactoryImpl.java
View file @
1b54a891
...
...
@@ -113,6 +113,7 @@ public class TenantFactoryImpl implements ITenantFactory {
ti
.
setName
(
tenantName
);
ti
.
setComplianceRuleSet
(
tenantInfoDoc
.
getComplianceRuleSet
());
ti
.
setDataPartitionId
(
tenantName
);
ti
.
setServiceAccount
(
tenantInfoDoc
.
getServiceprincipalAppId
());
this
.
tenants
.
put
(
tenantName
,
ti
);
}
);
...
...
src/test/java/org/opengroup/osdu/azure/multitenancy/TenantFactoryImplTest.java
View file @
1b54a891
...
...
@@ -81,6 +81,7 @@ public class TenantFactoryImplTest {
expected
.
setName
(
tenantName
);
expected
.
setDataPartitionId
(
tenantName
);
expected
.
setComplianceRuleSet
(
complianceRuleSet
);
expected
.
setServiceAccount
(
serviceprincipalAppId
);
assertEquals
(
expected
,
result
);
}
...
...
@@ -106,6 +107,7 @@ public class TenantFactoryImplTest {
tenantInfo
.
setName
(
tenantName
);
tenantInfo
.
setDataPartitionId
(
tenantName
);
tenantInfo
.
setComplianceRuleSet
(
complianceRuleSet
);
tenantInfo
.
setServiceAccount
(
serviceprincipalAppId
);
List
<
TenantInfo
>
expected
=
Collections
.
singletonList
(
tenantInfo
);
...
...
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