hammer_cli_foreman 2.4.0 → 3.1.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: apipie-bindings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -75,20 +75,20 @@ dependencies:
         version: 2.2.1
 description: 'Foreman commands for Hammer CLI
 
-  '
+'
 email: tstracho@redhat.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- doc/host_create.md
-- doc/release_notes.md
-- doc/plugin.md
 - doc/configuration.md
 - doc/name_id_resolution.md
-- doc/developer_docs.md
+- doc/option_builder.md
 - doc/using_hammer_cli_foreman_command.md
+- doc/developer_docs.md
+- doc/host_create.md
+- doc/plugin.md
 - doc/testing.md
-- doc/option_builder.md
+- doc/release_notes.md
 - README.md
 files:
 - LICENSE
@@ -130,10 +130,9 @@ files:
 - lib/hammer_cli_foreman/command_extensions/hosts/help/interfaces.rb
 - lib/hammer_cli_foreman/command_extensions/option_sources.rb
 - lib/hammer_cli_foreman/command_extensions/ping.rb
-- lib/hammer_cli_foreman/command_extensions/puppet_environment.rb
-- lib/hammer_cli_foreman/command_extensions/puppet_environments.rb
 - lib/hammer_cli_foreman/command_extensions/status.rb
 - lib/hammer_cli_foreman/command_extensions/subnet.rb
+- lib/hammer_cli_foreman/command_extensions/update_common.rb
 - lib/hammer_cli_foreman/command_extensions/user.rb
 - lib/hammer_cli_foreman/commands.rb
 - lib/hammer_cli_foreman/common_parameter.rb
@@ -150,7 +149,6 @@ files:
 - lib/hammer_cli_foreman/compute_resource/register_compute_resources.rb
 - lib/hammer_cli_foreman/compute_resource/utils.rb
 - lib/hammer_cli_foreman/compute_resource/vmware.rb
-- lib/hammer_cli_foreman/config_group.rb
 - lib/hammer_cli_foreman/config_report.rb
 - lib/hammer_cli_foreman/defaults.rb
 - lib/hammer_cli_foreman/dependency_resolver.rb
@@ -181,7 +179,6 @@ files:
 - lib/hammer_cli_foreman/option_sources/id_params.rb
 - lib/hammer_cli_foreman/option_sources/ids_params.rb
 - lib/hammer_cli_foreman/option_sources/new_params.rb
-- lib/hammer_cli_foreman/option_sources/puppet_environment_params.rb
 - lib/hammer_cli_foreman/option_sources/referenced_resource_id_params.rb
 - lib/hammer_cli_foreman/option_sources/self_param.rb
 - lib/hammer_cli_foreman/option_sources/user_params.rb
@@ -194,16 +191,14 @@ files:
 - lib/hammer_cli_foreman/partition_table.rb
 - lib/hammer_cli_foreman/personal_access_token.rb
 - lib/hammer_cli_foreman/ping.rb
-- lib/hammer_cli_foreman/puppet_class.rb
-- lib/hammer_cli_foreman/puppet_environment.rb
 - lib/hammer_cli_foreman/realm.rb
 - lib/hammer_cli_foreman/references.rb
+- lib/hammer_cli_foreman/registration.rb
 - lib/hammer_cli_foreman/report_template.rb
 - lib/hammer_cli_foreman/resource_supported_test.rb
 - lib/hammer_cli_foreman/role.rb
 - lib/hammer_cli_foreman/sessions.rb
 - lib/hammer_cli_foreman/settings.rb
-- lib/hammer_cli_foreman/smart_class_parameter.rb
 - lib/hammer_cli_foreman/smart_proxy.rb
 - lib/hammer_cli_foreman/ssh_keys.rb
 - lib/hammer_cli_foreman/status.rb
@@ -245,6 +240,9 @@ files:
 - test/data/1.24/foreman_api.json
 - test/data/2.0/foreman_api.json
 - test/data/2.1/foreman_api.json
+- test/data/2.4/foreman_api.json
+- test/data/2.5/foreman_api.json
+- test/data/3.1/foreman_api.json
 - test/data/README.md
 - test/functional/architecture_test.rb
 - test/functional/associating_commands_test.rb
@@ -255,7 +253,6 @@ files:
 - test/functional/compute_attribute_test.rb
 - test/functional/compute_profile_test.rb
 - test/functional/compute_resource_test.rb
-- test/functional/config_group_test.rb
 - test/functional/filter_test.rb
 - test/functional/host_test.rb
 - test/functional/hostgroup/create_test.rb
@@ -269,12 +266,11 @@ files:
 - test/functional/organization_test.rb
 - test/functional/personal_access_token_test.rb
 - test/functional/ping_test.rb
