Skip to content

HDDS-5647. [Multi-Tenant] Implement AssignUserToTenant#2564

Merged
smengcl merged 20 commits intoapache:HDDS-4944from
smengcl:HDDS-5647
Sep 15, 2021
Merged

HDDS-5647. [Multi-Tenant] Implement AssignUserToTenant#2564
smengcl merged 20 commits intoapache:HDDS-4944from
smengcl:HDDS-5647

Conversation

@smengcl
Copy link
Contributor

@smengcl smengcl commented Aug 23, 2021 •
edited
Loading

This PR implements AssignUserToTenant, replacing CreateUserTenant in the prototype.

How was this patch tested?

  • Added basic integration test.
    • But doesn't check the end-to-end implementation yet. Ranger endpoint is missing for the integration test.
      • And a mock server for integration test as well?
      • Add an internal config to disable Ranger communication just for testing?
  • Manual tested. Added a mock server to compose/ozonesecure.

Manual testing

In a compose/ozonesecure container:

kinit -kt /etc/security/keytabs/om.keytab om/om@EXAMPLE.COM
curl -k https://ranger:6182/
ozone s3 tenant create finance
ozone s3 user assign bob@EXAMPLE.COM --tenant=finance

smengcl added 2 commits August 20, 2021 13:17
@smengcl
Rename all createTenantUser references to assignUserToTenant.
c7d05f6
@smengcl
Impl the third arg 'accessId' of assignUserToTenant;
36caa76 
handles new table write in OMAssignUserToTenantRequest and OMAssignUserToTenantResponse.

Change-Id: I9f726b5b2780c4a73631bd2eb76a12f2bcf3e232
@smengcl smengcl changed the base branch from master to HDDS-4944 August 23, 2021 17:53
smengcl added 5 commits August 23, 2021 10:56
@smengcl
Checkstyle.
0626977 
Change-Id: I9cde446b7faf01ac5b437428e901ae8f74aba8b9
@smengcl
findbugs: Remove unused field tenantName in OMAssignUserToTenantRespo…
5949b32 
…nse.

Change-Id: Ic5a3d8a6894b0261a98afa8404ed7ced641c3155
@smengcl
Clean up import; javadoc.
002b71a 
Change-Id: Ib889da19191111ddbb03189af8594eafdddbf60d
@smengcl
Should use principal as key for TenantAccessIdTable/PrincipalToAccess…
29447c3 
…IdsTable; use accessId as key for S3SecretTable.

Change-Id: Icbf005b32e937e633c1d351b712e3ef69443b313
@smengcl
Get rid of jettison in code.
8eb2b8d 
Change-Id: Ia2df2a33037522adb4e2d449670c16e911db6207
@smengcl smengcl requested a review from prashantpogde August 24, 2021 18:18
smengcl added 13 commits August 25, 2021 14:10
@smengcl
Associate codec to class.
c9e9c08 
Change-Id: I0042a1bc47aa40a84a8127f69157b4574a99ba40
@smengcl
Rename getResponseData.
5df7bac 
Change-Id: I4783eb5e607ad0bf01c8595188f2a5a6059eebdc
@smengcl
Add mockserver to compose/ozonesecure for testing.
2ac2f4e 
Change-Id: I076806ef4605fa237207f2bd07fc1be1f830e50d
@smengcl
Clean up ozonesecure/docker-compose.yaml.
e5903c7 
Change-Id: Id665ee2072a41f43ba03b81680e6ce9410b06d7d
@smengcl
Missing setAccessId in ClientSideTranslatorPC.
82237e1 
Change-Id: Icf6367345b7d0c63f8699efc89c146d251183fbd
@smengcl
CLI: Can't take more than one accessId.
996087a 
Change-Id: Id2e04771c6ba1fdfac6d964aa16d30856cee25bb
@smengcl
Clean up & fix Request.
1d6a383 
Change-Id: I55d655317bbae5fb5345fce728f6334551ed2af0
@smengcl
Don't need separator anymore? in getFullMultiTenantPrincipalID().
f3e67fa 
Change-Id: I635f5ba1edec819e8d1b65d5c5725bb64c8e734f
@smengcl
Move opts to om. (Doesn't seem to work anyway)
b58141f 
Change-Id: I54f13de495a440104a914f2d2c2c2dbe271ae205
@smengcl
Revert "Don't need separator anymore? in getFullMultiTenantPrincipalI…
90add92 
…D()."

This reverts commit f3e67fa.
@smengcl
CLI no longer defaults to s3v tenant if unspecified; Hide accessId op…
45d3618 
…tion; Add basic check in integration test; Clean up.

Change-Id: Ie7e137b88b6d77b9998fa7e8341563a083ab9c38
@smengcl
Check TENANT_NOT_FOUND in CLI.
82b5e97 
Change-Id: I3a0a1830941d3300f5674a663ab38e53e2ca286f
@smengcl
Put single quotes around assign output as AWS_ACCESS_KEY_ID may ver…
54653d6 
…y well have `$` in it.

Change-Id: I981522b0acf926f7bc060f314f77f0926c7234e2
@avijayanhwx avijayanhwx mentioned this pull request Sep 13, 2021
Merged
prashantpogde
prashantpogde approved these changes Sep 15, 2021
View reviewed changes
Copy link
Contributor

@prashantpogde prashantpogde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@smengcl smengcl merged commit 2c95164 into apache:HDDS-4944 Sep 15, 2021
@smengcl
Copy link
Contributor Author

smengcl commented Sep 15, 2021

Thanks @prashantpogde for reviewing this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@prashantpogde prashantpogde prashantpogde approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@smengcl @prashantpogde