Service specific protocol tests (#3049)

mullermp · web-flow · commit 24f1619862f3 · 2024-06-19T16:44:44.000-04:00
diff --git a/gems/aws-sdk-apigateway/spec/client_spec.rb b/gems/aws-sdk-apigateway/spec/client_spec.rb
@@ -6,7 +6,7 @@ module Aws
   module APIGateway
     describe Client do
 
-      let(:client) { Client.new(stub_responses:true) }
+      let(:client) { Client.new(stub_responses: true) }
 
       it 'supports maps for querystrings' do
         resp = client.get_sdk({
@@ -21,9 +21,7 @@ module APIGateway
         })
 
         expect(resp.context.http_request.endpoint.to_s).to match(/\?abc=xyz&key=value&string=string$/)
-
       end
-
     end
   end
 end
diff --git a/gems/aws-sdk-apigateway/spec/protocols_spec.rb b/gems/aws-sdk-apigateway/spec/protocols_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_relative 'spec_helper'
+
+module Aws
+  module APIGateway
+    describe Client do
+
+      let(:client) { Client.new(stub_responses: true) }
+
+      # {
+      #     id: "ApiGatewayAccept",
+      #     documentation: "API Gateway requires that this Accept header is set on all requests.",
+      #     protocol: restJson1,
+      #     method: "GET",
+      #     uri: "/restapis",
+      #     headers: {
+      #         "Accept": "application/json",
+      #     },
+      #     body: "",
+      #     params: {},
+      # }
+      it 'ApiGatewayAccept' do
+        resp = client.get_rest_apis
+        request = resp.context.http_request
+        expect(request.headers['accept']).to eq('application/json')
+      end
+    end
+  end
+end
diff --git a/gems/aws-sdk-core/CHANGELOG.md b/gems/aws-sdk-core/CHANGELOG.md
@@ -1,6 +1,8 @@
 Unreleased Changes
 ------------------
 
+* Issue - Fix trailing slash in endpoint URLs for rest-json and rest-xml services.
+
 3.197.1 (2024-06-19)
 ------------------
 
diff --git a/gems/aws-sdk-core/lib/aws-sdk-core/rest/request/endpoint.rb b/gems/aws-sdk-core/lib/aws-sdk-core/rest/request/endpoint.rb
@@ -30,7 +30,9 @@ def uri(base_uri, params)
         private
 
         def apply_path_params(uri, params)
-          path = uri.path.sub(%r{/$}, '') + @path_pattern.split('?')[0]
+          path = uri.path.sub(%r{/$}, '')
+          # handle trailing slash
+          path += @path_pattern.split('?')[0] if path.empty? || @path_pattern != '/'
           uri.path = path.gsub(/{.+?}/) do |placeholder|
             param_value_for_placeholder(placeholder, params)
           end
diff --git a/gems/aws-sdk-glacier/CHANGELOG.md b/gems/aws-sdk-glacier/CHANGELOG.md
@@ -1,6 +1,8 @@
 Unreleased Changes
 ------------------
 
+* Issue - Require `account_id` to be non-empty and set it to the default.
+
 1.62.0 (2024-06-05)
 ------------------
 
diff --git a/gems/aws-sdk-glacier/lib/aws-sdk-glacier/plugins/account_id.rb b/gems/aws-sdk-glacier/lib/aws-sdk-glacier/plugins/account_id.rb
@@ -14,10 +14,18 @@ class AccountId < Seahorse::Client::Plugin
 your `:credentials` belong to.
           DOCS
 
-        handle_request(step: :initialize) do |context|
-          context.params[:account_id] ||= context.config.account_id
+        class Handler < Seahorse::Client::Handler
+          def call(context)
+            context.params[:account_id] ||= context.config.account_id
+            if context.params[:account_id].empty?
+              context.params[:account_id] = '-'
+            end
+            @handler.call(context)
+          end
         end
 
+        handler(Handler, step: :initialize)
+
       end
     end
   end
diff --git a/gems/aws-sdk-glacier/lib/aws-sdk-glacier/plugins/api_version.rb b/gems/aws-sdk-glacier/lib/aws-sdk-glacier/plugins/api_version.rb
@@ -7,13 +7,11 @@ module Plugins
       class ApiVersion < Seahorse::Client::Plugin
 
         class Handler < Seahorse::Client::Handler
-
           def call(context)
             version = context.config.api.version
             context.http_request.headers['x-amz-glacier-version'] = version
             @handler.call(context)
           end
-
         end
 
         handler(Handler)
diff --git a/gems/aws-sdk-glacier/spec/client_spec.rb b/gems/aws-sdk-glacier/spec/client_spec.rb
@@ -39,17 +39,8 @@ module Glacier
         )
       end
 