-- test/functional/proxy_test.rb
 - test/functional/realm_test.rb
+- test/functional/registration_test.rb
 - test/functional/report_template_test.rb
 - test/functional/role_test.rb
 - test/functional/settings_test.rb
-- test/functional/smart_class_parameter_test.rb
 - test/functional/ssh_keys_test.rb
 - test/functional/status_test.rb
 - test/functional/subnet/create_test.rb
@@ -285,7 +281,6 @@ files:
 - test/functional/user_test.rb
 - test/functional/usergroup_test.rb
 - test/functional/virtual_machine_test.rb
-- test/reports/TEST-Minitest-Result.xml
 - test/test_helper.rb
 - test/unit/api/interactive_basic_auth_test.rb
 - test/unit/api/oauth/oauth_authentication_code_grant_test.rb
@@ -303,7 +298,6 @@ files:
 - test/unit/common_parameter_test.rb
 - test/unit/compute_profile_test.rb
 - test/unit/compute_resource_test.rb
-- test/unit/config_group_test.rb
 - test/unit/config_report_test.rb
 - test/unit/data/test_api.json
 - test/unit/defaults_test.rb
@@ -333,13 +327,10 @@ files:
 - test/unit/output/formatters_test.rb
 - test/unit/param_filters_test.rb
 - test/unit/partition_table_test.rb
-- test/unit/puppet_class_test.rb
-- test/unit/puppet_environment_test.rb
 - test/unit/realm_test.rb
 - test/unit/role_test.rb
 - test/unit/sessions_test.rb
 - test/unit/settings_test.rb
-- test/unit/smart_class_parameter_test.rb
 - test/unit/smart_proxy_test.rb
 - test/unit/subnet_test.rb
 - test/unit/template_test.rb
@@ -366,124 +357,120 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Foreman commands for Hammer
 test_files:
-- test/unit/image_test.rb
-- test/unit/helpers/resource_disabled.rb
-- test/unit/helpers/fake_searchables.rb
-- test/unit/helpers/command.rb
-- test/unit/messages_test.rb
-- test/unit/config_group_test.rb
-- test/unit/option_sources/id_params_test.rb
-- test/unit/option_sources/ids_params_test.rb
-- test/unit/exception_handler_test.rb
-- test/unit/user_test.rb
-- test/unit/api/session_authenticator_wrapper_test.rb
-- test/unit/api/interactive_basic_auth_test.rb
-- test/unit/api/oauth/oauth_authentication_code_grant_test.rb
-- test/unit/api/oauth/oauth_password_grant_test.rb
-- test/unit/api/void_auth_test.rb
-- test/unit/hostgroup_test.rb
-- test/unit/realm_test.rb
-- test/unit/auth_source_external.rb
-- test/unit/data/test_api.json
-- test/unit/auth_source_ldap_test.rb
-- test/unit/audit_test.rb
-- test/unit/test_helper.rb
-- test/unit/mail_notification_test.rb
-- test/unit/smart_class_parameter_test.rb
-- test/unit/partition_table_test.rb
-- test/unit/operating_system_test.rb
-- test/unit/media_test.rb
-- test/unit/architecture_test.rb
-- test/unit/usergroup_test.rb
-- test/unit/role_test.rb
-- test/unit/location_test.rb
-- test/unit/param_filters_test.rb
-- test/unit/apipie_resource_mock.rb
-- test/unit/option_builders_test.rb
-- test/unit/api_test.rb
-- test/unit/test_output_adapter.rb
-- test/unit/sessions_test.rb
-- test/unit/organization_test.rb
-- test/unit/settings_test.rb
-- test/unit/template_test.rb
-- test/unit/dependency_resolver_test.rb
-- test/unit/smart_proxy_test.rb
-- test/unit/domain_test.rb
-- test/unit/defaults_test.rb
-- test/unit/model_test.rb
-- test/unit/puppet_class_test.rb
-- test/unit/compute_resource_test.rb
-- test/unit/id_resolver_test.rb
-- test/unit/filter_test.rb
-- test/unit/puppet_environment_test.rb
-- test/unit/output/formatters_test.rb
-- test/unit/compute_profile_test.rb
-- test/unit/host_test.rb
-- test/unit/config_report_test.rb
-- test/unit/fact_test.rb
-- test/unit/external_usergroup_test.rb
-- test/unit/commands_test.rb
-- test/unit/common_parameter_test.rb
-- test/unit/subnet_test.rb
-- test/unit/bookmark_test.rb
-- test/data/2.1/foreman_api.json
-- test/data/2.0/foreman_api.json
-- test/data/1.24/foreman_api.json
-- test/data/1.18/foreman_api.json
-- test/data/1.11/foreman_api.json
 - test/data/1.10/foreman_api.json
