secret_config 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24792842f7d81af2c5d70eb431eae87ec96f190a52500c7e68267b6e875a4e09
-  data.tar.gz: 29f1683c2be73597476f976860dd021476559d97ed94e04195789fadaf4fb7f8
+  metadata.gz: 4774ef1279f56c5ce70a89de9fdada0c661b4085afef81c6296aa56800da92fa
+  data.tar.gz: 8f16b3bf4a7193315a5c761f3ce39283a23851660c2aa61752b8d958b1798e20
 SHA512:
-  metadata.gz: 89a0ecfab4bfb8263768ccf51ec56b987866cac08d23c2c9e34a69b9ba3210d9ed40198cfd525d72f54dcf4e6aa0f2c8965d30204ec96c4b825f1c61313c35b5
-  data.tar.gz: c0047de74541f0589ebe2ad66a67133b73d6fa5635610d81b685394aca395d46dfadc4171ca655975296289292203dc004a977fe265c6b0d704ad4a894cc6983
+  metadata.gz: 0afe6dab591c52af29ecb7a95317c8da193e8220b0a89da8f4dbd8f641c9aa8848adf033aa32ffc15f7974c54ec245791914526b07f3a589dec1e562caa91e3b
+  data.tar.gz: feb776daefb9795da0ffabcec4cc3da4a6030bcc3d6043525eba24823e0d6051c072ebfb0ee019466eeadef03e491afdd5ed88a0ac552575a78351b1c456d5b9

data/lib/secret_config/cli.rb

@@ -10,7 +10,7 @@ module SecretConfig
   class CLI
     attr_reader :path, :region, :provider,
                 :export, :no_filter,
-                :import, :key_id, :key_alias, :random_size, :prune, :overwrite,
+                :import, :key_id, :key_alias, :random_size, :prune, :force,
                 :diff_path, :import_path,
                 :fetch_key, :delete_key, :set_key, :set_value, :delete_path,
                 :copy_path, :diff,
@@ -46,6 +46,7 @@ module SecretConfig
       @delete_path  = nil
       @diff_path    = nil
       @import_path  = nil
+      @force        = false
 
       if argv.empty?
         puts parser
@@ -63,13 +64,13 @@ module SecretConfig
       elsif export
         run_export(export, path, filtered: !no_filter)
       elsif import
-        run_import(import, path, prune)
+        run_import(import, path, prune, force)
       elsif import_path
-        run_import_path(import_path, path, prune)
+        run_import_path(import_path, path, prune, force)
       elsif diff
         run_diff(diff, path)
       elsif diff_path
-        run_diff_path(diff, path)
+        run_diff_path(diff_path, path)
       elsif set_key
         run_set(set_key, set_value)
       elsif fetch_key
@@ -152,6 +153,10 @@ module SecretConfig
           @prune = true
         end
 
+        opts.on "--force", "During import overwrite all values, not just the changed ones. Useful for changing the KMS key. Only applies to --import and --import-path." do
+          @force = true
+        end
+
         opts.on "--key_id KEY_ID", "Encrypt config settings with this AWS KMS key id. Default: AWS Default key." do |key_id|
           @key_id = key_id
         end
@@ -182,14 +187,15 @@ module SecretConfig
     private
 
     def provider_instance
-      @provider_instance ||= begin
-        case provider
-        when :ssm
-          Providers::Ssm.new(key_id: key_id, key_alias: key_alias)
-        else
-          raise ArgumentError, "Invalid provider: #{provider}"
+      @provider_instance ||=
+        begin
+          case provider
+          when :ssm
+            Providers::Ssm.new(key_id: key_id, key_alias: key_alias)
+          else
+            raise ArgumentError, "Invalid provider: #{provider}"
+          end
         end
-      end
     end
 
     def run_export(file_name, path, filtered: true)
@@ -201,20 +207,20 @@ module SecretConfig
       puts("Exported #{path} from #{provider} to #{file_name}") if file_name.is_a?(String)
     end
 
-    def run_import(file_name, path, prune = false)
+    def run_import(file_name, path, prune, force)
       raise(ArgumentError, "Missing required option --path") unless path
 
       config = read_config_file(file_name)
-      import_config(config, path, prune)
+      import_config(config, path, prune, force)
 
       puts("Imported #{file_name} to #{path} on provider: #{provider}") if file_name.is_a?(String)
     end
 
-    def run_import_path(source_path, path, prune = false)
+    def run_import_path(source_path, path, prune, force)
       raise(ArgumentError, "Missing required option --path") unless path
 
       config = fetch_config(source_path, filtered: false)
-      import_config(config, path, prune)
+      import_config(config, path, prune, force)
 
       puts("Imported #{source_path} to #{path} on provider: #{provider}")
     end
@@ -236,10 +242,10 @@ module SecretConfig
       raise(ArgumentError, "Missing required option --path") unless path
 
       source_config = fetch_config(source_path, filtered: false)
-      source        = Utils.flatten(source_config, path)
+      source        = Utils.flatten(source_config)
 
       target_config = fetch_config(path, filtered: false)
-      target        = Utils.flatten(target_config, path)
+      target        = Utils.flatten(target_config)
 
       puts("Comparing #{source_path} to #{path} on provider: #{provider}")
       diff_config(source, target)
@@ -253,6 +259,15 @@ module SecretConfig
       provider_instance.delete(key)
     end
 
+    def run_delete_path(path)
+      source_config = fetch_config(path)
+      source        = Utils.flatten(source_config, path)
+      source.each_key do |key|
+        puts("Deleting #{key}")
+        provider_instance.delete(key)
+      end
+    end
+
     def run_fetch(key)
       value = provider_instance.fetch(key)
       puts value if value
@@ -319,7 +334,7 @@ module SecretConfig
       end
     end
 
-    def import_config(config, path, prune = false)
+    def import_config(config, path, prune, force)
       raise(ArgumentError, "Missing required option --path") unless path
 
       delete_keys = prune ? current_values.keys - Utils.flatten(config, path).keys : []
@@ -330,7 +345,7 @@ module SecretConfig
         sleep(5)
       end
 
-      set_config(config, path, current_values)
+      set_config(config, path, force ? {} : current_values)
 
       delete_keys.each do |key|
         puts "Deleting: #{key}"

data/lib/secret_config/version.rb

@@ -1,3 +1,3 @@
 module SecretConfig
-  VERSION = "0.7.0".freeze
+  VERSION = "0.7.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: secret_config
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby