From f553a41f6a45e5f94423dcfcf0ce693a8f61e783 Mon Sep 17 00:00:00 2001
From: Daijiro Fukuda <fukuda@clear-code.com>
Date: Wed, 19 Jun 2024 20:09:35 +0900
Subject: [PATCH 1/2] in_exec: add option 'encoding'

Need this feature to handle none-ascii characters.

Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com>
---
 lib/fluent/plugin/in_exec.rb | 16 ++++++++++++++--
 test/plugin/test_in_exec.rb  | 37 ++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/lib/fluent/plugin/in_exec.rb b/lib/fluent/plugin/in_exec.rb
index c285136604..d288f19895 100644
--- a/lib/fluent/plugin/in_exec.rb
+++ b/lib/fluent/plugin/in_exec.rb
@@ -45,6 +45,8 @@ class ExecInput < Fluent::Plugin::Input
     config_param :run_interval, :time, default: nil
     desc 'The default block size to read if parser requires partial read.'
     config_param :read_block_size, :size, default: 10240 # 10k
+    desc 'The encoding to receive the result of the command, especially for none-ascii characters.'
+    config_param :encoding, :string, default: nil
 
     attr_reader :parser
 
@@ -63,9 +65,16 @@ def configure(conf)
       if !@tag && (!@extract_config || !@extract_config.tag_key)
         raise Fluent::ConfigError, "'tag' or 'tag_key' option is required on exec input"
       end
+      validate_encoding(@encoding) if @encoding
       @parser = parser_create
     end
 
+    def validate_encoding(encoding)
+      Encoding.find(encoding)
+    rescue ArgumentError => e
+      raise Fluent::ConfigError, e.message
+    end
+
     def multi_workers_ready?
       true
     end
@@ -73,10 +82,13 @@ def multi_workers_ready?
     def start
       super
 
+      options = { mode: [@connect_mode] }
+      options[:external_encoding] = @encoding if @encoding
+
       if @run_interval
-        child_process_execute(:exec_input, @command, interval: @run_interval, mode: [@connect_mode], &method(:run))
+        child_process_execute(:exec_input, @command, interval: @run_interval, **options, &method(:run))
       else
-        child_process_execute(:exec_input, @command, immediate: true, mode: [@connect_mode], &method(:run))
+        child_process_execute(:exec_input, @command, immediate: true, **options, &method(:run))
       end
     end
 
diff --git a/test/plugin/test_in_exec.rb b/test/plugin/test_in_exec.rb
index cbce44313b..788120ce81 100644
--- a/test/plugin/test_in_exec.rb
+++ b/test/plugin/test_in_exec.rb
@@ -218,6 +218,43 @@ def create_driver(conf)
     end
   end
 
+  sub_test_case 'encoding' do
+    data(immediate: "")
+    data(run_interval: "run_interval 1")
+    test 'can handle none-ascii characters' do |additional_setting|
+      content = 'ひらがな漢字'
+
+      d = create_driver %[
+        command ruby -e "puts '#{content}'"
+        tag test
+        encoding utf-8
+        <parse>
+          @type none
+        </parse>
+        #{additional_setting}
+      ]
+
+      d.run(expect_records: 1, timeout: 10)
+
+      assert_equal 1, d.events.length
+      tag, time, record = d.events.first
+      assert_equal({"message" => content}, record)
+    end
+
+    test 'raise ConfigError for invalid encoding' do
+      assert_raise Fluent::ConfigError do
+        d = create_driver %[
+          command ruby -e "puts foo"
+          tag test
+          encoding invalid-encode
+          <parse>
+            @type none
+          </parse>
+        ]
+      end
+    end
+  end
+
   data(
     'default' => [TSV_CONFIG,     "tag1", event_time("2011-01-02 13:14:15"), {"k1"=>"ok"}],
     'json'    => [JSON_CONFIG,    "tag1", event_time("2011-01-02 13:14:15"), {"k1"=>"ok"}],

From 5ccbc48c84ca5b308032120bc41e172aed8968f1 Mon Sep 17 00:00:00 2001
From: Daijiro Fukuda <fukuda@clear-code.com>
Date: Thu, 20 Jun 2024 20:08:23 +0900
Subject: [PATCH 2/2] Apply suggestions from code review

Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com>

Co-authored-by: Kentaro Hayashi <kenhys@gmail.com>
---
 lib/fluent/plugin/in_exec.rb | 2 +-
 test/plugin/test_in_exec.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/fluent/plugin/in_exec.rb b/lib/fluent/plugin/in_exec.rb
index d288f19895..b62025c60f 100644
--- a/lib/fluent/plugin/in_exec.rb
+++ b/lib/fluent/plugin/in_exec.rb
@@ -45,7 +45,7 @@ class ExecInput < Fluent::Plugin::Input
     config_param :run_interval, :time, default: nil
     desc 'The default block size to read if parser requires partial read.'
     config_param :read_block_size, :size, default: 10240 # 10k
-    desc 'The encoding to receive the result of the command, especially for none-ascii characters.'
+    desc 'The encoding to receive the result of the command, especially for non-ascii characters.'
     config_param :encoding, :string, default: nil
 
     attr_reader :parser
diff --git a/test/plugin/test_in_exec.rb b/test/plugin/test_in_exec.rb
index 788120ce81..f7c9f6d705 100644
--- a/test/plugin/test_in_exec.rb
+++ b/test/plugin/test_in_exec.rb
@@ -221,7 +221,7 @@ def create_driver(conf)
   sub_test_case 'encoding' do
     data(immediate: "")
     data(run_interval: "run_interval 1")
-    test 'can handle none-ascii characters' do |additional_setting|
+    test 'can handle non-ascii characters' do |additional_setting|
       content = 'ひらがな漢字'
 
       d = create_driver %[