katello 3.18.2 → 4.0.0.rc3.1
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/rhsm/candlepin_dynflow_proxy_controller.rb +0 -19
- data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb +1 -3
- data/app/controllers/katello/api/v2/content_credentials_controller.rb +24 -24
- data/app/controllers/katello/api/v2/content_export_incrementals_controller.rb +1 -1
- data/app/controllers/katello/api/v2/content_exports_controller.rb +5 -1
- data/app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb +3 -3
- data/app/controllers/katello/api/v2/content_view_versions_controller.rb +1 -1
- data/app/controllers/katello/api/v2/content_views_controller.rb +2 -2
- data/app/controllers/katello/api/v2/errata_controller.rb +1 -1
- data/app/controllers/katello/api/v2/host_errata_controller.rb +2 -2
- data/app/controllers/katello/api/v2/host_packages_controller.rb +6 -6
- data/app/controllers/katello/api/v2/host_subscriptions_controller.rb +2 -3
- data/app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb +1 -1
- data/app/controllers/katello/api/v2/organizations_controller.rb +0 -1
- data/app/controllers/katello/api/v2/repositories_controller.rb +3 -19
- data/app/controllers/katello/api/v2/simple_content_access_controller.rb +34 -0
- data/app/controllers/katello/api/v2/subscriptions_controller.rb +1 -1
- data/app/controllers/katello/api/v2/upstream_subscriptions_controller.rb +8 -4
- data/app/controllers/katello/concerns/authorization/api/v2/content_views_controller.rb +1 -1
- data/app/controllers/katello/concerns/smart_proxies_controller_extensions.rb +1 -2
- data/app/helpers/katello/concerns/smart_proxy_helper_extensions.rb +15 -20
- data/app/helpers/katello/sync_management_helper.rb +0 -2
- data/app/lib/actions/candlepin/environment/create.rb +1 -1
- data/app/lib/actions/candlepin/environment/set_content.rb +1 -1
- data/app/lib/actions/katello/activation_key/create.rb +9 -11
- data/app/lib/actions/katello/agent/dispatch_history_presenter.rb +64 -0
- data/app/lib/actions/katello/agent_action.rb +107 -0
- data/app/lib/actions/katello/bulk_agent_action.rb +21 -0
- data/app/lib/actions/katello/capsule_content/sync.rb +8 -8
- data/app/lib/actions/katello/capsule_content/sync_capsule.rb +9 -0
- data/app/lib/actions/katello/check_matching_content.rb +17 -0
- data/app/lib/actions/katello/content_view/environment_create.rb +6 -8
- data/app/lib/actions/katello/content_view/publish.rb +1 -1
- data/app/lib/actions/katello/content_view_version/incremental_update.rb +11 -7
- data/app/lib/actions/katello/host/erratum/applicable_errata_install.rb +1 -1
- data/app/lib/actions/katello/host/erratum/install.rb +8 -26
- data/app/lib/actions/katello/host/hypervisors_update.rb +4 -4
- data/app/lib/actions/katello/host/package/install.rb +8 -21
- data/app/lib/actions/katello/host/package/remove.rb +8 -20
- data/app/lib/actions/katello/host/package/update.rb +9 -22
- data/app/lib/actions/katello/host/package_group/install.rb +8 -21
- data/app/lib/actions/katello/host/package_group/remove.rb +8 -20
- data/app/lib/actions/katello/organization/create.rb +3 -5
- data/app/lib/actions/katello/organization/destroy.rb +1 -1
- data/app/lib/actions/katello/organization/manifest_delete.rb +3 -5
- data/app/lib/actions/katello/organization/manifest_import.rb +1 -1
- data/app/lib/actions/katello/organization/manifest_refresh.rb +1 -1
- data/app/lib/actions/katello/repository/check_matching_content.rb +3 -1
- data/app/lib/actions/katello/repository/clone_contents.rb +8 -11
- data/app/lib/actions/katello/repository/create.rb +0 -8
- data/app/lib/actions/katello/repository/filtered_index_content.rb +3 -0
- data/app/lib/actions/katello/repository/index_content.rb +1 -0
- data/app/lib/actions/katello/repository/multi_clone_contents.rb +9 -12
- data/app/lib/actions/katello/repository/update.rb +0 -8
- data/app/lib/actions/middleware/execute_if_contents_changed.rb +4 -1
- data/app/lib/actions/pulp/consumer.rb +0 -11
- data/app/lib/actions/pulp/orchestration/repository/refresh_repos.rb +0 -6
- data/app/lib/actions/pulp3/capsule_content/refresh_distribution.rb +3 -3
- data/app/lib/actions/pulp3/orchestration/repository/refresh_repos.rb +1 -6
- data/app/lib/katello/agent/base_message.rb +38 -0
- data/app/lib/katello/agent/client_message_handler.rb +60 -0
- data/app/lib/katello/agent/connection.rb +38 -0
- data/app/lib/katello/agent/install_errata_message.rb +25 -0
- data/app/lib/katello/agent/install_package_group_message.rb +25 -0
- data/app/lib/katello/agent/install_package_message.rb +28 -0
- data/app/lib/katello/agent/remove_package_group_message.rb +25 -0
- data/app/lib/katello/agent/remove_package_message.rb +28 -0
- data/app/lib/katello/agent/update_package_message.rb +25 -0
- data/app/lib/katello/concerns/base_template_scope_extensions.rb +11 -2
- data/app/lib/katello/event_daemon/monitor.rb +53 -0
- data/app/lib/katello/event_daemon/runner.rb +99 -0
- data/app/lib/katello/event_daemon/services/agent_event_receiver.rb +63 -0
- data/app/lib/katello/logging.rb +32 -0
- data/app/lib/katello/messaging/connection.rb +1 -7
- data/app/lib/katello/messaging/received_message.rb +1 -1
- data/app/lib/katello/qpid/connection.rb +147 -0
- data/app/lib/katello/validators/content_view_puppet_module_validator.rb +1 -1
- data/app/models/katello/activation_key.rb +2 -2
- data/app/models/katello/agent/dispatch_history.rb +17 -0
- data/app/models/katello/candlepin/repository_mapper.rb +1 -1
- data/app/models/katello/concerns/host_managed_extensions.rb +3 -0
- data/app/models/katello/concerns/organization_extensions.rb +2 -2
- data/app/models/katello/concerns/pulp_database_unit.rb +0 -12
- data/app/models/katello/concerns/smart_proxy_extensions.rb +52 -0
- data/app/models/katello/content_view.rb +5 -1
- data/app/models/katello/content_view_environment.rb +2 -2
- data/app/models/katello/content_view_puppet_environment.rb +2 -2
- data/app/models/katello/content_view_version.rb +2 -1
- data/app/models/katello/content_view_version_export_history.rb +21 -0
- data/app/models/katello/erratum.rb +3 -1
- data/app/models/katello/events/delete_host_agent_queue.rb +19 -0
- data/app/models/katello/file_unit.rb +0 -4
- data/app/models/katello/glue/candlepin/pool.rb +2 -0
- data/app/models/katello/glue/pulp/repo.rb +0 -6
- data/app/models/katello/glue/pulp/repos.rb +1 -22
- data/app/models/katello/host/content_facet.rb +9 -31
- data/app/models/katello/host/info_provider.rb +0 -2
- data/app/models/katello/ping.rb +48 -20
- data/app/models/katello/pool.rb +5 -0
- data/app/models/katello/product.rb +3 -3
- data/app/models/katello/repository.rb +3 -3
- data/app/models/setting/content.rb +0 -2
- data/app/presenters/katello/host_subscription_presenter.rb +3 -4
- data/app/presenters/katello/host_subscriptions_presenter.rb +24 -0
- data/app/services/katello/agent/dispatcher.rb +66 -0
- data/app/services/katello/candlepin_event_listener.rb +12 -19
- data/app/services/katello/event_monitor/poller_thread.rb +3 -11
- data/app/services/katello/pulp/smart_proxy_repository.rb +0 -15
- data/app/services/katello/pulp3/migration.rb +1 -12
- data/app/services/katello/pulp3/migration_switchover.rb +5 -21
- data/app/services/katello/pulp3/repository.rb +5 -1
- data/app/services/katello/pulp3/repository/yum.rb +2 -11
- data/app/services/katello/registration_manager.rb +10 -0
- data/app/services/katello/repository_type.rb +1 -1
- data/app/services/katello/ui_notifications/pulp/proxy_disk_space.rb +2 -5
- data/app/views/foreman/smart_proxies/_content_tab.html.erb +4 -47
- data/app/views/foreman/smart_proxies/show.html.erb +1 -1
- data/app/views/katello/api/v2/capsule_content/sync_status.json.rabl +22 -25
- data/app/views/katello/api/v2/content_view_version_export_histories/show.json.rabl +1 -0
- data/app/views/katello/api/v2/organizations/show.json.rabl +7 -9
- data/app/views/overrides/organizations/_edit_override.html.erb +1 -4
- data/app/views/overrides/smart_proxies/_environment_tab.html.erb +1 -1
- data/app/views/overrides/smart_proxies/_environment_tab_pane.html.erb +1 -1
- data/app/views/smart_proxies/_disk_usage.html.erb +6 -4
- data/config/katello.yaml.example +0 -3
- data/config/routes/api/v2.rb +8 -10
- data/db/migrate/20191204214919_add_content_view_version_counts.rb +0 -1
- data/db/migrate/20210119162528_delete_puppet_and_ostree_repos.rb +56 -0
- data/db/migrate/20210122200618_create_katello_agent_dispatch_history.rb +11 -0
- data/db/migrate/20210125161911_delete_erratum_install_batch_size_setting.rb +5 -0
- data/db/migrate/20210128231228_add_type_and_from_cvv_to_cvv_export_history.rb +14 -0
- data/db/migrate/20210201163238_migrate_background_download_policy_to_migrate.rb +7 -0
- data/db/migrate/20210208213920_add_available_module_stream_context.rb +8 -0
- data/db/migrate/20210218214048_change_default_content_view_version_export_history.rb +5 -0
- data/db/seeds.d/104-proxy.rb +1 -1
- data/db/seeds.d/111-upgrade_tasks.rb +1 -12
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-register-os-client.directive.js +17 -0
- 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 +2 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-client.html +11 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-deb-client.html +38 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-oracle-client.html +5 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-sles-client.html +28 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register.html +14 -11
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/package-filter-details.html +2 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js +2 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/download-policy.service.js +0 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/products.controller.js +2 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscription-start-date.directive.js +21 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscription-type.directive.js +16 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscription-start-date.html +2 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscription-type.html +18 -0
- data/lib/katello/engine.rb +15 -6
- data/lib/katello/middleware/event_daemon.rb +1 -1
- data/lib/katello/permission_creator.rb +3 -2
- data/lib/katello/plugin.rb +4 -3
- data/lib/katello/tasks/jenkins.rake +1 -1
- data/lib/katello/tasks/pulp3_content_switchover.rake +0 -2
- data/lib/katello/tasks/pulp3_migration.rake +5 -8
- data/lib/katello/tasks/pulp3_migration_stats.rake +1 -34
- data/lib/katello/tasks/reimport.rake +1 -1
- data/lib/katello/tasks/reset.rake +0 -15
- data/lib/katello/tasks/upgrades/4.0/remove_ostree_puppet_content.rake +16 -0
- data/lib/katello/version.rb +1 -1
- data/lib/proxy_api/container_gateway.rb +21 -0
- data/locale/bn/katello.edit.po +8538 -0
- data/locale/bn/katello.po.time_stamp +0 -0
- data/locale/cs/katello.edit.po +8440 -0
- data/locale/cs/katello.po.time_stamp +0 -0
- data/locale/de/katello.edit.po +8344 -0
- data/locale/de/katello.po.time_stamp +0 -0
- data/locale/en/katello.edit.po +8161 -0
- data/locale/en/katello.po.time_stamp +0 -0
- data/locale/es/katello.edit.po +8306 -0
- data/locale/es/katello.po.time_stamp +0 -0
- data/locale/fr/katello.edit.po +8356 -0
- data/locale/fr/katello.po.time_stamp +0 -0
- data/locale/gu/katello.edit.po +8540 -0
- data/locale/gu/katello.po.time_stamp +0 -0
- data/locale/hi/katello.edit.po +8537 -0
- data/locale/hi/katello.po.time_stamp +0 -0
- data/locale/it/katello.edit.po +8293 -0
- data/locale/it/katello.po.time_stamp +0 -0
- data/locale/ja/katello.edit.po +8322 -0
- data/locale/ja/katello.po.time_stamp +0 -0
- data/locale/kn/katello.edit.po +8538 -0
- data/locale/kn/katello.po.time_stamp +0 -0
- data/locale/ko/katello.edit.po +8289 -0
- data/locale/ko/katello.po.time_stamp +0 -0
- data/locale/mr/katello.edit.po +8502 -0
- data/locale/mr/katello.po.time_stamp +0 -0
- data/locale/or/katello.edit.po +8538 -0
- data/locale/or/katello.po.time_stamp +0 -0
- data/locale/pa/katello.edit.po +8524 -0
- data/locale/pa/katello.po.time_stamp +0 -0
- data/locale/pt/katello.edit.po +8255 -0
- data/locale/pt/katello.po.time_stamp +0 -0
- data/locale/pt_BR/katello.edit.po +8289 -0
- data/locale/pt_BR/katello.po.time_stamp +0 -0
- data/locale/ru/katello.edit.po +8309 -0
- data/locale/ru/katello.po.time_stamp +0 -0
- data/locale/ta/katello.edit.po +8536 -0
- data/locale/ta/katello.po.time_stamp +0 -0
- data/locale/te/katello.edit.po +8536 -0
- data/locale/te/katello.po.time_stamp +0 -0
- data/locale/zh_CN/katello.edit.po +8288 -0
- data/locale/zh_CN/katello.po.time_stamp +0 -0
- data/locale/zh_TW/katello.edit.po +8420 -0
- data/locale/zh_TW/katello.po.time_stamp +0 -0
- data/package.json +1 -1
- data/webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js +0 -1
- data/webpack/__mocks__/foremanReact/components/Pagination/PaginationHooks.js +2 -0
- data/webpack/__mocks__/foremanReact/components/common/dates/LongDateTime.js +5 -0
- data/webpack/{scenes/ContentViews/Details/Repositories → components/SelectableDropdown}/SelectableDropdown.js +20 -3
- data/webpack/components/SelectableDropdown/__tests__/SelectableDropdown.test.js +45 -0
- data/webpack/components/SelectableDropdown/index.js +3 -0
- data/webpack/components/Table/TableWrapper.js +2 -1
- data/webpack/components/Table/helpers.js +14 -0
- data/webpack/components/TypeAhead/pf4Search/TypeAheadSearch.js +0 -1
- data/webpack/containers/Application/overrides.scss +6 -0
- data/webpack/index.js +6 -0
- data/webpack/redux/actions/RedHatRepositories/helpers.js +5 -5
- data/webpack/scenes/ContentViews/ContentViewsActions.js +31 -2
- data/webpack/scenes/ContentViews/ContentViewsConstants.js +5 -1
- data/webpack/scenes/ContentViews/Copy/ContentViewCopySelectors.js +16 -0
- data/webpack/scenes/ContentViews/Copy/CopyContentViewForm.js +77 -0
- data/webpack/scenes/ContentViews/Copy/CopyContentViewModal.js +44 -0
- data/webpack/scenes/ContentViews/Copy/__tests__/contentViewCopyResult.fixtures.json +42 -0
- data/webpack/scenes/ContentViews/Copy/__tests__/copyContentView.test.js +39 -0
- data/webpack/scenes/ContentViews/Copy/index.js +4 -0
- data/webpack/scenes/ContentViews/Create/ContentViewCreateSelectors.js +16 -0
- data/webpack/scenes/ContentViews/Create/ContentViewFormComponents.js +58 -0
- data/webpack/scenes/ContentViews/Create/CreateContentViewForm.js +175 -0
- data/webpack/scenes/ContentViews/Create/CreateContentViewModal.js +27 -0
- data/webpack/scenes/ContentViews/Create/__tests__/contentViewCreateResult.fixtures.json +42 -0
- data/webpack/scenes/ContentViews/Create/__tests__/createContentView.test.js +92 -0
- data/webpack/scenes/ContentViews/Create/index.js +4 -0
- data/webpack/scenes/ContentViews/Details/ContentViewDetailActions.js +16 -0
- data/webpack/scenes/ContentViews/Details/ContentViewDetailSelectors.js +20 -1
- data/webpack/scenes/ContentViews/Details/ContentViewDetails.js +17 -7
- data/webpack/scenes/ContentViews/Details/ContentViewInfo.js +19 -13
- data/webpack/scenes/ContentViews/Details/Filters/ContentType.js +40 -0
- data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js +124 -0
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilters.fixtures.json +134 -0
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilters.test.js +92 -0
- data/webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js +44 -25
- data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.test.js +17 -7
- data/webpack/scenes/ContentViews/Details/__tests__/contentViewDetail.test.js +24 -0
- data/webpack/scenes/ContentViews/Table/ContentViewsTable.js +53 -3
- data/webpack/scenes/ContentViews/Table/tableDataGenerator.js +4 -3
- data/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js +41 -0
- data/webpack/scenes/ContentViews/helpers.js +13 -0
- data/webpack/scenes/SmartProxy/Content.js +17 -0
- data/webpack/scenes/SmartProxy/SmartProxyContentActions.js +11 -0
- data/webpack/scenes/SmartProxy/SmartProxyContentConstants.js +3 -0
- data/webpack/scenes/SmartProxy/SmartProxyContentSelectors.js +16 -0
- data/webpack/scenes/SmartProxy/SmartProxyContentTable.js +152 -0
- data/webpack/scenes/SmartProxy/__tests__/SmartProxyContentResult.fixtures.json +140 -0
- data/webpack/scenes/SmartProxy/__tests__/SmartProxyContentTest.js +38 -0
- data/webpack/scenes/SmartProxy/index.js +4 -0
- data/webpack/scenes/Subscriptions/Manifest/ManifestActions.js +3 -3
- data/webpack/scenes/Subscriptions/Manifest/__tests__/ManifestActions.test.js +2 -2
- data/webpack/scenes/Subscriptions/Manifest/__tests__/SimpleContentAccess.test.js +2 -2
- data/webpack/test-utils/react-testing-lib-wrapper.js +5 -2
- data/webpack/utils/helpers.js +3 -0
- metadata +150 -55
- data/app/controllers/katello/api/v2/gpg_keys_controller.rb +0 -114
- data/app/lib/actions/pulp/consumer/abstract_content_action.rb +0 -71
- data/app/lib/actions/pulp/consumer/content_install.rb +0 -43
- data/app/lib/actions/pulp/consumer/content_uninstall.rb +0 -26
- data/app/lib/actions/pulp/consumer/content_update.rb +0 -32
- data/app/overrides/disable_turbolinks_on_proxies_index.rb +0 -5
- data/app/services/katello/event_daemon.rb +0 -135
- data/app/services/katello/pulp/content_counts_calculator.rb +0 -60
- data/db/functions/empty_v01.sql +0 -7
- data/db/functions/evr_trigger_v01.sql +0 -9
- data/db/functions/isalpha_v01.sql +0 -11
- data/db/functions/isalphanum_v01.sql +0 -12
- data/db/functions/isdigit_v01.sql +0 -10
- data/db/functions/rpmver_array_v01.sql +0 -60
- data/db/migrate/20210201165835_add_migration_missing_content.rb +0 -12
- data/lib/katello/tasks/pulp3_migration_approve_corrupted.rake +0 -16
- data/lib/katello/tasks/reports.rake +0 -7
- data/lib/katello/tasks/upgrades/3.10/clear_invalid_repo_credentials.rake +0 -27
- data/lib/katello/tasks/upgrades/3.10/update_gpg_key_urls.rake +0 -32
- data/lib/katello/tasks/upgrades/3.11/import_yum_metadata_file.rake +0 -12
- data/lib/katello/tasks/upgrades/3.11/update_puppet_repos.rake +0 -29
- data/lib/katello/tasks/upgrades/3.12/remove_pulp2_notifier.rake +0 -13
- data/lib/katello/tasks/upgrades/3.13/republish_deb_metadata.rake +0 -22
- data/lib/katello/tasks/upgrades/3.15/reindex_rpm_modular.rake +0 -23
- data/lib/katello/tasks/upgrades/3.15/set_sub_facet_dmi_uuid.rake +0 -16
- data/lib/katello/tasks/upgrades/3.16/update_applicable_el8_hosts.rake +0 -29
- data/lib/katello/tasks/upgrades/3.18/add_cvv_export_history_metadata.rb +0 -18
- data/lib/katello/tasks/upgrades/3.8/clear_checksum_type.rake +0 -41
- data/webpack/components/TypeAhead/pf4Search/TypeAheadSearch.scss +0 -5
- data/webpack/scenes/ContentViews/Table/actionResolver.js +0 -28
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4b1f2f557b3626c3063d82e67d89ad487eb532ceae69ebd8b3d17a5e6c1d1f58
|
4
|
+
data.tar.gz: 4740bb46003409a84d0e3ff4d83d265e872c59744afd996c7d930e41978c8ec7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d2b588283c5bfc2f7ffe233be131fc45579531bee31b5202216e20be8f7fd4178a9080b34262dbfe46c25d463f9638c10f1c9820f5c6ecdb6fdcd1b73e1ad64a
|
7
|
+
data.tar.gz: 63fe08f466e464a3e628ca3e44dec60a46f2480bb88598798511175e05afdf43becbdfb8586edf5ca3ec13e37c67c3bf5b3ddb0315cd604ed5d82b315d3b6632
|
@@ -4,8 +4,6 @@ module Katello
|
|
4
4
|
include ForemanTasks::Triggers
|
5
5
|
include AbstractController::Callbacks
|
6
6
|
|
7
|
-
before_action :deprecated, only: :deb_package_profile
|
8
|
-
|
9
7
|
skip_before_action :authorize, :only => [:upload_package_profile, :upload_profiles, :deb_package_profile]
|
10
8
|
before_action :find_host, :only => [:upload_package_profile, :upload_profiles, :deb_package_profile]
|
11
9
|
before_action :authorize_client_or_user, :only => [:upload_package_profile, :upload_profiles, :deb_package_profile]
|
@@ -31,19 +29,6 @@ module Katello
|
|
31
29
|
render :json => Resources::Candlepin::Consumer.get(@host.subscription_facet.uuid)
|
32
30
|
end
|
33
31
|
|
34
|
-
api :PUT, "/systems/:id/deb_package_profile", N_("Update installed deb packages")
|
35
|
-
param :deb_package_profile, Hash, :required => true do
|
36
|
-
param :deb_packages, Array, :required => true do
|
37
|
-
param :name, String, :required => true
|
38
|
-
param :architecture, String, :required => true
|
39
|
-
param :version, String, :required => true
|
40
|
-
end
|
41
|
-
end
|
42
|
-
param :id, String, :desc => N_("UUID of the system"), :required => true
|
43
|
-
def deb_package_profile
|
44
|
-
upload_profiles
|
45
|
-
end
|
46
|
-
|
47
32
|
def find_host(uuid = nil)
|
48
33
|
params = request.path_parameters
|
49
34
|
uuid ||= params[:id]
|
@@ -65,9 +50,5 @@ module Katello
|
|
65
50
|
authorized = (User.current.uuid == @host.subscription_facet.uuid) if @host && User.consumer?
|
66
51
|
authorized
|
67
52
|
end
|
68
|
-
|
69
|
-
def deprecated
|
70
|
-
::Foreman::Deprecation.api_deprecation_warning("it will be removed in Katello 4.0. Please use /consumers/:id/profiles instead.")
|
71
|
-
end
|
72
53
|
end
|
73
54
|
end
|
@@ -41,8 +41,6 @@ module Katello
|
|
41
41
|
body_json['displayMessage'] = body_json['message']
|
42
42
|
end
|
43
43
|
response.body = body_json.to_s
|
44
|
-
|
45
|
-
# rubocop:disable Lint/SuppressedException
|
46
44
|
rescue JSON::ParserError
|
47
45
|
# Not a json response, leave as-is
|
48
46
|
end
|
@@ -370,7 +368,7 @@ module Katello
|
|
370
368
|
|
371
369
|
if (ak_names = params[:activation_keys])
|
372
370
|
fail HttpErrors::NotFound, _("Organization not found") if organization.nil?
|
373
|
-
ak_names = ak_names.split(",")
|
371
|
+
ak_names = ak_names.split(",").uniq.compact
|
374
372
|
activation_keys = ak_names.map do |ak_name|
|
375
373
|
activation_key = organization.activation_keys.find_by(:name => ak_name)
|
376
374
|
fail HttpErrors::NotFound, _("Couldn't find activation key '%s'") % ak_name unless activation_key
|
@@ -10,9 +10,9 @@ module Katello
|
|
10
10
|
end
|
11
11
|
|
12
12
|
def_param_group :content_credential do
|
13
|
-
param :name, :identifier, :action_aware => true, :required => true, :desc => N_(
|
14
|
-
param :content_type, String, :action_aware => true, :required => true, :desc => N_(
|
15
|
-
param :content, String, :action_aware => true, :required => true, :desc => N_(
|
13
|
+
param :name, :identifier, :action_aware => true, :required => true, :desc => N_('Name of the Content Credential')
|
14
|
+
param :content_type, String, :action_aware => true, :required => true, :desc => N_('Type of content: "cert", "gpg_key"')
|
15
|
+
param :content, String, :action_aware => true, :required => true, :desc => N_('Public key block in DER encoding or certificate content')
|
16
16
|
end
|
17
17
|
|
18
18
|
resource_description do
|
@@ -22,13 +22,13 @@ module Katello
|
|
22
22
|
Content Credentials are used to store credentials like GPG Keys and Certificates for the authentication
|
23
23
|
to Products / Repositories.
|
24
24
|
DESC
|
25
|
-
api_version
|
25
|
+
api_version 'v2'
|
26
26
|
end
|
27
27
|
|
28
|
-
api :GET, "/content_credentials", N_(
|
29
|
-
param :organization_id, :number, :desc => N_(
|
30
|
-
param :name, String, :desc => N_(
|
31
|
-
param :content_type, String, :desc => N_(
|
28
|
+
api :GET, "/content_credentials", N_('List Content Credentials')
|
29
|
+
param :organization_id, :number, :desc => N_('Organization identifier'), :required => true
|
30
|
+
param :name, String, :desc => N_('Name of the Content Credential'), :required => false
|
31
|
+
param :content_type, String, :desc => N_('Type of content'), :required => false
|
32
32
|
param_group :search, Api::V2::ApiController
|
33
33
|
def index
|
34
34
|
respond(:collection => scoped_search(index_relation.distinct, :name, :asc))
|
@@ -41,15 +41,15 @@ module Katello
|
|
41
41
|
query
|
42
42
|
end
|
43
43
|
|
44
|
-
api :POST, "/content_credentials", N_(
|
45
|
-
param :organization_id, :number, :desc => N_(
|
44
|
+
api :POST, "/content_credentials", N_('Create a Content Credential')
|
45
|
+
param :organization_id, :number, :desc => N_('Organization identifier'), :required => true
|
46
46
|
param_group :content_credential, :as => :create
|
47
47
|
def create
|
48
48
|
filepath = params.try(:[], :file_path).try(:path)
|
49
49
|
|
50
50
|
content = nil
|
51
51
|
if filepath
|
52
|
-
content = File.open(filepath,
|
52
|
+
content = File.open(filepath, 'rb') { |file| file.read }
|
53
53
|
else
|
54
54
|
content = params[:content]
|
55
55
|
end
|
@@ -58,45 +58,45 @@ module Katello
|
|
58
58
|
respond_for_create(:resource => content_credential)
|
59
59
|
end
|
60
60
|
|
61
|
-
api :GET, "/content_credentials/:id", N_(
|
62
|
-
param :id, :number, :desc => N_(
|
61
|
+
api :GET, "/content_credentials/:id", N_('Show a Content Credential')
|
62
|
+
param :id, :number, :desc => N_('Content Credential numeric identifier'), :required => true
|
63
63
|
def show
|
64
64
|
respond_for_show(:resource => @content_credential)
|
65
65
|
end
|
66
66
|
|
67
|
-
api :PUT, "/content_credentials/:id", N_(
|
68
|
-
param :id, :number, :desc => N_(
|
67
|
+
api :PUT, "/content_credentials/:id", N_('Update a Content Credential')
|
68
|
+
param :id, :number, :desc => N_('Content Credential ID'), :required => true
|
69
69
|
param_group :content_credential
|
70
70
|
def update
|
71
71
|
sync_task(::Actions::Katello::GpgKey::Update, @content_credential, content_credential_params.to_h)
|
72
72
|
respond_for_show(:resource => @content_credential)
|
73
73
|
end
|
74
74
|
|
75
|
-
api :DELETE, "/content_credentials/:id", N_(
|
76
|
-
param :id, :number, :desc => N_(
|
75
|
+
api :DELETE, "/content_credentials/:id", N_('Destroy a Content Credential')
|
76
|
+
param :id, :number, :desc => N_('Content Credential ID'), :required => true
|
77
77
|
def destroy
|
78
78
|
@content_credential.destroy
|
79
79
|
respond_for_destroy
|
80
80
|
end
|
81
81
|
|
82
|
-
api :GET, "/content_credentials/:id/content", N_(
|
82
|
+
api :GET, "/content_credentials/:id/content", N_('Return the content of a Content Credential, used directly by yum')
|
83
83
|
param :id, :number, :required => true
|
84
84
|
def content
|
85
85
|
render(:plain => @content_credential.content, :layout => false)
|
86
86
|
end
|
87
87
|
|
88
|
-
api :POST, "/content_credentials/:id/content", N_(
|
89
|
-
param :id, :number, :desc => N_(
|
90
|
-
param :content, File, :desc => N_(
|
88
|
+
api :POST, "/content_credentials/:id/content", N_('Upload Content Credential contents')
|
89
|
+
param :id, :number, :desc => N_('Content Credential ID'), :required => true
|
90
|
+
param :content, File, :desc => N_('File contents'), :required => true
|
91
91
|
def set_content
|
92
92
|
filepath = params.try(:[], :content).try(:path)
|
93
93
|
|
94
94
|
if filepath
|
95
|
-
content = File.open(filepath,
|
95
|
+
content = File.open(filepath, 'rb') { |file| file.read }
|
96
96
|
@content_credential.update!(:content => content)
|
97
|
-
render :json => {:status =>
|
97
|
+
render :json => {:status => 'success'}
|
98
98
|
else
|
99
|
-
fail HttpErrors::BadRequest, _(
|
99
|
+
fail HttpErrors::BadRequest, _('No file uploaded')
|
100
100
|
end
|
101
101
|
end
|
102
102
|
|
@@ -58,7 +58,7 @@ module Katello
|
|
58
58
|
organization: @organization,
|
59
59
|
create_by_default: false)
|
60
60
|
if @view.blank?
|
61
|
-
msg = _("Unable to incrementally export. Do a Full Export the library content "\
|
61
|
+
msg = _("Unable to incrementally export. Do a Full Export on the library content "\
|
62
62
|
"before updating from the latest increment.")
|
63
63
|
fail HttpErrors::BadRequest, msg
|
64
64
|
end
|
@@ -10,6 +10,9 @@ module Katello
|
|
10
10
|
param :destination_server, String, :desc => N_("Destination Server name"), :required => false
|
11
11
|
param :organization_id, :number, :desc => N_("Organization identifier"), :required => false
|
12
12
|
param :id, :number, :desc => N_("Content view version export history identifier"), :required => false
|
13
|
+
param :type, ::Katello::ContentViewVersionExportHistory::EXPORT_TYPES,
|
14
|
+
:desc => N_("Export Types"),
|
15
|
+
:required => false
|
13
16
|
param_group :search, Api::V2::ApiController
|
14
17
|
add_scoped_search_description_for(ContentViewVersionExportHistory)
|
15
18
|
def index
|
@@ -17,6 +20,7 @@ module Katello
|
|
17
20
|
history = history.where(:id => params[:id]) unless params[:id].blank?
|
18
21
|
history = history.where(:content_view_version_id => params[:content_view_version_id]) unless params[:content_view_version_id].blank?
|
19
22
|
history = history.where(:destination_server => params[:destination_server]) unless params[:destination_server].blank?
|
23
|
+
history = history.where(:export_type => params[:type]) unless params[:type].blank?
|
20
24
|
history = history.with_organization_id(params[:organization_id]) unless params[:organization_id].blank?
|
21
25
|
history = history.with_content_view_id(params[:content_view_id]) unless params[:content_view_id].blank?
|
22
26
|
respond_with_template_collection("index", 'content_view_version_export_histories',
|
@@ -25,7 +29,7 @@ module Katello
|
|
25
29
|
|
26
30
|
api :GET, "/content_exports/api_status", N_("true if the export api is pulp3 ready and usable. This API is intended for use by hammer-cli only.")
|
27
31
|
def api_status
|
28
|
-
::Foreman::Deprecation.api_deprecation_warning("/content_exports/api_status is being deprecated and will be removed in
|
32
|
+
::Foreman::Deprecation.api_deprecation_warning("/content_exports/api_status is being deprecated and will be removed in Katello 4.1.")
|
29
33
|
render json: { api_usable: SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE) }, status: :ok
|
30
34
|
end
|
31
35
|
|
@@ -9,7 +9,7 @@ module Katello
|
|
9
9
|
param :content_view_id, :number, :desc => N_("content view identifier"), :required => true
|
10
10
|
param :name, String, :desc => N_("name of the puppet module")
|
11
11
|
param :author, String, :desc => N_("author of the puppet module")
|
12
|
-
param :uuid, String, :desc => N_("uuid of the puppet module")
|
12
|
+
param :uuid, String, :desc => N_("uuid of the puppet module")
|
13
13
|
param_group :search, ::Katello::Api::V2::ApiController
|
14
14
|
add_scoped_search_description_for(ContentViewPuppetModule)
|
15
15
|
def index
|
@@ -22,7 +22,7 @@ module Katello
|
|
22
22
|
param :name, String, :desc => N_("name of the puppet module")
|
23
23
|
param :author, String, :desc => N_("author of the puppet module")
|
24
24
|
param :id, String, :desc => N_("the id of the puppet module to associate")
|
25
|
-
param :uuid, String, :desc => N_("the uuid of the puppet module to associate")
|
25
|
+
param :uuid, String, :desc => N_("the uuid of the puppet module to associate")
|
26
26
|
def create
|
27
27
|
params[:content_view_puppet_module][:uuid] ||= PuppetModule.find(params[:id]).try(:pulp_id) if params[:id]
|
28
28
|
respond resource: ContentViewPuppetModule.create!(puppet_module_params.merge(content_view: @view))
|
@@ -41,7 +41,7 @@ module Katello
|
|
41
41
|
param :id, :number, :desc => N_("puppet module ID"), :required => true
|
42
42
|
param :name, String, :desc => N_("name of the puppet module")
|
43
43
|
param :author, String, :desc => N_("author of the puppet module")
|
44
|
-
param :uuid, String, :desc => N_("the uuid of the puppet module to associate")
|
44
|
+
param :uuid, String, :desc => N_("the uuid of the puppet module to associate")
|
45
45
|
def update
|
46
46
|
@puppet_module.update!(puppet_module_params)
|
47
47
|
respond :resource => @puppet_module
|
@@ -95,7 +95,7 @@ module Katello
|
|
95
95
|
fail HttpErrors::BadRequest, _("Invalid usage for Pulp 3 repositories. "\
|
96
96
|
"Use hammer content-export for Yum repositories")
|
97
97
|
end
|
98
|
-
::Foreman::Deprecation.api_deprecation_warning("
|
98
|
+
::Foreman::Deprecation.api_deprecation_warning("Pulp 2 export is deprecated and will not work as of Katello 4.0. To export using Pulp 3, use hammer content-export version.")
|
99
99
|
if params[:export_to_iso].blank? && params[:iso_mb_size].present?
|
100
100
|
fail HttpErrors::BadRequest, _("ISO export must be enabled when specifying ISO size")
|
101
101
|
end
|
@@ -190,8 +190,8 @@ module Katello
|
|
190
190
|
|
191
191
|
api :PUT, "/content_views/:id/remove", N_("Remove versions and/or environments from a content view and reassign systems and keys")
|
192
192
|
param :id, :number, :desc => N_("content view numeric identifier"), :required => true
|
193
|
-
param :environment_ids, :number, :desc => N_("environment numeric identifiers to be removed")
|
194
|
-
param :content_view_version_ids, :number, :desc => N_("content view version identifiers to be deleted")
|
193
|
+
param :environment_ids, Array, of: :number, :desc => N_("environment numeric identifiers to be removed")
|
194
|
+
param :content_view_version_ids, Array, of: :number, :desc => N_("content view version identifiers to be deleted")
|
195
195
|
param :system_content_view_id, :number, :desc => N_("content view to reassign orphaned systems to")
|
196
196
|
param :system_environment_id, :number, :desc => N_("environment to reassign orphaned systems to")
|
197
197
|
param :key_content_view_id, :number, :desc => N_("content view to reassign orphaned activation keys to")
|
@@ -62,7 +62,7 @@ module Katello
|
|
62
62
|
collection
|
63
63
|
end
|
64
64
|
|
65
|
-
api :GET, "/content_view_versions/:id/available_errata", N_("Return errata that can be added to the Content View Version via an Incremental Update"), :deprecated => true
|
65
|
+
api :GET, "/content_view_versions/:id/available_errata", N_("Return errata that can be added to the Content View Version via an Incremental Update. Will be removed in Katello 4.1."), :deprecated => true
|
66
66
|
param :id, :number, :desc => N_("Content View Version identifier"), :required => true
|
67
67
|
param :organization_id, :number, :desc => N_("Organization identifier")
|
68
68
|
param :content_view_filter_id, :number, :desc => N_("Content View Filter identifier")
|
@@ -51,11 +51,11 @@ module Katello
|
|
51
51
|
|
52
52
|
api :PUT, "/hosts/:host_id/errata/apply", N_("Schedule errata for installation")
|
53
53
|
param :host_id, :number, :desc => N_("Host ID"), :required => true
|
54
|
-
param :errata_ids, Array, :desc => N_("List of Errata ids to install"), :required => false, :deprecated => true
|
54
|
+
param :errata_ids, Array, :desc => N_("List of Errata ids to install. Will be removed in Katello 4.1."), :required => false, :deprecated => true
|
55
55
|
|
56
56
|
param_group :bulk_errata_ids
|
57
57
|
def apply
|
58
|
-
task = async_task(::Actions::Katello::Host::Erratum::Install, @host, @errata_ids)
|
58
|
+
task = async_task(::Actions::Katello::Host::Erratum::Install, @host, content: @errata_ids)
|
59
59
|
respond_for_async :resource => task
|
60
60
|
end
|
61
61
|
|
@@ -33,14 +33,14 @@ module Katello
|
|
33
33
|
def install
|
34
34
|
if params[:packages]
|
35
35
|
packages = validate_package_list_format(params[:packages])
|
36
|
-
task = async_task(::Actions::Katello::Host::Package::Install, @host, packages)
|
36
|
+
task = async_task(::Actions::Katello::Host::Package::Install, @host, content: packages)
|
37
37
|
respond_for_async :resource => task
|
38
38
|
return
|
39
39
|
end
|
40
40
|
|
41
41
|
if params[:groups]
|
42
42
|
groups = extract_group_names(params[:groups])
|
43
|
-
task = async_task(::Actions::Katello::Host::PackageGroup::Install, @host, groups)
|
43
|
+
task = async_task(::Actions::Katello::Host::PackageGroup::Install, @host, content: groups)
|
44
44
|
respond_for_async :resource => task
|
45
45
|
end
|
46
46
|
end
|
@@ -51,7 +51,7 @@ module Katello
|
|
51
51
|
def upgrade
|
52
52
|
if params[:packages]
|
53
53
|
packages = validate_package_list_format(params[:packages])
|
54
|
-
task = async_task(::Actions::Katello::Host::Package::Update, @host, packages)
|
54
|
+
task = async_task(::Actions::Katello::Host::Package::Update, @host, content: packages)
|
55
55
|
respond_for_async :resource => task
|
56
56
|
end
|
57
57
|
end
|
@@ -59,7 +59,7 @@ module Katello
|
|
59
59
|
api :PUT, "/hosts/:host_id/packages/upgrade_all", N_("Update packages remotely")
|
60
60
|
param :host_id, :number, :required => true, :desc => N_("ID of the host")
|
61
61
|
def upgrade_all
|
62
|
-
task = async_task(::Actions::Katello::Host::Package::Update, @host, [])
|
62
|
+
task = async_task(::Actions::Katello::Host::Package::Update, @host, content: [])
|
63
63
|
respond_for_async :resource => task
|
64
64
|
end
|
65
65
|
|
@@ -69,14 +69,14 @@ module Katello
|
|
69
69
|
def remove
|
70
70
|
if params[:packages]
|
71
71
|
packages = validate_package_list_format(params[:packages])
|
72
|
-
task = async_task(::Actions::Katello::Host::Package::Remove, @host, packages)
|
72
|
+
task = async_task(::Actions::Katello::Host::Package::Remove, @host, content: packages)
|
73
73
|
respond_for_async :resource => task
|
74
74
|
return
|
75
75
|
end
|
76
76
|
|
77
77
|
if params[:groups]
|
78
78
|
groups = extract_group_names(params[:groups])
|
79
|
-
task = async_task(::Actions::Katello::Host::PackageGroup::Remove, @host, groups)
|
79
|
+
task = async_task(::Actions::Katello::Host::PackageGroup::Remove, @host, content: groups)
|
80
80
|
respond_for_async :resource => task
|
81
81
|
end
|
82
82
|
end
|
@@ -42,9 +42,8 @@ module Katello
|
|
42
42
|
def index_response(reload_host = false)
|
43
43
|
# Host needs to be reloaded because of lazy accessor
|
44
44
|
@host.reload if reload_host
|
45
|
-
|
46
|
-
subscriptions
|
47
|
-
full_result_response(subscriptions)
|
45
|
+
presenter = ::Katello::HostSubscriptionsPresenter.new(@host)
|
46
|
+
full_result_response(presenter.subscriptions)
|
48
47
|
end
|
49
48
|
|
50
49
|
api :PUT, "/hosts/:host_id/subscriptions/auto_attach", N_("Trigger an auto-attach of subscriptions")
|
@@ -365,7 +365,7 @@ module Katello
|
|
365
365
|
if params[:action] == :update_content && params[:update_all]
|
366
366
|
content = []
|
367
367
|
end
|
368
|
-
task = async_task(
|
368
|
+
task = async_task(Actions::Katello::BulkAgentAction, PARAM_ACTIONS[params[:action]][params[:content_type]], @hosts, content: content)
|
369
369
|
respond_for_async :resource => task
|
370
370
|
end
|
371
371
|
end
|
@@ -22,7 +22,6 @@ module Katello
|
|
22
22
|
param :smart_proxy_ids, Array, N_("Smart proxy IDs"), :required => false
|
23
23
|
param :compute_resource_ids, Array, N_("Compute resource IDs"), :required => false
|
24
24
|
param :medium_ids, Array, N_("Medium IDs"), :required => false
|
25
|
-
param :config_template_ids, Array, N_("Provisioning template IDs"), :required => false # FIXME: deprecated
|
26
25
|
param :ptable_ids, Array, N_("Partition template IDs"), :required => false
|
27
26
|
param :provisioning_template_ids, Array, N_("Provisioning template IDs"), :required => false
|
28
27
|
param :domain_ids, Array, N_("Domain IDs"), :required => false
|
@@ -25,7 +25,6 @@ module Katello
|
|
25
25
|
before_action(:only => [:create, :update]) { find_content_credential CONTENT_CREDENTIAL_SSL_CA_CERT_TYPE }
|
26
26
|
before_action(:only => [:create, :update]) { find_content_credential CONTENT_CREDENTIAL_SSL_CLIENT_CERT_TYPE }
|
27
27
|
before_action(:only => [:create, :update]) { find_content_credential CONTENT_CREDENTIAL_SSL_CLIENT_KEY_TYPE }
|
28
|
-
before_action :check_ignore_global_proxy, :only => [ :update, :create ]
|
29
28
|
skip_before_action :authorize, :only => [:gpg_key_content]
|
30
29
|
skip_before_action :check_media_type, :only => [:upload_content]
|
31
30
|
|
@@ -45,7 +44,7 @@ module Katello
|
|
45
44
|
param :checksum_type, String, :desc => N_("Checksum of the repository, currently 'sha1' & 'sha256' are supported")
|
46
45
|
param :docker_upstream_name, String, :desc => N_("Name of the upstream docker repository")
|
47
46
|
param :docker_tags_whitelist, Array, :desc => N_("Comma-separated list of tags to sync for Container Image repository")
|
48
|
-
param :download_policy, ["immediate", "on_demand"
|
47
|
+
param :download_policy, ["immediate", "on_demand"], :desc => N_("download policy for yum repos (either 'immediate' or 'on_demand')")
|
49
48
|
param :download_concurrency, :number, :desc => N_("Used to determine download concurrency of the repository in pulp3. Use value less than 20. Defaults to 10")
|
50
49
|
param :mirror_on_sync, :bool, :desc => N_("true if this repository when synced has to be mirrored from the source and stale rpms removed")
|
51
50
|
param :verify_ssl_on_sync, :bool, :desc => N_("if true, Katello will verify the upstream url's SSL certifcates are signed by a trusted CA")
|
@@ -56,11 +55,11 @@ module Katello
|
|
56
55
|
param :deb_releases, String, :desc => N_("comma-separated list of releases to be synced from deb-archive")
|
57
56
|
param :deb_components, String, :desc => N_("comma-separated list of repo components to be synced from deb-archive")
|
58
57
|
param :deb_architectures, String, :desc => N_("comma-separated list of architectures to be synced from deb-archive")
|
59
|
-
param :ignore_global_proxy, :bool, :desc => N_("if true, will ignore the globally configured proxy when syncing"), :deprecated => true
|
60
58
|
param :ignorable_content, Array, :desc => N_("List of content units to ignore while syncing a yum repository. Must be subset of %s") % RootRepository::IGNORABLE_CONTENT_UNIT_TYPES.join(",")
|
61
59
|
param :ansible_collection_requirements, String, :desc => N_("Contents of requirement yaml file to sync from URL")
|
62
60
|
param :http_proxy_policy, ::Katello::RootRepository::HTTP_PROXY_POLICIES, :desc => N_("policies for HTTP proxy for content sync")
|
63
61
|
param :http_proxy_id, :number, :desc => N_("ID of a HTTP Proxy")
|
62
|
+
param :arch, String, :desc => N_("Architecture of content in the repository")
|
64
63
|
end
|
65
64
|
|
66
65
|
def_param_group :repo_create do
|
@@ -226,10 +225,6 @@ module Katello
|
|
226
225
|
fail HttpErrors::UnprocessableEntity, msg
|
227
226
|
end
|
228
227
|
|
229
|
-
if repo_params['content_type'] == "puppet" || repo_params['content_type'] == "ostree"
|
230
|
-
::Foreman::Deprecation.api_deprecation_warning("Puppet and OSTree will no longer be supported in Katello 4.0")
|
231
|
-
end
|
232
|
-
|
233
228
|
gpg_key = get_content_credential(repo_params, CONTENT_CREDENTIAL_GPG_KEY_TYPE)
|
234
229
|
ssl_ca_cert = get_content_credential(repo_params, CONTENT_CREDENTIAL_SSL_CA_CERT_TYPE)
|
235
230
|
ssl_client_cert = get_content_credential(repo_params, CONTENT_CREDENTIAL_SSL_CLIENT_CERT_TYPE)
|
@@ -495,17 +490,6 @@ module Katello
|
|
495
490
|
params.require(:repository).permit(*keys).to_h.with_indifferent_access
|
496
491
|
end
|
497
492
|
|
498
|
-
def check_ignore_global_proxy
|
499
|
-
if params.key?(:ignore_global_proxy)
|
500
|
-
::Foreman::Deprecation.api_deprecation_warning("The parameter ignore_global_proxy will be removed in a future Katello release. Please update to use the http_proxy_policy parameter.")
|
501
|
-
if ::Foreman::Cast.to_bool(params[:ignore_global_proxy])
|
502
|
-
params[:repository][:http_proxy_policy] = RootRepository::NO_DEFAULT_HTTP_PROXY
|
503
|
-
else
|
504
|
-
params[:repository][:http_proxy_policy] = RootRepository::GLOBAL_DEFAULT_HTTP_PROXY
|
505
|
-
end
|
506
|
-
end
|
507
|
-
end
|
508
|
-
|
509
493
|
def get_content_credential(repo_params, content_type)
|
510
494
|
credential_value = @product.send(content_type)
|
511
495
|
|
@@ -517,7 +501,7 @@ module Katello
|
|
517
501
|
end
|
518
502
|
|
519
503
|
# rubocop:disable Metrics/CyclomaticComplexity
|
520
|
-
def construct_repo_from_params(repo_params)
|
504
|
+
def construct_repo_from_params(repo_params) # rubocop:disable Metrics/AbcSize
|
521
505
|
root = @product.add_repo(repo_params.slice(:label, :name, :description, :url, :content_type, :arch, :unprotected,
|
522
506
|
:gpg_key, :ssl_ca_cert, :ssl_client_cert, :ssl_client_key,
|
523
507
|
:checksum_type, :download_policy, :http_proxy_policy).to_h.with_indifferent_access)
|
@@ -0,0 +1,34 @@
|
|
1
|
+
module Katello
|
2
|
+
class Api::V2::SimpleContentAccessController < Api::V2::ApiController
|
3
|
+
before_action :find_organization
|
4
|
+
before_action :check_upstream_connection
|
5
|
+
|
6
|
+
resource_description do
|
7
|
+
description "Red Hat subscriptions management platform."
|
8
|
+
api_version 'v2'
|
9
|
+
end
|
10
|
+
|
11
|
+
api :GET, "/organizations/:organization_id/simple_content_access/eligible",
|
12
|
+
N_("Check if the specified organization is eligible for Simple Content Access")
|
13
|
+
def eligible
|
14
|
+
eligible = @organization.upstream_consumer.simple_content_access_eligible?
|
15
|
+
render json: { simple_content_access_eligible: eligible }
|
16
|
+
end
|
17
|
+
|
18
|
+
api :PUT, "/organizations/:organization_id/simple_content_access/enable",
|
19
|
+
N_("Enable simple content access for a manifest")
|
20
|
+
param :organization_id, :number, :desc => N_("Organization ID"), :required => true
|
21
|
+
def enable
|
22
|
+
task = async_task(::Actions::Katello::Organization::SimpleContentAccess::Enable, params[:organization_id])
|
23
|
+
respond_for_async :resource => task
|
24
|
+
end
|
25
|
+
|
26
|
+
api :PUT, "/organizations/:organization_id/simple_content_access/disable",
|
27
|
+
N_("Disable simple content access for a manifest")
|
28
|
+
param :organization_id, :number, :desc => N_("Organization ID"), :required => true
|
29
|
+
def disable
|
30
|
+
task = async_task(::Actions::Katello::Organization::SimpleContentAccess::Disable, params[:organization_id])
|
31
|
+
respond_for_async :resource => task
|
32
|
+
end
|
33
|
+
end
|
34
|
+
end
|