Merge branch 'bump-tff-0-1-4' into 'master'

Update test_file_finder and Faraday

See merge request gitlab-org/gitlab!64017

Gemfile.lock

@@ -352,13 +352,24 @@ GEM
     factory_bot_rails (6.1.0)
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
-    faraday (1.0.1)
+    faraday (1.4.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
     faraday-http-cache (2.2.0)
       faraday (>= 0.8)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     faraday_middleware-aws-sigv4 (0.3.0)
@@ -1135,7 +1146,7 @@ GEM
       nokogiri (>= 1.10.5)
       rexml
     ruby-statistics (2.1.2)
-    ruby2_keywords (0.0.2)
+    ruby2_keywords (0.0.4)
     ruby_parser (3.15.0)
       sexp_processor (~> 4.9)
     rubyntlm (0.6.2)
@@ -1260,8 +1271,8 @@ GEM
     terser (1.0.2)
       execjs (>= 0.3.0, < 3)
     test-prof (0.12.0)
-    test_file_finder (0.1.3)
-      faraday (~> 1.0.1)
+    test_file_finder (0.1.4)
+      faraday (~> 1.0)
     text (1.3.1)
     thin (1.8.0)
       daemons (~> 1.0, >= 1.0.9)

ee/spec/lib/gitlab/elastic/client_spec.rb

@@ -49,10 +49,10 @@ RSpec.describe Gitlab::Elastic::Client do
           stub_request(:get, 'http://example-elastic:9200/foo/_all/1')
             .with(
               headers: {
-                'Authorization'        => 'AWS4-HMAC-SHA256 Credential=0/20170303/us-east-1/es/aws4_request, SignedHeaders=content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-opaque-id, Signature=61a04383d24ca21f7ec80cd56c252bc3ecd3a306dbe6681e615416b4b9ec5ecb',
+                'Authorization'        => 'AWS4-HMAC-SHA256 Credential=0/20170303/us-east-1/es/aws4_request, SignedHeaders=content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-opaque-id, Signature=33a12f5ce6863009a29c856204935d454c32202fc9f321131e31fdd3ae5748c6',
                 'Content-Type'         => 'application/json',
                 # User-Agent is a part of SignedHeaders; if this changes, the signature will change
-                'User-Agent'           => 'Faraday v1.0.1',
+                'User-Agent'           => 'Faraday v1.4.2',
                 'X-Amz-Content-Sha256' => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855',
                 'X-Amz-Date'           => '20170303T133952Z'
               })