hammer_cli_foreman 3.16.0 → 3.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6cce84aa9448f148f34dc8c3dadefb63266befb216719e8f8c288ac6dc6b086
-  data.tar.gz: c60b4c38f40c445f882d8916d8e07544f52cb783c04950d454a5f7e7e0944656
+  metadata.gz: 19aecc76c45aea21d165a63bf62ce10fec9774e4d552fd34e176dae195dcaf23
+  data.tar.gz: 18d5e71e31373b5b4ac1d744712f9a77b8a263e9eb612690f94b63f49eb5d0dd
 SHA512:
-  metadata.gz: 0e7e14288bd716781334577c6fbf5898fee6f2e5c0c9e225a4afc2d6f615ff55ad42676d97a14bdf791e87eb646c61408263832c89d7108b2e81826de6eae3f9
-  data.tar.gz: 644f4208b796b37517c556e3cbf95955f3c3d9f7032d6214ac2fa52a08683d52f3f4a873a4f411b4d83d60b6a172a87526489d23123d963c51f80c1e567c1fb4
+  metadata.gz: ecd60a4cadea52d36350b5dc32a42a5741dab3bb2d99bc5568754879b55b2521c3f9da136490dfbde9d7ea745349ecdc2693dd2b0f50db7605f2ca460be29cd7
+  data.tar.gz: ae9865919068552dcafdf72d1d8da6a35f2b3d999c7d88251849e75c83bb54d9dba9e7982a5f91d5be735545e1f6d5928a224e999f6a2da6ef92ab81b263b035

data/doc/release_notes.md

@@ -1,5 +1,12 @@
 Release notes
 =============
