Only try to decrypt original value if it is present

Author: marcqualie

lib/diffcrypt/encryptor.rb

@@ -79,7 +79,7 @@ def encrypt_values(data, original_data = nil)
         data[key] = if value.is_a?(Hash) || value.is_a?(Array)
                       encrypt_values(value, original_encrypted_value)
                     else
-                      original_decrypted_value = original_data ? decrypt_string(original_encrypted_value) : nil
+                      original_decrypted_value = original_encrypted_value ? decrypt_string(original_encrypted_value) : nil
                       key_changed = original_decrypted_value.nil? || original_decrypted_value != value
                       key_changed ? encrypt_string(value) : original_encrypted_value
                     end

test/diffcrypt/encryptor_test.rb

@@ -75,4 +75,12 @@ def test_it_only_updates_changed_values
 
     assert_match expected_pattern, Diffcrypt::Encryptor.new(TEST_KEY).encrypt_data(updated_content, original_encrypted_content).to_yaml
   end
+
+  def test_it_assumes_changed_when_no_original_value
+    original_encrypted_content = "---\ndata:\n  secret_key_base_1: 88Ry6HESUoXBr6QUFXmni9zzfCIYt9qGNFvIWFcN--4xoecI5mqbNRBibI--62qPJbkzzh5h8lhFEFOSaQ==\n"
+    updated_content = "---\nsecret_key_base_1: secret_key_base_test\naws:\n  access_key_id: new_value\n"
+    expected_pattern = /---\nsecret_key_base_1: 88Ry6HESUoXBr6QUFXmni9zzfCIYt9qGNFvIWFcN--4xoecI5mqbNRBibI--62qPJbkzzh5h8lhFEFOSaQ==\naws:\n  access_key_id: #{ENCRYPTED_VALUE_PATTERN}\n/
+
+    assert_match expected_pattern, Diffcrypt::Encryptor.new(TEST_KEY).encrypt_data(updated_content, original_encrypted_content).to_yaml
+  end
 end