From 60fbccf8c0e97af9ad22b26ce539844a3965bfe1 Mon Sep 17 00:00:00 2001
From: microzchang <110015819+microzchang@users.noreply.github.com>
Date: Wed, 17 Jul 2024 02:26:21 -0700
Subject: [PATCH] Storage Fix AccessType live test failure (#5807)

* Fix live test failure

* update datalake tests
---
 sdk/storage/assets.json                        |  2 +-
 .../test/ut/blob_container_client_test.cpp     | 18 ++++++++++++++++--
 .../ut/datalake_file_system_client_test.cpp    | 14 ++++++++++++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/sdk/storage/assets.json b/sdk/storage/assets.json
index 8ff799743..3f1bbef7e 100644
--- a/sdk/storage/assets.json
+++ b/sdk/storage/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "cpp",
   "TagPrefix": "cpp/storage",
-  "Tag": "cpp/storage_75931731d9"
+  "Tag": "cpp/storage_c3a4a21ce9"
 }
diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp
index 8d1e031bc..3ec9bac71 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp
@@ -442,7 +442,6 @@ namespace Azure { namespace Storage { namespace Test {
     containerClient.CreateIfNotExists();
 
     Blobs::SetBlobContainerAccessPolicyOptions options;
-    options.AccessType = Blobs::Models::PublicAccessType::Blob;
     {
       Blobs::Models::SignedIdentifier identifier;
       identifier.Id = RandomString(63) + "1";
@@ -479,7 +478,6 @@ namespace Azure { namespace Storage { namespace Test {
     EXPECT_TRUE(IsValidTime(ret.Value.LastModified));
 
     auto ret2 = containerClient.GetAccessPolicy();
-    EXPECT_EQ(ret2.Value.AccessType, options.AccessType);
     if (m_testContext.IsLiveMode())
     {
       EXPECT_EQ(ret2.Value.SignedIdentifiers, options.SignedIdentifiers);
@@ -487,6 +485,22 @@ namespace Azure { namespace Storage { namespace Test {
     containerClient.DeleteIfExists();
   }
 
+  TEST_F(BlobContainerClientTest, AccessType_PLAYBACKONLY_)
+  {
+    auto containerClient = *m_blobContainerClient;
+    containerClient.CreateIfNotExists();
+
+    Blobs::SetBlobContainerAccessPolicyOptions options;
+    options.AccessType = Blobs::Models::PublicAccessType::Blob;
+    auto ret = containerClient.SetAccessPolicy(options);
+    EXPECT_TRUE(ret.Value.ETag.HasValue());
+    EXPECT_TRUE(IsValidTime(ret.Value.LastModified));
+
+    auto ret2 = containerClient.GetAccessPolicy();
+    EXPECT_EQ(ret2.Value.AccessType, options.AccessType);
+    containerClient.DeleteIfExists();
+  }
+
   TEST_F(BlobContainerClientTest, Lease)
   {
     auto containerClient = *m_blobContainerClient;
diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.cpp
index 0d87c83a6..9c8a49979 100644
--- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.cpp
+++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.cpp
@@ -304,7 +304,8 @@ namespace Azure { namespace Storage { namespace Test {
   TEST_F(DataLakeFileSystemClientTest, Constructors_LIVEONLY_)
   {
     {
-      // Create from connection string validates static creator function and shared key constructor.
+      // Create from connection string validates static creator function and shared key
+      // constructor.
       auto fileSystemName = LowercaseRandomString() + "1";
       auto connectionStringClient
           = Azure::Storage::Files::DataLake::DataLakeFileSystemClient::CreateFromConnectionString(
@@ -653,10 +654,18 @@ namespace Azure { namespace Storage { namespace Test {
       {
         EXPECT_EQ(ret2.Value.SignedIdentifiers, options.SignedIdentifiers);
       }
+    }
+  }
 
+  TEST_F(DataLakeFileSystemClientTest, AccessType_PLAYBACKONLY_)
+  {
+    {
+      auto fileSystem = GetFileSystemClientForTest(LowercaseRandomString());
+      fileSystem.CreateIfNotExists();
+      Files::DataLake::SetFileSystemAccessPolicyOptions options;
       options.AccessType = Files::DataLake::Models::PublicAccessType::FileSystem;
       EXPECT_NO_THROW(fileSystem.SetAccessPolicy(options));
-      ret2 = fileSystem.GetAccessPolicy();
+      auto ret2 = fileSystem.GetAccessPolicy();
       EXPECT_EQ(ret2.Value.AccessType, options.AccessType);
 
       options.AccessType = Files::DataLake::Models::PublicAccessType::None;
@@ -664,6 +673,7 @@ namespace Azure { namespace Storage { namespace Test {
       ret2 = fileSystem.GetAccessPolicy();
       EXPECT_EQ(ret2.Value.AccessType, options.AccessType);
     }
+
     {
       auto fileSystem = GetFileSystemClientForTest(LowercaseRandomString());
       Files::DataLake::CreateFileSystemOptions options;