hammer_cli_foreman 3.13.0 → 3.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b728c2b2cca4f001c8a3dba0747303c9499290bc16a06d70a5cb7c5765e5cc7
-  data.tar.gz: fef40b01976a85d5006b517066f6cc732490369f58bc8dfd18c34589a75ec5e1
+  metadata.gz: f1914d889f653cab17ed415ae4a8abc986cf4ea8d35b2da21abf0f028380b4e9
+  data.tar.gz: 31ec9e413efc2cdcb6e5feb8136407103009d29c29d96046807471b5ecffe96d
 SHA512:
-  metadata.gz: bf060f1ccac3d9f41da96f03795bb4029692d8c053e6a4e30c90146efd04a38e485933de5e599f69e2d573ed474183160847dd340175a4dbc5b6173c61106bf2
-  data.tar.gz: 89acced01c741343c528f2ddb6f52e7a522990c7d73add80ef8423c8ad8cf56f309e2c8121bb26ce11824f614646c2451a08ecf31aff25ed365aa747e0259fd1
+  metadata.gz: f4a29083cd559a9504a1e4d7023504c83cd9df6acae39f001ed1cde21943e2c72bceb7212d13071e2c7e2bb2aed97cde2a7a2500883e2478c9282079d63fe2be
+  data.tar.gz: fe3e6166aa6a2cb174dda72d0585a7ce19b1b5b6880dae1034d5e5f7be1fb7b0c5fd8e58eeab0fa6c08f1f6b7871a00643511c6134364f7e9cc955de0a2cb2b7

data/doc/host_create.md

@@ -195,6 +195,7 @@ Available keys for `--compute-attributes`:
 cpus          # number of CPUs
 memory        # string, amount of memory, value in bytes
 start         # Must be a 1 or 0, whether to start the machine or not
+firmware      # automatic/bios/uefi/uefi_secure_boot (UEFI with Secure Boot enabled)
 ```
 
 Available keys for `--interface`:
@@ -257,7 +258,7 @@ Available keys for `--compute-attributes`:
 cpus                  CPU count
 corespersocket        Number of cores per socket (applicable to hardware versions < 10 only)
 memory_mb             Integer number, amount of memory in MB
-firmware              automatic/bios/efi
+firmware              automatic/bios/uefi/uefi_secure_boot (UEFI with Secure Boot enabled)
 cluster               Cluster ID from VMware
 resource_pool         Resource Pool ID from VMware
 path                  Path to folder
@@ -270,6 +271,7 @@ annotation            Annotation Notes
 scsi_controllers      List with SCSI controllers definitions
                         type - ID of the controller from VMware
                         key  - Key of the controller (e.g. 1000)
+virtual_tpm           Must be a 1 or 0, Enable virtual TPM. Only compatible with EFI firmware
 start         # Must be a 1 or 0, whether to start the machine or not
 ```
 

data/doc/release_notes.md

@@ -1,5 +1,18 @@
 Release notes
 =============