-- test/data/1.17/foreman_api.json
-- test/data/1.15/foreman_api.json
+- test/data/1.11/foreman_api.json
 - test/data/1.14/_foreman_api.json
 - test/data/1.14/foreman_api.json
+- test/data/1.15/foreman_api.json
+- test/data/1.16/foreman_api.json
+- test/data/1.17/foreman_api.json
+- test/data/1.18/foreman_api.json
+- test/data/1.20/foreman_api.json
 - test/data/1.21/foreman_api.json
 - test/data/1.22/foreman_api.json
-- test/data/1.20/foreman_api.json
+- test/data/1.24/foreman_api.json
+- test/data/2.0/foreman_api.json
+- test/data/2.1/foreman_api.json
+- test/data/2.4/foreman_api.json
+- test/data/2.5/foreman_api.json
 - test/data/README.md
-- test/data/1.16/foreman_api.json
-- test/functional/http_proxy_test.rb
+- test/data/3.1/foreman_api.json
+- test/functional/auth_source_test.rb
 - test/functional/commands/list_test.rb
-- test/functional/user_mail_notification_test.rb
-- test/functional/config_group_test.rb
-- test/functional/user_test.rb
-- test/functional/realm_test.rb
+- test/functional/hostgroup/create_test.rb
+- test/functional/hostgroup/update_test.rb
+- test/functional/compute_profile_test.rb
+- test/functional/model_test.rb
+- test/functional/operating_system_test.rb
 - test/functional/personal_access_token_test.rb
-- test/functional/audit_test.rb
+- test/functional/user_mail_notification_test.rb
+- test/functional/template_test.rb
+- test/functional/ssh_keys_test.rb
+- test/functional/subnet/update_test.rb
+- test/functional/subnet/create_test.rb
 - test/functional/test_helper.rb
-- test/functional/mail_notification_test.rb
-- test/functional/ping_test.rb
-- test/functional/smart_class_parameter_test.rb
-- test/functional/operating_system_test.rb
+- test/functional/filter_test.rb
+- test/functional/http_proxy_test.rb
 - test/functional/media_test.rb
-- test/functional/architecture_test.rb
+- test/functional/registration_test.rb
 - test/functional/usergroup_test.rb
-- test/functional/role_test.rb
-- test/functional/location_test.rb
-- test/functional/hostgroup/create_test.rb
-- test/functional/hostgroup/update_test.rb
-- test/functional/subnet/create_test.rb
-- test/functional/subnet/update_test.rb
+- test/functional/architecture_test.rb
+- test/functional/bookmark_test.rb
+- test/functional/compute_resource_test.rb
 - test/functional/organization_test.rb
+- test/functional/report_template_test.rb
+- test/functional/user_test.rb
+- test/functional/virtual_machine_test.rb
+- test/functional/mail_notification_test.rb
 - test/functional/settings_test.rb
-- test/functional/template_test.rb
-- test/functional/proxy_test.rb
-- test/functional/model_test.rb
-- test/functional/compute_resource_test.rb
 - test/functional/compute_attribute_test.rb
-- test/functional/filter_test.rb
-- test/functional/report_template_test.rb
-- test/functional/compute_profile_test.rb
-- test/functional/host_test.rb
-- test/functional/ssh_keys_test.rb
-- test/functional/status_test.rb
 - test/functional/associating_commands_test.rb