-      describe 'api verison' do
-
-        it 'sends the API version as a header' do
-          resp = client.list_vaults
-          expect(resp.context.http_request.headers['x-amz-glacier-version']).to eq('2012-06-01')
-        end
-
-      end
 
       describe 'errors' do
-
         it 'extracts the error code form the header' do
           client.handle(step: :send) do |context|
             context.http_response.signal_headers(409, {})
@@ -67,11 +58,9 @@ module Glacier
             client.list_vaults(account_id: '12345')
           }.to raise_error(Errors::AccessDeniedException)
         end
-
       end
 
       describe ':account_id' do
-
         it 'defaults to -' do
           resp = client.list_vaults
           expect(resp.context.http_request.endpoint.path).to eq('/-/vaults')
@@ -88,7 +77,6 @@ module Glacier
           resp = client.list_vaults(account_id: 'xyz')
           expect(resp.context.http_request.endpoint.path).to eq('/xyz/vaults')
         end
-
       end
     end
   end
diff --git a/gems/aws-sdk-glacier/spec/protocols_spec.rb b/gems/aws-sdk-glacier/spec/protocols_spec.rb
@@ -0,0 +1,137 @@
+# frozen_string_literal: true
+
+require_relative 'spec_helper'
+
+module Aws
+  module Glacier
+    describe Client do
+
+      let(:client) { Client.new(stub_responses: true) }
+
+      describe '#upload_archive' do
+        # {
+        #     id: "GlacierVersionHeader",
+        #     documentation: "Glacier requires that a version header be set on all requests.",
+        #     protocol: restJson1,
+        #     method: "POST",
+        #     uri: "/foo/vaults/bar/archives",
+        #     headers: {
+        #         "X-Amz-Glacier-Version": "2012-06-01",
+        #     },
+        #     body: "",
+        #     params: {
+        #         accountId: "foo",
+        #         vaultName: "bar",
+        #     },
+        # },
+        it 'GlacierVersionHeader' do
+          resp = client.upload_archive(
+            account_id: 'foo',
+            vault_name: 'bar'
+          )
+          request = resp.context.http_request
+          expect(request.headers['x-amz-glacier-version']).to eq('2012-06-01')
+        end
+
+        # {
+        #     id: "GlacierChecksums",
+        #     documentation: "Glacier requires checksum headers that are cumbersome to provide.",
+        #     protocol: restJson1,
+        #     method: "POST",
+        #     uri: "/foo/vaults/bar/archives",
+        #     headers: {
+        #         "X-Amz-Glacier-Version": "2012-06-01",
+        #         "X-Amz-Content-Sha256": "b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9",
+        #         "X-Amz-Sha256-Tree-Hash": "b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9",
+        #     },
+        #     body: "hello world",
+        #     params: {
+        #         accountId: "foo",
+        #         vaultName: "bar",
+        #         body: "hello world"
+        #     },
+        #     appliesTo: "client",
+        # },
+        it 'GlacierChecksums' do
+          resp = client.upload_archive(
+            account_id: 'foo',
+            vault_name: 'bar',
+            body: 'hello world'
+          )
+          request = resp.context.http_request
+          expect(request.headers['x-amz-glacier-version']).to eq('2012-06-01')
+          expect(request.headers['x-amz-content-sha256'])
+            .to eq('b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9')
+          expect(request.headers['x-amz-sha256-tree-hash'])
+            .to eq('b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9')
+        end
+
+        # {
+        #     id: "GlacierAccountId",
+        #     documentation: """
+        #         Glacier requires that the account id be set, but you can just use a
+        #         hyphen (-) to indicate the current account. This should be default
+        #         behavior if the customer provides a null or empty string.""",
+        #     protocol: restJson1,
+        #     method: "POST",
+        #     uri: "/-/vaults/bar/archives",
+        #     headers: {
+        #         "X-Amz-Glacier-Version": "2012-06-01",
+        #     },
+        #     body: "",
+        #     params: {
+        #         accountId: "",
+        #         vaultName: "bar",
+        #     },
+        #     appliesTo: "client",
+        # }
+        it 'GlacierAccountId' do
+          resp = client.upload_archive(
+            account_id: '',
+            vault_name: 'bar'
+          )
+          request = resp.context.http_request
+          expect(request.headers['x-amz-glacier-version']).to eq('2012-06-01')
+          expect(request.endpoint.path).to eq('/-/vaults/bar/archives')
+        end
+      end
+
+      describe '#upload_multipart_part' do
+        # {
+        #     id: "GlacierMultipartChecksums",
+        #     documentation: "Glacier requires checksum headers that are cumbersome to provide.",
+        #     protocol: restJson1,
+        #     method: "PUT",
+        #     uri: "/foo/vaults/bar/multipart-uploads/baz",
+        #     headers: {
+        #         "X-Amz-Glacier-Version": "2012-06-01",
+        #         "X-Amz-Content-Sha256": "b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9",
+        #         "X-Amz-Sha256-Tree-Hash": "b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9",
+        #     },
+        #     body: "hello world",
+        #     params: {
+        #         accountId: "foo",
+        #         vaultName: "bar",
+        #         uploadId: "baz",
+        #         body: "hello world"
+        #     },
+        #     appliesTo: "client",
+        # }
+        it 'GlacierMultipartChecksums' do
+          resp = client.upload_multipart_part(
+            account_id: 'foo',
+            vault_name: 'bar',
+            upload_id: 'baz',
+            body: 'hello world'
+          )
+          request = resp.context.http_request
+          expect(request.headers['x-amz-glacier-version']).to eq('2012-06-01')
+          expect(request.headers['x-amz-content-sha256'])
+            .to eq('b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9')
+          expect(request.headers['x-amz-sha256-tree-hash'])
+            .to eq('b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9')
+        end
+      end
+    end
+  end
+end
diff --git a/gems/aws-sdk-machinelearning/spec/client_spec.rb b/gems/aws-sdk-machinelearning/spec/client_spec.rb
diff --git a/gems/aws-sdk-machinelearning/spec/protocols_spec.rb b/gems/aws-sdk-machinelearning/spec/protocols_spec.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require_relative 'spec_helper'
+
+module Aws
+  module MachineLearning
+    describe Client do
+
+      let(:client) { Client.new(stub_responses: true) }
+
+      describe '#predict' do
+        #   {
+        #       id: "MachinelearningPredictEndpoint",
+        #       documentation: """
+        #           MachineLearning's api makes use of generated endpoints that the
+        #           customer is then expected to use for the Predict operation. Having
+        #           to alter the endpoint for a specific operation would be cumbersome,
+        #           so an AWS client should be able to do it for them.""",
+        #       protocol: awsJson1_1,
+        #       method: "POST",
+        #       uri: "/",
+        #       host: "example.com",
+        #       resolvedHost: "custom.example.com",
+        #       body: "{\"MLModelId\": \"foo\", \"Record\": {}, \"PredictEndpoint\": \"https://custom.example.com/\"}",
+        #       bodyMediaType: "application/json",
+        #       headers: {"Content-Type": "application/x-amz-json-1.1"},
+        #       params: {
+        #           MLModelId: "foo",
+        #           Record: {},
+        #           PredictEndpoint: "https://custom.example.com/",
+        #       }
+        #   }
+        it 'MachinelearningPredictEndpoint' do
+          endpoint = 'https://custom.example.com/'
+          body = '{"MLModelId":"foo","Record":{},"PredictEndpoint":"https://custom.example.com/"}'
+          headers = { 'Content-Type' => 'application/x-amz-json-1.1' }
+          resp = client.predict(
+            ml_model_id: 'foo',
+            record: {},
+            predict_endpoint: endpoint
+          )
+          request = resp.context.http_request
+          expect(request.endpoint.to_s).to eq(endpoint)
+          expect(request.body_contents).to eq(body)
+          expect(request.headers['content-type']).to eq(headers['Content-Type'])
+        end
+      end
+    end
+  end
+end
diff --git a/gems/aws-sdk-s3/spec/client_spec.rb b/gems/aws-sdk-s3/spec/client_spec.rb
@@ -492,7 +492,7 @@ module S3
         it 'uses path style addressing for DNS incompatible bucket names' do
           client = Client.new(stub_responses: true)
           resp = client.head_bucket(bucket: 'Bucket123')
-          expect(resp.context.http_request.endpoint.path).to eq('/Bucket123/')
+          expect(resp.context.http_request.endpoint.path).to eq('/Bucket123')
         end
       end
 
diff --git a/gems/aws-sdk-s3/spec/protocols_spec.rb b/gems/aws-sdk-s3/spec/protocols_spec.rb
