Skip to content

Commit 6462967

Browse files
committed
PR feedback
Signed-off-by: Jack Wink <[email protected]>
1 parent b5f52b4 commit 6462967

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

lib/fluent/plugin/in_s3.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def initialize
5050
desc "An identifier for the assumed role session"
5151
config_param :role_session_name, :string #required
5252
desc "The absolute path to the file on disk containing the OIDC token"
53-
config_param :web_identity_token_file, :string, default: nil #required
53+
config_param :web_identity_token_file, :string #required
5454
desc "An IAM policy in JSON format"
5555
config_param :policy, :string, default: nil
5656
desc "The duration, in seconds, of the role session (900-43200)"
@@ -222,8 +222,6 @@ def setup_credentials
222222
credentials_options[:role_session_name] = c.role_session_name
223223
credentials_options[:web_identity_token_file] = c.web_identity_token_file
224224
credentials_options[:policy] = c.policy if c.policy
225-
# TODO: Validation or clamping? If we go above 12 hours, the request will fail...
226-
# Is it better behavior to hard fail, or just provide the max session duration?
227225
credentials_options[:duration_seconds] = c.duration_seconds if c.duration_seconds
228226
if @s3_region
229227
credentials_options[:client] = Aws::STS::Client.new(:region => @s3_region)

lib/fluent/plugin/out_s3.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def initialize
4848
desc "An identifier for the assumed role session"
4949
config_param :role_session_name, :string #required
5050
desc "The absolute path to the file on disk containing the OIDC token"
51-
config_param :web_identity_token_file, :string, default: nil #required
51+
config_param :web_identity_token_file, :string #required
5252
desc "An IAM policy in JSON format"
5353
config_param :policy, :string, default: nil
5454
desc "The duration, in seconds, of the role session (900-43200)"
@@ -480,8 +480,6 @@ def setup_credentials
480480
credentials_options[:role_session_name] = c.role_session_name
481481
credentials_options[:web_identity_token_file] = c.web_identity_token_file
482482
credentials_options[:policy] = c.policy if c.policy
483-
# TODO: Validation or clamping? If we go above 12 hours, the request will fail...
484-
# Is it better behavior to hard fail, or just provide the max session duration?
485483
credentials_options[:duration_seconds] = c.duration_seconds if c.duration_seconds
486484
if @s3_region
487485
credentials_options[:client] = Aws::STS::Client.new(:region => @s3_region)

0 commit comments

Comments
 (0)