aws-sdk-core 3.190.2 → 3.240.0
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 +4 -4
- data/CHANGELOG.md +650 -0
- data/VERSION +1 -1
- data/lib/aws-defaults.rb +4 -1
- data/lib/aws-sdk-core/arn.rb +1 -3
- data/lib/aws-sdk-core/assume_role_credentials.rb +21 -13
- data/lib/aws-sdk-core/assume_role_web_identity_credentials.rb +16 -9
- data/lib/aws-sdk-core/binary/decode_handler.rb +3 -9
- data/lib/aws-sdk-core/binary/encode_handler.rb +1 -1
- data/lib/aws-sdk-core/binary/event_builder.rb +34 -37
- data/lib/aws-sdk-core/binary/event_stream_decoder.rb +1 -0
- data/lib/aws-sdk-core/binary/event_stream_encoder.rb +4 -3
- data/lib/aws-sdk-core/cbor/decoder.rb +308 -0
- data/lib/aws-sdk-core/cbor/encoder.rb +243 -0
- data/lib/aws-sdk-core/cbor.rb +53 -0
- data/lib/aws-sdk-core/client_side_monitoring.rb +9 -0
- data/lib/aws-sdk-core/client_stubs.rb +39 -58
- data/lib/aws-sdk-core/credential_provider.rb +5 -1
- data/lib/aws-sdk-core/credential_provider_chain.rb +101 -25
- data/lib/aws-sdk-core/credentials.rb +19 -6
- data/lib/aws-sdk-core/ec2_metadata.rb +1 -1
- data/lib/aws-sdk-core/ecs_credentials.rb +16 -14
- data/lib/aws-sdk-core/endpoints/endpoint.rb +3 -1
- data/lib/aws-sdk-core/endpoints/matchers.rb +8 -10
- data/lib/aws-sdk-core/endpoints.rb +101 -21
- data/lib/aws-sdk-core/error_handler.rb +46 -0
- data/lib/aws-sdk-core/errors.rb +16 -4
- data/lib/aws-sdk-core/event_emitter.rb +1 -17
- data/lib/aws-sdk-core/instance_profile_credentials.rb +148 -157
- data/lib/aws-sdk-core/json/builder.rb +8 -1
- data/lib/aws-sdk-core/json/error_handler.rb +29 -13
- data/lib/aws-sdk-core/json/handler.rb +6 -6
- data/lib/aws-sdk-core/json/json_engine.rb +3 -1
- data/lib/aws-sdk-core/json/oj_engine.rb +7 -1
- data/lib/aws-sdk-core/json/parser.rb +6 -1
- data/lib/aws-sdk-core/json.rb +43 -14
- data/lib/aws-sdk-core/log/param_filter.rb +2 -2
- data/lib/aws-sdk-core/log/param_formatter.rb +7 -3
- data/lib/aws-sdk-core/log.rb +10 -0
- data/lib/aws-sdk-core/login_credentials.rb +229 -0
- data/lib/aws-sdk-core/lru_cache.rb +75 -0
- data/lib/aws-sdk-core/pageable_response.rb +1 -1
- data/lib/aws-sdk-core/param_validator.rb +7 -2
- data/lib/aws-sdk-core/plugins/bearer_authorization.rb +2 -0
- data/lib/aws-sdk-core/plugins/checksum_algorithm.rb +347 -170
- data/lib/aws-sdk-core/plugins/client_metrics_plugin.rb +1 -1
- data/lib/aws-sdk-core/plugins/client_metrics_send_plugin.rb +14 -2
- data/lib/aws-sdk-core/plugins/credentials_configuration.rb +78 -56
- data/lib/aws-sdk-core/plugins/endpoint_pattern.rb +40 -32
- data/lib/aws-sdk-core/plugins/global_configuration.rb +8 -9
- data/lib/aws-sdk-core/plugins/http_checksum.rb +2 -8
- data/lib/aws-sdk-core/plugins/invocation_id.rb +1 -11
- data/lib/aws-sdk-core/plugins/logging.rb +2 -0
- data/lib/aws-sdk-core/plugins/protocols/api_gateway.rb +3 -1
- data/lib/aws-sdk-core/plugins/protocols/ec2.rb +2 -24
- data/lib/aws-sdk-core/plugins/protocols/json_rpc.rb +6 -8
- data/lib/aws-sdk-core/plugins/protocols/query.rb +4 -2
- data/lib/aws-sdk-core/plugins/protocols/rest_json.rb +3 -15
- data/lib/aws-sdk-core/plugins/protocols/rest_xml.rb +3 -0
- data/lib/aws-sdk-core/plugins/protocols/rpc_v2.rb +17 -0
- data/lib/aws-sdk-core/plugins/regional_endpoint.rb +74 -25
- data/lib/aws-sdk-core/plugins/request_compression.rb +11 -2
- data/lib/aws-sdk-core/plugins/retry_errors.rb +12 -3
- data/lib/aws-sdk-core/plugins/sign.rb +42 -26
- data/lib/aws-sdk-core/plugins/signature_v2.rb +2 -1
- data/lib/aws-sdk-core/plugins/signature_v4.rb +2 -1
- data/lib/aws-sdk-core/plugins/stub_responses.rb +59 -9
- data/lib/aws-sdk-core/plugins/telemetry.rb +75 -0
- data/lib/aws-sdk-core/plugins/transfer_encoding.rb +16 -9
- data/lib/aws-sdk-core/plugins/user_agent.rb +103 -26
- data/lib/aws-sdk-core/plugins.rb +39 -0
- data/lib/aws-sdk-core/process_credentials.rb +48 -29
- data/lib/aws-sdk-core/query/ec2_handler.rb +27 -0
- data/lib/aws-sdk-core/query/ec2_param_builder.rb +5 -7
- data/lib/aws-sdk-core/query/handler.rb +4 -4
- data/lib/aws-sdk-core/query/param_builder.rb +2 -2
- data/lib/aws-sdk-core/query.rb +2 -1
- data/lib/aws-sdk-core/refreshing_credentials.rb +8 -11
- data/lib/aws-sdk-core/resources.rb +8 -0
- data/lib/aws-sdk-core/rest/content_type_handler.rb +60 -0
- data/lib/aws-sdk-core/rest/handler.rb +3 -4
- data/lib/aws-sdk-core/rest/request/body.rb +32 -5
- data/lib/aws-sdk-core/rest/request/endpoint.rb +24 -4
- data/lib/aws-sdk-core/rest/request/headers.rb +15 -7
- data/lib/aws-sdk-core/rest/request/querystring_builder.rb +23 -11
- data/lib/aws-sdk-core/rest/response/body.rb +15 -1
- data/lib/aws-sdk-core/rest/response/header_list_parser.rb +79 -0
- data/lib/aws-sdk-core/rest/response/headers.rb +8 -3
- data/lib/aws-sdk-core/rest.rb +1 -0
- data/lib/aws-sdk-core/rpc_v2/builder.rb +62 -0
- data/lib/aws-sdk-core/rpc_v2/cbor_engine.rb +18 -0
- data/lib/aws-sdk-core/rpc_v2/content_type_handler.rb +47 -0
- data/lib/aws-sdk-core/rpc_v2/error_handler.rb +95 -0
- data/lib/aws-sdk-core/rpc_v2/handler.rb +79 -0
- data/lib/aws-sdk-core/rpc_v2/parser.rb +98 -0
- data/lib/aws-sdk-core/rpc_v2.rb +69 -0
- data/lib/aws-sdk-core/shared_config.rb +108 -22
- data/lib/aws-sdk-core/shared_credentials.rb +1 -7
- data/lib/aws-sdk-core/sso_credentials.rb +5 -2
- data/lib/aws-sdk-core/static_token_provider.rb +1 -2
- data/lib/aws-sdk-core/stubbing/protocols/ec2.rb +12 -11
- data/lib/aws-sdk-core/stubbing/protocols/json.rb +11 -10
- data/lib/aws-sdk-core/stubbing/protocols/query.rb +7 -6
- data/lib/aws-sdk-core/stubbing/protocols/rest.rb +2 -1
- data/lib/aws-sdk-core/stubbing/protocols/rest_json.rb +9 -8
- data/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb +6 -5
- data/lib/aws-sdk-core/stubbing/protocols/rpc_v2.rb +39 -0
- data/lib/aws-sdk-core/stubbing.rb +22 -0
- data/lib/aws-sdk-core/telemetry/base.rb +177 -0
- data/lib/aws-sdk-core/telemetry/no_op.rb +70 -0
- data/lib/aws-sdk-core/telemetry/otel.rb +235 -0
- data/lib/aws-sdk-core/telemetry/span_kind.rb +22 -0
- data/lib/aws-sdk-core/telemetry/span_status.rb +59 -0
- data/lib/aws-sdk-core/telemetry.rb +78 -0
- data/lib/aws-sdk-core/token.rb +3 -3
- data/lib/aws-sdk-core/token_provider.rb +4 -0
- data/lib/aws-sdk-core/token_provider_chain.rb +2 -6
- data/lib/aws-sdk-core/util.rb +41 -1
- data/lib/aws-sdk-core/waiters/poller.rb +10 -5
- data/lib/aws-sdk-core/xml/builder.rb +17 -9
- data/lib/aws-sdk-core/xml/error_handler.rb +35 -43
- data/lib/aws-sdk-core/xml/parser/frame.rb +4 -20
- data/lib/aws-sdk-core/xml/parser/stack.rb +2 -0
- data/lib/aws-sdk-core/xml/parser.rb +2 -6
- data/lib/aws-sdk-core.rb +86 -107
- data/lib/aws-sdk-signin/client.rb +604 -0
- data/lib/aws-sdk-signin/client_api.rb +119 -0
- data/lib/aws-sdk-signin/customizations.rb +1 -0
- data/lib/aws-sdk-signin/endpoint_parameters.rb +69 -0
- data/lib/aws-sdk-signin/endpoint_provider.rb +59 -0
- data/lib/aws-sdk-signin/endpoints.rb +20 -0
- data/lib/aws-sdk-signin/errors.rb +122 -0
- data/lib/aws-sdk-signin/plugins/endpoints.rb +77 -0
- data/lib/aws-sdk-signin/resource.rb +26 -0
- data/lib/aws-sdk-signin/types.rb +299 -0
- data/lib/aws-sdk-signin.rb +63 -0
- data/lib/aws-sdk-sso/client.rb +189 -96
- data/lib/aws-sdk-sso/client_api.rb +7 -0
- data/lib/aws-sdk-sso/endpoint_parameters.rb +13 -10
- data/lib/aws-sdk-sso/endpoint_provider.rb +16 -20
- data/lib/aws-sdk-sso/endpoints.rb +2 -54
- data/lib/aws-sdk-sso/plugins/endpoints.rb +20 -20
- data/lib/aws-sdk-sso/types.rb +1 -0
- data/lib/aws-sdk-sso.rb +15 -11
- data/lib/aws-sdk-ssooidc/client.rb +293 -122
- data/lib/aws-sdk-ssooidc/client_api.rb +38 -0
- data/lib/aws-sdk-ssooidc/endpoint_parameters.rb +13 -10
- data/lib/aws-sdk-ssooidc/endpoint_provider.rb +14 -18
- data/lib/aws-sdk-ssooidc/endpoints.rb +2 -54
- data/lib/aws-sdk-ssooidc/errors.rb +31 -0
- data/lib/aws-sdk-ssooidc/plugins/endpoints.rb +20 -20
- data/lib/aws-sdk-ssooidc/types.rb +142 -29
- data/lib/aws-sdk-ssooidc.rb +15 -11
- data/lib/aws-sdk-sts/client.rb +529 -156
- data/lib/aws-sdk-sts/client_api.rb +108 -8
- data/lib/aws-sdk-sts/customizations.rb +5 -2
- data/lib/aws-sdk-sts/endpoint_parameters.rb +15 -14
- data/lib/aws-sdk-sts/endpoint_provider.rb +50 -55
- data/lib/aws-sdk-sts/endpoints.rb +2 -118
- data/lib/aws-sdk-sts/errors.rb +79 -0
- data/lib/aws-sdk-sts/plugins/endpoints.rb +20 -28
- data/lib/aws-sdk-sts/presigner.rb +2 -6
- data/lib/aws-sdk-sts/types.rb +344 -32
- data/lib/aws-sdk-sts.rb +15 -11
- data/lib/seahorse/client/async_base.rb +4 -5
- data/lib/seahorse/client/async_response.rb +19 -0
- data/lib/seahorse/client/base.rb +18 -21
- data/lib/seahorse/client/h2/connection.rb +18 -28
- data/lib/seahorse/client/h2/handler.rb +19 -3
- data/lib/seahorse/client/handler.rb +1 -1
- data/lib/seahorse/client/http/response.rb +1 -1
- data/lib/seahorse/client/net_http/connection_pool.rb +15 -12
- data/lib/seahorse/client/net_http/handler.rb +21 -9
- data/lib/seahorse/client/networking_error.rb +1 -1
- data/lib/seahorse/client/plugin.rb +9 -0
- data/lib/seahorse/client/plugins/endpoint.rb +0 -1
- data/lib/seahorse/client/plugins/h2.rb +4 -4
- data/lib/seahorse/client/plugins/net_http.rb +57 -16
- data/lib/seahorse/client/request_context.rb +9 -2
- data/lib/seahorse/client/response.rb +2 -0
- data/lib/seahorse/model/shapes.rb +2 -2
- data/lib/seahorse/util.rb +2 -1
- data/sig/aws-sdk-core/async_client_stubs.rbs +21 -0
- data/sig/aws-sdk-core/client_stubs.rbs +10 -0
- data/sig/aws-sdk-core/errors.rbs +22 -0
- data/sig/aws-sdk-core/resources/collection.rbs +21 -0
- data/sig/aws-sdk-core/structure.rbs +4 -0
- data/sig/aws-sdk-core/telemetry/base.rbs +46 -0
- data/sig/aws-sdk-core/telemetry/otel.rbs +22 -0
- data/sig/aws-sdk-core/telemetry/span_kind.rbs +15 -0
- data/sig/aws-sdk-core/telemetry/span_status.rbs +24 -0
- data/sig/aws-sdk-core/waiters/errors.rbs +20 -0
- data/sig/aws-sdk-core.rbs +7 -0
- data/sig/seahorse/client/async_base.rbs +18 -0
- data/sig/seahorse/client/base.rbs +25 -0
- data/sig/seahorse/client/handler_builder.rbs +16 -0
- data/sig/seahorse/client/response.rbs +61 -0
- metadata +117 -23
- /data/lib/aws-sdk-core/xml/parser/{engines/libxml.rb → libxml_engine.rb} +0 -0
- /data/lib/aws-sdk-core/xml/parser/{engines/nokogiri.rb → nokogiri_engine.rb} +0 -0
- /data/lib/aws-sdk-core/xml/parser/{engines/oga.rb → oga_engine.rb} +0 -0
- /data/lib/aws-sdk-core/xml/parser/{engines/ox.rb → ox_engine.rb} +0 -0
- /data/lib/aws-sdk-core/xml/parser/{engines/rexml.rb → rexml_engine.rb} +0 -0
|
@@ -6,7 +6,6 @@ module Aws
|
|
|
6
6
|
def initialize
|
|
7
7
|
@listeners = {}
|
|
8
8
|
@validate_event = true
|
|
9
|
-
@status = :sleep
|
|
10
9
|
@signal_queue = Queue.new
|
|
11
10
|
end
|
|
12
11
|
|
|
@@ -32,7 +31,7 @@ module Aws
|
|
|
32
31
|
def emit(type, params)
|
|
33
32
|
unless @stream
|
|
34
33
|
raise Aws::Errors::SignalEventError.new(
|
|
35
|
-
"
|
|
34
|
+
"Signaling events before making async request"\
|
|
36
35
|
" is not allowed."
|
|
37
36
|
)
|
|
38
37
|
end
|
|
@@ -40,25 +39,10 @@ module Aws
|
|
|
40
39
|
Aws::ParamValidator.validate!(
|
|
41
40
|
@encoder.rules.shape.member(type), params)
|
|
42
41
|
end
|
|
43
|
-
_ready_for_events?
|
|
44
42
|
@stream.data(
|
|
45
43
|
@encoder.encode(type, params),
|
|
46
44
|
end_stream: type == :end_stream
|
|
47
45
|
)
|
|
48
46
|
end
|
|
49
|
-
|
|
50
|
-
private
|
|
51
|
-
|
|
52
|
-
def _ready_for_events?
|
|
53
|
-
return true if @status == :ready
|
|
54
|
-
|
|
55
|
-
# blocked until once initial 200 response is received
|
|
56
|
-
# signal will be available in @signal_queue
|
|
57
|
-
# and this check will no longer be blocked
|
|
58
|
-
@signal_queue.pop
|
|
59
|
-
@status = :ready
|
|
60
|
-
true
|
|
61
|
-
end
|
|
62
|
-
|
|
63
47
|
end
|
|
64
48
|
end
|
|
@@ -4,11 +4,23 @@ require 'time'
|
|
|
4
4
|
require 'net/http'
|
|
5
5
|
|
|
6
6
|
module Aws
|
|
7
|
-
# An auto-refreshing credential provider that loads credentials from
|
|
8
|
-
# EC2 instances.
|
|
7
|
+
# An auto-refreshing credential provider that loads credentials from EC2 instances.
|
|
9
8
|
#
|
|
10
9
|
# instance_credentials = Aws::InstanceProfileCredentials.new
|
|
11
10
|
# ec2 = Aws::EC2::Client.new(credentials: instance_credentials)
|
|
11
|
+
#
|
|
12
|
+
# ## Retries
|
|
13
|
+
# When initialized from the default credential chain, this provider defaults to `0` retries.
|
|
14
|
+
# Breakdown of retries is as follows:
|
|
15
|
+
#
|
|
16
|
+
# * **Configurable retries** (defaults to `1`): these retries handle errors when communicating
|
|
17
|
+
# with the IMDS endpoint. There are two separate retry mechanisms within the provider:
|
|
18
|
+
# * Entire token fetch and credential retrieval process
|
|
19
|
+
# * Token fetching
|
|
20
|
+
# * **JSON parsing retries**: Fixed at 3 attempts to handle cases when IMDS returns malformed JSON
|
|
21
|
+
# responses. These retries are separate from configurable retries.
|
|
22
|
+
#
|
|
23
|
+
# @see https://docs.aws.amazon.com/sdkref/latest/guide/feature-imds-credentials.html IMDS Credential Provider
|
|
12
24
|
class InstanceProfileCredentials
|
|
13
25
|
include CredentialProvider
|
|
14
26
|
include RefreshingCredentials
|
|
@@ -22,10 +34,8 @@ module Aws
|
|
|
22
34
|
# @api private
|
|
23
35
|
class TokenExpiredError < RuntimeError; end
|
|
24
36
|
|
|
25
|
-
# These are the errors we trap when attempting to talk to the
|
|
26
|
-
#
|
|
27
|
-
# is not present, no responding or some other non-recoverable
|
|
28
|
-
# error.
|
|
37
|
+
# These are the errors we trap when attempting to talk to the instance metadata service.
|
|
38
|
+
# Any of these imply the service is not present, no responding or some other non-recoverable error.
|
|
29
39
|
# @api private
|
|
30
40
|
NETWORK_ERRORS = [
|
|
31
41
|
Errno::EHOSTUNREACH,
|
|
@@ -46,99 +56,113 @@ module Aws
|
|
|
46
56
|
METADATA_TOKEN_PATH = '/latest/api/token'.freeze
|
|
47
57
|
|
|
48
58
|
# @param [Hash] options
|
|
49
|
-
# @option options [Integer] :retries (1) Number of times to retry
|
|
50
|
-
#
|
|
51
|
-
#
|
|
52
|
-
#
|
|
53
|
-
# @option options [String] :
|
|
54
|
-
#
|
|
55
|
-
#
|
|
56
|
-
#
|
|
57
|
-
#
|
|
58
|
-
# @option options [String] :ip_address ('169.254.169.254') Deprecated. Use
|
|
59
|
-
#
|
|
59
|
+
# @option options [Integer] :retries (1) Number of times to retry when retrieving credentials.
|
|
60
|
+
# @option options [Numeric, Proc] :backoff By default, failures are retried with exponential back-off, i.e.
|
|
61
|
+
# `lambda { |num_failures| sleep(1.2 ** num_failures) }`. You can pass a number of seconds to sleep
|
|
62
|
+
# between failed attempts, or a Proc that accepts the number of failures.
|
|
63
|
+
# @option options [String] :endpoint ('http://169.254.169.254') The IMDS endpoint. This option has precedence
|
|
64
|
+
# over the `:endpoint_mode`.
|
|
65
|
+
# @option options [String] :endpoint_mode ('IPv4') The endpoint mode for the instance metadata service. This is
|
|
66
|
+
# either 'IPv4' (`169.254.169.254`) or IPv6' (`[fd00:ec2::254]`).
|
|
67
|
+
# @option options [Boolean] :disable_imds_v1 (false) Disable the use of the legacy EC2 Metadata Service v1.
|
|
68
|
+
# @option options [String] :ip_address ('169.254.169.254') Deprecated. Use `:endpoint` instead.
|
|
69
|
+
# The IP address for the endpoint.
|
|
60
70
|
# @option options [Integer] :port (80)
|
|
61
71
|
# @option options [Float] :http_open_timeout (1)
|
|
62
72
|
# @option options [Float] :http_read_timeout (1)
|
|
63
|
-
# @option options [
|
|
64
|
-
#
|
|
65
|
-
#
|
|
66
|
-
#
|
|
67
|
-
# @option options [
|
|
68
|
-
#
|
|
69
|
-
# like $stdout.
|
|
70
|
-
# @option options [Integer] :token_ttl Time-to-Live in seconds for EC2
|
|
71
|
-
# Metadata Token used for fetching Metadata Profile Credentials, defaults
|
|
72
|
-
# to 21600 seconds
|
|
73
|
-
# @option options [Callable] before_refresh Proc called before
|
|
74
|
-
# credentials are refreshed. `before_refresh` is called
|
|
75
|
-
# with an instance of this object when
|
|
76
|
-
# AWS credentials are required and need to be refreshed.
|
|
73
|
+
# @option options [IO] :http_debug_output (nil) HTTP wire traces are sent to this object.
|
|
74
|
+
# You can specify something like `$stdout`.
|
|
75
|
+
# @option options [Integer] :token_ttl (21600) Time-to-Live in seconds for EC2 Metadata Token used for fetching
|
|
76
|
+
# Metadata Profile Credentials.
|
|
77
|
+
# @option options [Proc] :before_refresh A Proc called before credentials are refreshed. `:before_refresh`
|
|
78
|
+
# is called with an instance of this object when AWS credentials are required and need to be refreshed.
|
|
77
79
|
def initialize(options = {})
|
|
78
|
-
@
|
|
79
|
-
endpoint_mode = resolve_endpoint_mode(options)
|
|
80
|
-
@endpoint = resolve_endpoint(options, endpoint_mode)
|
|
81
|
-
@port = options[:port] || 80
|
|
80
|
+
@backoff = resolve_backoff(options[:backoff])
|
|
82
81
|
@disable_imds_v1 = resolve_disable_v1(options)
|
|
83
|
-
|
|
84
|
-
@imds_v1_fallback = false
|
|
82
|
+
@endpoint = resolve_endpoint(options)
|
|
85
83
|
@http_open_timeout = options[:http_open_timeout] || 1
|
|
86
84
|
@http_read_timeout = options[:http_read_timeout] || 1
|
|
87
85
|
@http_debug_output = options[:http_debug_output]
|
|
88
|
-
@
|
|
86
|
+
@port = options[:port] || 80
|
|
87
|
+
@retries = options[:retries] || 1
|
|
89
88
|
@token_ttl = options[:token_ttl] || 21_600
|
|
90
|
-
|
|
91
|
-
@no_refresh_until = nil
|
|
89
|
+
|
|
92
90
|
@async_refresh = false
|
|
91
|
+
@imds_v1_fallback = false
|
|
92
|
+
@no_refresh_until = nil
|
|
93
|
+
@token = nil
|
|
94
|
+
@metrics = ['CREDENTIALS_IMDS']
|
|
93
95
|
super
|
|
94
96
|
end
|
|
95
97
|
|
|
96
|
-
# @return [
|
|
97
|
-
|
|
98
|
-
|
|
98
|
+
# @return [Boolean]
|
|
99
|
+
attr_reader :disable_imds_v1
|
|
100
|
+
|
|
101
|
+
# @return [Integer]
|
|
102
|
+
attr_reader :token_ttl
|
|
103
|
+
|
|
104
|
+
# @return [Integer]
|
|
99
105
|
attr_reader :retries
|
|
100
106
|
|
|
107
|
+
# @return [Proc]
|
|
108
|
+
attr_reader :backoff
|
|
109
|
+
|
|
110
|
+
# @return [String]
|
|
111
|
+
attr_reader :endpoint
|
|
112
|
+
|
|
113
|
+
# @return [Integer]
|
|
114
|
+
attr_reader :port
|
|
115
|
+
|
|
116
|
+
# @return [Integer]
|
|
117
|
+
attr_reader :http_open_timeout
|
|
118
|
+
|
|
119
|
+
# @return [Integer]
|
|
120
|
+
attr_reader :http_read_timeout
|
|
121
|
+
|
|
122
|
+
# @return [IO, nil]
|
|
123
|
+
attr_reader :http_debug_output
|
|
124
|
+
|
|
101
125
|
private
|
|
102
126
|
|
|
103
127
|
def resolve_endpoint_mode(options)
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
)
|
|
109
|
-
value || 'IPv4'
|
|
128
|
+
options[:endpoint_mode] ||
|
|
129
|
+
ENV['AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE'] ||
|
|
130
|
+
Aws.shared_config.ec2_metadata_service_endpoint_mode(profile: options[:profile]) ||
|
|
131
|
+
'IPv4'
|
|
110
132
|
end
|
|
111
133
|
|
|
112
|
-
def resolve_endpoint(options
|
|
113
|
-
value = options[:
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
)
|
|
134
|
+
def resolve_endpoint(options)
|
|
135
|
+
if (value = options[:ip_address])
|
|
136
|
+
warn('The `:ip_address` option is deprecated. Use `:endpoint` instead.')
|
|
137
|
+
return value
|
|
138
|
+
end
|
|
118
139
|
|
|
140
|
+
value =
|
|
141
|
+
options[:endpoint] ||
|
|
142
|
+
ENV['AWS_EC2_METADATA_SERVICE_ENDPOINT'] ||
|
|
143
|
+
Aws.shared_config.ec2_metadata_service_endpoint(profile: options[:profile]) ||
|
|
144
|
+
nil
|
|
119
145
|
return value if value
|
|
120
146
|
|
|
147
|
+
endpoint_mode = resolve_endpoint_mode(options)
|
|
121
148
|
case endpoint_mode.downcase
|
|
122
149
|
when 'ipv4' then 'http://169.254.169.254'
|
|
123
150
|
when 'ipv6' then 'http://[fd00:ec2::254]'
|
|
124
151
|
else
|
|
125
|
-
raise ArgumentError,
|
|
126
|
-
':endpoint_mode is not valid, expected IPv4 or IPv6, '\
|
|
127
|
-
"got: #{endpoint_mode}"
|
|
152
|
+
raise ArgumentError, ":endpoint_mode is not valid, expected IPv4 or IPv6, got: #{endpoint_mode}"
|
|
128
153
|
end
|
|
129
154
|
end
|
|
130
155
|
|
|
131
156
|
def resolve_disable_v1(options)
|
|
132
|
-
value =
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
profile: options[:profile]
|
|
136
|
-
|
|
137
|
-
value
|
|
138
|
-
Aws::Util.str_2_bool(value) || false
|
|
157
|
+
value =
|
|
158
|
+
options[:disable_imds_v1] ||
|
|
159
|
+
ENV['AWS_EC2_METADATA_V1_DISABLED'] ||
|
|
160
|
+
Aws.shared_config.ec2_metadata_v1_disabled(profile: options[:profile]) ||
|
|
161
|
+
'false'
|
|
162
|
+
Aws::Util.str_2_bool(value.to_s.downcase)
|
|
139
163
|
end
|
|
140
164
|
|
|
141
|
-
def
|
|
165
|
+
def resolve_backoff(backoff)
|
|
142
166
|
case backoff
|
|
143
167
|
when Proc then backoff
|
|
144
168
|
when Numeric then ->(_) { sleep(backoff) }
|
|
@@ -152,97 +176,74 @@ module Aws
|
|
|
152
176
|
return
|
|
153
177
|
end
|
|
154
178
|
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
@credentials = Credentials.new(
|
|
163
|
-
c['AccessKeyId'],
|
|
164
|
-
c['SecretAccessKey'],
|
|
165
|
-
c['Token']
|
|
166
|
-
)
|
|
167
|
-
@expiration = c['Expiration'] ? Time.iso8601(c['Expiration']) : nil
|
|
168
|
-
if @expiration && @expiration < Time.now
|
|
169
|
-
@no_refresh_until = Time.now + refresh_offset
|
|
170
|
-
warn_expired_credentials
|
|
171
|
-
end
|
|
172
|
-
else
|
|
173
|
-
# credentials are already set, update them only if the new ones are not empty
|
|
174
|
-
if !c['AccessKeyId'] || c['AccessKeyId'].empty?
|
|
175
|
-
# error getting new credentials
|
|
176
|
-
@no_refresh_until = Time.now + refresh_offset
|
|
177
|
-
warn_expired_credentials
|
|
178
|
-
else
|
|
179
|
-
@credentials = Credentials.new(
|
|
180
|
-
c['AccessKeyId'],
|
|
181
|
-
c['SecretAccessKey'],
|
|
182
|
-
c['Token']
|
|
183
|
-
)
|
|
184
|
-
@expiration = c['Expiration'] ? Time.iso8601(c['Expiration']) : nil
|
|
185
|
-
if @expiration && @expiration < Time.now
|
|
186
|
-
@no_refresh_until = Time.now + refresh_offset
|
|
187
|
-
warn_expired_credentials
|
|
188
|
-
end
|
|
189
|
-
end
|
|
179
|
+
new_creds =
|
|
180
|
+
begin
|
|
181
|
+
# Retry loading credentials up to 3 times is the instance metadata
|
|
182
|
+
# service is responding but is returning invalid JSON documents
|
|
183
|
+
# in response to the GET profile credentials call.
|
|
184
|
+
retry_errors([Aws::Json::ParseError], max_retries: 3) do
|
|
185
|
+
Aws::Json.load(retrieve_credentials.to_s)
|
|
190
186
|
end
|
|
187
|
+
rescue Aws::Json::ParseError
|
|
188
|
+
raise Aws::Errors::MetadataParserError
|
|
191
189
|
end
|
|
192
|
-
|
|
193
|
-
|
|
190
|
+
|
|
191
|
+
if @credentials&.set? && empty_credentials?(new_creds)
|
|
192
|
+
# credentials are already set, but there was an error getting new credentials
|
|
193
|
+
# so don't update the credentials and use stale ones (static stability)
|
|
194
|
+
@no_refresh_until = Time.now + rand(300..360)
|
|
195
|
+
warn_expired_credentials
|
|
196
|
+
else
|
|
197
|
+
# credentials are empty or successfully retrieved, update them
|
|
198
|
+
update_credentials(new_creds)
|
|
194
199
|
end
|
|
195
200
|
end
|
|
196
201
|
|
|
197
|
-
def
|
|
202
|
+
def retrieve_credentials
|
|
198
203
|
# Retry loading credentials a configurable number of times if
|
|
199
204
|
# the instance metadata service is not responding.
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
# disable insecure flow if we couldn't get token
|
|
212
|
-
# and imds v1 is disabled
|
|
213
|
-
raise TokenRetrivalError if token.nil? && @disable_imds_v1
|
|
214
|
-
|
|
215
|
-
_get_credentials(conn, token)
|
|
216
|
-
end
|
|
205
|
+
begin
|
|
206
|
+
retry_errors(NETWORK_ERRORS, max_retries: @retries) do
|
|
207
|
+
open_connection do |conn|
|
|
208
|
+
# attempt to fetch token to start secure flow first
|
|
209
|
+
# and rescue to failover
|
|
210
|
+
fetch_token(conn) unless @imds_v1_fallback || (@token && !@token.expired?)
|
|
211
|
+
|
|
212
|
+
# disable insecure flow if we couldn't get token and imds v1 is disabled
|
|
213
|
+
raise TokenRetrivalError if @token.nil? && @disable_imds_v1
|
|
214
|
+
|
|
215
|
+
fetch_credentials(conn)
|
|
217
216
|
end
|
|
218
|
-
rescue
|
|
219
|
-
'{}'
|
|
220
217
|
end
|
|
218
|
+
rescue StandardError => e
|
|
219
|
+
warn("Error retrieving instance profile credentials: #{e}")
|
|
220
|
+
'{}'
|
|
221
221
|
end
|
|
222
222
|
end
|
|
223
223
|
|
|
224
|
+
def update_credentials(creds)
|
|
225
|
+
@credentials = Credentials.new(creds['AccessKeyId'], creds['SecretAccessKey'], creds['Token'])
|
|
226
|
+
@expiration = creds['Expiration'] ? Time.iso8601(creds['Expiration']) : nil
|
|
227
|
+
return unless @expiration && @expiration < Time.now
|
|
228
|
+
|
|
229
|
+
@no_refresh_until = Time.now + rand(300..360)
|
|
230
|
+
warn_expired_credentials
|
|
231
|
+
end
|
|
232
|
+
|
|
224
233
|
def fetch_token(conn)
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
token_value, ttl = http_put(
|
|
229
|
-
conn, METADATA_TOKEN_PATH, @token_ttl
|
|
230
|
-
)
|
|
231
|
-
@token = Token.new(token_value, ttl, created_time) if token_value && ttl
|
|
232
|
-
end
|
|
233
|
-
end
|
|
234
|
+
created_time = Time.now
|
|
235
|
+
token_value, ttl = http_put(conn)
|
|
236
|
+
@token = Token.new(token_value, ttl, created_time) if token_value && ttl
|
|
234
237
|
rescue *NETWORK_ERRORS
|
|
235
238
|
# token attempt failed, reset token
|
|
236
239
|
# fallback to non-token mode
|
|
237
|
-
@token = nil
|
|
238
240
|
@imds_v1_fallback = true
|
|
239
241
|
end
|
|
240
242
|
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
metadata = http_get(conn, METADATA_PATH_BASE, token)
|
|
243
|
+
def fetch_credentials(conn)
|
|
244
|
+
metadata = http_get(conn, METADATA_PATH_BASE)
|
|
244
245
|
profile_name = metadata.lines.first.strip
|
|
245
|
-
http_get(conn, METADATA_PATH_BASE + profile_name
|
|
246
|
+
http_get(conn, METADATA_PATH_BASE + profile_name)
|
|
246
247
|
rescue TokenExpiredError
|
|
247
248
|
# Token has expired, reset it
|
|
248
249
|
# The next retry should fetch it
|
|
@@ -255,13 +256,9 @@ module Aws
|
|
|
255
256
|
@token && !@token.expired?
|
|
256
257
|
end
|
|
257
258
|
|
|
258
|
-
def _metadata_disabled?
|
|
259
|
-
ENV.fetch('AWS_EC2_METADATA_DISABLED', 'false').downcase == 'true'
|
|
260
|
-
end
|
|
261
|
-
|
|
262
259
|
def open_connection
|
|
263
260
|
uri = URI.parse(@endpoint)
|
|
264
|
-
http = Net::HTTP.new(uri.hostname || @endpoint,
|
|
261
|
+
http = Net::HTTP.new(uri.hostname || @endpoint, uri.port || @port)
|
|
265
262
|
http.open_timeout = @http_open_timeout
|
|
266
263
|
http.read_timeout = @http_read_timeout
|
|
267
264
|
http.set_debug_output(@http_debug_output) if @http_debug_output
|
|
@@ -270,9 +267,9 @@ module Aws
|
|
|
270
267
|
end
|
|
271
268
|
|
|
272
269
|
# GET request fetch profile and credentials
|
|
273
|
-
def http_get(connection, path
|
|
270
|
+
def http_get(connection, path)
|
|
274
271
|
headers = { 'User-Agent' => "aws-sdk-ruby3/#{CORE_GEM_VERSION}" }
|
|
275
|
-
headers['x-aws-ec2-metadata-token'] = token if token
|
|
272
|
+
headers['x-aws-ec2-metadata-token'] = @token.value if @token
|
|
276
273
|
response = connection.request(Net::HTTP::Get.new(path, headers))
|
|
277
274
|
|
|
278
275
|
case response.code.to_i
|
|
@@ -286,12 +283,12 @@ module Aws
|
|
|
286
283
|
end
|
|
287
284
|
|
|
288
285
|
# PUT request fetch token with ttl
|
|
289
|
-
def http_put(connection
|
|
286
|
+
def http_put(connection)
|
|
290
287
|
headers = {
|
|
291
288
|
'User-Agent' => "aws-sdk-ruby3/#{CORE_GEM_VERSION}",
|
|
292
|
-
'x-aws-ec2-metadata-token-ttl-seconds' =>
|
|
289
|
+
'x-aws-ec2-metadata-token-ttl-seconds' => @token_ttl.to_s
|
|
293
290
|
}
|
|
294
|
-
response = connection.request(Net::HTTP::Put.new(
|
|
291
|
+
response = connection.request(Net::HTTP::Put.new(METADATA_TOKEN_PATH, headers))
|
|
295
292
|
case response.code.to_i
|
|
296
293
|
when 200
|
|
297
294
|
[
|
|
@@ -320,18 +317,12 @@ module Aws
|
|
|
320
317
|
end
|
|
321
318
|
|
|
322
319
|
def warn_expired_credentials
|
|
323
|
-
warn(
|
|
324
|
-
|
|
325
|
-
"will be attempted again in 5 minutes.")
|
|
326
|
-
end
|
|
327
|
-
|
|
328
|
-
def empty_credentials?(creds)
|
|
329
|
-
!creds || !creds.access_key_id || creds.access_key_id.empty?
|
|
320
|
+
warn('Attempting credential expiration extension due to a credential service availability issue. '\
|
|
321
|
+
'A refresh of these credentials will be attempted again in 5 minutes.')
|
|
330
322
|
end
|
|
331
323
|
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
300 + rand(0..60)
|
|
324
|
+
def empty_credentials?(creds_hash)
|
|
325
|
+
!creds_hash['AccessKeyId'] || creds_hash['AccessKeyId'].empty?
|
|
335
326
|
end
|
|
336
327
|
|
|
337
328
|
# @api private
|
|
@@ -8,7 +8,7 @@ module Aws
|
|
|
8
8
|
|
|
9
9
|
include Seahorse::Model::Shapes
|
|
10
10
|
|
|
11
|
-
def initialize(rules)
|
|
11
|
+
def initialize(rules, _options = {})
|
|
12
12
|
@rules = rules
|
|
13
13
|
end
|
|
14
14
|
|
|
@@ -20,6 +20,8 @@ module Aws
|
|
|
20
20
|
private
|
|
21
21
|
|
|
22
22
|
def structure(ref, values)
|
|
23
|
+
return nil if values.nil?
|
|
24
|
+
|
|
23
25
|
shape = ref.shape
|
|
24
26
|
values.each_pair.with_object({}) do |(key, value), data|
|
|
25
27
|
if shape.member?(key) && !value.nil?
|
|
@@ -31,11 +33,15 @@ module Aws
|
|
|
31
33
|
end
|
|
32
34
|
|
|
33
35
|
def list(ref, values)
|
|
36
|
+
return nil if values.nil?
|
|
37
|
+
|
|
34
38
|
member_ref = ref.shape.member
|
|
35
39
|
values.collect { |value| format(member_ref, value) }
|
|
36
40
|
end
|
|
37
41
|
|
|
38
42
|
def map(ref, values)
|
|
43
|
+
return nil if values.nil?
|
|
44
|
+
|
|
39
45
|
value_ref = ref.shape.value
|
|
40
46
|
values.each.with_object({}) do |(key, value), data|
|
|
41
47
|
data[key] = format(value_ref, value)
|
|
@@ -49,6 +55,7 @@ module Aws
|
|
|
49
55
|
when MapShape then map(ref, value)
|
|
50
56
|
when TimestampShape then timestamp(ref, value)
|
|
51
57
|
when BlobShape then encode(value)
|
|
58
|
+
when FloatShape then Util.serialize_number(value)
|
|
52
59
|
else value
|
|
53
60
|
end
|
|
54
61
|
end
|
|
@@ -2,10 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
module Aws
|
|
4
4
|
module Json
|
|
5
|
-
|
|
5
|
+
# @api private
|
|
6
|
+
class ErrorHandler < Aws::ErrorHandler
|
|
6
7
|
|
|
7
|
-
# @param [Seahorse::Client::RequestContext] context
|
|
8
|
-
# @return [Seahorse::Client::Response]
|
|
9
8
|
def call(context)
|
|
10
9
|
@handler.call(context).on(300..599) do |response|
|
|
11
10
|
response.error = error(context)
|
|
@@ -19,24 +18,28 @@ module Aws
|
|
|
19
18
|
json = Json.load(body)
|
|
20
19
|
code = error_code(json, context)
|
|
21
20
|
message = error_message(code, json)
|
|
22
|
-
data = parse_error_data(context, code)
|
|
21
|
+
data = parse_error_data(context, body, code)
|
|
23
22
|
[code, message, data]
|
|
24
23
|
rescue Json::ParseError
|
|
25
24
|
[http_status_error_code(context), '', EmptyStructure.new]
|
|
26
25
|
end
|
|
27
26
|
|
|
28
27
|
def error_code(json, context)
|
|
28
|
+
# This is not correct per protocol tests. awsQueryError is intended to populate the
|
|
29
|
+
# error code of the error class. The error class should come from __type. Query and
|
|
30
|
+
# query compatible services currently have dynamic errors raised from error codes instead
|
|
31
|
+
# of the modeled error class. However, changing this in this major version would break
|
|
32
|
+
# existing usage.
|
|
29
33
|
code =
|
|
30
34
|
if aws_query_error?(context)
|
|
31
|
-
|
|
32
|
-
remove_prefix(error, context)
|
|
35
|
+
aws_query_error_code(context)
|
|
33
36
|
else
|
|
34
37
|
json['__type']
|
|
35
38
|
end
|
|
36
39
|
code ||= json['code']
|
|
37
40
|
code ||= context.http_response.headers['x-amzn-errortype']
|
|
38
41
|
if code
|
|
39
|
-
code.split('#').last
|
|
42
|
+
code.split('#').last.split(':').first
|
|
40
43
|
else
|
|
41
44
|
http_status_error_code(context)
|
|
42
45
|
end
|
|
@@ -47,8 +50,14 @@ module Aws
|
|
|
47
50
|
context.http_response.headers['x-amzn-query-error']
|
|
48
51
|
end
|
|
49
52
|
|
|
53
|
+
def aws_query_error_code(context)
|
|
54
|
+
query_header = context.http_response.headers['x-amzn-query-error']
|
|
55
|
+
error, _type = query_header.split(';') # type not supported
|
|
56
|
+
remove_prefix(error, context)
|
|
57
|
+
end
|
|
58
|
+
|
|
50
59
|
def remove_prefix(error_code, context)
|
|
51
|
-
if prefix = context.config.api.metadata['errorPrefix']
|
|
60
|
+
if (prefix = context.config.api.metadata['errorPrefix'])
|
|
52
61
|
error_code.sub(/^#{prefix}/, '')
|
|
53
62
|
else
|
|
54
63
|
error_code
|
|
@@ -63,22 +72,29 @@ module Aws
|
|
|
63
72
|
end
|
|
64
73
|
end
|
|
65
74
|
|
|
66
|
-
def parse_error_data(context, code)
|
|
75
|
+
def parse_error_data(context, body, code)
|
|
67
76
|
data = EmptyStructure.new
|
|
68
|
-
if error_rules = context.operation.errors
|
|
77
|
+
if (error_rules = context.operation.errors)
|
|
69
78
|
error_rules.each do |rule|
|
|
70
79
|
# match modeled shape name with the type(code) only
|
|
71
80
|
# some type(code) might contains invalid characters
|
|
72
81
|
# such as ':' (efs) etc
|
|
73
82
|
match = rule.shape.name == code.gsub(/[^^a-zA-Z0-9]/, '')
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
83
|
+
next unless match && rule.shape.members.any?
|
|
84
|
+
|
|
85
|
+
data = Parser.new(rule).parse(body)
|
|
86
|
+
# errors support HTTP bindings
|
|
87
|
+
apply_error_headers(rule, context, data)
|
|
77
88
|
end
|
|
78
89
|
end
|
|
79
90
|
data
|
|
80
91
|
end
|
|
81
92
|
|
|
93
|
+
def apply_error_headers(rule, context, data)
|
|
94
|
+
headers = Aws::Rest::Response::Headers.new(rule)
|
|
95
|
+
headers.apply(context.http_response, data)
|
|
96
|
+
end
|
|
97
|
+
|
|
82
98
|
end
|
|
83
99
|
end
|
|
84
100
|
end
|
|
@@ -12,8 +12,7 @@ module Aws
|
|
|
12
12
|
build_request(context)
|
|
13
13
|
response = @handler.call(context)
|
|
14
14
|
response.on(200..299) { |resp| parse_response(resp) }
|
|
15
|
-
response.on(200..599) { |
|
|
16
|
-
response
|
|
15
|
+
response.on(200..599) { |_resp| apply_request_id(context) }
|
|
17
16
|
end
|
|
18
17
|
|
|
19
18
|
private
|
|
@@ -22,6 +21,7 @@ module Aws
|
|
|
22
21
|
context.http_request.http_method = 'POST'
|
|
23
22
|
context.http_request.headers['Content-Type'] = content_type(context)
|
|
24
23
|
context.http_request.headers['X-Amz-Target'] = target(context)
|
|
24
|
+
context.http_request.headers['X-Amzn-Query-Mode'] = 'true' if query_compatible?(context)
|
|
25
25
|
context.http_request.body = build_body(context)
|
|
26
26
|
end
|
|
27
27
|
|
|
@@ -38,10 +38,10 @@ module Aws
|
|
|
38
38
|
end
|
|
39
39
|
|
|
40
40
|
def parse_body(context)
|
|
41
|
+
json = context.http_response.body_contents
|
|
41
42
|
if simple_json?(context)
|
|
42
|
-
Json.load(
|
|
43
|
-
elsif rules = context.operation.output
|
|
44
|
-
json = context.http_response.body_contents
|
|
43
|
+
Json.load(json)
|
|
44
|
+
elsif (rules = context.operation.output)
|
|
45
45
|
if json.is_a?(Array)
|
|
46
46
|
# an array of emitted events
|
|
47
47
|
if json[0].respond_to?(:response)
|
|
@@ -62,7 +62,7 @@ module Aws
|
|
|
62
62
|
Parser.new(
|
|
63
63
|
rules,
|
|
64
64
|
query_compatible: query_compatible?(context)
|
|
65
|
-
).parse(json
|
|
65
|
+
).parse(json)
|
|
66
66
|
end
|
|
67
67
|
else
|
|
68
68
|
EmptyStructure.new
|
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
+
require 'oj'
|
|
4
|
+
|
|
3
5
|
module Aws
|
|
4
6
|
module Json
|
|
5
7
|
module OjEngine
|
|
6
8
|
# @api private
|
|
7
|
-
LOAD_OPTIONS = {
|
|
9
|
+
LOAD_OPTIONS = {
|
|
10
|
+
mode: :compat,
|
|
11
|
+
symbol_keys: false,
|
|
12
|
+
empty_string: false
|
|
13
|
+
}.freeze
|
|
8
14
|
|
|
9
15
|
# @api private
|
|
10
16
|
DUMP_OPTIONS = { mode: :compat }.freeze
|