foreman_envsync 1.2.3 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d987ff8f7bfd3d2845ea51195f513ab357ae8fef2382d2bb15cc764293c9ef9
-  data.tar.gz: 55cf9f7a96aed4cdbe4fe0271d0fb45b227d660f4291762f640cf9db7203673a
+  metadata.gz: ce024c44d5429e2072e68add6244287999429a4222a73bff1f68244100d5cfd9
+  data.tar.gz: 375478ec27003f15f4c462bbd3974149f0d6f665850c9c7ed4ff5ab19c803c07
 SHA512:
-  metadata.gz: 9ec0f2236b24b425f33ff68419f3d2732efafc65e36723936e03691c8caf655cfd820028c18e5f2dd206fea4976ab5c3d5931ba270672652b95c98253ef2def4
-  data.tar.gz: 1bc572c08b399cbc6e816c8701d8bd778e6e590c5d51982b92e35be96d0614b879c292a0ff87bdf900f47a14c98fde8bf0aeee3fa286860ebe4a76e69e369993
+  metadata.gz: 14303c21ba7370e97c9950de54ae5d92f15a551b3a829249873295c57190271c57daeddc0fd04bd115bda13ed558d946a7e310868b4004320b2a73f9b7d0cdbd
+  data.tar.gz: f30fe471f95524c48271fc1a305007187281719b43e92a3230860a626a032e57c4d5f98819a3503fc5157957061e6879e56b6c8ffe4998acdf10641b80290b92

data/.rubocop.yml

@@ -1,5 +1,9 @@
+require:
+  - rubocop-rake
+  - rubocop-rspec
+
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0
   NewCops: enable
 
 Style/StringLiterals:
@@ -15,3 +19,20 @@ Layout/LineLength:
 
 Gemspec/RequireMFA:
   Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/ModuleLength:
+  Enabled: false
+Metrics/ParameterLists:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false

data/exe/foreman_envsync

@@ -8,29 +8,38 @@ require "rest-client"
 require "socket"
 require "yaml"
 
-@options = {}
-option_parser = OptionParser.new do |opts|
-  opts.banner = "Usage: foreman_envsync [options]"
-  opts.separator ""
-  opts.separator "Specifc options:"
-
-  opts.on("-v", "--verbose", "Enable verbose output") do |o|
-    @options[:verbose] = [o]
-  end
-
-  opts.on_tail("-h", "--help", "Show this message") do
-    puts opts
-    exit
+def parse_options
+  @options = {}
+  option_parser = OptionParser.new do |opts|
+    opts.banner = "Usage: foreman_envsync [options]"
+    opts.separator ""
+    opts.separator "Specifc options:"
+
+    opts.on("-v", "--verbose", "Enable verbose output") do |o|
+      @options[:verbose] = [o]
+    end
+
+    opts.on_tail("-h", "--help", "Show this message") do
+      puts opts
+      exit
+    end
   end
+  option_parser.parse!
 end
-option_parser.parse!
 
 def verbose_list(msg, items)
   return unless @options[:verbose] && !items.nil?
 
   printf(msg, items.count)
   puts
-  puts "#{YAML.dump(items.sort)}\n" unless items.empty?
+  return if items.empty?
+
+  # do not attempt to sorry Array of Hashes
+  if items.is_a?(Array) && items.first.is_a?(Hash)
+    puts "#{YAML.dump(items)}\n"
+  else
+    puts "#{YAML.dump(items.sort)}\n"
+  end
 end
 
 def cert_file(file)
@@ -103,6 +112,14 @@ def foreman_org_ids
   hammer_cmd_parse_one(cmd, field)
 end
 
+# prefer the puppetserver 7 ca_crt.pem path
+def ssl_ca_file
+  %w[
+    /etc/puppetlabs/puppetserver/ca/ca_crt.pem
+    /etc/puppetlabs/puppet/ssl/ca/ca_crt.pem
+  ].find { |f| File.exist?(f) }
+end
+
 def puppetserver_env_list
   hostname = Socket.gethostname
 
@@ -112,59 +129,65 @@ def puppetserver_env_list
     ssl_client_cert: cert_file("/etc/puppetlabs/puppet/ssl/certs/#{hostname}.pem"),
     ssl_client_key: key_file("/etc/puppetlabs/puppet/ssl/private_keys/#{hostname}.pem"),
     verify_ssl: true,
