From 0487c62d7fdbd1d3f4e79beb957263f300dba9ea Mon Sep 17 00:00:00 2001
From: Diego Molteni <dmolteni3@slb.com>
Date: Wed, 4 May 2022 11:06:37 +0200
Subject: [PATCH 1/2] fix: cleared continaution token

---
 .../providers/azure/curl/AzureStorage.cc      | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/src/lib/cloud/providers/azure/curl/AzureStorage.cc b/src/src/lib/cloud/providers/azure/curl/AzureStorage.cc
index 1b8a004..e35037d 100644
--- a/src/src/lib/cloud/providers/azure/curl/AzureStorage.cc
+++ b/src/src/lib/cloud/providers/azure/curl/AzureStorage.cc
@@ -130,8 +130,8 @@ namespace seismicdrive
             try
             {
                 auto blobContainerClient = _blob_service_client.GetBlobContainerClient(containerName);
-                auto blockBlobCllient = blobContainerClient.GetBlockBlobClient(blobName);
-                blockBlobCllient.GetProperties();
+                auto blockBlobClient = blobContainerClient.GetBlockBlobClient(blobName);
+                blockBlobClient.GetProperties();
                 return true;
             }
             catch (const Azure::Storage::StorageException &e)
@@ -294,10 +294,7 @@ namespace seismicdrive
                     obi.second = blob.BlobSize;
                     result.emplace_back(obi);
                 }
-                if (pageResult.NextPageToken)
-                {
-                    nextPageToken = pageResult.NextPageToken.Value();
-                }
+                nextPageToken = pageResult.NextPageToken ? pageResult.NextPageToken.Value() : "";
             }
             else
             {
@@ -309,10 +306,7 @@ namespace seismicdrive
                     obi.second = blob.BlobSize;
                     result.emplace_back(obi);
                 }
-                if (pageResult.NextPageToken)
-                {
-                    nextPageToken = pageResult.NextPageToken.Value();
-                }
+                nextPageToken = pageResult.NextPageToken ? pageResult.NextPageToken.Value() : "";
             }
         }
 
@@ -351,10 +345,7 @@ namespace seismicdrive
                     obi.size = blob.BlobSize;
                     result.emplace_back(obi);
                 }
-                if (pageResult.NextPageToken)
-                {
-                    nextPageToken = pageResult.NextPageToken.Value();
-                }
+                nextPageToken = pageResult.NextPageToken ? pageResult.NextPageToken.Value() : "";
             }
             else
             {
@@ -366,10 +357,7 @@ namespace seismicdrive
                     obi.size = blob.BlobSize;
                     result.emplace_back(obi);
                 }
-                if (pageResult.NextPageToken)
-                {
-                    nextPageToken = pageResult.NextPageToken.Value();
-                }
+                nextPageToken = pageResult.NextPageToken ? pageResult.NextPageToken.Value() : "";
             }
         }
 
-- 
GitLab


From 45225802f635f50f088e55a18726692c0e7952e7 Mon Sep 17 00:00:00 2001
From: Sid Stenersen <sstenersen@slb.com>
Date: Wed, 4 May 2022 16:27:00 +0000
Subject: [PATCH 2/2] chore: reduce redundant code

---
 .../lib/cloud/providers/azure/curl/AzureStorage.cc | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/src/lib/cloud/providers/azure/curl/AzureStorage.cc b/src/src/lib/cloud/providers/azure/curl/AzureStorage.cc
index e35037d..6a5d7d2 100644
--- a/src/src/lib/cloud/providers/azure/curl/AzureStorage.cc
+++ b/src/src/lib/cloud/providers/azure/curl/AzureStorage.cc
@@ -260,6 +260,12 @@ namespace seismicdrive
             auto result = blobClient.DeleteIfExists();
         }
 
+        template<class T>
+        static auto next_page_token(const T &pageResult)
+        {
+            return pageResult.NextPageToken ? pageResult.NextPageToken.Value() : "";
+        }
+
         void CloudBlobClient::list_blobs_segmented(
             const std::string &containerName,
             const std::string &prefix,
@@ -294,7 +300,7 @@ namespace seismicdrive
                     obi.second = blob.BlobSize;
                     result.emplace_back(obi);
                 }
-                nextPageToken = pageResult.NextPageToken ? pageResult.NextPageToken.Value() : "";
+                nextPageToken = next_page_token(pageResult);
             }
             else
             {
@@ -306,7 +312,7 @@ namespace seismicdrive
                     obi.second = blob.BlobSize;
                     result.emplace_back(obi);
                 }
-                nextPageToken = pageResult.NextPageToken ? pageResult.NextPageToken.Value() : "";
+                nextPageToken = next_page_token(pageResult);
             }
         }
 
@@ -345,7 +351,7 @@ namespace seismicdrive
                     obi.size = blob.BlobSize;
                     result.emplace_back(obi);
                 }
-                nextPageToken = pageResult.NextPageToken ? pageResult.NextPageToken.Value() : "";
+                nextPageToken = next_page_token(pageResult);
             }
             else
             {
@@ -357,7 +363,7 @@ namespace seismicdrive
                     obi.size = blob.BlobSize;
                     result.emplace_back(obi);
                 }
-                nextPageToken = pageResult.NextPageToken ? pageResult.NextPageToken.Value() : "";
+                nextPageToken = next_page_token(pageResult);
             }
         }
 
-- 
GitLab