+### 3.14.1 (2025-03-31)
+* Fix hammer host update error messages, [#38291](http://projects.theforeman.org/issues/38291)
+
+### 3.14.0 (2025-02-20)
+* Invalidate tokens for specific user/users ([PR #636](https://github.com/theforeman/hammer-cli-foreman/pull/636)), [#38124](http://projects.theforeman.org/issues/38124)
+* Don't build hidden params as options ([PR #634](https://github.com/theforeman/hammer-cli-foreman/pull/634)), [#38077](http://projects.theforeman.org/issues/38077)
+* Use master branch of apipie-bindings in ci
+* Drop el 8 from packit config
+* Add secure boot and tpm options to vmware ([PR #630](https://github.com/theforeman/hammer-cli-foreman/pull/630)), [#37685](http://projects.theforeman.org/issues/37685)
+* Add firmware option for libvirt hosts creation ([PR #631](https://github.com/theforeman/hammer-cli-foreman/pull/631)), [#37692](http://projects.theforeman.org/issues/37692)
+* Use non-deprecated gpl-3.0-or-later license tag
+* Bump to 3.14.0-develop
+
 ### 3.13.0 (2024-11-08)
 * Bump to 3.13.0-develop
 

data/lib/hammer_cli_foreman/commands.rb

@@ -96,7 +96,7 @@ module HammerCLIForeman
     def self.create_option_builder
       configurator = BuilderConfigurator.new(searchables, dependency_resolver)
 
-      builder = ForemanOptionBuilder.new(searchables)
+      builder = ForemanOptionBuilder.new(searchables, resource_defined? ? resource.action(action) : nil)
       builder.builders = super.builders
       builder.builders += configurator.builders_for(resource, resource.action(action)) if resource_defined?
       builder

data/lib/hammer_cli_foreman/compute_resource/libvirt.rb

@@ -9,7 +9,8 @@ module HammerCLIForeman
         [
           ['cpus',   _('Number of CPUs'), { bold: true }],
           ['memory', _('String, amount of memory, value in bytes'), { bold: true }],
-          ['boot_order', _('Device names to specify the boot order')]
+          ['boot_order', _('Device names to specify the boot order')],
+          ['firmware', _('automatic/bios/uefi/uefi_secure_boot (UEFI with Secure Boot enabled)')]
         ]
       end
 
@@ -49,7 +50,9 @@ module HammerCLIForeman
             Fields::Field.new(:label => _('OS Type'), :path => [:os_type]),
             Fields::Field.new(:label => _('Domain Type'), :path => [:domain_type]),
             Fields::Field.new(:label => _('Persistent'), :path => [:persistent]),
-            Fields::List.new(:label => _('Boot order'), :path => [:boot_order])
+            Fields::List.new(:label => _('Boot order'), :path => [:boot_order]),
+            Fields::Field.new(:label => _('Firmware'), :path => [:firmware]),
+            Fields::Field.new(:label => _('Secure Boot'), :path => [:secure_boot])
         ]
       end
 

data/lib/hammer_cli_foreman/compute_resource/vmware.rb

@@ -16,7 +16,7 @@ module HammerCLIForeman
           ['memory_mb',            _('Integer number, amount of memory in MB'), { bold: true }],
           ['path',                 _('Path to folder'), { bold: true }],
           ['resource_pool',        _('Resource Pool ID from VMware'), { bold: true }],
-          ['firmware',             'automatic/bios/efi'],
+          ['firmware',             _('automatic/bios/uefi/uefi_secure_boot (UEFI with Secure Boot enabled)')],
           ['guest_id',             _('Guest OS ID form VMware')],
           ['hardware_version',     _('Hardware version ID from VMware')],
           ['memoryHotAddEnabled',  _('Must be a 1 or 0, lets you add memory resources while the machine is on')],
@@ -26,10 +26,11 @@ module HammerCLIForeman
           ['scsi_controllers',     [_('List with SCSI controllers definitions'),
                                     '  type - ' + _('ID of the controller type from VMware'),
                                     '  key  - ' + _('Key of the controller (e.g. 1000)')].flatten(1).join("\n")],
-          ['nvme_controllers', [_('List with NVME controllers definitions'),
-                                '  type - ' + _('ID of the controller type from VMware'),
-                                '  key  - ' + _('Key of the controller (e.g. 2000)')].flatten(1).join("\n")],
-          ['boot_order', _('Device names to specify the boot order')]
+          ['nvme_controllers',     [_('List with NVME controllers definitions'),
+                                    '  type - ' + _('ID of the controller type from VMware'),
+                                    '  key  - ' + _('Key of the controller (e.g. 2000)')].flatten(1).join("\n")],
+          ['boot_order',           _('Device names to specify the boot order')],
+          ['virtual_tpm',          _('Must be a 1 or 0, Enable virtual TPM. Only compatible with EFI firmware.')]
         ]
       end
 
@@ -84,7 +85,9 @@ module HammerCLIForeman
           Fields::Field.new(label: _('Path'), path: [:path]),
           Fields::Field.new(label: _('Operating System'), path: [:operatingsystem]),
           Fields::Field.new(label: _('Mac'), path: [:mac]),
-          Fields::List.new(label: _('Boot order'), path: [:boot_order])
+          Fields::List.new(label: _('Boot order'), path: [:boot_order]),
+          Fields::Field.new(label: _('Virtual TPM'), path: [:virtual_tpm]),
+          Fields::Field.new(label: _('Secure Boot'), path: [:secure_boot])
         ]
       end
 

data/lib/hammer_cli_foreman/exception_handler.rb

@@ -98,9 +98,11 @@ module HammerCLIForeman
       begin
         response = JSON.parse(e.response)
         response = HammerCLIForeman.record_to_common_format(response) unless response.has_key?('message')
-        message = response['message'] || e.message
+        message = response["displayMessage"] || response["full_messages"] || response["message"]
       rescue JSON::ParserError
         message = e.message
+      ensure
+        message ||= e.message
       end
 
       print_error message

data/lib/hammer_cli_foreman/option_builders.rb

@@ -95,15 +95,17 @@ module HammerCLIForeman
 
   class ForemanOptionBuilder < HammerCLI::OptionBuilderContainer
 
-    def initialize(searchables)
+    def initialize(searchables, action = nil)
       @searchables = searchables
+      @action = action
     end
 
     def build(builder_params={})
       expansion_options = builder_params[:expand] || {}
 
+      except_default = @action&.params&.select { |p| !p.show? }&.map { |p| HammerCLIForeman.param_to_resource(p.name).name } || []
       allowed_resources = expansion_options[:only] || default_dependent_resources
-      allowed_resources -= expansion_options[:except] || []
+      allowed_resources -= expansion_options[:except] || except_default
       allowed_resources += expansion_options[:including] || []
       allowed_resources.uniq!
 

data/lib/hammer_cli_foreman/registration_tokens.rb

@@ -0,0 +1,27 @@
+module HammerCLIForeman
+  class RegistrationTokens < HammerCLIForeman::Command
+    resource :registration_tokens
+    command_name 'registration-tokens'
+    desc _('Manage registration tokens')
+
+    class InvalidateMultipleCommand < HammerCLIForeman::DeleteCommand
+      action :invalidate_jwt_tokens
+      command_name 'invalidate-multiple'
+      success_message _('Successfully invalidated registration tokens for %{users}.')
+      failure_message _('Could not invalidate registration tokens')
+
+      build_options
+    end
+
+    class InvalidateCommand < HammerCLIForeman::DeleteCommand
+      action :invalidate_jwt
+      command_name 'invalidate'
+      success_message _('Successfully invalidated registration tokens for %{user}.')
+      failure_message _('Could not invalidate registration tokens')
+
+      build_options
+    end
+
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_foreman/user.rb

@@ -93,7 +93,8 @@ module HammerCLIForeman
     lazy_subcommand('table-preference', _("Managing table preferences"),
                     'HammerCLIForeman::TablePreference', 'hammer_cli_foreman/table_preference'
     )
+    lazy_subcommand('registration-tokens', _("Managing registration tokens"),
+                    'HammerCLIForeman::RegistrationTokens', 'hammer_cli_foreman/registration_tokens')
     autoload_subcommands
   end
-
 end

data/lib/hammer_cli_foreman/version.rb

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