diff --git a/galaxy_ng/app/api/v1/viewsets/tasks.py b/galaxy_ng/app/api/v1/viewsets/tasks.py index 8057367ba4..14723ef0a5 100644 --- a/galaxy_ng/app/api/v1/viewsets/tasks.py +++ b/galaxy_ng/app/api/v1/viewsets/tasks.py @@ -72,22 +72,6 @@ def get_task(self, request, id=None): 'COMPLETED': 'SUCCESS' } - # generate a message for the response - # FIXME(cutwater): Begin of the code that does nothing - msg = '' - if state == 'SUCCESS': - msg = 'role imported successfully' - elif state == 'RUNNING': - msg = 'running' - - if this_task.error and this_task.error.get('traceback'): - msg = ( - this_task.error['description'] - + '\n' - + this_task.error['traceback'] - ) - # FIXME(cutwater): End of the code that does nothing - task_messages = [] # get messages from the model if this was a role import diff --git a/galaxy_ng/app/management/commands/populate-role-tags.py b/galaxy_ng/app/management/commands/populate-role-tags.py index 39ccda6183..8a6b323617 100644 --- a/galaxy_ng/app/management/commands/populate-role-tags.py +++ b/galaxy_ng/app/management/commands/populate-role-tags.py @@ -3,7 +3,6 @@ import django_guid from django.core.management.base import BaseCommand -# from galaxy_ng.app.api.v1.tasks import legacy_sync_from_upstream from galaxy_ng.app.api.v1.models import LegacyRole, LegacyRoleTag diff --git a/galaxy_ng/app/management/commands/set-repo-keyring.py b/galaxy_ng/app/management/commands/set-repo-keyring.py index 80bfd6163f..d09846d68f 100644 --- a/galaxy_ng/app/management/commands/set-repo-keyring.py +++ b/galaxy_ng/app/management/commands/set-repo-keyring.py @@ -77,7 +77,7 @@ def handle(self, *args, **options): if not options["yes"]: confirm = input( f"This will set keyring to {keyring_path} for " - f"{repository} repository, " "Proceed? (Y/n)" + f"{repository} repository, Proceed? (Y/n)" ).lower() while True: if confirm not in ("y", "n", "yes", "no"): diff --git a/galaxy_ng/app/metrics_collection/automation_analytics/data.py b/galaxy_ng/app/metrics_collection/automation_analytics/data.py index dc73a8fdcc..f366fe9543 100644 --- a/galaxy_ng/app/metrics_collection/automation_analytics/data.py +++ b/galaxy_ng/app/metrics_collection/automation_analytics/data.py @@ -78,21 +78,6 @@ def signing_services(since, full_path, **kwargs): return export_to_csv(full_path, "signing_services", query) -# @register( -# "collection_imports", -# "1.0", -# format="csv", -# description="Data on ansible_collectionimport", -# ) -# def collection_imports(since, full_path, until, **kwargs): -# # currently no rows in the table, so no objects to base a query off -# source_query = """COPY ( -# SELECT * FROM ansible_collectionimport -# ) TO STDOUT WITH CSV HEADER -# """ -# return _simple_csv(full_path, "ansible_collectionimport", source_query) -# - @register( "collection_download_logs", "1.0", diff --git a/galaxy_ng/app/migrations/0038_namespace_sync.py b/galaxy_ng/app/migrations/0038_namespace_sync.py index addd8efff9..4a684a3be2 100644 --- a/galaxy_ng/app/migrations/0038_namespace_sync.py +++ b/galaxy_ng/app/migrations/0038_namespace_sync.py @@ -34,12 +34,6 @@ def add_pulp_ansible_namespace_metadata_objects(apps, schema_editor): AnsibleNamespace = apps.get_model('ansible', 'AnsibleNamespace') Namespace = apps.get_model('galaxy', 'Namespace') - # ContentType = apps.get_model("contenttypes", "ContentType") - # GroupRole = apps.get_model("core", "GroupRole") - # old_ns_type = ContentType.objects.get(app_label="galaxy", model="namespace") - # new_ns_type = ContentType.objects.get(app_label="ansible", model="ansiblenamespace") - - for old_ns in Namespace.objects.all(): new_ns = AnsibleNamespace.objects.create(name=old_ns.name) links = {l.name: l.url for l in old_ns.links.all()} @@ -97,7 +91,6 @@ def add_namespace_metadata_to_published_repository(apps, schema_editor): RepositoryContent = apps.get_model('core', 'RepositoryContent') RepositoryVersion = apps.get_model('core', 'RepositoryVersion') RepositoryVersionContentDetails = apps.get_model('core', 'RepositoryVersionContentDetails') - RepositoryVersionContentDetails = apps.get_model('core', 'RepositoryVersionContentDetails') repo = AnsibleDistribution.objects.get(base_path="published").repository repo_v = RepositoryVersion.objects.filter(repository=repo).order_by("-number").first() diff --git a/galaxy_ng/app/migrations/_dab_rbac.py b/galaxy_ng/app/migrations/_dab_rbac.py index cc95143c44..8f7fef3ece 100644 --- a/galaxy_ng/app/migrations/_dab_rbac.py +++ b/galaxy_ng/app/migrations/_dab_rbac.py @@ -34,7 +34,7 @@ def create_permissions_as_operation(apps, schema_editor): for app_label in {'ansible', 'container', 'core', 'galaxy'}: create_dab_permissions(global_apps.get_app_config(app_label), apps=apps) - print(f'FINISHED CREATING PERMISSIONS') + print('FINISHED CREATING PERMISSIONS') def split_pulp_roles(apps, schema_editor): diff --git a/galaxy_ng/app/models/collectionimport.py b/galaxy_ng/app/models/collectionimport.py index 636d6ecdea..e5da2e958c 100644 --- a/galaxy_ng/app/models/collectionimport.py +++ b/galaxy_ng/app/models/collectionimport.py @@ -24,16 +24,12 @@ class CollectionImport(LifecycleModel): Relations: namespace: Reference to a namespace. """ - # task_id = models.UUIDField(primary_key=True) task_id = models.OneToOneField(PulpCollectionImport, primary_key=True, on_delete=models.CASCADE, db_column='task_id', related_name='galaxy_import') - # pulp_task = models.ForeignKey(Task, on_delete=models.CASCADE, default=task_id) - created_at = models.DateTimeField() - namespace = models.ForeignKey(Namespace, on_delete=models.CASCADE) name = models.CharField(max_length=64, editable=False) version = models.CharField(max_length=32, editable=False) diff --git a/galaxy_ng/app/tasks/__init__.py b/galaxy_ng/app/tasks/__init__.py index a2ca3c1c9b..f126170b9e 100644 --- a/galaxy_ng/app/tasks/__init__.py +++ b/galaxy_ng/app/tasks/__init__.py @@ -4,5 +4,3 @@ from .registry_sync import launch_container_remote_sync, sync_all_repos_in_registry # noqa: F401 from .signing import call_sign_and_move_task, call_sign_task # noqa: F401 from .namespaces import dispatch_create_pulp_namespace_metadata # noqa: F401 - -# from .synchronizing import synchronize # noqa diff --git a/galaxy_ng/app/utils/galaxy.py b/galaxy_ng/app/utils/galaxy.py index 8ca236ca89..5fdad64755 100644 --- a/galaxy_ng/app/utils/galaxy.py +++ b/galaxy_ng/app/utils/galaxy.py @@ -466,7 +466,6 @@ def upstream_role_iterator( role_upstream_url = _baseurl + f'/api/v1/roles/{remote_id}/' logger.info(f'fetch {role_upstream_url}') - # role_page = requests.get(role_upstream_url) role_page = safe_fetch(role_upstream_url) if role_page.status_code == 404: continue diff --git a/galaxy_ng/app/utils/git.py b/galaxy_ng/app/utils/git.py index e1917379b0..e14c5381a9 100644 --- a/galaxy_ng/app/utils/git.py +++ b/galaxy_ng/app/utils/git.py @@ -23,12 +23,12 @@ def get_tag_commit_date(git_url, tag, checkout_path=None): def get_tag_commit_hash(git_url, tag, checkout_path=None): if checkout_path is None: checkout_path = tempfile.mkdtemp() - pid = subprocess.run(f'git clone {git_url} {checkout_path}', shell=True) - pid = subprocess.run( + subprocess.run(f'git clone {git_url} {checkout_path}', shell=True) + proc = subprocess.run( "git log -1 --format='%H'", shell=True, cwd=checkout_path, stdout=subprocess.PIPE ) - commit_hash = pid.stdout.decode('utf-8').strip() + commit_hash = proc.stdout.decode('utf-8').strip() return commit_hash diff --git a/galaxy_ng/openapi/__init__.py b/galaxy_ng/openapi/__init__.py index 6094751e18..410da0a4b7 100644 --- a/galaxy_ng/openapi/__init__.py +++ b/galaxy_ng/openapi/__init__.py @@ -7,12 +7,12 @@ class GalaxySchemaGenerator(PulpSchemaGenerator): def convert_endpoint_path_params(self, path, view, schema): """Bypass variable-ization of paths if not a pulp route""" - if hasattr(self, '_input_request'): - if ( - self._input_request.path.startswith(settings.GALAXY_API_PATH_PREFIX) - and not self._input_request.path.startswith(settings.API_ROOT) - ): - return path + if ( + hasattr(self, '_input_request') + and self._input_request.path.startswith(settings.GALAXY_API_PATH_PREFIX) + and not self._input_request.path.startswith(settings.API_ROOT) + ): + return path return super().convert_endpoint_path_params(path, view, schema) def get_schema(self, request=None, public=False): diff --git a/galaxy_ng/social/__init__.py b/galaxy_ng/social/__init__.py index 542daf563f..3a34c18b40 100644 --- a/galaxy_ng/social/__init__.py +++ b/galaxy_ng/social/__init__.py @@ -5,11 +5,9 @@ from django.db import transaction from social_core.backends.github import GithubOAuth2 -# from galaxy_ng.app.models.auth import Group, User from galaxy_ng.app.models import Namespace from galaxy_ng.app.api.v1.models import LegacyNamespace from galaxy_ng.app.utils import rbac -# from galaxy_ng.app.utils import namespaces as ns_utils from galaxy_importer.constants import NAME_REGEXP @@ -42,7 +40,6 @@ def get_session_state(self): def do_auth(self, access_token, *args, **kwargs): """Finish the auth process once the access_token was retrieved""" - # userdata = id, login, access_token data = self.get_github_user(access_token) # extract the login now to prevent mutation @@ -213,17 +210,6 @@ def transform_namespace_name(self, name): """Convert namespace name to valid v3 name.""" return name.replace('-', '_').lower() - ''' - def _ensure_group(self, namespace_name, user): - """Create a group in the form of :""" - with transaction.atomic(): - group, created = \ - Group.objects.get_or_create_identity('namespace', namespace_name) - if created: - rbac.add_user_to_group(user, group) - return group, created - ''' - def _ensure_namespace(self, namespace_name, user): """Create an auto v3 namespace for the account""" @@ -239,17 +225,9 @@ def _ensure_namespace(self, namespace_name, user): def _ensure_legacynamespace(self, login, v3_namespace): """Create an auto legacynamespace for the account""" - ''' - # userdata = id, login, access_token - user = User.objects.filter(username=login).first() - ''' - # make the namespace with transaction.atomic(): - legacy_namespace, created = \ - LegacyNamespace.objects.get_or_create( - name=login - ) + legacy_namespace, created = LegacyNamespace.objects.get_or_create(name=login) # bind the v3 namespace if created or not legacy_namespace.namespace: