config_o_mat 0.5.0.beta0 → 0.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f62a5fad3fe328d90a14019d838f16de18fe9398a380c02d9f49882c90bcb4e3
-  data.tar.gz: 1f2d4bcfacefe5481d965bf4898e8c53f980c4ffbaab84bc3d51fb9a513ac7e0
+  metadata.gz: bb9ec5b07f001551fee80b15ba613646a295d35a1aa0d341e1cdd7924f014b17
+  data.tar.gz: 60a37f95f84bb1d0c29de65cbe43110a7dd4e1eab1f41b7c1952268a200d0776
 SHA512:
-  metadata.gz: 15243ce8aff37e6218459cf7f629394200eb309b649edc99ce260d44ecb11150be97dad200a0d78a20b599f3af3bd9b38cd06d467400aaa8b8dfee3cce0fbd09
-  data.tar.gz: 62ba31b15aabb2a19ba22354d7837be93f17d9455564da40da878fb9949a6fe1eabfbf9db27baed5ecfb23bb49a7421717311d6d182135914dc9830fd7b7fca5
+  metadata.gz: 14de2abaa1de0b6d6fb5b8301fb628f7c7315d7ac8ed302a5392115a754ba24c9b263784e2862ea3abafb0850b3f4b1626f2a74fe0b5bc97b9a461ac73c7bdfc
+  data.tar.gz: 483f4cfd52cd9d0e835490249602abb87167ae65bb07aa29113b33cce4d679e2e1a1364e2916a1c84784d32749be6fba7631c26d0254a94720bf6efe36242024

data/CHANGELOG.md

@@ -1,8 +1,8 @@
-## 0.5.0.beta0
+## 0.5.0.beta1
 
 NEW FEATURES:
 
-* Profiles can now specify an s3_fallback hash with bucket: and object:. If AWS AppConfig is unreachable, we will fall back to loading the specified S3 object and interpreting it as a response from AWS AppConfig. For best results enable versioning on the bucket.
+* Profiles can now specify an s3_fallback key. If AWS AppConfig is unreachable, we will fall back to loading the specified S3 object from the top level configured fallback_s3_bucket and interpreting it as a response from AWS AppConfig. For best results enable versioning on the bucket. It is an error to specify an s3_fallback key if the configuration does not have a top level fallback_s3_bucket.
 * AppConfig responses can request that the s3_fallback be used by setting a top level "aws:chaos_config" key to true. This allows for deployments which AppConfig deployments which can test the fallback mechanism. If a chaos config load fails, the source AppConfig profile will remain in use. Chaos config is ignored in error recovery scenarios.
 
 BUG FIXES:

data/lib/config_o_mat/configurator/memory.rb

@@ -26,7 +26,8 @@ module ConfigOMat
                     :generated_templates, :services_to_reload, :profiles_to_apply,
                     :last_refresh_time, :next_state, :retry_count, :retries_left, :retry_wait,
                     :region, :appconfig_client, :secretsmanager_client, :s3_client,
-                    :systemd_interface, :secrets_loader_memory, :gc_compact, :gc_stat
+                    :systemd_interface, :secrets_loader_memory, :gc_compact, :gc_stat,
+                    :fallback_s3_bucket
 
       def initialize(
         argv: [],
@@ -61,7 +62,8 @@ module ConfigOMat
         systemd_interface: nil,
         secrets_loader_memory: nil,
         gc_compact: 0,
-        gc_stat: 0
+        gc_stat: 0,
+        fallback_s3_bucket: nil
       )
         super()
 
@@ -98,6 +100,7 @@ module ConfigOMat
         @secrets_loader_memory = secrets_loader_memory
         @gc_compact = gc_compact
         @gc_stat = gc_stat
+        @fallback_s3_bucket = fallback_s3_bucket
       end
     end
   end

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

@@ -22,7 +22,7 @@ module ConfigOMat
   module Op
     class RefreshAllProfiles < LifecycleVM::OpBase
       reads :profile_defs, :applied_profiles, :client_id, :appconfig_client, :secrets_loader_memory,
-            :secretsmanager_client, :s3_client
+            :secretsmanager_client, :s3_client, :fallback_s3_bucket
       writes :profiles_to_apply, :last_refresh_time, :secrets_loader_memory
 
       def call
@@ -57,13 +57,12 @@ module ConfigOMat
       end
 
       def request_from_s3(profile_name, definition, ignore_errors)
-        fallback = definition.s3_fallback
         begin
-          s3_response = s3_client.get_object(bucket: fallback[:bucket], key: fallback[:object])
+          s3_response = s3_client.get_object(bucket: fallback_s3_bucket, key: definition.s3_fallback)
           OpenStruct.new(
             content: s3_response.body,
             content_type: s3_response.content_type,
-            configuration_version: s3_response.version_id
+            configuration_version: s3_response.version_id || s3_response.etag
           )
         rescue StandardError => e
           logger&.error(:s3_fallback_load_failed, name: profile_name, reason: e)

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

@@ -20,7 +20,7 @@ module ConfigOMat
   module Op
     class RefreshProfile < LifecycleVM::OpBase
       reads :profile_defs, :client_id, :applying_profile, :appconfig_client, :secretsmanager_client,
-            :secrets_loader_memory, :s3_client
+            :secrets_loader_memory, :s3_client, :fallback_s3_bucket
       writes :applying_profile, :secrets_loader_memory
 
       def call
@@ -56,13 +56,12 @@ module ConfigOMat
       end
 
       def request_from_s3(profile_name, definition)
-        fallback = definition.s3_fallback
         begin
-          s3_response = s3_client.get_object(bucket: fallback[:bucket], key: fallback[:object])
+          s3_response = s3_client.get_object(bucket: fallback_s3_bucket, key: definition.s3_fallback)
           OpenStruct.new(
             content: s3_response.body,
             content_type: s3_response.content_type,
-            configuration_version: s3_response.version_id
+            configuration_version: s3_response.version_id || s3_response.etag
           )
         rescue StandardError => e
           error profile_name, e

data/lib/config_o_mat/meta_configurator/memory.rb

@@ -23,7 +23,8 @@ module ConfigOMat
                     :systemd_directory, :logs_directory, :profile_defs,
                     :template_defs, :service_defs, :dependencies, :refresh_interval,
                     :client_id, :retry_count, :retries_left, :retry_wait,
-                    :region, :systemd_interface, :gc_stat, :gc_compact
+                    :region, :systemd_interface, :gc_stat, :gc_compact,
+                    :fallback_s3_bucket
 
       def initialize(
         argv: [],
@@ -46,7 +47,8 @@ module ConfigOMat
         region: nil,
         systemd_interface: nil,
         gc_stat: 0,
-        gc_copmact: 0
+        gc_copmact: 0,
+        fallback_s3_bucket: nil
       )
         super()
 
@@ -71,6 +73,7 @@ module ConfigOMat
         @systemd_interface = systemd_interface
         @gc_stat = gc_stat
         @gc_compact = gc_compact
+        @fallback_s3_bucket = fallback_s3_bucket
       end
     end
   end

data/lib/config_o_mat/shared/op/load_meta_config.rb

@@ -63,7 +63,8 @@ module ConfigOMat
       reads :configuration_directory, :logs_directory, :env
       writes :profile_defs, :template_defs, :service_defs, :dependencies,
              :refresh_interval, :client_id, :logger, :retry_count, :retries_left,
-             :retry_wait, :region, :systemd_interface, :gc_stat, :gc_compact
+             :retry_wait, :region, :systemd_interface, :gc_stat, :gc_compact,
+             :fallback_s3_bucket
 
       def call
         default_config = {
@@ -127,6 +128,11 @@ module ConfigOMat
         self.service_defs = instantiate.call(:services, Service)
         self.template_defs = instantiate.call(:templates, Template)
         self.profile_defs = instantiate.call(:profiles, Profile)
+        self.fallback_s3_bucket = merged_config[:fallback_s3_bucket]
+
+        if profile_defs.values.any? { |pd| pd.s3_fallback } && (fallback_s3_bucket.nil? || fallback_s3_bucket.empty?)
+          error :fallback_s3_bucket, 'must be present to use s3_fallback on profiles'
+        end
 
         facter = merged_config[:facter]
         if facter

data/lib/config_o_mat/shared/types.rb

@@ -178,13 +178,10 @@ module ConfigOMat
       error :environment, 'must be present' if @environment.nil? || @environment.empty?
       error :profile, 'must be present' if @profile.nil? || @profile.empty?
       if !@s3_fallback.nil?
-        if !@s3_fallback.kind_of?(Hash)
-          error :s3_fallback, 'must be a hash'
+        if @s3_fallback.kind_of?(String)
+          error :s3_fallback, 'must be non-empty' if @s3_fallback.empty?
         else
-          bucket = @s3_fallback[:bucket]
-          object = @s3_fallback[:object]
-          error :s3_fallback, 'must include bucket' if bucket.nil? || bucket.empty?
-          error :s3_fallback, 'must include object' if object.nil? || object.empty?
+          error :s3_fallback, 'must be a string'
         end
       end
     end

data/lib/config_o_mat/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config_o_mat
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta0
+  version: 0.5.0.beta1
 platform: ruby
 authors:
 - Alex Scarborough