foreman_envsync 1.2.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d38a8f525bb525110ab6a663e5fd078d7307fcf723482f325be84b7c52fd8234
-  data.tar.gz: 32ac2c15a493a6c1ecf3a17672e3318791edeeb3072ecea3d777a9603222f1c1
+  metadata.gz: 9bbd2448eb8bc5347c7753ebb733be2dac67c13cb01ef248ebb888ed80697a54
+  data.tar.gz: b1793f92f1489b9bc235b870190ced2285d9bdd50c2ec7fa12fc0c71fb1e0769
 SHA512:
-  metadata.gz: 8de536088363db02fe41cc82d19a09b1a82796f109100b283271893b6a0dd5c1c7590f9558a4717b82f235ded05440f65fa2e49f4987f44b68058a77dc6707c5
-  data.tar.gz: 01e819fd4e5d5c1c20a0eb10b36c88363a9c35b85eb8cfc21a8f08b9ae2041137907d5d985d310af79df561caa8e82bf3832787111a29fa09598d0856979f00f
+  metadata.gz: 6b1c79bfc420af41375b913a51fd58bc3b38372eadf69710d926b0d38f07c1ea042a3af8793f8e8e6ae2ae34ca203a5e76c88472d39c3f5817c4efcf830cba3d
+  data.tar.gz: 69d4d1a6994047dce137702ae3c1c51de952e754137d781b39ef07662f1609a573c2beff3071b7a6ad6d6f0a15bf6f51118896fdc8609ad7ce55ab6cc8a5809b

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)
+  return if items.empty?
+
   puts
-  puts "#{YAML.dump(items.sort)}\n" unless 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.2"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_envsync
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Joshua Hoblitt
-autorequire:
+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
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - josh@hoblitt.com
 executables:
@@ -126,7 +126,7 @@ metadata:
   source_code_uri: https://github.com/lsst-it/foreman_envsync
   changelog_uri: https://github.com/lsst-it/foreman_envsync/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'false'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -134,15 +134,15 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: Sync pupperserver envs with foreman
 test_files: []