{Graph} Refine code and tests for ms graph group #21663
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -588,139 +588,159 @@ def test_graph_user_scenario(self): | |
|
|
||
| class GraphGroupScenarioTest(ScenarioTest): | ||
|
|
||
| def clean_resource(self, resource, type='group'): | ||
| try: | ||
| if type == 'user': | ||
| self.cmd('ad user delete --id {}'.format(resource)) | ||
| elif type == 'group': | ||
| self.cmd('ad group delete -g {}'.format(resource)) | ||
| elif type == 'app': | ||
| self.cmd('ad app delete --id {}'.format(resource)) | ||
| except Exception: | ||
| pass | ||
|
|
||
| def test_graph_group_scenario(self): | ||
| username = get_signed_in_user(self) | ||
| if not username: | ||
| return # this test delete users which are beyond a SP's capacity, so quit... | ||
|
|
||
| domain = 'AzureSDKTeam.onmicrosoft.com' | ||
| self.kwargs = { | ||
| 'group': self.create_random_name(prefix='testgroup', length=24), | ||
| 'mail_nick_name': 'deleteme11', | ||
| 'child_group': self.create_random_name(prefix='testchildgroup', length=24), | ||
| 'leaf_group': self.create_random_name(prefix='testleafgroup', length=24), | ||
| 'user1': self.create_random_name(prefix='testgroupuser1', length=24), | ||
| 'user2': self.create_random_name(prefix='testgroupuser2', length=24), | ||
| 'pass': 'Test1234!!', | ||
| 'domain': domain, | ||
| 'app_name': self.create_random_name(prefix='testgroupapp', length=24) | ||
| } | ||
|
|
||
| self.recording_processors.append(AADGraphUserReplacer('@' + domain, '@example.com')) | ||
| try: | ||
| # create group | ||
| group_result = self.cmd( | ||
| 'ad group create --display-name {group} --mail-nickname {mail_nick_name} --description {group}', | ||
| checks=[self.check('displayName', '{group}'), | ||
| self.check('mailNickname', '{mail_nick_name}'), | ||
| self.check('description', '{group}')] | ||
| ).get_output_in_json() | ||
| self.kwargs['group_id'] = group_result['id'] | ||
|
Member
Author
There was a problem hiding this comment.
|
||
|
|
||
| # create again to test idempotency | ||
| self.cmd('ad group create --display-name {group} --mail-nickname {mail_nick_name}') | ||
| # list groups | ||
| self.cmd('ad group list --display-name {group}', checks=self.check('length([])', 1)) | ||
| # show group | ||
| self.cmd('ad group show -g {group}', checks=[ | ||
| self.check('id', '{group_id}'), | ||
| self.check('displayName', '{group}'), | ||
| self.check('mailNickname', '{mail_nick_name}'), | ||
| self.check('description', '{group}') | ||
| ]) | ||
|
|
||
| # create other groups to test membership transitivity | ||
| group_result = self.cmd('ad group create --display-name {child_group} --mail-nickname {mail_nick_name}').get_output_in_json() | ||
| self.kwargs['child_group_id'] = group_result['id'] | ||
| group_result = self.cmd('ad group create --display-name {leaf_group} --mail-nickname {mail_nick_name}').get_output_in_json() | ||
| self.kwargs['leaf_group_id'] = group_result['id'] | ||
|
|
||
| # add child_group as member of group | ||
| self.cmd('ad group member add -g {group_id} --member-id {child_group_id}') | ||
| # add leaf_group as member of child_group | ||
| self.cmd('ad group member add -g {child_group_id} --member-id {leaf_group_id}') | ||
evelyn-ys marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| # check member transitivity | ||
| self.cmd('ad group member check -g {group_id} --member-id {child_group_id}', | ||
| checks=self.check('value', True)) | ||
| self.cmd('ad group member check -g {child_group_id} --member-id {leaf_group_id}', | ||
| checks=self.check('value', True)) | ||
| self.cmd('ad group member check -g {group_id} --member-id {leaf_group_id}', | ||
| checks=self.check('value', True)) | ||
|
|
||
| # list members (intransitive) | ||
| self.cmd('ad group member list -g {group_id}', checks=self.check('length([])', 1)) | ||
| self.cmd('ad group member list -g {child_group_id}', checks=self.check('length([])', 1)) | ||
| self.cmd('ad group member list -g {leaf_group_id}', checks=self.check('length([])', 0)) | ||
|
|
||
| # get-member-groups transitivity | ||
| self.cmd('ad group get-member-groups -g {group_id}', checks=self.check('length([])', 0)) | ||
| self.cmd('ad group get-member-groups -g {child_group_id}', checks=self.check('length([])', 1)) | ||
| self.cmd('ad group get-member-groups -g {leaf_group_id}', checks=self.check('length([])', 2)) | ||
|
|
||
| # remove member | ||
| self.cmd('ad group member remove -g {child_group_id} --member-id {leaf_group_id}') | ||
| self.cmd('ad group member check -g {child_group_id} --member-id {leaf_group_id}', | ||
| checks=self.check('value', False)) | ||
|
|
||
| # create user to add group member | ||
| user_result = self.cmd('ad user create --display-name {user1} --password {pass} --user-principal-name {user1}@{domain}').get_output_in_json() | ||
| self.kwargs['user1_id'] = user_result['id'] | ||
|
|
||
| # add user as group member | ||
| self.cmd('ad group member add -g {leaf_group_id} --member-id {user1_id}') | ||
|
|
||
| # check user as group member | ||
| self.cmd('ad group member check -g {leaf_group_id} --member-id {user1_id}', | ||
| checks=self.check('value', True)) | ||
| # list member(user is expected) | ||
| self.cmd('ad group member list -g {leaf_group_id}', checks=self.check('length([])', 1)) | ||
|
|
||
| # remove user as member | ||
| self.cmd('ad group member remove -g {leaf_group_id} --member-id {user1_id}') | ||
| self.cmd('ad group member check -g {leaf_group_id} --member-id {user1_id}', | ||
| checks=self.check('value', False)) | ||
|
|
||
| # Create service principal to add group member | ||
| with mock.patch('azure.cli.command_modules.role.custom._gen_guid', side_effect=self.create_guid): | ||
|
Member
There was a problem hiding this comment. Actually we don't need this, as we are not generating any role assignments. |
||
| result = self.cmd('ad sp create-for-rbac -n {app_name}').get_output_in_json() | ||
| self.kwargs['app_id'] = result['appId'] | ||
| sp = self.cmd('ad sp show --id {app_id}').get_output_in_json() | ||
| self.kwargs['sp_id'] = sp['id'] | ||
|
|
||
| # add service principal as group member | ||
| self.cmd('ad group member add -g {leaf_group_id} --member-id {sp_id}') | ||
|
|
||
| # check service principal as group member | ||
| self.cmd('ad group member check -g {leaf_group_id} --member-id {sp_id}', | ||
| checks=self.check('value', True)) | ||
|
|
||
| # TODO: check list sp as member after staged roll-out of service principals on MS Graph | ||
| # list member(service principal is expected) | ||
| # self.cmd('ad group member list -g {leaf_group_id}', checks=self.check('length([])', 1)) | ||
|
|
||
| # remove service principal as member | ||
| self.cmd('ad group member remove -g {leaf_group_id} --member-id {sp_id}') | ||
| self.cmd('ad group member check -g {leaf_group_id} --member-id {sp_id}', | ||
| checks=self.check('value', False)) | ||
|
|
||
| # list owners | ||
| self.cmd('ad group owner list -g {group_id}', checks=self.check('length([])', 0)) | ||
|
|
||
| # create user to add group owner | ||
| user_result = self.cmd('ad user create --display-name {user2} --password {pass} --user-principal-name {user2}@{domain}').get_output_in_json() | ||
| self.kwargs['user2_id'] = user_result['id'] | ||
| # add owner | ||
| self.cmd('ad group owner add -g {group_id} --owner-object-id {user1_id}') | ||
| self.cmd('ad group owner add -g {group_id} --owner-object-id {user2_id}') | ||
| self.cmd('ad group owner list -g {group_id}', checks=self.check('length([])', 2)) | ||
|
|
||
| # remove owner | ||
| self.cmd('ad group owner remove -g {group_id} --owner-object-id {user1_id}') | ||
| self.cmd('ad group owner list -g {group_id}', checks=self.check('length([])', 1)) | ||
|
|
||
| # delete group | ||
| self.cmd('ad group delete -g {group}') | ||
| self.cmd('ad group show -g {group_id}', expect_failure=True) | ||
| finally: | ||
| self.clean_resource(self.kwargs['group']) | ||
| self.clean_resource(self.kwargs['child_group']) | ||
| self.clean_resource(self.kwargs['leaf_group']) | ||
| self.clean_resource('{}@{}'.format(self.kwargs['user1'], self.kwargs['domain']), type='user') | ||
| self.clean_resource('{}@{}'.format(self.kwargs['user2'], self.kwargs['domain']), type='user') | ||
| if self.kwargs.get('app_id'): | ||
| self.clean_resource(self.kwargs['app_id'], type='app') | ||
|
|
||
|
|
||
| def get_signed_in_user(test_case): | ||
|
|
@@ -760,26 +780,6 @@ def test_graph_application_ownership(self): | |
| except: | ||
| pass | ||
|
|
||
|
|
||
| class GraphAppCredsScenarioTest(ScenarioTest): | ||
| def test_graph_app_cred_e2e(self): | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@calvinhzy, please make sure these removed tests are covered by user tests.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah. I saw you have already mentioned that: #21663 (comment) 😄