openbolt 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e74b9e63937ae058968da0c60541d3cae344562016f669e086ea700bfee3965
-  data.tar.gz: eb99991557140aaecc0e4e357bbb1965b525d70482fc73313ce2d27efe90da7b
+  metadata.gz: e9b0100076081c5483e86b98cea67dc2c9ed0a46ceb7b86d3883257f34b68ee8
+  data.tar.gz: c85b0fd26588f95757ebdf25b86ed39a3f2c16dc530b0517c4d4c6848e16440a
 SHA512:
-  metadata.gz: 526167caf4b75c6c7d4ba08209cb42cae412f89c1593ea5cfd99acd2b172bffc991b8c197532e692f60cf047078251f218078ddbe72a92f9323043bdbcfa1afa
-  data.tar.gz: b0646851b4d375604eef1ca1a55856f66a1bf2d8b71de31e1b878bf642a6956704c428a2524061e8cad56c293202aa36dfe5f7d7b807511ef0b538796bbbe8dd
+  metadata.gz: 89b8e8179220b89ca34d44682c9a2e83723dfc7d06ffd09ed7bbaff010cb6e4635d837451f9131eea95917151b81c74e6f65912fd77c8cfc8d694e1748f236f9
+  data.tar.gz: 6158a6c97dad745b1ad1a0ec9a745bd44ce59f1a8ad0e636c3df2f39cd07f962b28a1a19d6109dc94d68c3938e18cb5acd498ceea12a3fff094327390ab776a8

data/Puppetfile

@@ -9,7 +9,7 @@ mod 'puppetlabs-service', '3.1.0'
 mod 'puppet-openvox_bootstrap', '1.2.0'
 mod 'puppetlabs-facts', '1.7.0'
 
-# puppetlabs-puppet_agent deps
+# Other core Puppet modules
 mod 'puppetlabs-inifile', '6.2.0'
 mod 'puppetlabs-apt', '11.1.0'
 mod 'puppetlabs-stdlib', '9.7.0'
@@ -17,16 +17,16 @@ mod 'puppetlabs-powershell', '6.1.0'
 mod 'puppetlabs-pwshlib', '2.0.0'
 
 # Core types and providers for Puppet 6
-mod 'puppetlabs-augeas_core', '1.5.0'
-mod 'puppetlabs-host_core', '1.3.0'
+mod 'puppetlabs-augeas_core', '2.0.1'
+mod 'puppetlabs-host_core', '2.0.1'
 mod 'puppetlabs-scheduled_task', '4.0.3'
-mod 'puppetlabs-sshkeys_core', '2.5.1'
+mod 'puppetlabs-sshkeys_core', '3.0.1'
 mod 'puppetlabs-zfs_core', '1.6.1'
-mod 'puppetlabs-cron_core', '1.3.0'
-mod 'puppetlabs-mount_core', '1.3.0'
-mod 'puppetlabs-selinux_core', '1.4.0'
-mod 'puppetlabs-yumrepo_core', '2.1.0'
-mod 'puppetlabs-zone_core', '1.2.0'
+mod 'puppetlabs-cron_core', '2.0.2'
+mod 'puppetlabs-mount_core', '2.0.1'
+mod 'puppetlabs-selinux_core', '2.0.1'
+mod 'puppetlabs-yumrepo_core', '3.0.1'
+mod 'puppetlabs-zone_core', '2.0.1'
 
 # Useful additional modules
 mod 'puppetlabs-package', '3.1.0'

data/bolt-modules/boltlib/lib/puppet/functions/puppetdb_query.rb

@@ -5,7 +5,6 @@ require 'bolt/error'
 # Makes a query to [puppetdb](https://puppet.com/docs/puppetdb/latest/index.html)
 # using Bolt's PuppetDB client.
 Puppet::Functions.create_function(:puppetdb_query) do
-  # rubocop:disable Layout/LineLength
   # Make a query to PuppetDB.
   #
   # @param query A PQL query.
@@ -13,13 +12,11 @@ Puppet::Functions.create_function(:puppetdb_query) do
   # @return Results of the PuppetDB query.
   # @example Request certnames for all nodes
   #   puppetdb_query('nodes[certname] {}')
-  # rubocop:enable Layout/LineLength
   dispatch :make_query do
     param 'Variant[String, Array[Data]]', :query
     return_type 'Array[Data]'
   end
 
-  # rubocop:disable Layout/LineLength
   # Make a query to a named PuppetDB instance.
   #
   # @param query A PQL query.
@@ -28,7 +25,6 @@ Puppet::Functions.create_function(:puppetdb_query) do
   # @return Results of the PuppetDB query.
   # @example Request certnames for all nodes using a named PuppetDB instance
   #   puppetdb_query('nodes[certname] {}', 'instance-1')
-  # rubocop:enable Layout/LineLength
   dispatch :make_query_with_instance do
     param 'Variant[String, Array[Data]]', :query
     param 'String', :instance

