manageiq-appliance_console 5.3.2 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3276f6f2b22a3501da156ea9e656495e9c91bb27e9f0a44c9ffaa149ce264d26
-  data.tar.gz: 4535caa205126d59deff41e2df1348e083b5a151b20c710b8664c8f3358ee7db
+  metadata.gz: 34445fe4cc1b697688c30f689ed12499635959a5ad428763f2cfaac48a9f64c9
+  data.tar.gz: ed7530438fc6d4cf6d143e99bee966a890af509bdcb065831db8897b995a7fa8
 SHA512:
-  metadata.gz: fa49faeff2176cc790659924a5acd4af02c682320f80afb8562d60bec1cb6b6541bfdeab5265008d0b921f35993ba285d825844c69b4d3644e7d7b879401fff0
-  data.tar.gz: 658510d617fbf89d36596312820623f1bf56692c80fe891b4b9353cac557edd195255e36234b15b1cd773ad1f3cc55cbff7f8bde8f8d964b016328d7efca7d21
+  metadata.gz: a35d79649faa4a600b16959312a35468737a49f106524a510ee6d917154eb736547980a5597edc853b39325730ec3eece30efd4ed7375717525f5ad56ae3191e
+  data.tar.gz: 537c818711a763daa128491cf61895fac0646a568d7b9f39d7701707ecfcef33272d1f0cb7347290f1f61e10eb4cb7729ad2cadd18556ab5c9dd8888c7104842

data/.codeclimate.yml

@@ -1,13 +1,18 @@
----
-exclude_paths:
-- ".git/"
-- "**.xml"
-- "**.yaml"
-- "**.yml"
-- locale/
-- spec/
-- tools/
-engines:
+prepare:
+  fetch:
+  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_base.yml
+    path: ".rubocop_base.yml"
+  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_cc_base.yml
+    path: ".rubocop_cc_base.yml"
+  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/styles/base.yml
+    path: styles/base.yml
+  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/styles/cc_base.yml
+    path: styles/cc_base.yml
+plugins:
+  rubocop:
+    enabled: true
+    config: ".rubocop_cc.yml"
+    channel: rubocop-0-82
   brakeman:
     enabled: false
   bundler-audit:
@@ -27,18 +32,12 @@ engines:
     enabled: false
   markdownlint:
     enabled: false
-  rubocop:
-    enabled: true
-    config: ".rubocop_cc.yml"
-    channel: rubocop-0-69
-prepare:
-  fetch:
-  - url: https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_base.yml
-    path: ".rubocop_base.yml"
-  - url: https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_cc_base.yml
-    path: ".rubocop_cc_base.yml"
-ratings:
-  paths:
-  - Gemfile.lock
-  - "**.rake"
-  - "**.rb"
+exclude_patterns:
+- ".git/"
+- "**.xml"
+- "**.yaml"
+- "**.yml"
+- locale/
+- spec/
+- tools/
+version: '2'

data/.rspec_ci

@@ -1,4 +1,6 @@
+--require ci_helper
 --require spec_helper
 --color
 --order random
 --profile
+--format documentation

data/.rubocop.yml

@@ -1,4 +1,4 @@
+inherit_gem:
+  manageiq-style: ".rubocop_base.yml"
 inherit_from:
-- https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_base.yml
-# put all local rubocop config into .rubocop_local.yml as it will be loaded by .rubocop_cc.yml as well
-- .rubocop_local.yml
+- ".rubocop_local.yml"

data/.rubocop_cc.yml

@@ -1,5 +1,4 @@
 inherit_from:
-# this is downloaded by .codeclimate.yml
-- .rubocop_base.yml
-- .rubocop_cc_base.yml
-- .rubocop_local.yml
+- ".rubocop_base.yml"
+- ".rubocop_cc_base.yml"
+- ".rubocop_local.yml"

data/.rubocop_local.yml

