etna 0.1.39 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c21212f38bbad3cf757eb84a9e453428c9d0b6f195fd34eb81f98aeff2746490
-  data.tar.gz: 3581821244c087cbbfbac162f9a5c61911e06ab64923c603a144d36ca3bedff0
+  metadata.gz: e83d3c30c23693011d59b103f8b5a9372950eba1b3123376a288826204d47c62
+  data.tar.gz: c3b50952e71d91f4361a87e872ba5532849644abe42fbc9e480549726a6bbf93
 SHA512:
-  metadata.gz: 3289530a2e874d2b79b0da66ea787e30b335b7a60626e4b67f1be9919067d4b79752db4e878ca8851dbce6c68a1e59a573bcbc60314bb7a35268cd37cc2eeaae
-  data.tar.gz: 2758348f253992e08fbf589d2b5444844becf69e179872c630804a7e8885568189168edd056c56beabe4ed5dc3e0905f46c51595896bd7bdd1255fbe4ece71ec
+  metadata.gz: c3c561cdd7db4631c267f2edba8421b94baba5de790ca1ff9edd06cd21d039d7224d868eaa43ba7090b4114b595830ac777c1c4688ec15c9320cde90530be4e5
+  data.tar.gz: 7148582a82f7e90357ed6658c7337bce7b34dd532b4a899ac27a2d74f40f34224cb6c225b2aa4db4164c467aa8a5c189d7acf28a1c462097e619e9875fbdc4d1

data/lib/etna/application.rb

@@ -192,7 +192,7 @@ module Etna::Application
       status = 'failed'
       raise
     ensure
-      if Yabeda.configured?
+      if defined?(Yabeda) && Yabeda.configured?
         tags = { command: cmd.class.name, status: status, application: application }
         dur = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
 

data/lib/etna/clients/metis/client.rb

@@ -210,34 +210,30 @@ module Etna
         }
       end
 
-      def recursively_rename_folder(project_name:, source_bucket:, dest_bucket:, folder:)
-        folder_contents = list_folder(
-          Etna::Clients::Metis::ListFolderRequest.new(
-            project_name: project_name,
-            bucket_name: source_bucket,
-            folder_path: folder.folder_path
-        ))
+      def resolve_conflicts_and_verify_rename(project_name:, source_bucket:, dest_bucket:, folder:, file:)
+        parent_folder = ::File.dirname(file.file_path)
 
-        folder_contents.folders.all.each do |sub_folder|
-          recursively_rename_folder(
-            project_name: project_name,
-            source_bucket: source_bucket,
-            dest_bucket: dest_bucket,
-            folder: sub_folder
-          )
-        end
+        should_rename_original = true
 
-        folder_contents.files.all.each do |file|
+        # If the destination folder already exists, check to see if
+        #   the file also exists, otherwise we risk a
+        #   rename conflict.
+        create_folder_request = CreateFolderRequest.new(
+          project_name: project_name,
+          bucket_name: dest_bucket,
+          folder_path: parent_folder
+        )
+
+        if folder_exists?(create_folder_request)
           # If file exists in destination, delete the older file.
           list_dest_folder_request = Etna::Clients::Metis::ListFolderRequest.new(
             bucket_name: dest_bucket,
             project_name: project_name,
-            folder_path: ::File.dirname(file.file_path)
+            folder_path: parent_folder
           )
 
           dest_file = list_folder(list_dest_folder_request).files.all.find { |f| f.file_name == file.file_name }
 
-          should_rename = true
           if (dest_file && file.updated_at <= dest_file.updated_at)
             # Delete source file if it's out of date
             delete_file(Etna::Clients::Metis::DeleteFileRequest.new(
@@ -246,7 +242,7 @@ module Etna
               file_path: file.file_path,
             ))
 
-            should_rename = false
+            should_rename_original = false
           elsif (dest_file && file.updated_at > dest_file.updated_at)
             # Delete dest file if it's out of date
             delete_file(Etna::Clients::Metis::DeleteFileRequest.new(
@@ -255,17 +251,44 @@ module Etna
               file_path: dest_file.file_path,
             ))
           end
+        end
 
-          if should_rename
-            rename_file(Etna::Clients::Metis::RenameFileRequest.new(
-              bucket_name: source_bucket,
-              project_name: project_name,
-              file_path: file.file_path,
-              new_bucket_name: dest_bucket,
-              new_file_path: file.file_path,
-              create_parent: true)
-            )
-          end
+        should_rename_original
+      end
+
+      def recursively_rename_folder(project_name:, source_bucket:, dest_bucket:, folder:)
+        folder_contents = list_folder(
+          Etna::Clients::Metis::ListFolderRequest.new(
+            project_name: project_name,
+            bucket_name: source_bucket,
+            folder_path: folder.folder_path
+        ))
+
+        folder_contents.folders.all.each do |sub_folder|
+          recursively_rename_folder(
+            project_name: project_name,
+            source_bucket: source_bucket,
+            dest_bucket: dest_bucket,
+            folder: sub_folder
+          )
+        end
+
+        folder_contents.files.all.each do |file|
+          should_rename = resolve_conflicts_and_verify_rename(
+            project_name: project_name,
+            source_bucket: source_bucket,
+            dest_bucket: dest_bucket,
+            folder: folder,
+            file: file)
+
+          rename_file(Etna::Clients::Metis::RenameFileRequest.new(
+            bucket_name: source_bucket,
+            project_name: project_name,
+            file_path: file.file_path,
+            new_bucket_name: dest_bucket,
+            new_file_path: file.file_path,
+            create_parent: true)
+          ) if should_rename
         end
 
         # Now delete the source folder

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etna
 version: !ruby/object:Gem::Version
-  version: 0.1.39
+  version: 0.1.40
 platform: ruby
 authors:
 - Saurabh Asthana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2021-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack