Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refs #29540 - Remove 3.16 deprecated functionality and warnings #8685

Merged
merged 17 commits into from May 11, 2020
Merged

Refs #29540 - Remove 3.16 deprecated functionality and warnings #8685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0da9566
Refs #29540 - remove DOWNLOAD_BACKGROUND type
jeremylenz Apr 28, 2020
a9e555a
Refs #29540 - remove hosts/:id/subscriptions/events endpoint
jeremylenz Apr 28, 2020
7d5b6f6
Refs #29540 - remove ostree and puppet in repositories_controller
jeremylenz Apr 29, 2020
de35978
Refs #29540 - update repositories_controller_test
jeremylenz Apr 29, 2020
a0ad085
Refs #29540 - remove deprecation warning from create.rb and update.rb
jeremylenz Apr 29, 2020
cf531b4
Refs #29540 - Fix root_repository tests
jeremylenz Apr 30, 2020
f92d000
Refs #29540 - fix some other tests
jeremylenz May 1, 2020
495e537
Refs #29540 - Revert "remove DOWNLOAD_BACKGROUND type"
jeremylenz May 7, 2020
dc7956c
Refs #29540 - Revert "remove ostree and puppet in repositories_contro…
jeremylenz May 7, 2020
16dcd72
Refs #29540 - Revert "update repositories_controller_test"
jeremylenz May 7, 2020
cbb7034
Refs #29540 - Revert "remove deprecation warning from create.rb and u…
jeremylenz May 7, 2020
f8489ca
Refs #29540 - Revert "Fix root_repository tests"
jeremylenz May 7, 2020
c50be75
Refs #29540 - bump deprecation warnings for puppet and ostree
jeremylenz May 7, 2020
76dec51
Refs #29540 - add back erroneously removed test
jeremylenz May 7, 2020
ab85246
Refs #29540 - bump cp_dynflow deprecation warning
jeremylenz May 11, 2020
287c148
Refs #29540 - remove route for events
jeremylenz May 11, 2020
0cad57c
Refs #29540 - remove old 2.0 warnings
jeremylenz May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/katello/api/rhsm/candlepin_dynflow_proxy_controller.rb
View file
Open in desktop
Expand Up @@ -67,7 +67,7 @@ def client_authorized?
end

def deprecated
::Foreman::Deprecation.api_deprecation_warning("it will be removed in Katello 3.15 - please use /consumers/:id/profiles instead.")
::Foreman::Deprecation.api_deprecation_warning("it will be removed in Katello 4.0. Please use /consumers/:id/profiles instead.")
end
end
end
7 changes: 0 additions & 7 deletions app/controllers/katello/api/v2/host_subscriptions_controller.rb
View file
Open in desktop
Expand Up @@ -56,13 +56,6 @@ def auto_attach
respond_for_index(:collection => index_response, :template => "index")
end

api :GET, "/hosts/:host_id/subscriptions/events", N_("List subscription events for the host"), :deprecated => true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should remove the route for this too

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

took me a minute to find, but that's done now :)

param :host_id, Integer, :desc => N_("Id of the host"), :required => true
def events
::Foreman::Deprecation.api_deprecation_warning("Events API is being deprecated and will be removed in Katello 3.16.")
respond_for_index :collection => full_result_response([])
end

api :DELETE, "/hosts/:host_id/subscriptions/", N_("Unregister the host as a subscription consumer")
param :host_id, Integer, :desc => N_("Id of the host"), :required => true
def destroy
Expand Down
2 changes: 0 additions & 2 deletions app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb
View file
Open in desktop
Expand Up @@ -99,7 +99,6 @@ def bulk_remove_host_collections
N_("Fetch applicable errata for one or more hosts.")
param_group :bulk_params
def applicable_errata
::Foreman::Deprecation.api_deprecation_warning("The 'applicable_hosts' field will be removed from this API in Katello 2.0")
respond_for_index(:collection => scoped_search(Katello::Erratum.applicable_to_hosts(@hosts), 'updated', 'desc',
:resource_class => Erratum))
end
Expand All @@ -108,7 +107,6 @@ def applicable_errata
N_("Fetch installable errata for one or more hosts.")
param_group :bulk_params
def installable_errata
::Foreman::Deprecation.api_deprecation_warning("The 'applicable_hosts' field will be removed from this API in Katello 2.0")
respond_for_index(:collection => scoped_search(Katello::Erratum.installable_for_hosts(@hosts), 'updated', 'desc',
:resource_class => Erratum))
end
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/katello/api/v2/repositories_controller.rb
View file
Open in desktop
Expand Up @@ -221,7 +221,7 @@ def create
end

