Accept client to Polly presigner (#2614)

Author: mullermp

gems/aws-sdk-polly/CHANGELOG.md

@@ -1,6 +1,8 @@
 Unreleased Changes
 ------------------
 
+* Feature - Allow `Aws::Polly::Presigner` to take a `:client` with FIPS or Dualstack configuration.
+
 1.48.0 (2021-11-04)
 ------------------
 
@@ -315,4 +317,4 @@ Unreleased Changes
 1.0.0.rc2 (2016-12-09)
 ------------------
 
-* Feature - Initial release of `aws-sdk-polly`.
+* Feature - Initial release of `aws-sdk-polly`.

gems/aws-sdk-polly/lib/aws-sdk-polly/presigner.rb

@@ -18,10 +18,13 @@ module Polly
     #
     class Presigner
 
-      # @option options [required, Credentials] :credentials
-      #   You need provide an object that responds to `#credentials`
-      #   returning another object that responds to `#access_key_id`, `#secret_access_key`,
-      #   and `#session_token`.
+      # @option options [Client] :client Optionally provide an existing Polly
+      #   client.
+      #
+      # @option options [Credentials] :credentials This option is deprecated,
+      #   please use :client instead. Provide an object that responds to
+      #   `#credentials` that returns another object that responds to
+      #   `#access_key_id`, `#secret_access_key`, and `#session_token`.
       #
       #   For example, you could provide an instance of following classes:
       #     * `Aws::Credentials`
@@ -30,35 +33,42 @@ class Presigner
       #     * `Aws::AssumeRoleCredentials`
       #     * `Aws::ECSCredentials`
       #
-      # @option options [required, string] :region
-      #   The region name, e.g. 'us-west-2'
+      # @option options [String] :region This option is deprecated, please use
+      #   :client instead. The region name, e.g. 'us-west-2'.
+      #
       def initialize(options = {})
-        @credentials = options.fetch(:credentials)
-        @region = options.fetch(:region)
+        if !(options.keys - [:credentials, :region, :client]).empty?
+          raise ArgumentError,
+                ':options may only contain :client, :region, :credentials '\
+                'keys. Please use the :client option instead.'
+        end
+        @client = options[:client] || Aws::Polly::Client.new(options)
       end
 
-      # @param [Hash] params parameter inputs for synthesize_speech operation
+      # @param [Hash] params Parameter inputs for {Client#synthesize_speech}
+      #  operation.
       def synthesize_speech_presigned_url(params = {})
-        input_shape = Client.api.operation(:synthesize_speech).input.shape
-        sign_but_dont_send(input_shape, params)
-      end
+        req = @client.build_request(:synthesize_speech, params)
 
-      private
-
-      def sign_but_dont_send(input_shape, params)
         parts = []
-        input_shape.members.each do |name, ref|
+        req.context.operation.input.shape.members.each do |name, ref|
           parts << [ ref, params[name] ] unless params[name].nil?
         end
         query = Aws::Rest::Request::QuerystringBuilder.new.build(parts)
 
         signer = Aws::Sigv4::Signer.new(
           service: 'polly',
-          region: @region,
-          credentials_provider: @credentials
+          region: req.context.config.region,
+          credentials_provider: req.context.config.credentials
+        )
+
+        url = Aws::Partitions::EndpointProvider.resolve(
+          signer.region, 'polly', 'regional',
+          {
+            dualstack: req.context.config.use_dualstack_endpoint,
+            fips: req.context.config.use_fips_endpoint
+          }
         )
-        # TODO - use context so that dualstack can be used
-        url = Aws::Partitions::EndpointProvider.resolve(signer.region, 'polly')
         url += "/v1/speech?#{query}"
         pre_signed_url = signer.presign_url(
           http_method: 'GET',

gems/aws-sdk-polly/spec/presigner_spec.rb

@@ -15,32 +15,62 @@ module Polly
       let(:now) { double('now') }
       let(:utc) { double('utc-time') }
       let(:datetime) { '20160101T112233Z' }
+
       let(:credentials) { Credentials.new('akid', 'secret') }
       let(:region) { 'us-west-2' }
+      let(:client) { Client.new(region: region, credentials: credentials) }
 
       describe '#initialize' do
 
-        it 'requires :credentials' do
-          expect {
-            Presigner.new(region: region)
-          }.to raise_error(
-            KeyError, /credentials/
-          )
+        it 'accepts :credentials and region (backwards compatible)' do
+          expect do
+            Presigner.new(region: region, credentials: credentials)
+          end.to_not raise_error
+        end
+
+        it 'accepts :client' do
+          expect do
+            Presigner.new(client: client)
+          end.to_not raise_error
         end
 
-        it 'requries :region' do
-          expect {
-            Presigner.new(credentials: credentials)
-          }.to raise_error(
-            KeyError, /region/
-          )
+        it 'raises when provided options that are not supported' do
+          expect do
+            Presigner.new(foo: 'bar')
+          end.to raise_error(ArgumentError, /use the :client option/)
         end
 
       end
 
       describe '#presigned_url' do
 
-        it 'can presign #synthesize_speech correctly' do
+        it 'can presign #synthesize_speech using client' do
+          expected_url =
+            'https://polly.us-west-2.amazonaws.com/v1/speech?'\
+            'LexiconNames=mno&LexiconNames=abc&OutputFormat=mp3&SampleRate=128&'\
+            'Text=Hello%20World&TextType=text&VoiceId=Ewa&'\
+            'X-Amz-Algorithm=AWS4-HMAC-SHA256&'\
+            'X-Amz-Credential=akid%2F20160101%2F'\
+            'us-west-2%2Fpolly%2Faws4_request&'\
+            'X-Amz-Date=20160101T112233Z&X-Amz-Expires=900&'\
+            'X-Amz-SignedHeaders=host&'\
+            'X-Amz-Signature=acb554087d5e340223b3415c79618adeb5c2b6dba19ba91771fbbe1d50a78f3d'
+
+          pre = Presigner.new(client: client)
+          params = {
+            lexicon_names: [ 'mno', 'abc' ],
+            output_format: 'mp3',
+            sample_rate: '128',
+            text: 'Hello World',
+            text_type: 'text',
+            voice_id: 'Ewa'
+          }
+
+          actual_url = pre.synthesize_speech_presigned_url(params)
+          expect(actual_url).to eq(expected_url)
+        end
+
+        it 'can presign #synthesize_speech using region and credentials' do
           expected_url =
             'https://polly.us-west-2.amazonaws.com/v1/speech?'\
             'LexiconNames=mno&LexiconNames=abc&OutputFormat=mp3&SampleRate=128&'\