fluent-plugin-opensearch 1.0.7 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c44bf1e420cb64daf8b5a2f21f38c47e692ed31feb0bd400189e737c19e819df
-  data.tar.gz: 896882755f7394472a8a4874a7a48786c50aee729b283e7be32818edcacc3e0c
+  metadata.gz: baace7e1273a04aa4cb21d218deb85304670857dbb5da3b6f12657504fa742d8
+  data.tar.gz: 0df9e116114cdf34cdcb3029b7fdb3196f7847178c8133837dd0df66859a4c39
 SHA512:
-  metadata.gz: a0718cd172d5549040faad8698a09eeeb9f5aadb00e19ab994d406143fa8789f20ce18e5b7526d9697822036c39f99aa96bdeeaace50b0b412f209d4057a3f5b
-  data.tar.gz: 59f7c8c735f4df3f69d4bc618df0653f00db191bd7c85f1a498509486f3fd7040073763436b0833279e24bdc52cf57b0a61322e896257a0e6ba6f19af9bc49e1
+  metadata.gz: 110f000927c80c588f9ba399cef32b1b50ef9334c577adc116a931cba784a2bd230e050c776b3ed6447b1393929843a94e52d6efa620f9d0b3c024eb065b2354
+  data.tar.gz: 7b0a79c72b1f10e7c018dc142a427b40943d38b3b31390ee19ab917287ea6b51ab2a3f38866ecd1de222678be58c2fa18bca3e0c9723cf620a4ca62c337842fd

data/.github/workflows/linux.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.7', '3.0' ]
+        ruby: [ '2.7', '3.0', '3.1' ]
         os:
           - ubuntu-latest
     name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}

data/.github/workflows/macos.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.7', '3.0' ]
+        ruby: [ '2.7', '3.0', '3.1' ]
         os:
           - macOS-latest
     name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}

data/.github/workflows/windows.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.7', '3.0' ]
+        ruby: [ '2.7', '3.0', '3.1' ]
         os:
           - windows-latest
     name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}

data/History.md

@@ -2,6 +2,13 @@
 
 ### [Unreleased]
 
+### 1.0.9
+ - Adjust GitHub workflows (#89)
+ - out\_opensearch: Provide service_name choices for handling serverless (#88)
+
+### 1.0.8
+ - Use faraday 1.x explicitly (#71)
+
 ### 1.0.7
  - Expire AWS credentials with a certain interval (#52)
 

data/README.md

@@ -1432,7 +1432,7 @@ Specify AWS OpenSearch Service endpoint.
 </endpoint>
 ```
 
-**NOTE:** This plugin will remove trailing slashes automatically. You don't need to pay attension to the trailing slash characters.
+**NOTE:** This plugin will remove trailing slashes automatically. You don't need to pay attention to the trailing slash characters.
 
 #### access_key_id
 
@@ -1577,6 +1577,19 @@ If you want to expire AWS credentials in certain interval, you should specify `r
 </endpoint>
 ```
 
+### Use OpenSearch Serverless
+
+If you want to use Serverless version of OpenSearch service, you have to specify `aoss` in `aws_service_name` under `endpoint` section:
+
+```aconf
+<endpoint>
+  url https://CLUSTER_ENDPOINT_URL
+  region us-east-2
+  # ...
+  aws_service_name aoss # default is es that is for AWS OpenSearch Service not Serverless.
+</endpoint>
+```
+
 ## Troubleshooting
 
 See [Troubleshooting document](README.Troubleshooting.md)

data/fluent-plugin-opensearch.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-opensearch'
-  s.version       = '1.0.7'
+  s.version       = '1.0.9'
   s.authors       = ['Hiroshi Hatake']
   s.email         = ['cosmo0920.wp@gmail.com']
   s.description   = %q{Opensearch output plugin for Fluent event collector}
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'excon', '>= 0'
   s.add_runtime_dependency 'opensearch-ruby'
   s.add_runtime_dependency "aws-sdk-core", "~> 3"
+  s.add_runtime_dependency "faraday", "~> 1.10"
   s.add_runtime_dependency "faraday_middleware-aws-sigv4"
 
 

data/lib/fluent/plugin/out_opensearch.rb

@@ -195,6 +195,7 @@ module Fluent::Plugin
       config_param :assume_role_web_identity_token_file, :string, :default => nil
       config_param :sts_credentials_region, :string, :default => nil
       config_param :refresh_credentials_interval, :time, :default => "5h"
+      config_param :aws_service_name, :enum, list: [:es, :aoss], :default => :es
     end
 
     config_section :buffer do
@@ -622,7 +623,7 @@ module Fluent::Plugin
                          lambda do |f|
                            f.request(
                              :aws_sigv4,
-                             service: 'es',
+                             service: @endpoint.aws_service_name.to_s,
                              region: @endpoint.region,
                              credentials: @_aws_credentials,
                            )

data/test/plugin/test_out_opensearch.rb

@@ -315,6 +315,39 @@ class OpenSearchOutputTest < Test::Unit::TestCase
     assert_equal "fluentd", instance.endpoint.assume_role_session_name
     assert_nil instance.endpoint.assume_role_web_identity_token_file
     assert_nil instance.endpoint.sts_credentials_region
+    assert_equal :es, instance.endpoint.aws_service_name
+  end
+
+  data("OpenSearch Service" => [:es, 'es'],
+       "OpenSearch Serverless" => [:aoss, 'aoss'])
+  test 'configure endpoint section w/ aws_service_name' do |data|
+    expected, conf = data
+    config = Fluent::Config::Element.new(
+      'ROOT', '', {
+        '@type' => 'opensearch',
+      }, [
+        Fluent::Config::Element.new('endpoint', '', {
+                                      'url' => "https://search-opensearch.aws.example.com/",
+                                      'region' => "local",
+                                      'access_key_id' => 'YOUR_AWESOME_KEY',
+                                      'secret_access_key' => 'YOUR_AWESOME_SECRET',
+                                      'aws_service_name' => conf,
+                                    }, []),
+        Fluent::Config::Element.new('buffer', 'tag', {}, [])
+
+      ])
+    instance = driver(config).instance
+
+    assert_equal "https://search-opensearch.aws.example.com", instance.endpoint.url
+    assert_equal "local", instance.endpoint.region
+    assert_equal "YOUR_AWESOME_KEY", instance.endpoint.access_key_id
+    assert_equal "YOUR_AWESOME_SECRET", instance.endpoint.secret_access_key
+    assert_nil instance.endpoint.assume_role_arn
+    assert_nil instance.endpoint.ecs_container_credentials_relative_uri
+    assert_equal "fluentd", instance.endpoint.assume_role_session_name
+    assert_nil instance.endpoint.assume_role_web_identity_token_file
+    assert_nil instance.endpoint.sts_credentials_region
+    assert_equal expected, instance.endpoint.aws_service_name
   end
 
   test 'configure compression' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-opensearch
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.9
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware-aws-sigv4
   requirement: !ruby/object:Gem::Requirement