if repo_params['content_type'] == "puppet" || repo_params['content_type'] == "ostree"
::Foreman::Deprecation.api_deprecation_warning("Puppet and OSTree will no longer be supported in Katello 3.16")
::Foreman::Deprecation.api_deprecation_warning("Puppet and OSTree will no longer be supported in Katello 4.0")
end

gpg_key = get_content_credential(repo_params, CONTENT_CREDENTIAL_GPG_KEY_TYPE)
Expand Down
4 changes: 2 additions & 2 deletions app/lib/actions/katello/repository/create.rb
View file
Open in desktop
Expand Up @@ -11,11 +11,11 @@ def plan(repository, clone = false, plan_create = false)
action_subject(repository)

if repository.download_policy == ::Runcible::Models::YumImporter::DOWNLOAD_BACKGROUND
::Foreman::Deprecation.api_deprecation_warning("Background download_policy will be removed in Katello 3.16. Any background repositories will be converted to Immediate")
::Foreman::Deprecation.api_deprecation_warning("Background download_policy will be removed in Katello 4.0. Any background repositories will be converted to Immediate")
end

if root['content_type'] == 'puppet' || root['content_type'] == 'ostree'
::Foreman::Deprecation.api_deprecation_warning("Repository types of 'Puppet' and 'OSTree' will no longer be supported in Katello 3.16.")
::Foreman::Deprecation.api_deprecation_warning("Repository types of 'Puppet' and 'OSTree' will no longer be supported in Katello 4.0.")
end

org = repository.organization
Expand Down
4 changes: 2 additions & 2 deletions app/lib/actions/katello/repository/update.rb
View file
Open in desktop
Expand Up @@ -13,11 +13,11 @@ def plan(root, repo_params)
root.update!(repo_params)

if root.download_policy == ::Runcible::Models::YumImporter::DOWNLOAD_BACKGROUND
::Foreman::Deprecation.api_deprecation_warning("Background download_policy will be removed in Katello 3.16. Any background repositories will be converted to Immediate")
::Foreman::Deprecation.api_deprecation_warning("Background download_policy will be removed in Katello 4.0. Any background repositories will be converted to Immediate")
end

if root['content_type'] == 'puppet' || root['content_type'] == 'ostree'
::Foreman::Deprecation.api_deprecation_warning("Repository types of 'Puppet' and 'OSTree' will no longer be supported in Katello 3.16.")
::Foreman::Deprecation.api_deprecation_warning("Repository types of 'Puppet' and 'OSTree' will no longer be supported in Katello 4.0.")
end

if update_content?(repository)
Expand Down
1 change: 0 additions & 1 deletion config/routes/overrides.rb
View file
Open in desktop
Expand Up @@ -104,7 +104,6 @@ def matches?(request)
collection do
put :auto_attach
get :product_content
get :events
get :available_release_versions
put :content_override
put :remove_subscriptions
Expand Down
2 changes: 1 addition & 1 deletion ...ascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ <h4 translate>Basic Information</h4>

<div class="alert alert-warning" ng-if="repository.content_type === 'ostree' || repository.content_type === 'puppet'">
<span class="pficon pficon-warning-triangle-o"></span>
<strong>Deprecation Warning: </strong>Puppet and OSTree will no longer be supported in Katello 3.16.
<strong>Deprecation Warning: </strong>Puppet and OSTree will no longer be supported in Katello 4.0.
</div>

<div class="divider"></div>
Expand Down
4 changes: 1 addition & 3 deletions ...s/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@ <h4 translate> Basic Information </h4>

<div class="alert alert-warning" ng-if="repository.content_type === 'ostree' || repository.content_type === 'puppet'">
<span class="pficon pficon-warning-triangle-o"></span>
<strong>Deprecation Warning: </strong>Puppet and OSTree will no longer be supported in Katello 3.16.
<strong>Deprecation Warning: </strong>Puppet and OSTree will no longer be supported in Katello 4.0.
</div>

<div bst-form-group label="{{ 'Restrict to Architecture' | translate }}" ng-show="repository.content_type === 'yum'">
Expand Down Expand Up @@ -308,5 +308,3 @@ <h4 ng-show="repository.content_type !== undefined" translate> Published Reposit
</div>
</form>
</div>