-- test/functional/auth_source_test.rb
-- test/functional/virtual_machine_test.rb
-- test/functional/bookmark_test.rb
+- test/functional/audit_test.rb
+- test/functional/ping_test.rb
+- test/functional/realm_test.rb
+- test/functional/role_test.rb
+- test/functional/status_test.rb
+- test/functional/host_test.rb
+- test/functional/location_test.rb
+- test/unit/api/void_auth_test.rb
+- test/unit/api/interactive_basic_auth_test.rb
+- test/unit/api/oauth/oauth_authentication_code_grant_test.rb
+- test/unit/api/oauth/oauth_password_grant_test.rb
+- test/unit/api/session_authenticator_wrapper_test.rb
+- test/unit/test_output_adapter.rb
+- test/unit/smart_proxy_test.rb
+- test/unit/auth_source_ldap_test.rb
+- test/unit/config_report_test.rb
+- test/unit/compute_resource_test.rb
+- test/unit/data/test_api.json
+- test/unit/defaults_test.rb
+- test/unit/external_usergroup_test.rb
+- test/unit/fact_test.rb
+- test/unit/helpers/fake_searchables.rb
+- test/unit/helpers/resource_disabled.rb
+- test/unit/helpers/command.rb
+- test/unit/image_test.rb
+- test/unit/location_test.rb
+- test/unit/messages_test.rb
+- test/unit/option_sources/id_params_test.rb
+- test/unit/option_sources/ids_params_test.rb
+- test/unit/organization_test.rb
+- test/unit/output/formatters_test.rb
+- test/unit/common_parameter_test.rb
+- test/unit/realm_test.rb
+- test/unit/mail_notification_test.rb
+- test/unit/option_builders_test.rb
+- test/unit/subnet_test.rb
+- test/unit/test_helper.rb
+- test/unit/user_test.rb
+- test/unit/param_filters_test.rb
+- test/unit/partition_table_test.rb
+- test/unit/role_test.rb
+- test/unit/operating_system_test.rb
+- test/unit/apipie_resource_mock.rb
+- test/unit/architecture_test.rb
+- test/unit/settings_test.rb
+- test/unit/audit_test.rb
+- test/unit/auth_source_external.rb
+- test/unit/dependency_resolver_test.rb
+- test/unit/exception_handler_test.rb
+- test/unit/filter_test.rb
+- test/unit/media_test.rb
+- test/unit/sessions_test.rb
+- test/unit/bookmark_test.rb
+- test/unit/commands_test.rb
+- test/unit/api_test.rb
+- test/unit/compute_profile_test.rb
+- test/unit/host_test.rb
+- test/unit/hostgroup_test.rb
+- test/unit/id_resolver_test.rb
+- test/unit/model_test.rb
+- test/unit/template_test.rb
+- test/unit/usergroup_test.rb
+- test/unit/domain_test.rb
 - test/test_helper.rb
-- test/reports/TEST-Minitest-Result.xml

data/lib/hammer_cli_foreman/command_extensions/puppet_environment.rb

@@ -1,29 +0,0 @@
-module HammerCLIForeman
-  module CommandExtensions
-    class PuppetEnvironment < HammerCLI::CommandExtensions
-      # Remove when support of --environment options is ended.
-      option_family(
-        aliased_resource: 'environment',
-        description: _('Puppet environment'),
-        deprecation: _("Use %s instead") % '--puppet-environment[-id]',
-        deprecated: { '--environment' => _("Use %s instead") % '--puppet-environment[-id]',
-                      '--environment-id' => _("Use %s instead") % '--puppet-environment[-id]'}
-      ) do
-        parent '--environment-id', 'ENVIRONMENT_ID', _(''),
-               format: HammerCLI::Options::Normalizers::Number.new,
-               attribute_name: :option_environment_id
-        child '--environment', 'ENVIRONMENT_NAME', _('Environment name'),
-              attribute_name: :option_environment_name
-      end
-
-      option_sources do |sources, command|
-        sources.find_by_name('IdResolution').insert_relative(
-          :after,
-          'IdParams',
-          HammerCLIForeman::OptionSources::PuppetEnvironmentParams.new(command)
-        )
-        sources
-      end
-    end
-  end
-end

data/lib/hammer_cli_foreman/command_extensions/puppet_environments.rb

@@ -1,29 +0,0 @@
-module HammerCLIForeman
-  module CommandExtensions
-    class PuppetEnvironments < HammerCLI::CommandExtensions
-      # Remove when support of --environments options is ended.
-      option_family(
-        aliased_resource: 'environment',
-        description: _('Puppet environments'),
-        deprecation: _("Use %s instead") % '--puppet-environment[s|-ids]',
-        deprecated: { '--environments' => _("Use %s instead") % '--puppet-environment[s|-ids]',
-                      '--environment-ids' => _("Use %s instead") % '--puppet-environment[s|-ids]' }
-      ) do
-        parent '--environment-ids', 'ENVIRONMENT_IDS', _('Environment IDs'),
-               format: HammerCLI::Options::Normalizers::List.new,
-               attribute_name: :option_environment_ids
-        child '--environments', 'ENVIRONMENT_NAMES', _(''),
-              attribute_name: :option_environment_names
-      end
-
-      option_sources do |sources, command|
-        sources.find_by_name('IdResolution').insert_relative(
-          :after,
-          'IdsParams',
-          HammerCLIForeman::OptionSources::PuppetEnvironmentParams.new(command)
-        )
-        sources
-      end
-    end
-  end
-end

data/lib/hammer_cli_foreman/config_group.rb

