Merge pull request #2084 from gooddata/GRIF-877

fix(lcm): Add retry with refresh token during upload file

Author: hung-nguyen-hoang

lib/gooddata/rest/connection.rb

@@ -527,14 +527,22 @@ def create_webdav_dir_if_needed(url)
       def do_stream_file(uri, filename, _options = {})
         GoodData.logger.info "Uploading file user storage #{uri}"
 
-        request = RestClient::Request.new(:method => :put,
-                                          :url => uri.to_s,
-                                          :verify_ssl => verify_ssl,
-                                          :headers => @webdav_headers.merge(:x_gdc_authtt => headers[:x_gdc_authtt]),
-                                          :payload => File.new(filename, 'rb'))
+        # Build the request inside the retryable block so that, after a token
+        # refresh triggered by a 401, the new x_gdc_authtt header is picked up
+        # and a fresh file handle is used for the retried upload.
+        b = proc do
+          request = RestClient::Request.new(:method => :put,
+                                            :url => uri.to_s,
+                                            :verify_ssl => verify_ssl,
+                                            :headers => @webdav_headers.merge(:x_gdc_authtt => headers[:x_gdc_authtt]),
+                                            :payload => File.new(filename, 'rb'))
+          request.execute
+        end
 
         begin
-          request.execute
+          GoodData::Rest::Connection.retryable(:tries => Helpers::GD_MAX_RETRY, :refresh_token => proc { refresh_token }) do
+            b.call
+          end
         rescue => e
           raise "Error when uploading file #{filename}. Error: #{e}"
         end

spec/project/full_process_schedule_spec.rb

@@ -228,7 +228,7 @@
     end
   end
 
-  xit "should be possible to download deployed process" do
+  it "should be possible to download deployed process" do
     process = @project.deploy_process('./spec/data/hello_world_process/hello_world.zip',
                                       type: 'RUBY',
                                       name: 'Test ETL zipped file Process')