csolidum-fluent-plugin-aws-elasticsearch-service 2.3.1 → 2.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2fce6852db386ab1da0756a4e3da925f578b61171083fec95536047c0935c250
4
- data.tar.gz: 83f2530615f33e71fad6e4fb61f3260009fc496697cf9c1ccafa80ceda7bd914
3
+ metadata.gz: dceff5477cb4402dca24bcac70b5983c3e555186ccecddeec32e68de5ea2d8c9
4
+ data.tar.gz: 2c1d6038ec1dd2314759fce489fb1f51547034293371ad25ad2f9eafa3da3e18
5
5
  SHA512:
6
- metadata.gz: ed3c952f1bf0e4f8759aa27e6b6acc9ffc753b85039415fcc13be44f9317be45c2ca42cfe6230d09a50fd69ced44b9124e9fde9e88277925b0d231cfc14d182e
7
- data.tar.gz: 7ffe087e9874a00ffa9f8297fc3ead17d6290383c6d30a97f534e8e93b1f96775cca4bdbecfee28917ae2d96953d9f2e2ef90aa498df98584a82b5e054adb1e8
6
+ metadata.gz: 6ccbccbced1986d8ee321fb9e913addf28b14cd7a2c676962969fa7559ea1ee12cbe5a4d4526d46d2c11f92bb3769fbf512abdaef989fbdc814c7fec6ccacae9
7
+ data.tar.gz: 1a86e69bd4e24b759848c19546305d88d4afdaf8e0d2e1754146eba641093ef60ae7cb39261319a9ef94e4a13b00f2073831bd342605c2e0bd4089e2cc76d98d
@@ -5,13 +5,13 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
5
5
 
6
6
  Gem::Specification.new do |spec|
7
7
  spec.name = "csolidum-fluent-plugin-aws-elasticsearch-service"
8
- spec.version = "2.3.1"
8
+ spec.version = "2.3.2"
9
9
  spec.authors = ["csolidum"]
10
- spec.email = ["chris2987+gh@gmail.com"]
10
+ spec.email = ["chris2987@@gmail.com"]
11
11
 
12
12
  spec.summary = %q{Output plugin to post to "Amazon Elasticsearch Service".}
13
13
  spec.description = %q{this is a Output plugin. Post to "Amazon Elasticsearch Service".}
14
- spec.homepage = "https://github.com/csolidum/fluent-plugin-aws-elasticsearch-service"
14
+ spec.homepage = "https://github.com/atomita/fluent-plugin-aws-elasticsearch-service"
15
15
  spec.license = "MIT"
16
16
 
17
17
 
@@ -20,7 +20,7 @@ module Fluent::Plugin
20
20
  config_param :ecs_container_credentials_relative_uri, :string, :default => nil #Set with AWS_CONTAINER_CREDENTIALS_RELATIVE_URI environment variable value
21
21
  config_param :assume_role_session_name, :string, :default => "fluentd"
22
22
  config_param :assume_role_web_identity_token_file, :string, :default => nil
23
- config_param :sts_credentials_region, :string, :default => ""
23
+ config_param :sts_credentials_region, :string, :default => nil
24
24
  end
25
25
 
26
26
  # here overrides default value of reload_connections to false because
@@ -87,22 +87,18 @@ module Fluent::Plugin
87
87
  }).credentials
88
88
  end
89
89
  else
90
- sts_credentials_region = opts[:sts_credentials_region]
91
- if sts_credentials_region.empty?
92
- sts_credentials_region = opts[:region]
93
- end
94
90
 
95
91
  if opts[:assume_role_web_identity_token_file].nil?
96
92
  credentials = sts_credential_provider({
97
93
  role_arn: opts[:assume_role_arn],
98
94
  role_session_name: opts[:assume_role_session_name],
99
- region: sts_credentials_region
95
+ region: sts_credentials_region(opts)
100
96
  }).credentials
101
97
  else
102
98
  credentials = sts_web_identity_credential_provider({
103
99
  role_arn: opts[:assume_role_arn],
104
100
  web_identity_token_file: opts[:assume_role_web_identity_token_file],
105
- region: sts_credentials_region
101
+ region: sts_credentials_region(opts)
106
102
  }).credentials
107
103
  end
108
104
  end
@@ -117,6 +113,12 @@ module Fluent::Plugin
117
113
  calback
118
114
  end
119
115
 
116
+ def sts_credentials_region(opts)
117
+ opts[:sts_credentials_region] || opts[:region]
118
+ end
119
+
120
+
121
+
120
122
  def sts_credential_provider(opts)
121
123
  # AssumeRoleCredentials is an auto-refreshing credential provider
122
124
  @sts ||= Aws::AssumeRoleCredentials.new(opts)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: csolidum-fluent-plugin-aws-elasticsearch-service
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.1
4
+ version: 2.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - csolidum
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-06-03 00:00:00.000000000 Z
11
+ date: 2020-06-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -142,7 +142,7 @@ dependencies:
142
142
  version: 0.3.0
143
143
  description: this is a Output plugin. Post to "Amazon Elasticsearch Service".
144
144
  email:
145
- - chris2987+gh@gmail.com
145
+ - chris2987@@gmail.com
146
146
  executables: []
147
147
  extensions: []
148
148
  extra_rdoc_files: []
@@ -155,7 +155,7 @@ files:
155
155
  - Rakefile
156
156
  - fluent-plugin-aws-elasticsearch-service.gemspec
157
157
  - lib/fluent/plugin/out_aws-elasticsearch-service.rb
158
- homepage: https://github.com/csolidum/fluent-plugin-aws-elasticsearch-service
158
+ homepage: https://github.com/atomita/fluent-plugin-aws-elasticsearch-service
159
159
  licenses:
160
160
  - MIT
161
161
  metadata: {}