@@ -1,45 +0,0 @@
-module HammerCLIForeman
-  class ConfigGroup < HammerCLIForeman::Command
-    resource :config_groups
-
-    class ListCommand < HammerCLIForeman::ListCommand
-      output do
-        field :id, _("ID")
-        field :name, _("Name")
-      end
-
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
-    end
-
-    class InfoCommand < HammerCLIForeman::InfoCommand
-      output ListCommand.output_definition do
-        HammerCLIForeman::References.puppetclasses(self)
-      end
-
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
-    end
-
-    class CreateCommand < HammerCLIForeman::CreateCommand
-      success_message _("Config group created.")
-      failure_message _("Could not create the config group")
-
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
-    end
-
-    class UpdateCommand < HammerCLIForeman::UpdateCommand
-      success_message _("Config group updated.")
-      failure_message _("Could not update the config group")
-
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
-    end
-
-    class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message _("Config group has been deleted.")
-      failure_message _("Could not delete the config group")
-
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
-    end
-
-    autoload_subcommands
-  end
-end

data/lib/hammer_cli_foreman/option_sources/puppet_environment_params.rb

@@ -1,59 +0,0 @@
-module HammerCLIForeman
-  module OptionSources
-    class PuppetEnvironmentParams < HammerCLI::Options::Sources::Base
-      def initialize(command)
-        @command = command
-      end
-
-      def get_options(_defined_options, result)
-        if result['option_environment_id'].nil? &&
-           (@command.respond_to?(:option_environment_id) ||
-           @command.respond_to?(:option_environment_name))
-          put_puppet_environment_id(result)
-        end
-        if result['option_environment_ids'].nil? &&
-           (@command.respond_to?(:option_environment_ids) ||
-           @command.respond_to?(:option_environment_names))
-          put_puppet_environment_ids(result)
-        end
-        result
-      end
-
-      private
-
-      def put_puppet_environment_id(result)
-        if result['option_environment_name'].nil?
-          if @command.option_environment_id
-            result['option_environment_id'] = @command.option_environment_id
-          elsif @command.option_environment_name
-            result['option_environment_name'] = @command.option_environment_name
-            result['option_environment_id'] = @command.resolver.puppet_environment_id(
-              @command.resolver.scoped_options('environment', result, :single)
-            )
-          end
-        else
-          result['option_environment_id'] = @command.resolver.puppet_environment_id(
-            @command.resolver.scoped_options('environment', result, :single)
-          )
-        end
-      end
-
-      def put_puppet_environment_ids(result)
-        if result['option_environment_names'].nil?
-          if @command.option_environment_ids
-            result['option_environment_ids'] = @command.option_environment_ids
-          elsif @command.option_environment_names
-            result['option_environment_names'] = @command.option_environment_names
-            result['option_environment_ids'] = @command.resolver.puppet_environment_ids(
-              @command.resolver.scoped_options('environment', result, :multi)
-            )
-          end
-        else
-          result['option_environment_ids'] = @command.resolver.puppet_environment_ids(
-            @command.resolver.scoped_options('environment', result, :multi)
-          )
-        end
-      end
-    end
-  end
-end

data/lib/hammer_cli_foreman/puppet_class.rb

@@ -1,61 +0,0 @@
-require 'hammer_cli_foreman/smart_class_parameter'
-
-module HammerCLIForeman
-
-  class PuppetClass < HammerCLIForeman::Command
-
-    resource :puppetclasses
-
-    class ListCommand < HammerCLIForeman::ListCommand
-
-      output do
-        field :id, _("Id")
-        field :name, _("Name")
-      end
-
-      def send_request
-        self.class.unhash_classes(super)
-      end
-
-      def self.unhash_classes(classes)
-        clss = classes.first.inject([]) { |list, (pp_module, pp_module_classes)| list + pp_module_classes }
-
-        HammerCLI::Output::RecordCollection.new(clss, :meta => classes.meta)
-
-      end
-
-      build_options
-
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
-    end
-
-
-    class InfoCommand < HammerCLIForeman::InfoCommand
-      output ListCommand.output_definition do
-        collection :smart_class_parameters, _("Smart class parameters"), :numbered => false do
-          custom_field Fields::Reference, :name_key => :parameter
-        end
-        HammerCLIForeman::References.hostgroups(self)
-        HammerCLIForeman::References.environments(self)
-        HammerCLIForeman::References.parameters(self)
-      end
-
-      build_options
-
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
-    end
-
-
-    class SCParamsCommand < HammerCLIForeman::SmartClassParametersBriefList
-      build_options_for :puppetclasses
-
-      def validate_options
-        super
-        validator.any(:option_puppetclass_name, :option_puppetclass_id).required
-      end
-    end
-
-    autoload_subcommands
-  end
-
-end