config_o_mat 0.5.0.beta1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb9ec5b07f001551fee80b15ba613646a295d35a1aa0d341e1cdd7924f014b17
-  data.tar.gz: 60a37f95f84bb1d0c29de65cbe43110a7dd4e1eab1f41b7c1952268a200d0776
+  metadata.gz: bfd77fccc2eacbbf97b0e44ea6caa02f2c994b174ec091d46e98f6aca26f9cdd
+  data.tar.gz: 03243ddfa16e63b0f5bc9816046be73ab1b557ae4bbaf70830b6e5c278fc7c68
 SHA512:
-  metadata.gz: 14de2abaa1de0b6d6fb5b8301fb628f7c7315d7ac8ed302a5392115a754ba24c9b263784e2862ea3abafb0850b3f4b1626f2a74fe0b5bc97b9a461ac73c7bdfc
-  data.tar.gz: 483f4cfd52cd9d0e835490249602abb87167ae65bb07aa29113b33cce4d679e2e1a1364e2916a1c84784d32749be6fba7631c26d0254a94720bf6efe36242024
+  metadata.gz: 6b25fa1f29266aaef70ce42c44eed6e45494d7d5c3d823f909ee25f49a339251152649685c3176dd045b4ba6b4a26aabca4ed5da1bc6fcf95da5ea2756a021b6
+  data.tar.gz: 48ecbdd572d5cd837db6f3be1e6e6b9a44d0d3dba58b1ef21000ac36755011d91cc00360cdb6fb082cf358ce8fbdc0635e69a07ec739ef7f1252c06e58fa82f8

data/CHANGELOG.md

@@ -1,4 +1,20 @@
-## 0.5.0.beta1
+## 0.5.3
+
+BUG FIXES:
+
+* When restart_mode: none, output dropins to load credentials for services.
+
+## 0.5.2
+
+* Rerelease of 0.5.1 with merged PRs.
+
+## 0.5.1
+
+ENHANCEMENTS:
+
+* Added restart_mode: none, to prevent service restarts on a configuration update.
+
+## 0.5.0
 
 NEW FEATURES:
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    config_o_mat (0.4.4)
+    config_o_mat (0.5.3)
       aws-sdk-appconfig (~> 1.18)
       aws-sdk-s3 (~> 1.114)
       aws-sdk-secretsmanager (~> 1.57)
