Merge pull request #198 from ripienaar/ruby_323

(misc) Attempt to fix CI

.circleci/config.yml

@@ -1,10 +1,17 @@
-version: 2
+version: 2.1
+
+orbs:
+  ruby: circleci/[email protected]
+
 jobs:
   rspec_and_rubocop:
     docker:
       - image: circleci/ruby:2.5-node
     steps:
       - checkout
+      - ruby/install:
+          version: '3.2.3'
+      - run: ruby --version
       - run: bundle install
       - run: bundle exec rake test
 

.gitignore

@@ -6,6 +6,5 @@ etc/ssl/clients/*pem
 plugins/mcollective/security/none.rb
 tags
 pkg
-Gemfile.lock
 .bundle
 .ruby-version

Gemfile

@@ -21,5 +21,4 @@ group :development, :test do
   gem "webmock"
   gem "yard"
   gem "google-protobuf", "3.25"
-
 end

Gemfile.lock

@@ -0,0 +1,157 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    ast (2.4.2)
+    bigdecimal (3.1.8)
+    choria-mcorpc-support (2.26.3)
+      nats-pure (~> 0.6, < 0.7.0)
+      systemu (~> 2.6, >= 2.6.4)
+    concurrent-ruby (1.3.3)
+    crack (1.0.0)
+      bigdecimal
+      rexml
+    deep_merge (1.2.2)
+    diff-lcs (1.5.1)
+    diplomat (2.6.4)
+      deep_merge (~> 1.2)
+      faraday (>= 0.9, < 3.0, != 2.0.0)
+    etcdv3 (0.11.6)
+      grpc (~> 1.17)
+    facter (4.7.1)
+      hocon (~> 1.3)
+      thor (>= 1.0.1, < 1.3)
+    faraday (2.9.2)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
+    fast_gettext (2.4.0)
+      prime
+    ffi (1.17.0-x86_64-linux-gnu)
+    forwardable (1.3.3)
+    google-protobuf (3.25.0-x86_64-linux)
+    googleapis-common-protos-types (1.15.0)
+      google-protobuf (>= 3.18, < 5.a)
+    grpc (1.64.0-x86_64-linux)
+      google-protobuf (~> 3.25)
+      googleapis-common-protos-types (~> 1.0)
+    hashdiff (1.1.0)
+    hocon (1.4.0)
+    jgrep (1.5.4)
+    json-schema (2.8.1)
+      addressable (>= 2.4)
+    json-schema-rspec (0.0.4)
+      json-schema (~> 2.5)
+      rspec
+    listen (3.9.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    locale (2.1.4)
+    mcollective-test (0.4.3)
+    metaclass (0.0.4)
+    mocha (0.12.10)
+      metaclass (~> 0.0.1)
+    multi_json (1.15.0)
+    nats-pure (0.6.2)
+    net-http (0.4.1)
+      uri
+    parallel (1.25.1)
+    parser (3.3.3.0)
+      ast (~> 2.4.1)
+      racc
+    prime (0.1.2)
+      forwardable
+      singleton
+    psych (5.1.2)
+      stringio
+    public_suffix (6.0.0)
+    puppet (8.7.0)
+      concurrent-ruby (~> 1.0)
+      deep_merge (~> 1.0)
+      facter (>= 4.3.0, < 5)
+      fast_gettext (>= 2.1, < 3)
+      locale (~> 2.1)
+      multi_json (~> 1.13)
+      puppet-resource_api (~> 1.5)
+      scanf (~> 1.0)
+      semantic_puppet (~> 1.0)
+    puppet-resource_api (1.9.0)
+      hocon (>= 1.0)
+    racc (1.8.0)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
+      ffi (~> 1.0)
+    rdoc (6.7.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.2)
+    rexml (3.3.1)
+      strscan
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.4)
+    rubocop (1.6.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
+    scanf (1.0.0)
+    semantic_puppet (1.1.0)
+    singleton (0.2.0)
+    stringio (3.1.1)
+    strscan (3.1.0)
+    systemu (2.6.5)
+    thor (1.2.2)
+    unicode-display_width (1.8.0)
+    uri (0.13.0)
+    webmock (3.23.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    yard (0.9.36)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  choria-mcorpc-support
+  diplomat (~> 2)
+  etcdv3
+  google-protobuf (= 3.25)
+  jgrep (>= 1.5.0)
+  json-schema-rspec
+  listen (~> 3)
+  mcollective-test
+  mocha (~> 0.12.2)
+  nats-pure (~> 0.6, < 0.7.0)
+  puppet (~> 8)
+  rake (>= 12.3.3)
+  rdoc
+  rspec (~> 3.9.0)
+  rubocop (= 1.6.1)
+  semantic_puppet
+  systemu (~> 2.6.4)
+  webmock
+  yard
+
+BUNDLED WITH
+   2.4.19

lib/mcollective/ddl/base.rb

@@ -52,11 +52,11 @@ def help(template=nil)
         unless template == "metadata-help.erb"
           metadata_template = Util.templatepath("metadata-help.erb")
           metadata_template = File.read(metadata_template)
-          metastring = ERB.new(metadata_template, 0, "%")
+          metastring = ERB.new(metadata_template, trim_mode: "%") # rubocop:disable Style/HashSyntax
           metastring = metastring.result(binding)
         end
 
-        erb = ERB.new(template, 0, "%")
+        erb = ERB.new(template, trim_mode: "%") # rubocop:disable Style/HashSyntax
         erb.result(binding)
       end
 

lib/mcollective/discovery/delegate.rb

@@ -39,9 +39,7 @@ def self.discover(filter, timeout, limit, client)
           cmd << "-S" << c.first["expr"]
         end
 
-        unless @config.federations.empty?
-          cmd << "--federations" << @config.federations.join(",")
-        end
+        cmd << "--federations" << @config.federations.join(",") unless @config.federations.empty?
 
         client.options.fetch(:discovery_options, []).each do |opt|
           cmd << "--do" << opt

lib/mcollective/rpc.rb

@@ -26,7 +26,6 @@ def rpcoptions
 
         Helpers.add_simplerpc_options(parser, opts)
       end
-
     end
 
     # Wrapper to create clients, supposed to be used as

lib/mcollective/ssl.rb

@@ -176,6 +176,8 @@ def verify_signature(signature, string, base64=false)
       signature = base64_decode(signature) if base64
 
       @public_key.verify(OpenSSL::Digest.new("SHA1"), signature, string)
+    rescue
+      false
     end
 
     # base 64 encode a string

lib/mcollective/util/choria.rb

@@ -97,7 +97,7 @@ def federated?
       #
       # @return [Array<String>]
       def federation_collectives
-        if (@config.federations.length > 0)
+        if !@config.federations.empty?
           @config.federations
         elsif (override_networks = env_fetch("CHORIA_FED_COLLECTIVE", nil))
           override_networks.split(",").map(&:strip).reject(&:empty?)

lib/mcollective/util/playbook/tasks/slack_task.rb

@@ -82,7 +82,7 @@ def run
               "username" => @username,
               "channel" => @channel,
               "icon_url" => @icon,
-              "attachments" => attachments,
+              "attachments" => attachments
             }
             post = choria.http_post(path, headers)
             post.body = params.to_json

lib/mcollective/util/tasks_support.rb

@@ -218,7 +218,7 @@ def request_spooldir(requestid)
       def create_request_spooldir(requestid, task)
         dir = request_spooldir(requestid)
 
-        FileUtils.mkdir_p(dir, :mode => 0o0750)
+        FileUtils.mkdir_p(dir, mode: 0o0750) # rubocop:disable Style/HashSyntax
 
         populate_spooldir(dir, task)
 
@@ -235,7 +235,7 @@ def populate_spooldir(spooldir, task)
 
           spool_filename = File.join(spooldir, "files", filename)
 
-          FileUtils.mkdir_p(File.dirname(spool_filename), :mode => 0o0750)
+          FileUtils.mkdir_p(File.dirname(spool_filename), mode: 0o0750) # rubocop:disable Style/HashSyntax
           FileUtils.cp(task_file_name(file), spool_filename)
         end
       end
@@ -718,7 +718,7 @@ def cache_task_file(file)
         http_get(path, "Accept" => "application/octet-stream") do |resp|
           raise("Failed to request task content %s: %s: %s" % [path, resp.code, resp.body]) unless resp.code == "200"
 
-          FileUtils.mkdir_p(cache_dir, :mode => 0o0750)
+          FileUtils.mkdir_p(cache_dir, mode: 0o0750) # rubocop:disable Style/HashSyntax
           FileUtils.rm_rf(file_name) if File.directory?(file_name)
 
           task_file = Tempfile.new("tasks_%s" % file["filename"])

spec/fixtures/ca_crt.pem

@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
 MIIFkDCCA3igAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFQdXBw
-ZXQgQ0E6IDFlN2RmZmFhYjBjOS5kZXZjby5uZXQwHhcNMTgwNTA3MTQ0NzUxWhcN
-MjMwNTA3MTQ0NzUxWjAsMSowKAYDVQQDDCFQdXBwZXQgQ0E6IDFlN2RmZmFhYjBj
-OS5kZXZjby5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDOesOo
-yTwLu1DpkDlYJi9u9U3NUFfiWckbWtp7uZwXtPoCuZlkr/i2oENu0uTvrUUW6X2s
-NJsZNbaaBnR/ieSfBYKZdVYoumnafM1cmxKZZubzQphjkMcgny0j+Mc1ON98XKlj
-kP3Is0tN11luznCPDhtApFAP16KURIrRV8INxwF3Cqcxdrtrmu7sQ9qNEGS9qSeJ
-zwLvajq8bwmmZpFnoti1q7n0NRLAeNSG7UBcsOHlgvf6SGdtEkBdREDpBSLozmeP
-o6urTpn/OOYNrbvI7o1ROtMSfkqAiiAap1I3uaOSOEjBdh60BUZYXDZwMp3ipk2O
-DWH1cUphIFm+Vjf8uxDF9ulONY4EUz9FdY9kYdO0w6WTP6jgwDPI/86kgSomSGzA
-Txy4qCq4mfgD6j/oBBpgaAOVIga40Gsh98lKPKgcEVxDgaW33MDCcGazJ/5aRKD2
-ZMrNoEfaklBZ1tvU3EB0TfBNk1MKwvR7tmqxUNaqRdxLWX4ypzXsyLd2NQ46ayFb
-iDOWRnhEz9qcOdhMPnYMn7OVUa+L45rm9Gto9o/uRtV8aSTL5BEvo3EejDg/qnVL
-aiOr45J/zwPYaczo9h05fHyUak2hGyhspaiCsz0QAe+S7n3gKkf8EX5W9Zqw0RE4
-cYMIls/V7lKk4bevBVx6OTplWMS3kyAgpl+L6QIDAQABo4G8MIG5MDcGCWCGSAGG
+ZXQgQ0E6IDRkZTVjZGMyZTQwMS5kZXZjby5uZXQwHhcNMjQwNzAxMTc0MDUwWhcN
+MjkwNzAxMTc0MDUwWjAsMSowKAYDVQQDDCFQdXBwZXQgQ0E6IDRkZTVjZGMyZTQw
+MS5kZXZjby5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDpbEOy
+4Xa/WJaRNZoW0fv6kEomk75WNw5Nw+Cosly5AnblTfFipzfcfb31YoQJnf0D8UKo
+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
-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
+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
 -----END CERTIFICATE-----

spec/fixtures/intermediate/ca-key.pem

@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAxEg9k5P6ydMaT7C2eLaytkRkp0bz4HR1KaWcE56ez4oAoGCCqGSM49
-AwEHoUQDQgAE4AznLqRAWi9V6kaIX7DIUuE8Py7DCHJ0duaNvaygy9XYe9grrqQN
-8tTBUcZjIGrI1wwWgsKPDsJDFYe7xHtWDA==
+MHcCAQEEIHm+pD4NmZExCCYcFpn+TmU23wTlblc+R4n8i1+iLqVwoAoGCCqGSM49
+AwEHoUQDQgAEeZaGuuqn/5hD14xG7ebOabkneBWS0ncN0yA08BjaQiq9Zrs5gffg
+tdz7mXWSxj/DYaEaiyzS8Y/gRMCk/RgHuA==
 -----END EC PRIVATE KEY-----

spec/fixtures/intermediate/ca.csr

@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIIBWTCCAQACAQAweTELMAkGA1UEBhMCWFgxETAPBgNVBAgTCExvY2FsaXR5MQ0w
+MIIBWjCCAQACAQAweTELMAkGA1UEBhMCWFgxETAPBgNVBAgTCExvY2FsaXR5MQ0w
 CwYDVQQHEwRDaXR5MQ8wDQYDVQQKEwZDaG9yaWExJTAjBgNVBAsTHFVuaXQgdGVz
 dGluZyBJbnRlcm1lZGlhdGUgQ0ExEDAOBgNVBAMTB1Jvb3QgQ0EwWTATBgcqhkjO
-PQIBBggqhkjOPQMBBwNCAATgDOcupEBaL1XqRohfsMhS4Tw/LsMIcnR25o29rKDL
-1dh72CuupA3y1MFRxmMgasjXDBaCwo8OwkMVh7vEe1YMoCUwIwYJKoZIhvcNAQkO
-MRYwFDASBgNVHRMBAf8ECDAGAQH/AgEBMAoGCCqGSM49BAMCA0cAMEQCIFIP7Y3o
-lWOmnnS439ynH+DhVHjxQB1nQq8S1ihT0hRvAiAu9QdE7bjn6on/Nvrx1OkgQKqp
-IUrny5/+biTN43+QHg==
+PQIBBggqhkjOPQMBBwNCAAR5loa66qf/mEPXjEbt5s5puSd4FZLSdw3TIDTwGNpC
+Kr1muzmB9+C13PuZdZLGP8NhoRqLLNLxj+BEwKT9GAe4oCUwIwYJKoZIhvcNAQkO
+MRYwFDASBgNVHRMBAf8ECDAGAQH/AgEBMAoGCCqGSM49BAMCA0gAMEUCIFEo8KBV
+60rfSbc4p2tJ9qNg51Jp3s8xOKkqEUbSXFqPAiEAwKOwPQgIKqzaO0dsHAVQ+XgQ
+WcZbeoJ5EYBG4Lrs4hw=
 -----END CERTIFICATE REQUEST-----

spec/fixtures/intermediate/ca.pem

@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICOzCCAeGgAwIBAgIUaW9IyV4kMARxLsp/4bXaQUJ8L9cwCgYIKoZIzj0EAwIw
+MIICOzCCAeGgAwIBAgIUED12r7dEslefj/UPBTS4ZCLbYYYwCgYIKoZIzj0EAwIw
 eTELMAkGA1UEBhMCWFgxETAPBgNVBAgTCExvY2FsaXR5MQ0wCwYDVQQHEwRDaXR5
 MQ8wDQYDVQQKEwZDaG9yaWExJTAjBgNVBAsTHFVuaXQgdGVzdGluZyBJbnRlcm1l
-ZGlhdGUgQ0ExEDAOBgNVBAMTB1Jvb3QgQ0EwIBcNMjIxMjI2MDkzNjAwWhgPMjA1
-MjEyMTgwOTM2MDBaMHkxCzAJBgNVBAYTAlhYMREwDwYDVQQIEwhMb2NhbGl0eTEN
+ZGlhdGUgQ0ExEDAOBgNVBAMTB1Jvb3QgQ0EwIBcNMjQwMTA0MTQzMDAwWhgPMjA1
+MzEyMjcxNDMwMDBaMHkxCzAJBgNVBAYTAlhYMREwDwYDVQQIEwhMb2NhbGl0eTEN
 MAsGA1UEBxMEQ2l0eTEPMA0GA1UEChMGQ2hvcmlhMSUwIwYDVQQLExxVbml0IHRl
 c3RpbmcgSW50ZXJtZWRpYXRlIENBMRAwDgYDVQQDEwdSb290IENBMFkwEwYHKoZI
-zj0CAQYIKoZIzj0DAQcDQgAE4AznLqRAWi9V6kaIX7DIUuE8Py7DCHJ0duaNvayg
-y9XYe9grrqQN8tTBUcZjIGrI1wwWgsKPDsJDFYe7xHtWDKNFMEMwDgYDVR0PAQH/
-BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYEFCjqodJmkbmxeN+P
-/xZkP0nXtiL9MAoGCCqGSM49BAMCA0gAMEUCIHYUykeatRjPhL4V1YeuayOhb7g7
-PtVO9P/H7YDe72bQAiEA2ggRyyPr/ALnbgJb8I96VKyFhdVXSPKTi9/gq7xupfc=
+zj0CAQYIKoZIzj0DAQcDQgAEeZaGuuqn/5hD14xG7ebOabkneBWS0ncN0yA08Bja
+Qiq9Zrs5gffgtdz7mXWSxj/DYaEaiyzS8Y/gRMCk/RgHuKNFMEMwDgYDVR0PAQH/
+BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYEFDh/G1nvTtOaU/xb
+/IwTHZwMVLMyMAoGCCqGSM49BAMCA0gAMEUCIQCg155sVWPDZFC55gL2tpVTb99u
+7P6uayFGD/w/rwuIIAIgcOBOisxqj44+aygaSM+aUAZlLFh13yVasyRXtU9QYfE=
 -----END CERTIFICATE-----