From 9283be17a0e72c3e6db1e43eee66b0dde050c660 Mon Sep 17 00:00:00 2001 From: Shira Maximov Date: Fri, 30 Oct 2020 01:29:39 +0200 Subject: [PATCH] Fixes #31094 - drop config groups API Extracted in https://github.com/theforeman/foreman_puppet_enc/pull/15. --- .../api/v2/config_groups_controller.rb | 55 ------------------- app/views/api/v2/config_groups/base.json.rabl | 3 - .../api/v2/config_groups/create.json.rabl | 3 - .../api/v2/config_groups/index.json.rabl | 3 - app/views/api/v2/config_groups/main.json.rabl | 9 --- app/views/api/v2/config_groups/show.json.rabl | 3 - .../api/v2/config_groups/update.json.rabl | 3 - config/routes/api/v2.rb | 1 - .../api/v2/config_groups_controller_test.rb | 22 -------- 9 files changed, 102 deletions(-) delete mode 100644 app/controllers/api/v2/config_groups_controller.rb delete mode 100644 app/views/api/v2/config_groups/base.json.rabl delete mode 100644 app/views/api/v2/config_groups/create.json.rabl delete mode 100644 app/views/api/v2/config_groups/index.json.rabl delete mode 100644 app/views/api/v2/config_groups/main.json.rabl delete mode 100644 app/views/api/v2/config_groups/show.json.rabl delete mode 100644 app/views/api/v2/config_groups/update.json.rabl delete mode 100644 test/controllers/api/v2/config_groups_controller_test.rb diff --git a/app/controllers/api/v2/config_groups_controller.rb b/app/controllers/api/v2/config_groups_controller.rb deleted file mode 100644 index 254a05f706b..00000000000 --- a/app/controllers/api/v2/config_groups_controller.rb +++ /dev/null @@ -1,55 +0,0 @@ -module Api - module V2 - class ConfigGroupsController < V2::BaseController - include Foreman::Controller::Parameters::ConfigGroup - - wrap_parameters ConfigGroup, :include => config_group_params_filter.accessible_attributes(parameter_filter_context) - - before_action :find_resource, :only => [:show, :update, :destroy] - - api :GET, "/config_groups", N_("List of config groups") - param_group :search_and_pagination, ::Api::V2::BaseController - add_scoped_search_description_for(ConfigGroup) - - def index - @config_groups = resource_scope_for_index - end - - api :GET, "/config_groups/:id/", N_("Show a config group") - param :id, :identifier, :required => true - - def show - end - - def_param_group :config_group do - param :config_group, Hash, :required => true, :action_aware => true do - param :name, String, :required => true - param :puppetclass_ids, Array - end - end - - api :POST, "/config_groups/", N_("Create a config group") - param_group :config_group, :as => :create - - def create - @config_group = ConfigGroup.new(config_group_params) - process_response @config_group.save - end - - api :PUT, "/config_groups/:id/", N_("Update a config group") - param :id, String, :required => true - param_group :config_group - - def update - process_response @config_group.update(config_group_params) - end - - api :DELETE, "/config_groups/:id/", N_("Delete a config group") - param :id, String, :required => true - - def destroy - process_response @config_group.destroy - end - end - end -end diff --git a/app/views/api/v2/config_groups/base.json.rabl b/app/views/api/v2/config_groups/base.json.rabl deleted file mode 100644 index 18249c70b9c..00000000000 --- a/app/views/api/v2/config_groups/base.json.rabl +++ /dev/null @@ -1,3 +0,0 @@ -object @config_group - -attributes :id, :name diff --git a/app/views/api/v2/config_groups/create.json.rabl b/app/views/api/v2/config_groups/create.json.rabl deleted file mode 100644 index 9e7ca03b0f9..00000000000 --- a/app/views/api/v2/config_groups/create.json.rabl +++ /dev/null @@ -1,3 +0,0 @@ -object @config_group - -extends "api/v2/config_groups/show" diff --git a/app/views/api/v2/config_groups/index.json.rabl b/app/views/api/v2/config_groups/index.json.rabl deleted file mode 100644 index 5e3c90912d6..00000000000 --- a/app/views/api/v2/config_groups/index.json.rabl +++ /dev/null @@ -1,3 +0,0 @@ -collection @config_groups - -extends "api/v2/config_groups/main" diff --git a/app/views/api/v2/config_groups/main.json.rabl b/app/views/api/v2/config_groups/main.json.rabl deleted file mode 100644 index 73f8e348c81..00000000000 --- a/app/views/api/v2/config_groups/main.json.rabl +++ /dev/null @@ -1,9 +0,0 @@ -object @config_group - -extends "api/v2/config_groups/base" - -attributes :created_at, :updated_at - -child :puppetclasses do - extends "api/v2/puppetclasses/base" -end diff --git a/app/views/api/v2/config_groups/show.json.rabl b/app/views/api/v2/config_groups/show.json.rabl deleted file mode 100644 index b3d38525a93..00000000000 --- a/app/views/api/v2/config_groups/show.json.rabl +++ /dev/null @@ -1,3 +0,0 @@ -object @config_group - -extends "api/v2/config_groups/main" diff --git a/app/views/api/v2/config_groups/update.json.rabl b/app/views/api/v2/config_groups/update.json.rabl deleted file mode 100644 index 9e7ca03b0f9..00000000000 --- a/app/views/api/v2/config_groups/update.json.rabl +++ /dev/null @@ -1,3 +0,0 @@ -object @config_group - -extends "api/v2/config_groups/show" diff --git a/config/routes/api/v2.rb b/config/routes/api/v2.rb index d0978e40080..9762539a0ce 100644 --- a/config/routes/api/v2.rb +++ b/config/routes/api/v2.rb @@ -252,7 +252,6 @@ resources :template_kinds, :only => [:index] resources :template_combinations, :only => [:show, :destroy] - resources :config_groups, :except => [:new, :edit] resources :compute_attributes, :only => [:index, :show, :create, :update] diff --git a/test/controllers/api/v2/config_groups_controller_test.rb b/test/controllers/api/v2/config_groups_controller_test.rb deleted file mode 100644 index c91227fafdf..00000000000 --- a/test/controllers/api/v2/config_groups_controller_test.rb +++ /dev/null @@ -1,22 +0,0 @@ -require 'test_helper' - -class Api::V2::ConfigGroupsControllerTest < ActionController::TestCase - test "should create config group" do - assert_difference('ConfigGroup.count') do - post :create, params: { :config_group => {:name => 'config-group', :puppetclass_ids => [puppetclasses(:one).id, puppetclasses(:four).id]} } - end - assert_response :created - end - - test "should update config group" do - name = 'new name' - put :update, params: { :id => config_groups(:one).to_param, - :config_group => { :name => name, - :puppetclass_ids => [puppetclasses(:one).id, puppetclasses(:four).id], - }, - } - assert_response :success - response = JSON.parse(@response.body) - assert_equal 2, response['puppetclasses'].count - end -end