@@ -15,30 +15,30 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.2.0)
-    aws-partitions (1.593.0)
-    aws-sdk-appconfig (1.25.0)
+    aws-partitions (1.615.0)
+    aws-sdk-appconfig (1.26.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.131.1)
+    aws-sdk-core (3.131.6)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.57.0)
+    aws-sdk-kms (1.58.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.114.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-secretsmanager (1.62.0)
+    aws-sdk-secretsmanager (1.64.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.5.1)
       aws-eventstream (~> 1, >= 1.0.2)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    facter (4.2.10)
+    facter (4.2.11)
       hocon (~> 1.3)
       thor (>= 1.0.1, < 2.0)
     hocon (1.3.1)

data/lib/config_o_mat/configurator/op/refresh_profile.rb

@@ -36,7 +36,6 @@ module ConfigOMat
       def refresh_facter_profile
         profile_name = applying_profile.name
         profile_version = applying_profile.version
-        definition = profile_defs[profile_name]
         new_profile = ConfigOMat::LoadedFacterProfile.new(profile_name)
 
         if new_profile.version == profile_version

data/lib/config_o_mat/configurator/op/reload_one_service.rb

@@ -33,6 +33,11 @@ module ConfigOMat
 
         if restart_mode == :restart || restart_mode == :restart_all
           do_restart(service, service_def)
+        elsif restart_mode == :none
+          logger&.notice(
+            :skipped_service_restart,
+            name: service, systemd_unit: service_def.systemd_unit
+          )
         else
           do_flip_flop(service, service_def)
         end

data/lib/config_o_mat/meta_configurator/op/generate_systemd_config.rb

@@ -29,9 +29,11 @@ module ConfigOMat
         grouped_restart_modes = service_defs.values.group_by(&:restart_mode)
         restarts = grouped_restart_modes.fetch(:restart, []) + grouped_restart_modes.fetch(:restart_all, [])
         flip_flops = grouped_restart_modes[:flip_flop]
+        nones = grouped_restart_modes[:none]
 
         enable_restarts(restarts) if !restarts.empty?
         enable_flip_flops(flip_flops) if flip_flops
+        enable_nones(nones) if nones
 
         systemd_interface.daemon_reload
       end
@@ -51,6 +53,16 @@ module ConfigOMat
         File.open(File.join(dropin_dir, DROPIN_FILE_NAME), 'w') { |f| f.write(dropin) }
       end
 
+      def enable_nones(services)
+        services.each do |service|
+          unit = service.systemd_unit.delete_suffix('@')
+          write_dropin(unit, service)
+
+          unit = "#{unit}@"
+          write_dropin(unit, service)
+        end
+      end
+
       def enable_restarts(services)
         units = []
         services.each do |service|

data/lib/config_o_mat/shared/types.rb

@@ -21,6 +21,8 @@ require 'yaml'
 require 'digest'
 
 module ConfigOMat
+  PRESENCE_ERROR_MSG = 'must be present'
+
   class LogWriter
     def call(level_name, event_type, merged_data)
       merged_data[:level] = level_name
@@ -87,7 +89,7 @@ module ConfigOMat
   end
 
   class Service < ConfigItem
-    RESTART_MODES = %i[restart flip_flop restart_all].freeze
+    RESTART_MODES = %i[restart flip_flop restart_all none].freeze
 
     attr_reader :systemd_unit, :restart_mode, :templates, :restart_unit
 
@@ -108,11 +110,11 @@ module ConfigOMat
     end
 
     def validate
-      error :templates, 'must be present' if @templates.nil? || @templates.empty?
+      error :templates, PRESENCE_ERROR_MSG if @templates.nil? || @templates.empty?
       unless @templates.is_a?(Array) && @templates.all? { |v| v.is_a?(String) }
         error :templates, 'must be an array of strings'
       end
-      error :systemd_unit, 'must be present' if @systemd_unit.nil? || @systemd_unit.empty? || @systemd_unit == '@'
+      error :systemd_unit, PRESENCE_ERROR_MSG if @systemd_unit.nil? || @systemd_unit.empty? || @systemd_unit == '@'
       error :restart_mode, "must be one of #{RESTART_MODES}" unless RESTART_MODES.include?(@restart_mode)
 
       if @restart_mode == :flip_flop && !@systemd_unit.end_with?('@')
@@ -148,8 +150,8 @@ module ConfigOMat
     end
 
     def validate
-      error :src, 'must be present' if @src.nil? || @src.empty?
-      error :dst, 'must be present' if @dst.nil? || @dst.empty?
+      error :src, PRESENCE_ERROR_MSG if @src.nil? || @src.empty?
+      error :dst, PRESENCE_ERROR_MSG if @dst.nil? || @dst.empty?
     end
 
     def hash
@@ -174,9 +176,9 @@ module ConfigOMat
     end
 
     def validate
-      error :application, 'must be present' if @application.nil? || @application.empty?
-      error :environment, 'must be present' if @environment.nil? || @environment.empty?
-      error :profile, 'must be present' if @profile.nil? || @profile.empty?
+      error :application, PRESENCE_ERROR_MSG if @application.nil? || @application.empty?
+      error :environment, PRESENCE_ERROR_MSG if @environment.nil? || @environment.empty?
+      error :profile, PRESENCE_ERROR_MSG if @profile.nil? || @profile.empty?
       if !@s3_fallback.nil?
         if @s3_fallback.kind_of?(String)
           error :s3_fallback, 'must be non-empty' if @s3_fallback.empty?
@@ -225,8 +227,8 @@ module ConfigOMat
     end
 
     def validate
-      error :name, 'must be present' if @name.nil? || @name.empty?
-      error :contents, 'must be present' if @contents.nil? || @contents.empty?
+      error :name, PRESENCE_ERROR_MSG if @name.nil? || @name.empty?
+      error :contents, PRESENCE_ERROR_MSG if @contents.nil? || @contents.empty?
       error :contents, 'must be a hash' if !@contents.kind_of?(Hash)
     end
 
@@ -320,10 +322,10 @@ module ConfigOMat
     end
 
     def validate
-      error :name, 'must be present' if @name.nil? || @name.empty?
+      error :name, PRESENCE_ERROR_MSG if @name.nil? || @name.empty?
       error :name, 'must be a Symbol' unless @name.is_a?(Symbol)
-      error :version, 'must be present' if @version.nil? || @version.empty?
-      error :contents, 'must be present' if @contents.nil? || @contents.empty?
+      error :version, PRESENCE_ERROR_MSG if @version.nil? || @version.empty?
+      error :contents, PRESENCE_ERROR_MSG if @contents.nil? || @contents.empty?
     end
 
     def hash
@@ -392,7 +394,7 @@ module ConfigOMat
     end
 
     def validate
-      error :secret_id, 'must be present' if @secret_id.nil? || @secret_id.empty?
+      error :secret_id, PRESENCE_ERROR_MSG if @secret_id.nil? || @secret_id.empty?
       error :content_type, "must be one of #{VALID_CONTENT_TYPES}" unless VALID_CONTENT_TYPES.include?(@content_type)
     end
 

data/lib/config_o_mat/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module ConfigOMat
-  VERSION = "0.5.0.beta1"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_o_mat
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta1
+  version: 0.5.3
 platform: ruby
 authors:
 - Alex Scarborough
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-27 00:00:00.000000000 Z
+date: 2022-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-appconfig
@@ -259,9 +259,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: