Skip to content

Fix test_task_definition_templates failures #482

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

Merged
merged 3 commits into from
Nov 7, 2024
Merged

Fix test_task_definition_templates failures #482

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39c61f6
Fix test_task_definition_templates failures
saimanikant Oct 24, 2024
7f85bf0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 24, 2024
73f6c7a
delete templete
saimanikant Oct 30, 2024
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
36 changes: 25 additions & 11 deletions tests/jms/test_task_definition_templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ def test_template_integration(client):
original_template.software_requirements[0].version
== original_template.software_requirements[0].version
)
jms_api.delete_task_definition_templates([new_template])


def test_template_permissions(client, keycloak_client, is_admin):
Expand All @@ -210,16 +211,19 @@ def test_template_permissions(client, keycloak_client, is_admin):
for template in templates:
permissions = jms_api.get_task_definition_template_permissions(template_id=template.id)
for permission in permissions:
assert permission.permission_type in ["user", "group", "anyone"]
assert permission.permission_type in ["organization", "user", "group", "anyone"]

# create new template and check default permissions
template = TaskDefinitionTemplate(name="my_template", version=uuid.uuid4())
template = jms_api.create_task_definition_templates([template])[0]
permissions = jms_api.get_task_definition_template_permissions(template_id=template.id)
assert len(permissions) == 1
assert len(permissions) == 2
assert permissions[0].permission_type == "user"
assert permissions[0].role == "admin"
assert permissions[0].value_id is not None
assert permissions[1].permission_type == "organization"
assert permissions[1].role == "reader"
assert permissions[1].value_id == "onprem_account"

# create test user
user1, client1 = create_new_user_client(client.url, keycloak_client)
Expand All @@ -232,7 +236,7 @@ def test_template_permissions(client, keycloak_client, is_admin):
# grant read all permissions
permissions.append(Permission(permission_type="anyone", role="reader", value_id=None))
permissions = jms_api.update_task_definition_template_permissions(template.id, permissions)
assert len(permissions) == 2
assert len(permissions) == 3

# verify test user can now access the template
client1_templates = jms_api1.get_task_definition_templates(id=template.id)
Expand All @@ -253,7 +257,7 @@ def test_template_permissions(client, keycloak_client, is_admin):
# grant write permissions to the user
permissions.append(Permission(permission_type="user", role="writer", value_id=user1.id))
permissions = jms_api.update_task_definition_template_permissions(template.id, permissions)
assert len(permissions) == 3
assert len(permissions) == 4

# verify test user can now edit the template
client1_templates[0].version = client1_templates[0].version + "-dev"
Expand All @@ -268,10 +272,13 @@ def test_template_permissions(client, keycloak_client, is_admin):
template = jms_api1.get_task_definition_templates(id=template.id)[0]
assert template.name == "my_template"
permissions = jms_api1.get_task_definition_template_permissions(template_id=template.id)
assert len(permissions) == 1
assert len(permissions) == 2
assert permissions[0].permission_type == "user"
assert permissions[0].role == "admin"
assert permissions[0].value_id == user1.id
assert permissions[1].permission_type == "organization"
assert permissions[1].role == "reader"
assert permissions[1].value_id == "onprem_account"

# verify that an admin user can access the template
if is_admin:
Expand All @@ -296,8 +303,9 @@ def test_template_permissions_update(client):
template = TaskDefinitionTemplate(name="my_template", version=uuid.uuid4())
template = jms_api.create_task_definition_templates([template])[0]
permissions = jms_api.get_task_definition_template_permissions(template_id=template.id)
assert len(permissions) == 1
assert len(permissions) == 2
assert permissions[0].permission_type == "user"
assert permissions[1].permission_type == "organization"

# change permissions
permissions = [Permission(permission_type="anyone", role="admin", value_id=None)]
Expand All @@ -321,10 +329,13 @@ def test_template_anyone_permission(client, keycloak_client):
template = TaskDefinitionTemplate(name="my_template", version=uuid.uuid4())
template = jms_api.create_task_definition_templates([template])[0]
permissions = jms_api.get_task_definition_template_permissions(template_id=template.id)
assert len(permissions) == 1
assert len(permissions) == 2
assert permissions[0].permission_type == "user"
assert permissions[0].role == "admin"
assert permissions[0].value_id is not None
assert permissions[1].permission_type == "organization"
assert permissions[1].role == "reader"
assert permissions[1].value_id == "onprem_account"

# create test user
user1, client1 = create_new_user_client(client.url, keycloak_client)
Expand All @@ -337,7 +348,7 @@ def test_template_anyone_permission(client, keycloak_client):
# grant read all permissions
permissions.append(Permission(permission_type="anyone", role="reader", value_id=None))
permissions = jms_api.update_task_definition_template_permissions(template.id, permissions)
assert len(permissions) == 2
assert len(permissions) == 3

# verify test user can now access the template
client1_templates = jms_api1.get_task_definition_templates(id=template.id)
Expand All @@ -359,7 +370,7 @@ def test_template_anyone_permission(client, keycloak_client):
anyone_permission = next(p for p in permissions if p.permission_type == "anyone")
anyone_permission.role = "writer"
permissions = jms_api.update_task_definition_template_permissions(template.id, permissions)
assert len(permissions) == 2
assert len(permissions) == 3
for p in permissions:
if p.permission_type == "anyone":
assert p.role == "writer"
Expand Down Expand Up @@ -391,10 +402,13 @@ def test_template_delete(client, keycloak_client):
template = TaskDefinitionTemplate(name="my_template", version=uuid.uuid4())
template = jms_api1.create_task_definition_templates([template])[0]
permissions = jms_api1.get_task_definition_template_permissions(template_id=template.id)
assert len(permissions) == 1
assert len(permissions) == 2
assert permissions[0].permission_type == "user"
assert permissions[0].role == "admin"
assert permissions[0].value_id == user1.id
assert permissions[1].permission_type == "organization"
assert permissions[1].role == "reader"
assert permissions[1].value_id == "onprem_account"

# verify user2 can't access the template
client2_templates = jms_api2.get_task_definition_templates(id=template.id)
Expand All @@ -403,7 +417,7 @@ def test_template_delete(client, keycloak_client):
# user1 grants anyone read permissions
permissions.append(Permission(permission_type="anyone", role="reader", value_id=None))
permissions = jms_api1.update_task_definition_template_permissions(template.id, permissions)
assert len(permissions) == 2
assert len(permissions) == 3

# verify user2 can now access the template
client2_templates = jms_api2.get_task_definition_templates(id=template.id)
Expand Down
Loading