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

Jump to bottom

avoid group creation directly in the hub #2179

Merged
merged 1 commit into from
Jun 18, 2024
Merged

avoid group creation directly in the hub #2179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions galaxy_ng/tests/integration/api/test_x_repo_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,12 @@ def test_search_upload_diff_collection_diff_namespaces(self, galaxy_client):
repo_pulp_href = create_repo_and_dist(gc, test_repo_name)
namespace_name = f"ns_{generate_random_string()}"
namespace_name_mod = namespace_name + "_mod"
create_namespace(gc, namespace_name, "ns_group_for_tests")
create_namespace(gc, namespace_name + "_mod", "ns_group_for_tests")
try:
create_namespace(gc, namespace_name, "ns_group_for_tests")
create_namespace(gc, namespace_name + "_mod", "ns_group_for_tests")
except ValueError:
create_namespace(gc, namespace_name, None)
create_namespace(gc, namespace_name + "_mod", None)

artifact_1 = upload_new_artifact(
gc, namespace_name, test_repo_name, "1.0.1", tags=["application"]
Expand Down
132 changes: 69 additions & 63 deletions galaxy_ng/tests/integration/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,74 +389,80 @@ def settings(galaxy_client):
def set_test_data(ansible_config, hub_version):
role = "admin"
gc = GalaxyKitClient(ansible_config).gen_authorized_client(role)
gc.create_group("ns_group_for_tests")
gc.create_group("system:partner-engineers")
gc.create_group("ee_group_for_tests")
pe_roles = [
"galaxy.group_admin",
"galaxy.user_admin",
"galaxy.collection_admin",
]
gc.get_or_create_user(username="iqe_normal_user", password="Th1sP4ssd", group=None)
gc.get_or_create_user(username="org-admin", password="Th1sP4ssd", group=None)
gc.get_or_create_user(username="jdoe", password="Th1sP4ssd", group=None)
gc.get_or_create_user(username="ee_admin", password="Th1sP4ssd", group=None)
ns_group_id = get_group_id(gc, group_name="ns_group_for_tests")
gc.add_user_to_group(username="iqe_normal_user", group_id=ns_group_id)
gc.add_user_to_group(username="org-admin", group_id=ns_group_id)
gc.add_user_to_group(username="jdoe", group_id=ns_group_id)
pe_group_id = get_group_id(gc, group_name="system:partner-engineers")
if parse_version(hub_version) < parse_version('4.6'):
pe_permissions = ["galaxy.view_group",
"galaxy.delete_group",
"galaxy.add_group",
"galaxy.change_group",
"galaxy.view_user",
"galaxy.delete_user",
"galaxy.add_user",
"galaxy.change_user",
"ansible.delete_collection",
"galaxy.delete_namespace",
"galaxy.add_namespace",
"ansible.modify_ansible_repo_content",
"ansible.view_ansiblerepository",
"ansible.add_ansiblerepository",
"ansible.change_ansiblerepository",
"ansible.delete_ansiblerepository",
"galaxy.change_namespace",
"galaxy.upload_to_namespace",
]
gc.set_permissions("system:partner-engineers", pe_permissions)
else:
for rbac_role in pe_roles:
if not aap_gateway():
gc.create_group("ns_group_for_tests")
gc.create_group("system:partner-engineers")
gc.create_group("ee_group_for_tests")
pe_roles = [
"galaxy.group_admin",
"galaxy.user_admin",
"galaxy.collection_admin",
]
gc.get_or_create_user(username="iqe_normal_user", password="Th1sP4ssd", group=None)
gc.get_or_create_user(username="org-admin", password="Th1sP4ssd", group=None)
gc.get_or_create_user(username="jdoe", password="Th1sP4ssd", group=None)
gc.get_or_create_user(username="ee_admin", password="Th1sP4ssd", group=None)
ns_group_id = get_group_id(gc, group_name="ns_group_for_tests")
gc.add_user_to_group(username="iqe_normal_user", group_id=ns_group_id)
gc.add_user_to_group(username="org-admin", group_id=ns_group_id)
gc.add_user_to_group(username="jdoe", group_id=ns_group_id)
pe_group_id = get_group_id(gc, group_name="system:partner-engineers")
if parse_version(hub_version) < parse_version('4.6'):
pe_permissions = ["galaxy.view_group",
"galaxy.delete_group",
"galaxy.add_group",
"galaxy.change_group",
"galaxy.view_user",
"galaxy.delete_user",
"galaxy.add_user",
"galaxy.change_user",
"ansible.delete_collection",
"galaxy.delete_namespace",
"galaxy.add_namespace",
"ansible.modify_ansible_repo_content",
"ansible.view_ansiblerepository",
"ansible.add_ansiblerepository",
"ansible.change_ansiblerepository",
"ansible.delete_ansiblerepository",
"galaxy.change_namespace",
"galaxy.upload_to_namespace",
]
gc.set_permissions("system:partner-engineers", pe_permissions)
else:
for rbac_role in pe_roles:
try:
gc.add_role_to_group(rbac_role, pe_group_id)
except GalaxyClientError:
# role already assigned to group. It's ok.
pass

gc.add_user_to_group(username="jdoe", group_id=pe_group_id)
gc.create_namespace(name="autohubtest2", group="ns_group_for_tests",
object_roles=["galaxy.collection_namespace_owner"])
gc.create_namespace(name="autohubtest3", group="ns_group_for_tests",
object_roles=["galaxy.collection_namespace_owner"])

ee_group_id = get_group_id(gc, group_name="ee_group_for_tests")
ee_role = 'galaxy.execution_environment_admin'
if parse_version(hub_version) < parse_version('4.6'):
ee_permissions = ["container.delete_containerrepository",
"galaxy.add_containerregistryremote",
"galaxy.change_containerregistryremote",
"galaxy.delete_containerregistryremote"]
gc.set_permissions("ee_group_for_tests", ee_permissions)
else:
try:
gc.add_role_to_group(rbac_role, pe_group_id)
gc.add_role_to_group(ee_role, ee_group_id)
except GalaxyClientError:
# role already assigned to group. It's ok.
pass

gc.add_user_to_group(username="jdoe", group_id=pe_group_id)
gc.create_namespace(name="autohubtest2", group="ns_group_for_tests",
object_roles=["galaxy.collection_namespace_owner"])
gc.create_namespace(name="autohubtest3", group="ns_group_for_tests",
object_roles=["galaxy.collection_namespace_owner"])

ee_group_id = get_group_id(gc, group_name="ee_group_for_tests")
ee_role = 'galaxy.execution_environment_admin'
if parse_version(hub_version) < parse_version('4.6'):
ee_permissions = ["container.delete_containerrepository",
"galaxy.add_containerregistryremote",
"galaxy.change_containerregistryremote",
"galaxy.delete_containerregistryremote"]
gc.set_permissions("ee_group_for_tests", ee_permissions)
gc.add_user_to_group(username="ee_admin", group_id=ee_group_id)
else:
try:
gc.add_role_to_group(ee_role, ee_group_id)
except GalaxyClientError:
# role already assigned to group. It's ok.
pass
gc.add_user_to_group(username="ee_admin", group_id=ee_group_id)
if aap_gateway():
gc.create_namespace(name="autohubtest2", group=None,
object_roles=["galaxy.collection_namespace_owner"])
gc.create_namespace(name="autohubtest3", group=None,
object_roles=["galaxy.collection_namespace_owner"])

users = ["iqe_normal_user", "jdoe", "ee_admin", "org-admin"]
for user in users:
body = {"username": user, "password": "Th1sP4ssd", "is_superuser": True}
Expand Down
Loading