data/lib/bolt/analytics.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# None of this currently works, as it's based on Perforce's old GA setup.
+# It is functionally disabled here, but the code remains in case we want
+# to revive it for Vox Pupuli later.
 require_relative '../bolt/util'
 require_relative '../bolt/version'
 require 'find'
@@ -30,6 +33,8 @@ module Bolt
     }.freeze
 
     def self.build_client(enabled = true)
+      # Remove if we fix this for Vox analytics
+      config = { 'disabled' => true }
       begin
         config_file = config_path
         config = enabled ? load_config(config_file) : {}
@@ -38,7 +43,8 @@ module Bolt
       end
 
       if !enabled || config['disabled'] || ENV['BOLT_DISABLE_ANALYTICS']
-        Bolt::Logger.debug "Analytics opt-out is set, analytics will be disabled"
+        # Uncomment if we fix this for Vox analytics
+        # Bolt::Logger.debug "Analytics opt-out is set, analytics will be disabled"
         NoopClient.new
       else
         unless config.key?('user-id')
@@ -76,7 +82,8 @@ module Bolt
       if File.exist?(filename)
         Bolt::Util.read_optional_yaml_hash(filename, 'analytics')
       else
-        unless ENV['BOLT_DISABLE_ANALYTICS']
+        # Remove || true if we fix this for Vox analytics
+        unless ENV['BOLT_DISABLE_ANALYTICS'] || true
           msg = <<~ANALYTICS
             Bolt collects data about how you use it. You can opt out of providing this data.
             To learn how to disable data collection, or see what data Bolt collects and why,

data/lib/bolt/apply_result.rb

@@ -52,13 +52,11 @@ module Bolt
       missing_keys = expected_report_keys.reject { |k| result.value.include?(k) }
 
       unless missing_keys.empty?
-        if result['_output']
-          # rubocop:disable Layout/LineLength
-          msg = "Report result contains an '_output' key. Catalog application might have printed extraneous output to stdout: #{result['_output']}"
-          # rubocop:enable Layout/LineLength
-        else
-          msg = "Report did not contain all expected keys missing: #{missing_keys.join(', ')}"
-        end
+        msg = if result['_output']
+                "Report result contains an '_output' key. Catalog application might have printed extraneous output to stdout: #{result['_output']}"
+              else
+                "Report did not contain all expected keys missing: #{missing_keys.join(', ')}"
+              end
 
         { 'msg' => msg,
           'kind' => 'bolt/invalid-report' }

data/lib/bolt/cli.rb

@@ -106,15 +106,6 @@ module Bolt
           # help text
           options[:subcommand] = nil unless COMMANDS.include?(options[:subcommand])
 
-          if Bolt::Util.first_run?
-            FileUtils.touch(Bolt::Util.first_runs_free)
-
-            if options[:subcommand].nil? && $stdout.isatty
-              welcome_message
-              raise Bolt::CLIExit
-            end
-          end
-
           # Update the parser for the subcommand (or lack thereof)
           parser.update
           puts parser.help
@@ -165,52 +156,6 @@ module Bolt
       end
     end
 
-    # TODO: Move this to the parser.
-    #
-    # Print a welcome message when users first install Bolt and run `bolt`,
-    # `bolt help` or `bolt --help`.
-    #
-    private def welcome_message
-      bolt = <<~BOLT
-                   `.::-`
-              `.-:///////-.`
-           `-:////:.  `-:///:-  /ooo.                        .ooo/
-       `.-:///::///:-`   `-//:  ymmm-                        :mmmy  .---.
-      :///:-.   `.:////.  -//:  ymmm-                        :mmmy  +mmm+
-      ://.          ///.  -//:  ymmm--/++/-       `-/++/:`   :mmmy-:smmms::-
-      ://.          ://. .://:  ymmmdmmmmmmdo`  .smmmmmmmmh: :mmmysmmmmmmmms
-      ://.          ://:///:-.  ymmmh/--/hmmmy -mmmd/-.:hmmm+:mmmy.-smmms--.
-      ://:.`      .-////:-`     ymmm-     ymmm:hmmm-    `dmmm/mmmy  +mmm+
-      `-:///:-..:///:-.`        ymmm-     ommm/dmmm`     hmmm+mmmy  +mmm+
-         `.-:////:-`            ymmm+    /mmmm.ommms`   /mmmh:mmmy  +mmmo
-             `-.`               ymmmmmhhmmmmd:  ommmmhydmmmy`:mmmy  -mmmmdhd
-                                oyyy+shddhs/`    .+shddhy+-  -yyyo   .ohddhs
-
-
-      BOLT
-      example_cmd = if Bolt::Util.windows?
-                      "Invoke-BoltCommand -Command 'hostname' -Targets localhost"
-                    else
-                      "bolt command run 'hostname' --target localhost"
-                    end
-      prev_cmd = String.new("bolt")
-      prev_cmd << " #{@argv[0]}" unless @argv.empty?
-
-      message = <<~MSG
-      🎉 Welcome to OpenBolt #{VERSION}
-      😌 We're here to help bring order to the chaos
-      📖 Find our documentation at https://bolt.guide
-      🙋 Ask a question in #bolt on https://slack.puppet.com/
-      🔩 Contribute at https://github.com/puppetlabs/bolt/
-      💡 Not sure where to start? Try "#{example_cmd}"
-
-      We only print this message once. Run "#{prev_cmd}" again for help text.
-      MSG
-
-      $stdout.print "\033[36m#{bolt}\033[0m"
-      $stdout.print message
-    end
-
     # TODO: Move this to the parser.
     #
     # Validate the command. Ensure that the subcommand and action are

