Merge branch 'develop'

UffizziCloud · Dec 19, 2023 · 4cc525d · 4cc525d
2 parents e074040 + b678d3b
commit 4cc525d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uffizzi-cli (2.4.1)
+    uffizzi-cli (2.4.2)
       activesupport
       awesome_print
       faker

diff --git a/lib/uffizzi/services/compose_file_service.rb b/lib/uffizzi/services/compose_file_service.rb
@@ -35,7 +35,7 @@ def prepare_dependencies(compose_file_dir, env_files_paths, config_files_paths,
 
     def prepare_dependency_configs_files(dependency_file_paths, compose_file_dir)
       dependency_file_paths.map do |dependency_file_path|
-        dependency_file_content = Psych.load(File.read("#{compose_file_dir}/#{dependency_file_path}"))
+        dependency_file_content = File.read("#{compose_file_dir}/#{dependency_file_path}")
 
         {
           path: dependency_file_path,

diff --git a/lib/uffizzi/version.rb b/lib/uffizzi/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uffizzi
-  VERSION = '2.4.1'
+  VERSION = '2.4.2'
 end
diff --git a/test/uffizzi/cli/preview_test.rb b/test/uffizzi/cli/preview_test.rb
@@ -274,19 +274,19 @@ def test_create_preview_with_file_success
           use_kind: 'config_map',
         },
         {
-          content: "UE9TVEdSRVNfVVNFUj1wb3N0Z3JlcyBQT1NUR1JFU19QQVNTV09SRD1wb3N0\nZ3Jlcw==\n",
+          content: "UE9TVEdSRVNfVVNFUj1wb3N0Z3JlcwpQT1NUR1JFU19QQVNTV09SRD1wb3N0\nZ3Jlcw==\n",
           path: 'local.env',
           source: 'local.env',
           use_kind: 'config_map',
         },
         {
-          content: "c2VydmVyIHsgbGlzdGVuICAgICAgIDg4ODg7IHNlcnZlcl9uYW1lICBsb2Nh\nbGhvc3Q7IGxvY2F0aW9uIC8geyBwcm94eV9wYXNzICAgICAgaHR0cDovLzEy\nNy4wLjAuMTo4MDg4LzsgfSBsb2NhdGlvbiAvdm90ZS8geyBwcm94eV9wYXNz\nICAgICAgaHR0cDovLzEyNy4wLjAuMTo4ODg4LzsgfSB9\n",
+          content: "c2VydmVyIHsKICAgICAgICAgICAgICAgbGlzdGVuICAgICAgIDg4ODg7CiAg\nICAgICAgICAgICAgIHNlcnZlcl9uYW1lICBsb2NhbGhvc3Q7CiAgICAgICAg\nICAgICAgIGxvY2F0aW9uIC8gewogICAgICAgICAgICAgICAgIHByb3h5X3Bh\nc3MgICAgICBodHRwOi8vMTI3LjAuMC4xOjgwODgvOwogICAgICAgICAgICAg\nICB9CiAgICAgICAgICAgICAgIGxvY2F0aW9uIC92b3RlLyB7CiAgICAgICAg\nICAgICAgICAgcHJveHlfcGFzcyAgICAgIGh0dHA6Ly8xMjcuMC4wLjE6ODg4\nOC87CiAgICAgICAgICAgICAgIH0KfQ==\n",
           path: 'config_files/config_file.conf',
           source: 'config_files/config_file.conf',
           use_kind: 'config_map',
         },
         {
-          content: "c2VydmVyIHsgbGlzdGVuICAgICAgIDgwODA7IHNlcnZlcl9uYW1lICBsb2Nh\nbGhvc3Q7IGxvY2F0aW9uIC8geyBwcm94eV9wYXNzICAgICAgaHR0cDovLzEy\nNy4wLjAuMTo4MDg4LzsgfSBsb2NhdGlvbiAvdm90ZS8geyBwcm94eV9wYXNz\nICAgICAgaHR0cDovLzEyNy4wLjAuMTo4ODg4LzsgfSB9\n",
+          content: "c2VydmVyIHsKICAgICAgICAgICAgICAgbGlzdGVuICAgICAgIDgwODA7CiAg\nICAgICAgICAgICAgIHNlcnZlcl9uYW1lICBsb2NhbGhvc3Q7CiAgICAgICAg\nICAgICAgIGxvY2F0aW9uIC8gewogICAgICAgICAgICAgICAgIHByb3h5X3Bh\nc3MgICAgICBodHRwOi8vMTI3LjAuMC4xOjgwODgvOwogICAgICAgICAgICAg\nICB9CiAgICAgICAgICAgICAgIGxvY2F0aW9uIC92b3RlLyB7CiAgICAgICAg\nICAgICAgICAgcHJveHlfcGFzcyAgICAgIGh0dHA6Ly8xMjcuMC4wLjE6ODg4\nOC87CiAgICAgICAgICAgICAgIH0KfQ==\n",
           path: 'vote.conf',
           source: 'vote.conf',
           use_kind: 'config_map',