-    ssl_ca_file: "/etc/puppetlabs/puppet/ssl/ca/ca_crt.pem"
+    ssl_ca_file: ssl_ca_file
   )
 
   JSON.parse(res)["environments"].keys
 end
 
-#
-# Fetch list of puppet environments from puppetserver API.
-#
-ps_envs = puppetserver_env_list
-verbose_list "found %d puppetserver environment(s).", ps_envs
-
-#
-# Fetch list of puppet environments from foreman. The hammer cli is used to
-# avoid having to manage credentials.  In theory, foreman supports auth using
-# x509 similar to puppetserver but this failed when tested using both `curl` and
-# configuring hammer to use x509.
-#
-f_envs = foreman_env_list
-verbose_list "found %d foreman environment(s).", f_envs
-
-#
-# Does foreman have any puppet envs puppetserver is unaware of?
-#
-extra_envs = f_envs - ps_envs
-verbose_list "found %d foreman environment(s) unknown to puppetserver.", extra_envs
-
-#
-# Remove any foreman envs unknown to puppetserver
-#
-report = extra_envs.collect { |x| foreman_env_delete(x) } unless extra_envs.empty?
-verbose_list "deleted %d foreman environment(s).", report.nil? ? nil : report.compact
-
-# update foreman envs if anything was deleted
-f_envs = foreman_env_list unless report.nil?
-
-#
-# Does puppetserver have any envs foreman is unaware of?
-#
-new_envs = ps_envs - f_envs
-verbose_list "found %d puppetserver environment(s) unknown to foreman.", new_envs
-
-# if not, exit
-exit 0 if new_envs.empty?
-
-#
-# Create new foreman env(s) with all existing locations and organizations
-#
-location_ids = foreman_location_ids
-verbose_list "found %d foreman location(s).", location_ids
-
-org_ids = foreman_org_ids
-verbose_list "found %d foreman organization(s).", org_ids
-
-report = new_envs.collect { |x| foreman_env_create(x, location_ids, org_ids) }
-verbose_list "created %d foreman environment(s).", report
+def main
+  parse_options
+
+  #
+  # Fetch list of puppet environments from puppetserver API.
+  #
+  ps_envs = puppetserver_env_list
+  verbose_list "found %d puppetserver environment(s).", ps_envs
+
+  #
+  # Fetch list of puppet environments from foreman. The hammer cli is used to
+  # avoid having to manage credentials.  In theory, foreman supports auth using
+  # x509 similar to puppetserver but this failed when tested using both `curl` and
+  # configuring hammer to use x509.
+  #
+  f_envs = foreman_env_list
+  verbose_list "found %d foreman environment(s).", f_envs
+
+  #
+  # Does foreman have any puppet envs puppetserver is unaware of?
+  #
+  extra_envs = f_envs - ps_envs
+  verbose_list "found %d foreman environment(s) unknown to puppetserver.", extra_envs
+
+  #
+  # Remove any foreman envs unknown to puppetserver
+  #
+  report = extra_envs.collect { |x| foreman_env_delete(x) } unless extra_envs.empty?
+  verbose_list "deleted %d foreman environment(s).", report.nil? ? nil : report.compact
+
+  # update foreman envs if anything was deleted
+  f_envs = foreman_env_list unless report.nil?
+
+  #
+  # Does puppetserver have any envs foreman is unaware of?
+  #
+  new_envs = ps_envs - f_envs
+  verbose_list "found %d puppetserver environment(s) unknown to foreman.", new_envs
+
+  # if not, exit
+  exit 0 if new_envs.empty?
+
+  #
+  # Create new foreman env(s) with all existing locations and organizations
+  #
+  location_ids = foreman_location_ids
+  verbose_list "found %d foreman location(s).", location_ids
+
+  org_ids = foreman_org_ids
+  verbose_list "found %d foreman organization(s).", org_ids
+
+  report = new_envs.collect { |x| foreman_env_create(x, location_ids, org_ids) }
+  verbose_list "created %d foreman environment(s).", report
+end
+
+main if File.basename($PROGRAM_NAME) == File.basename(__FILE__)

data/foreman_envsync.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "Sync pupperserver envs with foreman"
   spec.homepage      = "https://github.com/lsst-it/foreman_envsync"
   spec.license       = "MIT"
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 3.0.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/lsst-it/foreman_envsync"

data/lib/foreman_envsync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanEnvsync
-  VERSION = "1.2.3"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_envsync
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.4.1
 platform: ruby
 authors:
 - Joshua Hoblitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -134,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="