Skip to content

Commit

Permalink
Merge pull request #393 from UffizziCloud/feature/392_fix-creation-co…
Browse files Browse the repository at this point in the history
…nfig-file-from-json

[392] Fix creation config file from json
  • Loading branch information
moklidia authored Dec 19, 2023
2 parents ed54f40 + b0a13f5 commit 3bf25c4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/uffizzi/services/compose_file_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions test/uffizzi/cli/preview_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 3bf25c4

Please sign in to comment.