+### 3.17.0 (2025-11-11)
+* Add packit commit trigger job
+* Remove options related to filter overrides ([PR #645](https://github.com/theforeman/hammer-cli-foreman/pull/645)), [#38805](http://projects.theforeman.org/issues/38805)
+* Add github actions workflow for releases
+* Expose cloned from id in template info command
+* Bump to 3.17.0-develop
+
 ### 3.16.0 (2025-08-13)
 * Ldap group membership ([PR #641](https://github.com/theforeman/hammer-cli-foreman/pull/641)), [#38611](http://projects.theforeman.org/issues/38611)
 * Remove ovirt ([PR #639](https://github.com/theforeman/hammer-cli-foreman/pull/639)), [#38294](http://projects.theforeman.org/issues/38294)

data/lib/hammer_cli_foreman/filter.rb

@@ -9,8 +9,6 @@ module HammerCLIForeman
         field :id, _("Id")
         field :resource_type, _("Resource type")
         field :search, _("Search")
-        field :unlimited?, _("Unlimited?"), Fields::Boolean
-        field :override?, _("Override?"), Fields::Boolean
         field :role, _("Role"), Fields::Reference
         field :permissions, _("Permissions"), Fields::List
       end
@@ -27,8 +25,15 @@ module HammerCLIForeman
 
     class InfoCommand < HammerCLIForeman::InfoCommand
       output ListCommand.output_definition do
-        HammerCLIForeman::References.taxonomies(self)
         HammerCLIForeman::References.timestamps(self)
+        from :role do
+          collection :locations, _("Locations"), numbered: false, hide_blank: true do
+            custom_field Fields::Reference, name_key: :title
+          end
+          collection :organizations, _("Organizations"), numbered: false, hide_blank: true do
+            custom_field Fields::Reference, name_key: :title
+          end
+        end
       end
 
       def extend_data(filter)
@@ -42,81 +47,18 @@ module HammerCLIForeman
     end
 
 
-    module TaxonomyCheck
-
-      def self.included(base)
-        def taxonomy_options?
-          opt_names = ['location_ids', 'organization_ids']
-          opt_names += resolver.searchables(:locations).map { |s| 'location_' + s.plural_name }
-          opt_names += resolver.searchables(:organizations).map { |s| 'organization_' + s.plural_name }
-          opt_names.any? { |opt| send(HammerCLI.option_accessor_name(opt)) }
-        end
-
-        def signal_override_usage_error
-          signal_usage_error _('Organizations and locations can be set only for overriding filters.')
-        end
-
-        base.extend_help do |base_h|
-          base_h.section(_('Overriding organizations and locations')) do |section_h|
-            override_condition = "--override=true"
-            org_opts = '--organization[s|-ids]'
-            loc_opts = '--location[s|-ids]'
-
-            section_h.text(_("Filters inherit organizations and locations from its role by default. This behavior can be changed by setting %{condition}.%{wsp}" +
-              "Therefore options %{org_opts} and %{loc_opts} are applicable only when the override flag is set.") % {
-              :wsp => "\n",
-              :org_opts => org_opts,
-              :loc_opts => loc_opts,
-              :condition => override_condition
-            })
-          end
-        end
-      end
-    end
-
-
     class CreateCommand < HammerCLIForeman::CreateCommand
-      include TaxonomyCheck
-
       success_message _("Permission filter for [%<resource_type_label>s] created.")
       failure_message _("Could not create the permission filter")
 
-      def validate_options
-        signal_override_usage_error if !option_override && taxonomy_options?
-      end
-
       build_options
     end
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      include TaxonomyCheck
-
       success_message _("Permission filter for [%<resource_type_label>s] updated.")
       failure_message _("Could not update the permission filter")
 
-      def request_params
-        params = super
-        unless override?
-          # Clear taxonomies in case the filter is switching override from true to false
-          params['filter']['location_ids'] = [] if !@filter || !@filter['locations'].empty?
-          params['filter']['organization_ids'] = [] if !@filter || !@filter['organizations'].empty?
-        end
-        params
-      end
-
-      def validate_options
-        signal_override_usage_error if !override? && taxonomy_options?
-      end
-
-      def override?
-        if option_override.nil?
-          filter['override?']
-        else
-          option_override
-        end
-      end
-
       def filter
         @filter ||= HammerCLIForeman.foreman_resource!(:filters).action(:show).call({ :id => get_identifier }, request_headers, request_options)
       end

data/lib/hammer_cli_foreman/report_template.rb

@@ -16,6 +16,7 @@ module HammerCLIForeman
       output ListCommand.output_definition do
         field :description, _('Description'), Fields::Text
         field :locked, _("Locked"), Fields::Boolean
+        field :cloned_from_id, _("Cloned from id"), nil, :hide_blank => true
         field :default, _("Default"), Fields::Boolean
         HammerCLIForeman::References.timestamps(self)
         HammerCLIForeman::References.taxonomies(self)

data/lib/hammer_cli_foreman/template.rb

@@ -42,6 +42,7 @@ module HammerCLIForeman
       output ListCommand.output_definition do
         field :description, _('Description'), Fields::Text
         field :locked, _("Locked"), Fields::Boolean
+        field :cloned_from_id, _("Cloned from id"), nil, :hide_blank => true
         HammerCLIForeman::References.operating_systems(self)
         HammerCLIForeman::References.taxonomies(self)
         collection :template_combinations, 'Template Combinations' do

data/lib/hammer_cli_foreman/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForeman
   def self.version
-    @version ||= Gem::Version.new "3.16.0"
+    @version ||= Gem::Version.new "3.17.0"
   end
 end

data/test/functional/filter_test.rb

@@ -4,10 +4,9 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 
 describe 'filter' do
   def api_expects_filter_info(options)
-    override = !!options[:override]
     api_expects(:filters, :show, 'Get filter info').with_params(
       id: '1'
-    ).returns(@filter.merge('override?' => override))
+    ).returns(@filter)
   end
 
   def taxonomy_usage_error(action, cmd)
@@ -27,15 +26,6 @@ describe 'filter' do
       @cmd = %w[filter create]
     end
 
-    it 'prints error when taxonomies are used for a not-overriding filter' do
-      params = ['--organization-ids=1,2', '--location-ids=3,4', '--override=false']
-
-      api_expects_no_call
-
-      result = run_cmd(@cmd + params)
-      assert_cmd(taxonomy_usage_error('create', @cmd), result)
-    end
-
     it 'should create a filter' do
       params = ['--role-id=1', '--permission-ids=[1]']
 
@@ -67,8 +57,8 @@ describe 'filter' do
       api_expects(:filters, :index, 'List filters').returns(@filters)
 
       output = IndexMatcher.new([
-                                  ['ID', 'RESOURCE TYPE', 'SEARCH', 'UNLIMITED?', 'OVERRIDE?', 'ROLE', 'PERMISSIONS'],
-                                  ['1', 'Architecture', 'none', 'yes', 'no', 'Manager', 'view_architectures']
+                                  ['ID', 'RESOURCE TYPE', 'SEARCH', 'ROLE', 'PERMISSIONS'],
+                                  ['1', 'Architecture', 'none', 'Manager', 'view_architectures']
                                 ])
       expected_result = success_result(output)
 
@@ -100,115 +90,4 @@ describe 'filter' do
       assert_cmd(success_result("Permission filter deleted.\n"), result)
     end
   end
-
-  describe 'update' do
-    before do
-      @cmd = %w[filter update]
-      @filter = {
-        'search' => nil,
-        'resource_type_label' => 'User',
-        'resource_type' => 'User',
-        'unlimited?' => false,
-        'created_at' => '2017-07-18 14:34:09 UTC',
-        'updated_at' => '2017-07-18 14:34:09 UTC',
-        'override?' => true,
-        'id' => 404,
-        'role' => {
-          'name' => 'Some Role',
-          'id' => 28,
-          'description' => "Description\nof the new\nrole",
-          'origin' => nil
-        },
-        'permissions' => [{
-          'name' => 'view_users',
-          'id' => 164,
-          'resource_type' => 'User'
-        }],
-        'locations' => [{
-          'id' => 28,
-          'name' => 'location74',
-          'title' => 'location74',
-          'description' => nil
-        }],
-        'organizations' => [{
-          'id' => 27,
-          'name' => 'organization74',
-          'title' => 'organization74',
-          'description' => nil
-        }]
-      }
-    end
-
-    it 'resets taxonomies when a filter is not-overriding' do
-      params = ['--id=1']
-
-      api_expects_filter_info(override: false)
-      api_expects(:filters, :update, 'Update the filter').with_params(
-        'filter' => {
-          'organization_ids' => [],
-          'location_ids' => []
-        }
-      ).returns(@filter)
-
-      assert_update_success(run_cmd(@cmd + params))
-    end
-
-    it 'resets taxonomies when switching a filter to not-overriding' do
-      params = ['--id=1', '--override=false']
-
-      api_expects(:filters, :update, 'Update the filter').with_params(
-        'filter' => {
-          'organization_ids' => [],
-          'location_ids' => []
-        }
-      ).returns(@filter)
-
-      assert_update_success(run_cmd(@cmd + params))
-    end
-
-    it 'can add taxonomies when a filter is overriding' do
-      params = ['--id=1', '--organization-ids=1,2', '--location-ids=3,4']
-
-      api_expects_filter_info(override: true)
-      api_expects(:filters, :update, 'Update the filter').with_params(
-        'filter' => {
-          'organization_ids' => %w[1 2],
-          'location_ids' => %w[3 4]
-        }
-      ).returns(@filter)
-
-      assert_update_success(run_cmd(@cmd + params))
-    end
-
-    it 'can add taxonomies when switching a filter to overriding' do
-      params = ['--id=1', '--organization-ids=1,2', '--location-ids=3,4', '--override=true']
-
-      api_expects(:filters, :update, 'Update the filter').with_params(
-        'filter' => {
-          'organization_ids' => %w[1 2],
-          'location_ids' => %w[3 4]
-        }
-      ).returns(@filter)
-
-      assert_update_success(run_cmd(@cmd + params))
-    end
-
-    it 'prints error when taxonomies are used on not-overriding' do
-      params = ['--id=1', '--organization-ids=1,2', '--location-ids=3,4']
-
-      api_expects_filter_info(override: false)
-
-      result = run_cmd(@cmd + params)
-      assert_cmd(taxonomy_usage_error('update', @cmd), result)
-    end
-
-    it 'prints error when taxonomies are used when switching a filter to not-overriding' do
-      params = ['--id=1', '--organization-ids=1,2', '--location-ids=3,4', '--override=false']
-
-      api_expects_no_call
-
-      result = run_cmd(@cmd + params)
-      assert_cmd(taxonomy_usage_error('update', @cmd), result)
-    end
-  end
 end

data/test/unit/filter_test.rb

@@ -60,11 +60,6 @@ describe HammerCLIForeman::Filter do
   describe "CreateCommand" do
     let(:cmd) { HammerCLIForeman::Filter::CreateCommand.new("", ctx) }
 
-    before do
-      # FIXME: remove stubbing option_override once tests are switched to apidoc 1.14+
-      cmd.stubs(:option_override).returns(false)
-    end
-
     describe "parameters" do
       it_should_accept "role id and permission ids", ["--role-id=1", "--permission-ids=1,2"]
       it_should_accept "role name and permission ids", ["--role=role", "--permission-ids=1,2"]
@@ -85,11 +80,6 @@ describe HammerCLIForeman::Filter do
   describe "UpdateCommand" do
     let(:cmd) { HammerCLIForeman::Filter::UpdateCommand.new("", ctx) }
 
-    before do
-      # FIXME: remove stubbing option_override once tests are switched to apidoc 1.14+
-      cmd.stubs(:option_override).returns(false)
-    end
-
     describe "parameters" do
       it_should_accept "id, role id and permission ids", ["--id=1", "--role-id=1", "--permission-ids=1,2"]
       it_should_accept "id, role name and permission ids", ["--id=1", "--role=role", "--permission-ids=1,2"]

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 3.16.0
+  version: 3.17.0
 platform: ruby
 authors:
 - Tomáš Strachota
 - Martin Bačovský
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -79,7 +80,6 @@ email: tstracho@redhat.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
 - doc/configuration.md
 - doc/developer_docs.md
 - doc/host_create.md
@@ -89,6 +89,7 @@ extra_rdoc_files:
 - doc/release_notes.md
 - doc/testing.md
 - doc/using_hammer_cli_foreman_command.md
+- README.md
 files:
 - LICENSE
 - README.md
@@ -340,6 +341,7 @@ homepage: https://github.com/theforeman/hammer-cli-foreman
 licenses:
 - GPL-3.0-or-later
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -354,7 +356,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Foreman commands for Hammer
 test_files: