katello 3.13.4 → 3.14.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of katello might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/controllers/katello/api/registry/registry_proxies_controller.rb +25 -16
- data/app/controllers/katello/api/v2/activation_keys_controller.rb +26 -21
- data/app/controllers/katello/api/v2/ansible_collections_controller.rb +6 -0
- data/app/controllers/katello/api/v2/content_uploads_controller.rb +8 -2
- data/app/controllers/katello/api/v2/content_view_filter_rules_controller.rb +8 -1
- data/app/controllers/katello/api/v2/content_view_filters_controller.rb +1 -1
- data/app/controllers/katello/api/v2/errata_controller.rb +1 -1
- data/app/controllers/katello/api/v2/host_subscriptions_controller.rb +3 -3
- data/app/controllers/katello/api/v2/katello_ping_controller.rb +24 -0
- data/app/controllers/katello/api/v2/module_streams_controller.rb +21 -0
- data/app/controllers/katello/api/v2/package_groups_controller.rb +5 -0
- data/app/controllers/katello/api/v2/packages_controller.rb +16 -0
- data/app/controllers/katello/api/v2/repositories_controller.rb +7 -4
- data/app/controllers/katello/api/v2/srpms_controller.rb +1 -1
- data/app/controllers/katello/api/v2/subscriptions_controller.rb +5 -1
- data/app/controllers/katello/api/v2/sync_plans_controller.rb +7 -5
- data/app/controllers/katello/concerns/api/v2/repository_content_controller.rb +36 -5
- data/app/helpers/katello/hosts_and_hostgroups_helper.rb +12 -0
- data/app/lib/actions/katello/capsule_content/refresh_repos.rb +55 -0
- data/app/lib/actions/katello/capsule_content/sync.rb +13 -64
- data/app/lib/actions/katello/capsule_content/sync_capsule.rb +40 -0
- data/app/lib/actions/katello/content_view/publish.rb +0 -3
- data/app/lib/actions/katello/content_view_puppet_environment/destroy.rb +1 -3
- data/app/lib/actions/katello/orphan_cleanup/remove_orphans.rb +21 -0
- data/app/lib/actions/katello/repository/create.rb +8 -0
- data/app/lib/actions/katello/repository/import_upload.rb +13 -12
- data/app/lib/actions/katello/repository/metadata_generate.rb +2 -2
- data/app/lib/actions/katello/repository/update.rb +9 -0
- data/app/lib/actions/katello/repository/upload_files.rb +4 -11
- data/app/lib/actions/pulp/consumer/sync_capsule.rb +4 -0
- data/app/lib/actions/pulp/orchestration/orphan_cleanup/remove_orphans.rb +16 -0
- data/app/lib/actions/pulp/orchestration/repository/refresh_repos.rb +25 -0
- data/app/lib/actions/pulp/orchestration/repository/smart_proxy_sync.rb +34 -0
- data/app/lib/actions/pulp/orchestration/repository/upload_content.rb +35 -0
- data/app/lib/actions/pulp/orphan_cleanup/remove_orphans.rb +15 -0
- data/app/lib/actions/{katello/capsule_content → pulp/orphan_cleanup}/remove_unneeded_repos.rb +2 -2
- data/app/lib/actions/pulp/repository/import_upload.rb +7 -11
- data/app/lib/actions/pulp3/abstract_async_task.rb +7 -7
- data/app/lib/actions/pulp3/capsule_content/generate_metadata.rb +32 -0
- data/app/lib/actions/pulp3/capsule_content/refresh_distribution.rb +31 -0
- data/app/lib/actions/pulp3/capsule_content/sync.rb +26 -0
- data/app/lib/actions/pulp3/orchestration/orphan_cleanup/remove_orphans.rb +20 -0
- data/app/lib/actions/pulp3/orchestration/repository/copy_all_units.rb +15 -15
- data/app/lib/actions/pulp3/orchestration/repository/create.rb +3 -1
- data/app/lib/actions/pulp3/orchestration/repository/import_upload.rb +36 -0
- data/app/lib/actions/pulp3/orchestration/repository/refresh_repos.rb +24 -0
- data/app/lib/actions/pulp3/orchestration/repository/sync.rb +1 -1
- data/app/lib/actions/pulp3/orchestration/repository/upload_content.rb +25 -0
- data/app/lib/actions/pulp3/orphan_cleanup/delete_orphan_repository_versions.rb +20 -0
- data/app/lib/actions/pulp3/orphan_cleanup/remove_unneeded_repos.rb +16 -0
- data/app/lib/actions/pulp3/repository/create_publication.rb +1 -5
- data/app/lib/actions/pulp3/repository/import_upload.rb +21 -0
- data/app/lib/actions/pulp3/repository/save_artifact.rb +19 -0
- data/app/lib/actions/pulp3/repository/save_version.rb +3 -2
- data/app/lib/actions/pulp3/repository/sync.rb +1 -1
- data/app/lib/actions/pulp3/repository/upload_file.rb +76 -0
- data/app/lib/katello/api/v2/rendering.rb +1 -2
- data/app/lib/katello/concerns/base_template_scope_extensions.rb +34 -2
- data/app/lib/katello/errors.rb +21 -0
- data/app/lib/katello/resources/candlepin/consumer.rb +0 -9
- data/app/lib/katello/resources/candlepin/owner.rb +0 -5
- data/app/lib/katello/resources/candlepin/product.rb +2 -6
- data/app/lib/katello/resources/registry.rb +25 -10
- data/app/lib/katello/util/filter_clause_generator.rb +1 -1
- data/app/lib/katello/util/module_stream_clause_generator.rb +49 -0
- data/app/lib/katello/util/package_clause_generator.rb +1 -1
- data/app/models/katello/ansible_collection.rb +5 -8
- data/app/models/katello/ansible_collection_tag.rb +8 -0
- data/app/models/katello/ansible_tag.rb +8 -0
- data/app/models/katello/concerns/host_managed_extensions.rb +16 -14
- data/app/models/katello/concerns/pulp_database_unit.rb +27 -4
- data/app/models/katello/concerns/search_by_repository_name.rb +4 -1
- data/app/models/katello/concerns/smart_proxy_extensions.rb +44 -20
- data/app/models/katello/content_view_docker_filter.rb +15 -2
- data/app/models/katello/content_view_filter.rb +28 -8
- data/app/models/katello/content_view_module_stream_filter.rb +14 -0
- data/app/models/katello/content_view_module_stream_filter_rule.rb +11 -0
- data/app/models/katello/content_view_package_filter.rb +18 -8
- data/app/models/katello/content_view_version.rb +7 -2
- data/app/models/katello/deb.rb +0 -8
- data/app/models/katello/docker_manifest.rb +0 -8
- data/app/models/katello/docker_manifest_list.rb +0 -8
- data/app/models/katello/docker_meta_tag.rb +38 -20
- data/app/models/katello/docker_tag.rb +22 -33
- data/app/models/katello/erratum.rb +10 -8
- data/app/models/katello/file_unit.rb +1 -13
- data/app/models/katello/glue/candlepin/owner.rb +0 -5
- data/app/models/katello/glue/candlepin/product.rb +1 -5
- data/app/models/katello/glue/pulp/repo.rb +1 -1
- data/app/models/katello/host/content_facet.rb +6 -0
- data/app/models/katello/host_collection.rb +4 -0
- data/app/models/katello/installed_package.rb +4 -0
- data/app/models/katello/module_stream.rb +1 -12
- data/app/models/katello/ostree_branch.rb +0 -7
- data/app/models/katello/package_group.rb +0 -7
- data/app/models/katello/ping.rb +10 -3
- data/app/models/katello/pool.rb +11 -1
- data/app/models/katello/puppet_module.rb +0 -7
- data/app/models/katello/repository.rb +15 -6
- data/app/models/katello/repository_docker_meta_tag.rb +7 -0
- data/app/models/katello/repository_docker_tag.rb +7 -0
- data/app/models/katello/repository_file_unit.rb +7 -0
- data/app/models/katello/rhsm_fact_name.rb +5 -1
- data/app/models/katello/rhsm_fact_parser.rb +17 -1
- data/app/models/katello/root_repository.rb +11 -6
- data/app/models/katello/rpm.rb +0 -8
- data/app/models/katello/srpm.rb +0 -8
- data/app/models/katello/upstream_pool.rb +2 -0
- data/app/models/katello/yum_metadata_file.rb +0 -4
- data/app/models/setting/content.rb +124 -128
- data/app/services/katello/candlepin/consumer.rb +0 -1
- data/app/services/katello/pulp/content.rb +11 -4
- data/app/services/katello/pulp/docker_tag.rb +0 -1
- data/app/services/katello/pulp/pulp_content_unit.rb +4 -0
- data/app/services/katello/pulp/repository.rb +53 -0
- data/app/services/katello/pulp/repository/file.rb +1 -1
- data/app/services/katello/pulp/repository/puppet.rb +8 -1
- data/app/services/katello/pulp/repository/yum.rb +42 -9
- data/app/services/katello/pulp/smart_proxy_repository.rb +13 -96
- data/app/services/katello/pulp3/ansible_collection.rb +7 -3
- data/app/services/katello/pulp3/content.rb +60 -0
- data/app/services/katello/pulp3/docker_blob.rb +1 -1
- data/app/services/katello/pulp3/docker_manifest.rb +1 -1
- data/app/services/katello/pulp3/docker_manifest_list.rb +1 -1
- data/app/services/katello/pulp3/docker_tag.rb +2 -2
- data/app/services/katello/pulp3/file_unit.rb +7 -1
- data/app/services/katello/pulp3/pulp_content_unit.rb +15 -5
- data/app/services/katello/pulp3/repository.rb +301 -24
- data/app/services/katello/pulp3/repository/ansible_collection.rb +5 -1
- data/app/services/katello/pulp3/repository/docker.rb +54 -9
- data/app/services/katello/pulp3/repository/file.rb +8 -0
- data/app/services/katello/pulp3/repository/yum.rb +61 -0
- data/app/services/katello/pulp3/smart_proxy_repository.rb +38 -0
- data/app/services/katello/repository_type_manager.rb +7 -0
- data/app/services/katello/smart_proxy_helper.rb +50 -0
- data/app/views/foreman/smart_proxies/_content_tab.html.erb +1 -1
- data/app/views/katello/api/v2/ansible_collections/base.json.rabl +5 -0
- data/app/views/katello/api/v2/ansible_collections/show.json.rabl +7 -0
- data/app/views/katello/api/v2/capsule_content/sync_status.json.rabl +1 -0
- data/app/views/katello/api/v2/content_view_filter_rules/show.json.rabl +1 -1
- data/app/views/katello/api/v2/content_view_filters/base.json.rabl +5 -0
- data/app/views/katello/api/v2/content_view_filters/show.json.rabl +2 -1
- data/app/views/katello/api/v2/hosts_bulk_actions/erratum.json.rabl +2 -0
- data/app/views/katello/api/v2/{ping → katello_ping}/server_status.json.rabl +0 -0
- data/app/views/katello/api/v2/{ping → katello_ping}/show.json.rabl +0 -0
- data/app/views/katello/api/v2/{ping → katello_ping}/version.json.rabl +0 -0
- data/app/views/katello/api/v2/repositories/show.json.rabl +1 -1
- data/app/views/katello/api/v2/subscription_facet/base.json.rabl +1 -1
- data/app/views/katello/api/v2/subscriptions/index.json.rabl +1 -0
- data/app/views/katello/api/v2/subscriptions/permissions.rabl +11 -0
- data/config/katello.yaml.example +9 -0
- data/config/routes.rb +2 -1
- data/config/routes/api/v2.rb +2 -2
- data/db/migrate/20180920214134_create_repository_root.rb +1 -1
- data/db/migrate/20190730183518_add_docker_tag_join_table.rb +25 -0
- data/db/migrate/20190730203334_add_docker_meta_tag_join_table.rb +25 -0
- data/db/migrate/20190814025338_create_content_view_module_stream_filter_rules.rb +13 -0
- data/db/migrate/20190816162733_rename_ansible_collection_whitelist_to_requirements.rb +5 -0
- data/db/migrate/20190822144300_add_ansible_fields.rb +18 -0
- data/db/migrate/20190912210927_rename_repository_file_unit.rb +12 -0
- data/engines/bastion/README.md +2 -2
- data/engines/bastion/app/assets/javascripts/bastion/components/bst-edit.directive.js +2 -1
- data/engines/bastion/app/assets/javascripts/bastion/components/nutupane.factory.js +20 -6
- data/engines/bastion/app/assets/javascripts/bastion/components/views/bst-modal.html +1 -1
- data/engines/bastion/app/assets/javascripts/bastion/layouts/partials/table.html +2 -1
- data/engines/bastion/app/assets/stylesheets/bastion/overrides.scss +1 -0
- data/engines/bastion/lib/bastion.rb +1 -0
- data/engines/bastion_katello/README.md +1 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js +1 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ansible-collections/ansible-collections.factory.js +28 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ansible-collections/ansible-collections.module.js +15 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js +1 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion_katello.js +3 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js +4 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.js +0 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-destroy-modal.html +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html +2 -34
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-repository-sets-modal.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-register-client.directive.js +6 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.routes.js +0 -11
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-installed.controller.js +1 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages.controller.js +3 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html +1 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html +2 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-installed.html +1 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html +4 -16
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html +2 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-client.html +13 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register.html +1 -13
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.routes.js +47 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/views/content-view-composite-available-content-views.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/views/content-view-composite-content-views-list.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/available-module-stream-filter.controller.js +68 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-helper.service.js +2 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-rule-matching-package-modal.controller.js +37 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filters.controller.js +4 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/module-stream-list-filter.controller.js +73 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/new-filter.controller.js +4 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/package-filter.controller.js +14 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/errata-filter-details.html +3 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filter-details.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filter-repositories.html +5 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filter-rule-matching-package-modal.html +43 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filters.html +4 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/module-stream-filter-details.html +41 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/module-stream-filter.html +43 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/package-filter-details.html +4 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/histories/content-view-history.controller.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/histories/views/content-view-history.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-deb-repositories.html +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-info.html +1 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/new/views/content-view-new.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-errata.html +3 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/errata.controller.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-add-hosts.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-info.html +44 -35
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/packages.controller.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js +12 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-manage-content.controller.js +5 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html +21 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-ansible-collections.html +36 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/download-policy.service.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js +24 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html +29 -15
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repositories.routes.js +9 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html +1 -1
- data/engines/bastion_katello/app/assets/stylesheets/bastion_katello/bastion_katello.scss +8 -0
- data/engines/bastion_katello/lib/bastion_katello/engine.rb +8 -8
- data/lib/katello/engine.rb +0 -4
- data/lib/katello/plugin.rb +19 -1
- data/lib/katello/repository_types/yum.rb +2 -0
- data/lib/katello/tasks/delete_orphaned_content.rake +1 -1
- data/lib/katello/tasks/reimport.rake +1 -1
- data/lib/katello/version.rb +1 -1
- data/package.json +9 -5
- data/webpack/__mocks__/foremanReact/common/helpers.js +4 -1
- data/webpack/__mocks__/foremanReact/components/PermissionDenied/index.js +2 -0
- data/webpack/components/Content/ContentPage.js +55 -0
- data/webpack/{scenes/ModuleStreams/ModuleStreamsTable.js → components/Content/ContentTable.js} +9 -8
- data/webpack/components/Content/Details/ContentDetailInfo.js +33 -0
- data/webpack/{scenes/ModuleStreams/Details/Repositories/ModuleStreamDetailRepositories.js → components/Content/Details/ContentDetailRepositories.js} +4 -4
- data/webpack/{scenes/ModuleStreams/Details/Repositories/TableSchema.js → components/Content/Details/ContentDetailRepositoryTableSchema.js} +1 -1
- data/webpack/components/Content/Details/ContentDetails.js +70 -0
- data/webpack/components/Content/Details/__tests__/ContentDetailInfo.test.js +28 -0
- data/webpack/components/Content/Details/__tests__/ContentDetailRepositories.test.js +22 -0
- data/webpack/components/Content/Details/__tests__/ContentDetails.test.js +64 -0
- data/webpack/components/Content/Details/__tests__/__snapshots__/ContentDetailInfo.test.js.snap +39 -0
- data/webpack/{scenes/ModuleStreams/Details/Repositories/__tests__/__snapshots__/ModuleStreamDetailRepositories.test.js.snap → components/Content/Details/__tests__/__snapshots__/ContentDetailRepositories.test.js.snap} +3 -9
- data/webpack/components/Content/Details/__tests__/__snapshots__/ContentDetails.test.js.snap +137 -0
- data/webpack/components/Content/__tests__/ContentPage.test.js +36 -0
- data/webpack/components/Content/__tests__/ContentTable.test.js +40 -0
- data/webpack/components/Content/__tests__/__snapshots__/ContentPage.test.js.snap +70 -0
- data/webpack/components/Content/__tests__/__snapshots__/ContentTable.test.js.snap +33 -0
- data/webpack/components/Search/index.js +6 -7
- data/webpack/components/SelectOrg/SelectOrgAction.js +20 -22
- data/webpack/containers/Application/config.js +10 -0
- data/webpack/containers/Application/overrides.scss +5 -0
- data/webpack/move_to_foreman/common/helpers.js +1 -1
- data/webpack/move_to_foreman/components/common/table/components/TableSelectionCell.js +5 -2
- data/webpack/move_to_foreman/components/common/table/formatters/EntitlementsInlineEditFormatter.js +9 -2
- data/webpack/move_to_foreman/components/common/table/formatters/collapseableAndSelectionCellFormatter.js +2 -0
- data/webpack/move_to_foreman/components/common/table/formatters/selectionCellFormatter.js +3 -0
- data/webpack/move_to_pf/TypeAhead/TypeAhead.js +1 -0
- data/webpack/redux/OrganizationProducts/OrganizationProductsActions.js +10 -10
- data/webpack/redux/actions/RedHatRepositories/__tests__/enabled.test.js +39 -0
- data/webpack/redux/actions/RedHatRepositories/enabled.js +24 -24
- data/webpack/redux/actions/RedHatRepositories/helpers.js +5 -5
- data/webpack/redux/actions/RedHatRepositories/repositorySetRepositories.js +23 -22
- data/webpack/redux/actions/RedHatRepositories/sets.js +17 -21
- data/webpack/redux/reducers/RedHatRepositories/__tests__/enabled.test.js +1 -0
- data/webpack/redux/reducers/RedHatRepositories/__tests__/sets.test.js +1 -1
- data/webpack/redux/reducers/RedHatRepositories/enabled.fixtures.js +1 -0
- data/webpack/redux/reducers/RedHatRepositories/enabled.js +42 -33
- data/webpack/redux/reducers/RedHatRepositories/sets.fixtures.js +2 -1
- data/webpack/redux/reducers/RedHatRepositories/sets.js +2 -1
- data/webpack/redux/reducers/index.js +4 -0
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsActions.js +30 -0
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsConstants.js +3 -0
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsPage.js +80 -0
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsReducer.js +39 -0
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsTableSchema.js +60 -0
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsTables.scss +0 -0
- data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetails.js +91 -0
- data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetailsActions.js +23 -0
- data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetailsConstants.js +3 -0
- data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetailsReducer.js +30 -0
- data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js +35 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/AnsibleCollectionDetailInfo.test.js +16 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/AnsibleCollectionDetails.fixtures.js +25 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/AnsibleCollectionDetails.test.js +29 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/AnsibleCollectionDetailsActions.test.js +41 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/AnsibleCollectionDetailsReducer.test.js +33 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/__snapshots__/AnsibleCollectionDetailInfo.test.js.snap +83 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/__snapshots__/AnsibleCollectionDetails.test.js.snap +190 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/__snapshots__/AnsibleCollectionDetailsActions.test.js.snap +54 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/__snapshots__/AnsibleCollectionDetailsReducer.test.js.snap +50 -0
- data/webpack/scenes/AnsibleCollections/Details/index.js +17 -0
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollectionPage.test.js +25 -0
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollections.fixtures.js +52 -0
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollectionsActions.test.js +48 -0
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollectionsReducer.test.js +46 -0
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollectionsTable.test.js +27 -0
- data/webpack/scenes/AnsibleCollections/__tests__/__snapshots__/AnsibleCollectionPage.test.js.snap +73 -0
- data/webpack/scenes/AnsibleCollections/__tests__/__snapshots__/AnsibleCollectionsTable.test.js.snap +81 -0
- data/webpack/scenes/AnsibleCollections/index.js +17 -0
- data/webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js +56 -0
- data/webpack/scenes/ModuleStreams/Details/ModuleStreamDetails.js +7 -71
- data/webpack/scenes/ModuleStreams/Details/ModuleStreamDetailsActions.js +9 -11
- data/webpack/scenes/ModuleStreams/Details/__tests__/ModuleStreamDetailInfo.test.js +5 -3
- data/webpack/scenes/ModuleStreams/Details/__tests__/__snapshots__/ModuleStreamDetails.test.js.snap +453 -507
- data/webpack/scenes/ModuleStreams/ModuleStreamsActions.js +10 -11
- data/webpack/scenes/ModuleStreams/ModuleStreamsPage.js +12 -33
- data/webpack/scenes/ModuleStreams/__tests__/ModuleStreamPage.test.js +2 -4
- data/webpack/scenes/ModuleStreams/__tests__/ModuleStreamsActions.test.js +8 -9
- data/webpack/scenes/ModuleStreams/__tests__/ModuleStreamsTable.test.js +5 -3
- data/webpack/scenes/ModuleStreams/__tests__/__snapshots__/ModuleStreamPage.test.js.snap +83 -65
- data/webpack/scenes/ModuleStreams/__tests__/__snapshots__/ModuleStreamsTable.test.js.snap +1 -1
- data/webpack/scenes/Organizations/OrganizationActions.js +27 -32
- data/webpack/scenes/Organizations/__tests__/OrganizationActions.test.js +12 -12
- data/webpack/scenes/Organizations/__tests__/organizations.fixtures.js +1 -1
- data/webpack/scenes/Products/ProductActions.js +10 -10
- data/webpack/scenes/Products/__tests__/ProductActions.test.js +6 -6
- data/webpack/scenes/RedHatRepositories/RedHatRepositoriesPage.js +118 -0
- data/webpack/scenes/RedHatRepositories/__tests__/RedHatRepositoriesPage.test.js +51 -0
- data/webpack/scenes/RedHatRepositories/__tests__/__snapshots__/RedHatRepositoriesPage.test.js.snap +117 -0
- data/webpack/scenes/RedHatRepositories/components/EnabledRepository/EnabledRepository.js +44 -45
- data/webpack/scenes/RedHatRepositories/components/EnabledRepository/__tests__/EnabledRepository.test.js +84 -5
- data/webpack/scenes/RedHatRepositories/components/RepositorySetRepository/RepositorySetRepository.js +46 -47
- data/webpack/scenes/RedHatRepositories/helpers.js +1 -1
- data/webpack/scenes/RedHatRepositories/index.js +2 -101
- data/webpack/scenes/Settings/Tables/TableActions.js +42 -43
- data/webpack/scenes/Settings/Tables/__tests__/TableActions.test.js +18 -18
- data/webpack/scenes/Subscriptions/Details/SubscriptionDetailActions.js +10 -10
- data/webpack/scenes/Subscriptions/Details/SubscriptionDetails.js +7 -6
- data/webpack/scenes/Subscriptions/Details/__tests__/SubscriptionDetailActions.test.js +8 -8
- data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetails.test.js.snap +2 -2
- data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js +142 -113
- data/webpack/scenes/Subscriptions/Manifest/Manifest.scss +8 -0
- data/webpack/scenes/Subscriptions/Manifest/ManifestActions.js +40 -40
- data/webpack/scenes/Subscriptions/Manifest/__tests__/ManifestActions.test.js +24 -24
- data/webpack/scenes/Subscriptions/Manifest/__tests__/__snapshots__/ManageManifestModal.test.js.snap +0 -199
- data/webpack/scenes/Subscriptions/SubscriptionActions.js +52 -46
- data/webpack/scenes/Subscriptions/SubscriptionReducer.js +21 -2
- data/webpack/scenes/Subscriptions/SubscriptionsPage.js +64 -42
- data/webpack/scenes/Subscriptions/SubscriptionsSelectors.js +3 -0
- data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsActions.js +21 -21
- data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js +20 -21
- data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsTableSchema.js +1 -15
- data/webpack/scenes/Subscriptions/UpstreamSubscriptions/__tests__/UpstreamSubscriptionsActions.test.js +12 -13
- data/webpack/scenes/Subscriptions/UpstreamSubscriptions/__tests__/__snapshots__/UpstreamSubscriptionsPage.test.js.snap +11 -14
- data/webpack/scenes/Subscriptions/__tests__/SubscriptionsActions.test.js +21 -23
- data/webpack/scenes/Subscriptions/__tests__/SubscriptionsPage.test.js +35 -1
- data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsPage.test.js.snap +13 -0
- data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsReducer.test.js.snap +7 -0
- data/webpack/scenes/Subscriptions/__tests__/subscriptions.fixtures.js +18 -0
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTable.js +5 -4
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableHelpers.js +26 -5
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js +9 -1
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/SubscriptionsTable.fixtures.js +27 -2
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/SubscriptionsTableHelpers.test.js +5 -4
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/__snapshots__/SubscriptionsTable.test.js.snap +1 -0
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/UpdateDialog.js +9 -9
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Table.js +8 -3
- data/webpack/scenes/Subscriptions/components/SubscriptionsToolbar/SubscriptionsToolbar.js +28 -23
- data/webpack/scenes/Subscriptions/components/SubscriptionsToolbar/__snapshots__/SubscriptionsToolbar.test.js.snap +0 -135
- data/webpack/scenes/Subscriptions/index.js +2 -0
- data/webpack/scenes/Tasks/TaskActions.js +36 -31
- data/webpack/scenes/Tasks/__tests__/TaskActions.test.js +35 -47
- metadata +146 -67
- data/app/controllers/katello/api/v2/ping_controller.rb +0 -24
- data/app/lib/actions/katello/capsule_content/create_repos.rb +0 -30
- data/app/lib/actions/katello/capsule_content/remove_orphans.rb +0 -21
- data/app/lib/actions/pulp/repository/refresh_needed.rb +0 -37
- data/app/lib/katello/resources/candlepin/owner_info.rb +0 -18
- data/app/models/katello/glue/candlepin/owner_info.rb +0 -41
- data/app/models/katello/repository_file.rb +0 -7
- data/app/overrides/add_subscription_status.rb +0 -6
- data/app/views/overrides/hosts/_subscription_link.html.erb +0 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-events.controller.js +0 -17
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-events.html +0 -30
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/content-access-mode-banner.directive.js +0 -22
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-details.controller.js +0 -58
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-product-details.controller.js +0 -12
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-products.controller.js +0 -30
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-details.html +0 -25
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-info.html +0 -120
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-products.html +0 -54
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/grouped.filter.js +0 -21
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/manifest-details.controller.js +0 -34
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/manifest-history.controller.js +0 -18
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/manifest-import.controller.js +0 -261
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/manifest.controller.js +0 -16
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-delete-modal.html +0 -19
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-details.html +0 -46
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-import-history.html +0 -17
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-import.html +0 -92
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest.html +0 -33
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscription-start-date.directive.js +0 -21
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscription-type.directive.js +0 -16
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptionAttachAmountFilter.filter.js +0 -16
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptions.controller.js +0 -73
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptions.routes.js +0 -110
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html +0 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscription-start-date.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscription-type.html +0 -18
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscriptions-delete-bulk.html +0 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscriptions.html +0 -63
- data/webpack/scenes/ModuleStreams/Details/ModuleStreamDetailInfo.js +0 -52
- data/webpack/scenes/ModuleStreams/Details/Repositories/__tests__/ModuleStreamDetailRepositories.test.js +0 -16
@@ -1,4 +1,5 @@
|
|
1
1
|
require "pulpcore_client"
|
2
|
+
# rubocop:disable ClassLength
|
2
3
|
|
3
4
|
module Katello
|
4
5
|
module Pulp3
|
@@ -49,6 +50,10 @@ module Katello
|
|
49
50
|
fail NotImplementedError
|
50
51
|
end
|
51
52
|
|
53
|
+
def content_service
|
54
|
+
Katello::Pulp3::Content
|
55
|
+
end
|
56
|
+
|
52
57
|
def self.api_client(_smart_proxy)
|
53
58
|
fail NotImplementedError
|
54
59
|
end
|
@@ -57,21 +62,40 @@ module Katello
|
|
57
62
|
self.class.api_client(smart_proxy)
|
58
63
|
end
|
59
64
|
|
65
|
+
def distribution_mirror_options(path, options = {})
|
66
|
+
ret = {
|
67
|
+
base_path: path,
|
68
|
+
name: "#{backend_object_name}"
|
69
|
+
}
|
70
|
+
ret[:publication] = options[:publication] if options.key? :publication
|
71
|
+
ret[:repository_version] = options[:repository_version] if options.key? :repository_version
|
72
|
+
ret
|
73
|
+
end
|
74
|
+
|
75
|
+
def mirror_remote_options
|
76
|
+
common_mirror_remote_options.merge(url: mirror_remote_feed_url)
|
77
|
+
end
|
78
|
+
|
79
|
+
def create_mirror_remote
|
80
|
+
remote_file_data = remote_class.new(mirror_remote_options)
|
81
|
+
remotes_api.create(remote_file_data)
|
82
|
+
end
|
83
|
+
|
60
84
|
def create_remote
|
61
85
|
remote_file_data = remote_class.new(remote_options)
|
62
86
|
response = remotes_api.create(remote_file_data)
|
63
|
-
repo.update_attributes!(:remote_href => response.
|
87
|
+
repo.update_attributes!(:remote_href => response.pulp_href)
|
64
88
|
end
|
65
89
|
|
66
90
|
def update_remote
|
91
|
+
href = repo.remote_href
|
67
92
|
if remote_options[:url].blank?
|
68
|
-
if
|
69
|
-
href = repo.remote_href
|
93
|
+
if href
|
70
94
|
repo.update_attributes(remote_href: nil)
|
71
95
|
delete_remote href
|
72
96
|
end
|
73
97
|
else
|
74
|
-
if
|
98
|
+
if href
|
75
99
|
remote_partial_update
|
76
100
|
else
|
77
101
|
create_remote
|
@@ -103,6 +127,14 @@ module Katello
|
|
103
127
|
PulpcoreClient::RepositoriesVersionsApi.new(core_api_client)
|
104
128
|
end
|
105
129
|
|
130
|
+
def uploads_api
|
131
|
+
PulpcoreClient::UploadsApi.new(core_api_client)
|
132
|
+
end
|
133
|
+
|
134
|
+
def upload_class
|
135
|
+
PulpcoreClient::Upload
|
136
|
+
end
|
137
|
+
|
106
138
|
def self.instance_for_type(repo, smart_proxy)
|
107
139
|
Katello::RepositoryTypeManager.repository_types[repo.root.content_type].pulp3_service_class.new(repo, smart_proxy)
|
108
140
|
end
|
@@ -112,7 +144,12 @@ module Katello
|
|
112
144
|
end
|
113
145
|
|
114
146
|
def backend_object_name
|
115
|
-
|
147
|
+
if @smart_proxy.pulp_master?
|
148
|
+
"#{root.label}-#{repo.id}#{rand(9999)}"
|
149
|
+
else
|
150
|
+
# this is a capsule. Create repos in pulp3 instance with the name as this repo's pulp_id
|
151
|
+
repo.pulp_id
|
152
|
+
end
|
116
153
|
end
|
117
154
|
|
118
155
|
def repository_reference
|
@@ -123,6 +160,40 @@ module Katello
|
|
123
160
|
DistributionReference.find_by(:path => path)
|
124
161
|
end
|
125
162
|
|
163
|
+
def refresh_mirror_entities
|
164
|
+
href = mirror_remote_href
|
165
|
+
if href
|
166
|
+
[remotes_api.partial_update(href, mirror_remote_options)]
|
167
|
+
else
|
168
|
+
create_mirror_remote
|
169
|
+
[]
|
170
|
+
end
|
171
|
+
end
|
172
|
+
|
173
|
+
def mirror_needs_updates?
|
174
|
+
remote = fetch_remote
|
175
|
+
return true if remote.blank?
|
176
|
+
options = compute_mirror_remote_options
|
177
|
+
options.keys.any? { |key| remote.send(key) != options[key] }
|
178
|
+
end
|
179
|
+
|
180
|
+
def compute_mirror_remote_options
|
181
|
+
computed_options = mirror_remote_options
|
182
|
+
[:ssl_client_certificate, :ssl_client_key, :ssl_ca_certificate].each do |key|
|
183
|
+
computed_options[key] = Digest::SHA256.hexdigest(computed_options[key].chomp)
|
184
|
+
end
|
185
|
+
computed_options
|
186
|
+
end
|
187
|
+
|
188
|
+
def create_mirror_entities
|
189
|
+
create_mirror
|
190
|
+
create_mirror_remote unless mirror_remote_href
|
191
|
+
end
|
192
|
+
|
193
|
+
def create_mirror
|
194
|
+
repositories_api.create(name: backend_object_name)
|
195
|
+
end
|
196
|
+
|
126
197
|
def create
|
127
198
|
unless repository_reference
|
128
199
|
response = repositories_api.create(
|
@@ -130,29 +201,124 @@ module Katello
|
|
130
201
|
RepositoryReference.create!(
|
131
202
|
root_repository_id: repo.root_id,
|
132
203
|
content_view_id: repo.content_view.id,
|
133
|
-
repository_href: response.
|
204
|
+
repository_href: response.pulp_href)
|
134
205
|
response
|
135
206
|
end
|
136
207
|
end
|
137
208
|
|
209
|
+
def update_mirror
|
210
|
+
repositories_api.update(mirror_repository_href, name: backend_object_name)
|
211
|
+
end
|
212
|
+
|
138
213
|
def update
|
139
|
-
repositories_api.update(repository_reference.repository_href, name: backend_object_name)
|
214
|
+
repositories_api.update(repository_reference.try(:repository_href), name: backend_object_name)
|
215
|
+
end
|
216
|
+
|
217
|
+
def list(options)
|
218
|
+
repositories_api.list(options).results
|
140
219
|
end
|
141
220
|
|
142
|
-
def
|
143
|
-
|
221
|
+
def self.versions_list(smart_proxy, href, options)
|
222
|
+
repository_versions_api = ::Katello::Pulp3::Repository.new(nil, smart_proxy).repository_versions_api
|
223
|
+
fetch_from_list { |page_opts| repository_versions_api.list(href, page_opts.merge(options)) }
|
224
|
+
end
|
225
|
+
|
226
|
+
def self.list(smart_proxy, options)
|
227
|
+
repositories_api = ::Katello::Pulp3::Repository.new(nil, smart_proxy).repositories_api
|
228
|
+
fetch_from_list do |page_opts|
|
229
|
+
repositories_api.list(page_opts.merge(options))
|
230
|
+
end
|
231
|
+
end
|
232
|
+
|
233
|
+
def self.fetch_from_list
|
234
|
+
page_size = SETTINGS[:katello][:pulp][:bulk_load_size]
|
235
|
+
page_opts = { "offset" => 0, limit: page_size }
|
236
|
+
response = {}
|
237
|
+
|
238
|
+
results = []
|
239
|
+
|
240
|
+
loop do
|
241
|
+
page_opts = page_opts.with_indifferent_access
|
242
|
+
break unless (
|
243
|
+
(response["count"] && (page_opts["offset"] < response["count"])) ||
|
244
|
+
page_opts["offset"] == 0)
|
245
|
+
response = yield page_opts
|
246
|
+
response = response.as_json.with_indifferent_access
|
247
|
+
results = results.concat(response[:results])
|
248
|
+
page_opts[:offset] += page_size
|
249
|
+
end
|
250
|
+
|
251
|
+
results
|
252
|
+
end
|
253
|
+
|
254
|
+
def self.repository_versions(smart_proxy, options)
|
255
|
+
current_pulp_repositories = ::Katello::Pulp3::Repository.list(smart_proxy, options)
|
256
|
+
repo_hrefs = current_pulp_repositories.collect { |repo| repo[:pulp_href] }.uniq
|
257
|
+
|
258
|
+
version_hrefs = repo_hrefs.collect do |href|
|
259
|
+
::Katello::Pulp3::Repository.versions_list(smart_proxy, href, options).pluck(:pulp_href)
|
260
|
+
end
|
261
|
+
|
262
|
+
version_hrefs.flatten.uniq
|
263
|
+
end
|
264
|
+
|
265
|
+
def self.orphan_repository_versions(smart_proxy)
|
266
|
+
version_hrefs = repository_versions(smart_proxy, {})
|
267
|
+
|
268
|
+
version_hrefs - ::Katello::Repository.where(version_href: version_hrefs).pluck(:version_href)
|
269
|
+
end
|
270
|
+
|
271
|
+
def self.delete_orphan_repository_versions(smart_proxy)
|
272
|
+
orphans = orphan_repository_versions(smart_proxy)
|
273
|
+
orphans.collect do |href|
|
274
|
+
::Katello::Pulp3::Repository.new(nil, smart_proxy).
|
275
|
+
repository_versions_api.delete(href)
|
276
|
+
end
|
277
|
+
end
|
278
|
+
|
279
|
+
def self.orphan_repository_versions_for_mirror(smart_proxy)
|
280
|
+
current_pulp_repositories = ::Katello::Pulp3::Repository.list(smart_proxy, {})
|
281
|
+
|
282
|
+
orphan_version_hrefs = current_pulp_repositories.collect do |pulp_repo|
|
283
|
+
mirror_repo_versions = ::Katello::Pulp3::Repository.versions_list(
|
284
|
+
smart_proxy, pulp_repo['pulp_href'], ordering: :_created).pluck(:pulp_href)
|
285
|
+
|
286
|
+
mirror_repo_versions - [pulp_repo['latest_version_href']]
|
287
|
+
end
|
288
|
+
|
289
|
+
orphan_version_hrefs.flatten
|
290
|
+
end
|
291
|
+
|
292
|
+
def self.delete_orphan_repository_versions_for_mirror(smart_proxy)
|
293
|
+
orphans = orphan_repository_versions_for_mirror(smart_proxy)
|
294
|
+
orphans.collect do |href|
|
295
|
+
::Katello::Pulp3::Repository.new(nil, smart_proxy).
|
296
|
+
repository_versions_api.delete(href)
|
297
|
+
end
|
298
|
+
end
|
299
|
+
|
300
|
+
def delete_mirror(href = mirror_repository_href)
|
301
|
+
repositories_api.delete(href) if href
|
144
302
|
end
|
145
303
|
|
146
304
|
def delete(href = repository_reference.try(:repository_href))
|
147
305
|
repository_reference.try(:destroy)
|
148
|
-
if href
|
149
|
-
|
150
|
-
|
151
|
-
|
306
|
+
repositories_api.delete(href) if href
|
307
|
+
end
|
308
|
+
|
309
|
+
def sync_mirror
|
310
|
+
repository_sync_url_data = client_class::RepositorySyncURL.new(repository: mirror_repository_href, mirror: true)
|
311
|
+
[remotes_api.sync(mirror_remote_href, repository_sync_url_data)]
|
152
312
|
end
|
153
313
|
|
154
314
|
def sync
|
155
|
-
|
315
|
+
repository_sync_url_data = client_class::RepositorySyncURL.new(repository: repository_reference.repository_href, mirror: repo.root.mirror_on_sync)
|
316
|
+
[remotes_api.sync(repo.remote_href, repository_sync_url_data)]
|
317
|
+
end
|
318
|
+
|
319
|
+
def mirror_version_href
|
320
|
+
repository = fetch_repository
|
321
|
+
repository.latest_version_href
|
156
322
|
end
|
157
323
|
|
158
324
|
def create_publication
|
@@ -160,8 +326,37 @@ module Katello
|
|
160
326
|
publications_api.create(publication_data)
|
161
327
|
end
|
162
328
|
|
329
|
+
def create_mirror_publication
|
330
|
+
href = mirror_version_href
|
331
|
+
if href
|
332
|
+
publication_data = publication_class.new(repository_version: href)
|
333
|
+
publications_api.create(publication_data)
|
334
|
+
end
|
335
|
+
end
|
336
|
+
|
337
|
+
def relative_path
|
338
|
+
repo.relative_path.sub(/^\//, '')
|
339
|
+
end
|
340
|
+
|
341
|
+
def refresh_mirror_distributions(options = {})
|
342
|
+
path = relative_path
|
343
|
+
dist_params = {}
|
344
|
+
dist_params[:publication] = options[:publication] if options[:publication]
|
345
|
+
dist_params[:repository_version] = mirror_version_href if options[:use_repository_version]
|
346
|
+
dist_options = distribution_mirror_options(path, dist_params)
|
347
|
+
if (distro = lookup_distributions(base_path: path).first)
|
348
|
+
# update dist
|
349
|
+
dist_options = dist_options.except(:name, :base_path)
|
350
|
+
distributions_api.partial_update(distro.pulp_href, dist_options)
|
351
|
+
else
|
352
|
+
# create dist
|
353
|
+
distribution_data = distribution_class.new(dist_options)
|
354
|
+
distributions_api.create(distribution_data)
|
355
|
+
end
|
356
|
+
end
|
357
|
+
|
163
358
|
def refresh_distributions
|
164
|
-
path =
|
359
|
+
path = relative_path
|
165
360
|
dist_ref = distribution_reference(path)
|
166
361
|
if dist_ref
|
167
362
|
update_distribution(path)
|
@@ -170,6 +365,11 @@ module Katello
|
|
170
365
|
end
|
171
366
|
end
|
172
367
|
|
368
|
+
def create_mirror_distribution(path)
|
369
|
+
distribution_data = distribution_class.new(distribution_mirror_options(path))
|
370
|
+
distributions_api.create(distribution_data)
|
371
|
+
end
|
372
|
+
|
173
373
|
def create_distribution(path)
|
174
374
|
distribution_data = distribution_class.new(distribution_options(path))
|
175
375
|
distributions_api.create(distribution_data)
|
@@ -201,10 +401,6 @@ module Katello
|
|
201
401
|
nil
|
202
402
|
end
|
203
403
|
|
204
|
-
def create_version(options = {})
|
205
|
-
repository_versions_api.create(repository_reference.repository_href, options)
|
206
|
-
end
|
207
|
-
|
208
404
|
def copy_units_by_href(unit_hrefs)
|
209
405
|
tasks = []
|
210
406
|
unit_hrefs.each_slice(COPY_UNIT_PAGE_SIZE) do |slice|
|
@@ -217,6 +413,23 @@ module Katello
|
|
217
413
|
create_version(:base_version => from_repository.version_href)
|
218
414
|
end
|
219
415
|
|
416
|
+
def mirror_repository_href
|
417
|
+
fetch_repository.try(:pulp_href)
|
418
|
+
end
|
419
|
+
|
420
|
+
def mirror_remote_href
|
421
|
+
fetch_remote.try(:pulp_href)
|
422
|
+
end
|
423
|
+
|
424
|
+
def create_mirror_version(options = {})
|
425
|
+
href = mirror_repository_href
|
426
|
+
repository_versions_api.create(href, options) if href
|
427
|
+
end
|
428
|
+
|
429
|
+
def create_version(options = {})
|
430
|
+
repository_versions_api.create(repository_reference.repository_href, options)
|
431
|
+
end
|
432
|
+
|
220
433
|
def save_distribution_references(hrefs)
|
221
434
|
hrefs.each do |href|
|
222
435
|
path = get_distribution(href)&.base_path
|
@@ -229,7 +442,7 @@ module Katello
|
|
229
442
|
def delete_distributions
|
230
443
|
path = repo.relative_path.sub(/^\//, '')
|
231
444
|
dists = lookup_distributions(base_path: path)
|
232
|
-
delete_distribution(dists.first.
|
445
|
+
delete_distribution(dists.first.pulp_href) if dists.first
|
233
446
|
dist_ref = distribution_reference(path)
|
234
447
|
dist_ref.destroy! if dist_ref
|
235
448
|
end
|
@@ -241,11 +454,12 @@ module Katello
|
|
241
454
|
url: root.url,
|
242
455
|
proxy_url: root.http_proxy&.full_url
|
243
456
|
}
|
457
|
+
remote_options[:url] = root.url unless root.url.blank?
|
244
458
|
if root.upstream_username && root.upstream_password
|
245
|
-
remote_options.merge(username: root.upstream_username,
|
459
|
+
remote_options.merge!(username: root.upstream_username,
|
246
460
|
password: root.upstream_password)
|
247
461
|
end
|
248
|
-
remote_options.merge(ssl_remote_options)
|
462
|
+
remote_options.merge!(ssl_remote_options)
|
249
463
|
end
|
250
464
|
|
251
465
|
def ssl_remote_options
|
@@ -266,18 +480,81 @@ module Katello
|
|
266
480
|
end
|
267
481
|
end
|
268
482
|
|
483
|
+
def common_mirror_remote_options
|
484
|
+
remote_options = {
|
485
|
+
name: backend_object_name
|
486
|
+
}
|
487
|
+
remote_options.merge!(ssl_mirror_remote_options)
|
488
|
+
end
|
489
|
+
|
490
|
+
def ssl_mirror_remote_options
|
491
|
+
ueber_cert = ::Cert::Certs.ueber_cert(root.organization)
|
492
|
+
{
|
493
|
+
ssl_client_certificate: ueber_cert[:cert],
|
494
|
+
ssl_client_key: ueber_cert[:key],
|
495
|
+
ssl_ca_certificate: ::Cert::Certs.ca_cert,
|
496
|
+
ssl_validation: true
|
497
|
+
}
|
498
|
+
end
|
499
|
+
|
500
|
+
def mirror_remote_feed_url
|
501
|
+
uri = ::SmartProxy.pulp_master.pulp3_uri!
|
502
|
+
uri.path = partial_repo_path
|
503
|
+
uri.to_s
|
504
|
+
end
|
505
|
+
|
506
|
+
def partial_repo_path
|
507
|
+
fail NotImplementedError
|
508
|
+
end
|
509
|
+
|
510
|
+
def needs_importer_updates?
|
511
|
+
false
|
512
|
+
end
|
513
|
+
|
514
|
+
def needs_distributor_updates?
|
515
|
+
false
|
516
|
+
end
|
517
|
+
|
269
518
|
def lookup_version(href)
|
270
|
-
repository_versions_api.read(href)
|
519
|
+
repository_versions_api.read(href) if href
|
520
|
+
rescue PulpcoreClient::ApiError => e
|
521
|
+
Rails.logger.error "Exception when calling repository_versions_api->read: #{e}"
|
522
|
+
nil
|
523
|
+
end
|
524
|
+
|
525
|
+
def lookup_publication(href)
|
526
|
+
publications_api.read(href) if href
|
271
527
|
rescue PulpcoreClient::ApiError => e
|
272
|
-
Rails.logger.error "Exception when calling
|
528
|
+
Rails.logger.error "Exception when calling publications_api->read: #{e}"
|
273
529
|
nil
|
274
530
|
end
|
275
531
|
|
532
|
+
def fetch_repository
|
533
|
+
list(name: backend_object_name).first
|
534
|
+
end
|
535
|
+
|
536
|
+
def fetch_remote
|
537
|
+
list_remotes(name: backend_object_name).first
|
538
|
+
end
|
539
|
+
|
276
540
|
def remove_content(content_units)
|
277
541
|
data = PulpcoreClient::RepositoryVersionCreate.new(
|
278
542
|
remove_content_units: content_units.map(&:pulp_id))
|
279
543
|
repository_versions_api.create(repository_reference.repository_href, data)
|
280
544
|
end
|
545
|
+
|
546
|
+
def add_content(content_unit_href)
|
547
|
+
content_unit_href = [content_unit_href] unless content_unit_href.is_a?(Array)
|
548
|
+
data = PulpcoreClient::RepositoryVersionCreate.new(
|
549
|
+
add_content_units: content_unit_href)
|
550
|
+
repository_versions_api.create(repository_reference.repository_href, data)
|
551
|
+
end
|
552
|
+
|
553
|
+
def unit_keys(uploads)
|
554
|
+
uploads.map do |upload|
|
555
|
+
upload.except('id')
|
556
|
+
end
|
557
|
+
end
|
281
558
|
end
|
282
559
|
end
|
283
560
|
end
|