@@ -1,2 +1,2 @@
-# GlobalVars:
+# Style/GlobalVars:
 #   AllowedVariables:

data/.travis.yml

@@ -1,10 +1,11 @@
 ---
 language: ruby
 rvm:
-- 2.5.7
-- 2.6.5
-sudo: false
+- 2.6.6
+- 2.7.2
 cache: bundler
+addons:
+  postgresql: '10'
 env:
   global:
   - RUBY_GC_HEAP_GROWTH_MAX_SLOTS=300000

data/Gemfile

@@ -1,7 +1,5 @@
 source 'http://rubygems.manageiq.org'
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in manageiq-smartstate.gemspec
+# Specify your gem's dependencies in manageiq-appliance_console.gemspec
 gemspec
-
-gem "manageiq-gems-pending", :git => "https://github.com/ManageIQ/manageiq-gems-pending", :branch => "master"

data/README.md

@@ -1,10 +1,9 @@
 # ManageIQ::ApplianceConsole
 
 [![Gem Version](https://badge.fury.io/rb/manageiq-appliance_console.svg)](http://badge.fury.io/rb/manageiq-appliance_console)
-[![Build Status](https://travis-ci.org/ManageIQ/manageiq-appliance_console.svg?branch=master)](https://travis-ci.org/ManageIQ/manageiq-appliance_console)
+[![Build Status](https://travis-ci.com/ManageIQ/manageiq-appliance_console.svg?branch=master)](https://travis-ci.com/ManageIQ/manageiq-appliance_console)
 [![Code Climate](https://codeclimate.com/github/ManageIQ/manageiq-appliance_console.svg)](https://codeclimate.com/github/ManageIQ/manageiq-appliance_console)
 [![Test Coverage](https://codeclimate.com/github/ManageIQ/manageiq-appliance_console/badges/coverage.svg)](https://codeclimate.com/github/ManageIQ/manageiq-appliance_console/coverage)
-[![Dependency Status](https://gemnasium.com/ManageIQ/manageiq-appliance_console.svg)](https://gemnasium.com/ManageIQ/manageiq-appliance_console)
 [![Security](https://hakiri.io/github/ManageIQ/manageiq-appliance_console/master.svg)](https://hakiri.io/github/ManageIQ/manageiq-appliance_console/master)
 
 [![Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ManageIQ/manageiq-appliance_console?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

data/Rakefile

@@ -1,6 +1,25 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
+desc "Run RSpec code examples (skip postgres required ones)"
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+# In CI, as part of the .rspec_ci, load a helper that sets the configuration
+# setting to allow the postgres specs to run.
+desc "Run RSpec code examples (assumes ci dependencies)"
+RSpec::Core::RakeTask.new("spec:ci") do |t|
+  t.rspec_opts = "--options #{File.expand_path(".rspec_ci", __dir__)}"
+end
+
+desc "Run RSpec code examples (with local postgres dependencies)"
+RSpec::Core::RakeTask.new("spec:dev") do |t|
+  # Load the PostgresRunner helper to facilitate a clean postgres environment
+  # for testing locally (not necessary for CI), and enables the postgres test
+  # via the helper.
+  pg_runner = File.join("spec", "postgres_runner_helper.rb")
+  t.rspec_opts = "-r #{File.expand_path(pg_runner, __dir__)}"
+end
+
+task :default do
+  Rake::Task["spec#{':ci' if ENV['CI']}"].invoke
+end

data/bin/appliance_console

@@ -13,7 +13,7 @@ require 'highline/system_extensions'
 require 'rubygems'
 require 'bcrypt'
 require 'linux_admin'
-require 'util/postgres_admin'
+require 'manageiq/appliance_console/postgres_admin'
 require 'awesome_spawn'
 include HighLine::SystemExtensions
 
@@ -374,7 +374,7 @@ Static Network Configuration
           raise MiqSignalError
         end
 
-      when I18n.t("advanced_settings.db_config")
+      when I18n.t("advanced_settings.app_config")
         say("#{selection}\n\n")
 
         ensure_key_configured
@@ -383,21 +383,30 @@ Static Network Configuration
           "Create Internal Database"           => "create_internal",
           "Create Region in External Database" => "create_external",
           "Join Region in External Database"   => "join_external",
-          "Reset Configured Database"          => "reset_region"
+          "Reset Configured Database"          => "reset_region",
+          "Make No Database Changes"           => "no_changes"
         }
-        action = ask_with_menu("Database Operation", options)
+        database_action = ask_with_menu("Database Operation", options)
+
+        messaging_options = {
+          "Configure this appliance as a messaging server" => "message_server",
+          "Connect to an external messaging system"        => "message_client",
+          "Make No messaging changes"                      => "no_changes"
+        }
+
+        messaging_action = ask_with_menu("Configure Messaging", messaging_options)
 
         database_configuration =
-          case action
+          case database_action
           when "create_internal"
             ManageIQ::ApplianceConsole::InternalDatabaseConfiguration.new
           when /_external/
-            ManageIQ::ApplianceConsole::ExternalDatabaseConfiguration.new(:action => action.split("_").first.to_sym)
+            ManageIQ::ApplianceConsole::ExternalDatabaseConfiguration.new(:action => database_action.split("_").first.to_sym)
           else
             ManageIQ::ApplianceConsole::DatabaseConfiguration.new
           end
 
-        case action
+        case database_action
         when "reset_region"
           if database_configuration.reset_region
             say("Database reset successfully")
@@ -411,6 +420,34 @@ Static Network Configuration
         # Get the region again because it may have changed
         region = ManageIQ::ApplianceConsole::DatabaseConfiguration.region
 
+        case messaging_action
+        when "message_server"
+          say("#{selection}\n\n")
+
+          message_server = MessageServerConfiguration.new
+          if message_server.ask_questions && message_server.configure
+            say("\nMessage Server configured successfully.\n")
+            press_any_key
+          else
+            say("\nMessage Server configuration failed!\n")
+            press_any_key
+            raise MiqSignalError
+          end
+
+        when "message_client"
+          say("#{selection}\n\n")
+
+          message_client = MessageClientConfiguration.new
+          if message_client.ask_questions && message_client.configure
+            say("\nMessage Client configured successfully.\n")
+            press_any_key
+          else
+            say("\nMessage Client configuration failed!\n")
+            press_any_key
+            raise MiqSignalError
+          end
+        end
+
         press_any_key
 
       when I18n.t("advanced_settings.db_replication")

data/lib/manageiq-appliance_console.rb

@@ -11,10 +11,6 @@ module ManageIQ
     def self.logger
       @logger ||= ManageIQ::ApplianceConsole::Logger.instance
     end
-
-    def self.logger=(logger)
-      @logger = logger
-    end
   end
 end
 
@@ -24,7 +20,6 @@ require 'manageiq/appliance_console/logger'
 require 'manageiq/appliance_console/logging'
 require 'manageiq/appliance_console/prompts'
 
-require 'manageiq-gems-pending'
 require 'highline'
 
 require 'manageiq/appliance_console/auth_utilities'
@@ -43,6 +38,8 @@ require 'manageiq/appliance_console/internal_database_configuration'
 require 'manageiq/appliance_console/key_configuration'
 require 'manageiq/appliance_console/logfile_configuration'
 require 'manageiq/appliance_console/logical_volume_management'
+require 'manageiq/appliance_console/message_configuration_client'
+require 'manageiq/appliance_console/message_configuration_server'
 require 'manageiq/appliance_console/oidc_authentication'
 require 'manageiq/appliance_console/principal'
 require 'manageiq/appliance_console/saml_authentication'

data/lib/manageiq/appliance_console/certificate_authority.rb

@@ -1,6 +1,6 @@
 require 'fileutils'
 require 'tempfile'
-require 'util/postgres_admin'
+require 'manageiq/appliance_console/postgres_admin'
 
 module ManageIQ
 module ApplianceConsole

data/lib/manageiq/appliance_console/cli.rb

@@ -77,6 +77,22 @@ module ApplianceConsole
       options[:saml_unconfig]
     end
 
+    def message_server_config?
+      options[:message_server_config]
+    end
+
+    def message_server_unconfig?
+      options[:message_server_unconfig]
+    end
+
+    def message_client_config?
+      options[:message_client_config]
+    end
+
+    def message_client_unconfig?
+      options[:message_client_unconfig]
+    end
+
     def oidc_config?
       options[:oidc_config]
     end
@@ -165,15 +181,42 @@ module ApplianceConsole
         opt :oidc_client_host,     "Optional Appliance host used for OpenID-Connect Authentication", :type => :string
         opt :oidc_client_id,       "The OpenID-Connect Provider Client ID",                          :type => :string
         opt :oidc_client_secret,   "The OpenID-Connect Provider Client Secret",                      :type => :string
+        opt :oidc_insecure,        "OpenID-Connect Insecure No SSL Verify (development)",            :type => :boolean, :default => false
+        opt :oidc_introspection_endpoint, "The OpenID-Connect Provider Introspect Endpoint",         :type => :string
         opt :oidc_enable_sso,      "Optionally enable SSO with OpenID-Connect Authentication",       :type => :boolean, :default => false
         opt :oidc_unconfig,        "Unconfigure Appliance OpenID-Connect Authentication",            :type => :boolean, :default => false
         opt :server,               "{start|stop|restart} actions on evmserverd Server",   :type => :string
         opt :openscap,             "Setup OpenScap", :type => :boolean, :default => false
+        opt :message_server_config,       "Subcommand to   Configure Appliance as a Kafka Message Server", :type => :boolean, :default => false
+        opt :message_server_unconfig,     "Subcommand to Unconfigure Appliance as a Kafka Message Server", :type => :boolean, :default => false
+        opt :message_client_config,       "Subcommand to   Configure Appliance as a Kafka Message Client", :type => :boolean, :default => false
+        opt :message_client_unconfig,     "Subcommand to Unconfigure Appliance as a Kafka Message Client", :type => :boolean, :default => false
+        opt :message_keystore_username,   "Message Server Keystore Username",                              :type => :string
+        opt :message_keystore_password,   "Message Server Keystore Password",                              :type => :string
+        opt :message_server_username,     "Message Server Username",                                       :type => :string
+        opt :message_server_password,     "Message Server password",                                       :type => :string
+        opt :message_server_port,         "Message Server Port",                                           :type => :integer
+        opt :message_server_use_ipaddr,   "Message Server Use Address",                                    :type => :boolean, :default => false
+        opt :message_server_host,         "Message Server Hostname or IP Address",                         :type => :string
+        opt :message_truststore_path_src, "Message Server Truststore Path",                                :type => :string
+        opt :message_ca_cert_path_src,    "Message Server CA Cert Path",                                   :type => :string
+        opt :message_persistent_disk,     "Message Persistent Disk Path",                                  :type => :string
       end
       Optimist.die :region, "needed when setting up a local database" if region_number_required? && options[:region].nil?
+      Optimist.die "Supply only one of --message-server-host or --message-server-use-ipaddr=true" if both_host_and_use_ip_addr_specified?
+      Optimist.die "Supply only one of --message-server-config, --message-server-unconfig, --message-client-config or --message-client-unconfig" if multiple_message_subcommands?
       self
     end
 
+    def both_host_and_use_ip_addr_specified?
+      !options[:message_server_host].nil? && options[:message_server_use_ipaddr] == true
+    end
+
+    def multiple_message_subcommands?
+      a = [options[:message_server_config], options[:message_server_unconfig], options[:message_client_config], options[:message_client_unconfig]]
+      a.each_with_object(Hash.new(0)) { |o, h| h[o] += 1 }[true] > 1
+    end
+
     def region_number_required?
       !options[:standalone] && local_database?
     end
@@ -183,7 +226,9 @@ module ApplianceConsole
                               uninstall_ipa? || install_ipa? || certs? || extauth_opts? ||
                               set_server_state? || set_replication? || openscap? ||
                               saml_config? || saml_unconfig? ||
-                              oidc_config? || oidc_unconfig?
+                              oidc_config? || oidc_unconfig? ||
+                              message_server_config? || message_server_unconfig? ||
+                              message_client_config? || message_client_unconfig?
 
       if set_host?
         system_hosts = LinuxAdmin::Hosts.new
@@ -207,6 +252,10 @@ module ApplianceConsole
       oidc_unconfig if oidc_unconfig?
       set_server_state if set_server_state?
       openscap if openscap?
+      message_server_config if message_server_config?
+      message_server_unconfig if message_server_unconfig?
+      message_client_config if message_client_config?
+      message_client_unconfig if message_client_unconfig?
     rescue CliError => e
       say(e.message)
       say("")
@@ -408,6 +457,22 @@ module ApplianceConsole
       OIDCAuthentication.new(options).unconfigure
     end
 
+    def message_server_config
+      MessageServerConfiguration.new(options).configure
+    end
+
+    def message_server_unconfig
+      MessageServerConfiguration.new(options).unconfigure
+    end
+
+    def message_client_config
+      MessageClientConfiguration.new(options).configure
+    end
+
+    def message_client_unconfig
+      MessageClientConfiguration.new(options).unconfigure
+    end
+
     def set_server_state
       service = LinuxAdmin::Service.new("evmserverd")
       service_running = service.running?

data/lib/manageiq/appliance_console/database_configuration.rb

@@ -8,7 +8,8 @@ require 'fileutils'
 module ManageIQ
 module ApplianceConsole
   class DatabaseConfiguration
-    attr_accessor :adapter, :host, :username, :database, :password, :port, :region
+    attr_accessor :adapter, :host, :username, :database, :port, :region
+    attr_reader :password
 
     class ModelWithNoBackingTable < ActiveRecord::Base
     end

data/lib/manageiq/appliance_console/database_replication.rb

@@ -1,6 +1,6 @@
 require 'pg'
 require 'English'
-require 'util/postgres_admin'
+require 'manageiq/appliance_console/postgres_admin'
 
 module ManageIQ
 module ApplianceConsole

data/lib/manageiq/appliance_console/database_replication_standby.rb

@@ -1,4 +1,4 @@
-require 'util/postgres_admin'
+require 'manageiq/appliance_console/postgres_admin'
 require 'fileutils'
 require 'linux_admin'
 

data/lib/manageiq/appliance_console/internal_database_configuration.rb

@@ -1,5 +1,5 @@
 require "pathname"
-require "util/postgres_admin"
+require "manageiq/appliance_console/postgres_admin"
 require "pg"
 require "linux_admin"
 

data/lib/manageiq/appliance_console/logfile_configuration.rb

@@ -1,7 +1,7 @@
+require "manageiq/appliance_console/utilities"
 require 'linux_admin'
 require 'pathname'
 require 'fileutils'
-require 'util/miq-system.rb'
 
 module ManageIQ
 module ApplianceConsole
@@ -18,7 +18,7 @@ module ApplianceConsole
       self.disk                = config[:disk]
       self.new_logrotate_count = nil
 
-      self.size = MiqSystem.disk_usage(LOGFILE_DIRECTORY)[0][:total_bytes]
+      self.size = Utilities.disk_usage(LOGFILE_DIRECTORY)[0][:total_bytes]
       self.current_logrotate_count = /rotate\s+(\d+)/.match(File.read(MIQ_LOGS_CONF))[1]
       self.evm_was_running = LinuxAdmin::Service.new("evmserverd").running?
     end