data/lib/bolt/config/options.rb

@@ -428,15 +428,14 @@ module Bolt
           _example: ["myproject", "myproject::foo", "myproject::bar", "myproject::deploy::*"]
         },
         "plugin-hooks" => {
-          # rubocop:disable Layout/LineLength
           description: "A map of [plugin hooks](writing_plugins.md#hooks) and which plugins a hook should use. " \
                        "The only configurable plugin hook is `puppet_library`, which can use two possible plugins: " \
                        "[`openvox_bootstrap`](https://github.com/voxpupuli/puppet-openvox_bootstrap#openvox_boostrapinstall) " \
                        "and [`task`](using_plugins.md#task).",
-          # rubocop:enable Layout/LineLength
           type: Hash,
           _plugin: true,
-          _example: { "puppet_library" => { "plugin" => "puppet_agent", "version" => "6.15.0", "_run_as" => "root" } }
+          _example: { "puppet_library" => { "plugin" => "openvox_bootstrap", "version" => "1.2.0",
+                      "_run_as" => "root" } }
         },
         "plugins" => {
           description: "A map of plugins and their configuration data, where each key is the name of a plugin and " \

data/lib/bolt/inventory/group.rb

@@ -256,7 +256,7 @@ module Bolt
 
         # DEPRECATION : remove this before finalization
         if input.key?('target-lookups')
-          msg = "'target-lookups' are no longer a separate key. Merge 'target-lookups' and 'targets' lists and replace 'plugin' with '_plugin'" # rubocop:disable Layout/LineLength
+          msg = "'target-lookups' are no longer a separate key. Merge 'target-lookups' and 'targets' lists and replace 'plugin' with '_plugin'"
           raise ValidationError.new(msg, @name)
         end
 

data/lib/bolt/util.rb

@@ -80,26 +80,6 @@ module Bolt
         File.exist?(path) ? read_yaml_hash(path, file_name) : {}
       end
 
-      def first_runs_free
-        # If this fails, use the system path instead
-        FileUtils.mkdir_p(Bolt::Config.user_path)
-        Bolt::Config.user_path + '.first_runs_free'
-      rescue StandardError
-        begin
-          # If using the system path fails, then don't bother with the welcome
-          # message
-          FileUtils.mkdir_p(Bolt::Config.system_path)
-          Bolt::Config.system_path + '.first_runs_free'
-        rescue StandardError
-          nil
-        end
-      end
-
-      def first_run?
-        !first_runs_free.nil? &&
-          !File.exist?(first_runs_free)
-      end
-
       # If Puppet is loaded, we aleady have the path to the module and should
       # just get it. This takes the path to a file provided by the user and a
       # Puppet Parser scope object and tries to find the file, either as an

data/lib/bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bolt
-  VERSION = '5.2.0'
+  VERSION = '5.3.0'
 end

data/modules/puppet_connect/plans/test_input_data.pp

@@ -78,11 +78,11 @@ plan puppet_connect::test_input_data(TargetSpec $targets = 'all') {
       }
     }
 
-    # Bolt defaults to using the "module" based form of the puppet_agent plugin. Connect defaults
+    # OpenBolt defaults to using the "module" based form of the openvox_bootstrap plugin. Connect defaults
     # to using the "task" based form as *only* the task based form in supported in Connect. This check
     # ensures that if the default is not being used, only task based plugins are allowed.
     $plugin = $target.plugin_hooks["puppet_library"]
-    $user_configured_plugin = $plugin != { "plugin"=> "puppet_agent", "stop_service"=> true }
+    $user_configured_plugin = $plugin != { "plugin"=> "openvox_bootstrap", "stop_service"=> true }
     if ($user_configured_plugin and $plugin["plugin"] != "task"){
       fail_plan("Only task plugins are acceptable for puppet_library hook")
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openbolt
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - OpenVox Project
@@ -111,14 +111,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +147,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: minitar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -307,14 +327,14 @@ dependencies:
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -433,26 +453,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
-- !ruby/object:Gem::Dependency
-  name: minitar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 description: Execute commands remotely over SSH and WinRM
 email:
 - openvox@voxpupuli.org