hybrid_platforms_conductor 33.9.1 → 33.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f6fe7f17295eff7ec9450d1ee910807a17904b8fa3c2bc5959449805b3c4aee
-  data.tar.gz: 3e39403d767099165e0765ba631effcb76b4d998ab7e34069d6d63ce9d75979a
+  metadata.gz: 2a6b91bf179fa45f605d1b08d8c21cced9547c0588139b1998fca01a19f75abe
+  data.tar.gz: 5372e49247ba48adf64eed5a9fe3cc5aff5b2e82be8bc834a2283f815cc4c928
 SHA512:
-  metadata.gz: 2abe0958607c3980f84acfb55a1d1b4b5dd96e03ab94db21f1069a30e9026e7053fca09125c253c619bd3228772718acf744af6447450d8bb36277ee341c18e5
-  data.tar.gz: a14bfcaaf1bff4ca92206d54c7e2bf0d7367c8ccd1609a311bec0c9fb844e3ae1fd1aaf2836ab7e69446b98713bdfea227653da4c55b2c2d1c797ed9896465bb
+  metadata.gz: a1d886444be942a74153cb834e450b8062356959aaca508e10186bcb444f63295f8fc198b3e49f94babbbb7b6315bed146c1a29c21ab23d9112de94971e18d11
+  data.tar.gz: 31640de82a155dc42128926683fe7ded34039bad1cb639ff6bb8d4571f7f01a191f2103ea6a01c3de60322dc67015e92c833a0e8597b10bb3d6030e10199a864

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [v33.9.2](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.9.1...v33.9.2) (2021-09-01 17:46:34)
+
+## Global changes
+### Patches
+
+* [[Fix(nodes_to_deploy)] [#112] Support UTF-8 encoding from log files](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/26a7bd2fd53d387bd972b5e1b60cac9be6541ce5)
+
+## Changes for nodes_to_deploy
+### Patches
+
+* [[Fix(nodes_to_deploy)] [#112] Support UTF-8 encoding from log files](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/26a7bd2fd53d387bd972b5e1b60cac9be6541ce5)
+
 # [v33.9.1](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.9.0...v33.9.1) (2021-09-01 16:59:59)
 
 ## Global changes

data/lib/hybrid_platforms_conductor/deployer.rb

@@ -475,9 +475,15 @@ module HybridPlatformsConductor
         progress_name: 'Read deployment logs'
       )
       nodes.map do |node|
+        exit_code, stdout, stderr = read_actions_results[node] || [nil, nil, nil]
         [
           node,
-          @log_plugins[log_plugins_for(node).first].logs_for(node, *(read_actions_results[node] || [nil, nil, nil]))
+          @log_plugins[log_plugins_for(node).first].logs_for(
+            node,
+            exit_code,
+            stdout&.force_encoding(Encoding::UTF_8),
+            stderr&.force_encoding(Encoding::UTF_8)
+          )
         ]
       end.to_h
     end

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '33.9.1'
+  VERSION = '33.9.2'
 
 end

data/spec/hybrid_platforms_conductor_test/api/deployer/deploy_spec.rb

@@ -196,6 +196,50 @@ describe HybridPlatformsConductor::Deployer do
         end
       end
 
+      it 'gets deployment info from log plugins returning UTF-8 characters' do
+        with_test_platform_for_deploy_tests({ nodes: { 'node' => {} } }) do
+          HybridPlatformsConductorTest::TestLogPlugin.mocked_logs = {
+            'node' => {
+              deployment_info: { user: 'test_user' },
+              exit_status: 666,
+              services: %w[unknown],
+              stderr: 'stderrの展開テストログ',
+              stdout: 'stdoutの展開テストログ'
+            }
+          }
+          expect_actions_executor_runs [
+            # Expect the actions to get log files
+            proc do |actions_per_nodes|
+              expect(actions_per_nodes).to eq('node' => [{ bash: 'echo Read logs for node' }])
+              # Simulate the fact that data returned by the ssh system calls can contain UTF-8 chars, but is perceived as binary
+              { 'node' => [42, 'ログファイルはstdoutを読み取ります'.force_encoding('BINARY'), 'ログファイルはstderrを読み取ります'.force_encoding('BINARY')] }
+            end
+          ]
+          expect(test_deployer.deployment_info_from('node')).to eq(
+            'node' => {
+              deployment_info: { user: 'test_user' },
+              exit_status: 666,
+              services: %w[unknown],
+              stderr: 'stderrの展開テストログ',
+              stdout: 'stdoutの展開テストログ'
+            }
+          )
+          expect(HybridPlatformsConductorTest::TestLogPlugin.calls).to eq [
+            {
+              method: :actions_to_read_logs,
+              node: 'node'
+            },
+            {
+              method: :logs_for,
+              node: 'node',
+              exit_status: 42,
+              stdout: 'ログファイルはstdoutを読み取ります',
+              stderr: 'ログファイルはstderrを読み取ります'
+            }
+          ]
+        end
+      end
+
       it 'gets deployment info from log plugins not having actions_to_read_logs' do
         with_test_platform_for_deploy_tests({ nodes: { 'node' => {} } }, additional_config: 'send_logs_to :test_log_no_read') do
           expect(test_deployer.deployment_info_from('node')).to eq(

data/spec/hybrid_platforms_conductor_test/test_log_plugin.rb

@@ -5,7 +5,7 @@ module HybridPlatformsConductorTest
 
     class << self
 
-      attr_accessor :calls
+      attr_accessor(*%i[calls mocked_logs])
 
     end
 
@@ -89,7 +89,7 @@ module HybridPlatformsConductorTest
         stdout: stdout,
         stderr: stderr
       }
-      {
+      TestLogPlugin.mocked_logs[node] || {
         services: %w[unknown],
         deployment_info: {
           user: 'test_user'

data/spec/hybrid_platforms_conductor_test.rb

@@ -145,6 +145,7 @@ module HybridPlatformsConductorTest
         HybridPlatformsConductorTest::TestPlugins::NodeCheck.only_on_nodes = nil
         HybridPlatformsConductorTest::TestPlugins::SeveralChecks.runs = []
         HybridPlatformsConductorTest::TestLogPlugin.calls = []
+        HybridPlatformsConductorTest::TestLogPlugin.mocked_logs = {}
         HybridPlatformsConductorTest::TestLogNoReadPlugin.calls = []
         HybridPlatformsConductorTest::TestSecretsReaderPlugin.calls = []
         HybridPlatformsConductorTest::TestSecretsReaderPlugin.deployer = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 33.9.1
+  version: 33.9.2
 platform: ruby
 authors:
 - Muriel Salvan