Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix create_user issue #275

Open
wants to merge 14 commits into
base: devel
Choose a base branch
from
Open

Fix create_user issue #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
10a3ff1
Updated for #273
jaapbrasser Apr 11, 2021
eaeec43
Updated logic for 5.3 cluster support 🌷
jaapbrasser Apr 11, 2021
7e4c041
Fix test 🧪
jaapbrasser Apr 11, 2021
812ca8c
Fix test again 🧪
jaapbrasser Apr 11, 2021
32acd70
Fixing tests part 3 🕒
jaapbrasser Apr 11, 2021
08212fa
Test fix 🧪
jaapbrasser Apr 11, 2021
7b888ce
Disable test for now 🦕
jaapbrasser Apr 11, 2021
2047bf6
Final fix perhaps 🧪
jaapbrasser Apr 11, 2021
35a8629
Add missing comma 📄
jaapbrasser Apr 11, 2021
e1b7734
Add empty data field 🧪
jaapbrasser Apr 11, 2021
9e91920
Set data to none🚫
jaapbrasser Apr 11, 2021
26441fb
Matched internal post and get
jaapbrasser Apr 11, 2021
1cbf32b
Removed none 🚫
jaapbrasser Apr 11, 2021
a69f54e
Test user object 🕴
jaapbrasser Apr 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### Changed

- Changed API endpoint and logic for create_user ([Issue 273](https://github.com/rubrikinc/rubrik-sdk-for-python/issues/273))

### Fixed

- Fix MSSQL Recovery Point timestamp validation on Windows OS Python 2 & 3 ([Issue 268](https://github.com/rubrikinc/rubrik-sdk-for-python/issues/268))

## v2.0.10
Expand Down
4 changes: 2 additions & 2 deletions rubrik_cdm/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,8 +874,8 @@ def create_user(self, username, password, first_name=None, last_name=None, email

self.log("create_user: Searching for the current users on the Rubrik cluster")
current_users = self.get(
"internal", "/user?username={}".format(username), timeout=timeout)
if len(current_users) > 0:
"v1", "/principal?name={}".format(username), timeout=timeout)
if len(current_users["data"]) > 0:
return "No change required. The user '{}' already exists on the Rubrik cluster.".format(username)

config = {}
Expand Down
27 changes: 14 additions & 13 deletions tests/unit/cluster_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,18 +1024,17 @@ def mock_job_status():
def test_create_user_idempotence(rubrik, mocker):

def mock_get_internal_user():
return [
{
"id": "string",
"authDomainId": "string",
"username": "string",
"firstName": "string",
"lastName": "string",
"emailAddress": "string",
"contactNumber": "string",
"mfaServerId": "string"
}
]
return {
"id": "string",
"authDomainId": "string",
"data": "blah",
"username": "string",
"firstName": "string",
"lastName": "string",
"emailAddress": "string",
"contactNumber": "string",
"mfaServerId": "string"
}

mock_get = mocker.patch('rubrik_cdm.Connect.get',
autospec=True, spec_set=True)
Expand All @@ -1048,7 +1047,9 @@ def mock_get_internal_user():
def test_create_user(rubrik, mocker):

def mock_get_internal_user():
return []
return {
"data": ""
}

def mock_post_internal_user():
return {
Expand Down