Remove json tests (tested in other ways) and minor touch ups

aws · Oct 24, 2023 · f321f6a · f321f6a
1 parent d672281
commit f321f6a
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 172 deletions.
diff --git a/build_tools/aws-sdk-code-generator/lib/aws-sdk-code-generator/views/endpoints_module.rb b/build_tools/aws-sdk-code-generator/lib/aws-sdk-code-generator/views/endpoints_module.rb
@@ -42,10 +42,6 @@ def initialize(options)
 
         # @return [Array<EndpointParameter>]
         attr_reader :parameters
-
-        def has_endpoint_built_in?
-          parameters.any? { |p| p.param_data['builtIn'] == 'SDK::Endpoint' }
-        end
       end
 
       class EndpointParameter
@@ -153,7 +149,7 @@ def built_in_client_context_param_value(param_data)
         when 'AWS::S3::DisableMultiRegionAccessPoints'
           'context.config.s3_disable_multiregion_access_points'
         when 'SDK::Endpoint'
-          'endpoint'
+          'context.config.regional_endpoint ? nil : context.config.endpoint.to_s'
         end
       end
 

diff --git a/build_tools/aws-sdk-code-generator/templates/endpoints_module.mustache b/build_tools/aws-sdk-code-generator/templates/endpoints_module.mustache
@@ -11,11 +11,6 @@ module {{module_name}}
     {{#endpoint_classes}}
     class {{name}}
       def self.build(context)
-        {{#has_endpoint_built_in?}}
-        unless context.config.regional_endpoint
-          endpoint = context.config.endpoint.to_s
-        end
-        {{/has_endpoint_built_in?}}
         {{module_name}}::EndpointParameters.new(
           {{#parameters}}
           {{#static_string?}}

diff --git a/gems/aws-sdk-core/CHANGELOG.md b/gems/aws-sdk-core/CHANGELOG.md
@@ -1,7 +1,7 @@
 Unreleased Changes
 ------------------
 
-* Feature - Support Credential scoping using `ENV['AWS_CREDENTIAL_SCOPE']`, `aws_credential_scope` shared config, or the `credential_scope` Client configuration option.
+* Feature - Support Credential scoped credentials using `ENV['AWS_CREDENTIAL_SCOPE']`, `aws_credential_scope` shared config, or the `credential_scope` Client configuration option.
 
 3.185.1 (2023-10-05)
 ------------------

diff --git a/gems/aws-sdk-core/spec/aws/credential_scope_spec.rb b/gems/aws-sdk-core/spec/aws/credential_scope_spec.rb
diff --git a/gems/aws-sdk-core/spec/aws/credential_scope_tests.json b/gems/aws-sdk-core/spec/aws/credential_scope_tests.json
diff --git a/gems/aws-sdk-core/spec/aws/shared_credentials_spec.rb b/gems/aws-sdk-core/spec/aws/shared_credentials_spec.rb
@@ -25,6 +25,7 @@ module Aws
       expect(creds.access_key_id).to eq('ACCESS_KEY_0')
       expect(creds.secret_access_key).to eq('SECRET_KEY_0')
       expect(creds.session_token).to eq('TOKEN_0')
+      expect(creds.credential_scope).to eq('SCOPE_0')
     end
 
     it 'supports fetching profiles from ENV' do

diff --git a/gems/aws-sdk-core/spec/fixtures/credentials/mock_shared_credentials b/gems/aws-sdk-core/spec/fixtures/credentials/mock_shared_credentials
@@ -2,6 +2,7 @@
 aws_access_key_id = ACCESS_KEY_0
 aws_secret_access_key = SECRET_KEY_0
 aws_session_token = TOKEN_0
+aws_credential_scope = SCOPE_0
 
 [fooprofile]
 aws_access_key_id = ACCESS_KEY_1