Skip to content

Commit bf5edaa

Browse files
author
Nivedithaa Mahendran
committed
update
1 parent e6a9826 commit bf5edaa

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

bin/mas-devops-create-initial-users-for-saas

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if __name__ == "__main__":
3434
parser.add_argument("--coreapi-port", required=False, default=443)
3535
parser.add_argument("--admin-dashboard-port", required=False, default=443)
3636
parser.add_argument("--manage-api-port", required=False, default=443)
37-
parser.add_argument("--mas_version", required=False, default="9.1")
37+
parser.add_argument("--mas-version", required=False, default="9.0")
3838

3939
group = parser.add_mutually_exclusive_group(required=True)
4040
group.add_argument("--initial-users-yaml-file")
@@ -68,7 +68,7 @@ if __name__ == "__main__":
6868
logger.info("--------------")
6969
logger.info(f"mas_instance_id: {mas_instance_id}")
7070
logger.info(f"mas_workspace_id: {mas_workspace_id}")
71-
logger.info(msg=f"mas_version: {mas_version}")
71+
logger.info(f"mas_version: {mas_version}")
7272
logger.info(f"initial_users_yaml_file: {initial_users_yaml_file}")
7373
logger.info(f"initial_users_secret_name: {initial_users_secret_name}")
7474
logger.info(f"log_level: {log_level}")

src/mas/devops/users.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,6 @@ def create_or_get_manage_api_key_for_user(self, user_id, temporary=False):
970970
# otherwise, retrieve the apikey (either it already existed, or we just created it)
971971

972972
apikey = self.get_manage_api_key_for_user(user_id)
973-
self.logger.info(f"Retrieved Manage API Key for user {user_id}: {apikey}")
974973
if apikey is None:
975974
# either create call reported that apikey already exists, or we created the api key
976975
# so we expect the get call to find it
@@ -1203,8 +1202,6 @@ def add_user_to_manage_group(self, user_id, group_name, manage_api_key):
12031202
json=payload,
12041203
verify=self.manage_internal_ca_pem_file_path,
12051204
)
1206-
self.logger.info(f"Response status code: {response.status_code}")
1207-
self.logger.info(f"Response text: {response.text}")
12081205
if response.status_code == 204:
12091206
return None
12101207

@@ -1505,13 +1502,19 @@ def create_initial_user_for_saas(self, user, user_type, groupreassign=None):
15051502
Exception: If required fields are missing or user creation fails.
15061503
15071504
Note:
1505+
For version < 9.1,
15081506
PRIMARY users get:
15091507
- userAdmin permission
1508+
- PREMIUM application entitlement
1509+
- Workspace admin access
1510+
- ADMIN role for most apps, MANAGEUSER for Manage
1511+
- MAXADMIN security group membership
1512+
1513+
For version >= 9.1,
1514+
PRIMARY users get:
15101515
- apikeyAdmin permission (API Key Management)
15111516
- idpAdmin permission (IDP Management)
1512-
- PREMIUM application entitlement
15131517
- Regular workspace access (not workspace admin)
1514-
- ADMIN role for most apps, MANAGEUSER for Manage
15151518
- USERMANAGEMENT security group membership
15161519
- Group reassignment authorization for ALL security groups
15171520

0 commit comments

Comments
 (0)