Skip to content

Commit 57f6181

Browse files
committed
Revert "Storage/STG92 List Handles Include Client Name (#5088) (#5134)"
This reverts commit 761f258.
1 parent 2da2d0d commit 57f6181

File tree

9 files changed

+51
-105
lines changed

9 files changed

+51
-105
lines changed

sdk/storage/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "cpp",
44
"TagPrefix": "cpp/storage",
5-
"Tag": "cpp/storage_67aff8fa0e"
5+
"Tag": "cpp/storage_f8b8f80b3c"
66
}

sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/rest_client.hpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
3131
/**
3232
* The version used for the operations to Azure storage services.
3333
*/
34-
constexpr static const char* ApiVersion = "2024-02-04";
34+
constexpr static const char* ApiVersion = "2023-01-03";
3535
} // namespace _detail
3636
namespace Models {
3737
/**
@@ -1300,10 +1300,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
13001300
* Client IP that opened the handle.
13011301
*/
13021302
std::string ClientIp;
1303-
/**
1304-
* Name of the client machine where the share is being mounted.
1305-
*/
1306-
std::string ClientName;
13071303
/**
13081304
* Time when the session that previously opened the handle has last been reconnected. (UTC).
13091305
*/

sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,10 +300,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
300300
* Client IP that opened the handle.
301301
*/
302302
std::string ClientIp;
303-
/**
304-
* Name of the client machine where the share is being mounted.
305-
*/
306-
std::string ClientName;
307303
/**
308304
* Time when the session that previously opened the handle has last been reconnected. (UTC).
309305
*/

sdk/storage/azure-storage-files-shares/src/rest_client.cpp

Lines changed: 46 additions & 64 deletions
Large diffs are not rendered by default.

sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
587587
directoryHandle.Path = std::move(handle.Path.Content);
588588
}
589589
directoryHandle.ClientIp = std::move(handle.ClientIp);
590-
directoryHandle.ClientName = std::move(handle.ClientName);
591590
directoryHandle.FileId = std::move(handle.FileId);
592591
directoryHandle.HandleId = std::move(handle.HandleId);
593592
directoryHandle.LastReconnectedOn = std::move(handle.LastReconnectedOn);

sdk/storage/azure-storage-files-shares/src/share_file_client.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,6 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
692692
fileHandle.Path = std::move(handle.Path.Content);
693693
}
694694
fileHandle.ClientIp = std::move(handle.ClientIp);
695-
fileHandle.ClientName = std::move(handle.ClientName);
696695
fileHandle.FileId = std::move(handle.FileId);
697696
fileHandle.HandleId = std::move(handle.HandleId);
698697
fileHandle.LastReconnectedOn = std::move(handle.LastReconnectedOn);

sdk/storage/azure-storage-files-shares/swagger/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ package-name: azure-storage-files-shares
99
namespace: Azure::Storage::Files::Shares
1010
output-folder: generated
1111
clear-output-folder: true
12-
input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/storage/data-plane/Microsoft.FileStorage/preview/2024-02-04/file.json
12+
input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/storage/data-plane/Microsoft.FileStorage/preview/2023-08-03/file.json
1313
```
1414
1515
## ModelFour Options
@@ -79,12 +79,12 @@ directive:
7979
"name": "ApiVersion",
8080
"modelAsString": false
8181
},
82-
"enum": ["2024-02-04"]
82+
"enum": ["2023-01-03"]
8383
};
8484
- from: swagger-document
8585
where: $.parameters
8686
transform: >
87-
$.ApiVersionParameter.enum[0] = "2024-02-04";
87+
$.ApiVersionParameter.enum[0] = "2023-01-03";
8888
```
8989
9090
### Rename Operations

sdk/storage/azure-storage-files-shares/test/ut/share_directory_client_test.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,18 +1190,6 @@ namespace Azure { namespace Storage { namespace Test {
11901190
EXPECT_EQ(allAccessRights, directoryHandles[0].AccessRights.Value());
11911191
}
11921192

1193-
TEST_F(FileShareDirectoryClientTest, ListHandlesWithClientName_PLAYBACKONLY_)
1194-
{
1195-
auto shareClient = Files::Shares::ShareClient::CreateFromConnectionString(
1196-
StandardStorageConnectionString(),
1197-
"testing",
1198-
InitStorageClientOptions<Files::Shares::ShareClientOptions>());
1199-
auto directoryClient = shareClient.GetRootDirectoryClient().GetSubdirectoryClient("dir1");
1200-
auto directoryHandles = directoryClient.ListHandles().DirectoryHandles;
1201-
EXPECT_EQ(directoryHandles.size(), 1L);
1202-
EXPECT_FALSE(directoryHandles[0].ClientName.empty());
1203-
}
1204-
12051193
TEST_F(FileShareDirectoryClientTest, WithShareSnapshot)
12061194
{
12071195
const std::string timestamp1 = "2001-01-01T01:01:01.1111000Z";

sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1741,20 +1741,6 @@ namespace Azure { namespace Storage { namespace Test {
17411741
EXPECT_EQ(allAccessRights, fileHandles[0].AccessRights.Value());
17421742
}
17431743

1744-
TEST_F(FileShareFileClientTest, ListHandlesWithClientName_PLAYBACKONLY_)
1745-
{
1746-
auto shareClient = Files::Shares::ShareClient::CreateFromConnectionString(
1747-
StandardStorageConnectionString(),
1748-
"testing",
1749-
InitStorageClientOptions<Files::Shares::ShareClientOptions>());
1750-
auto fileClient
1751-
= shareClient.GetRootDirectoryClient().GetSubdirectoryClient("dir1").GetFileClient(
1752-
"test.txt");
1753-
auto fileHandles = fileClient.ListHandles().FileHandles;
1754-
EXPECT_EQ(fileHandles.size(), 1L);
1755-
EXPECT_FALSE(fileHandles[0].ClientName.empty());
1756-
}
1757-
17581744
TEST_F(FileShareFileClientTest, WithShareSnapshot)
17591745
{
17601746
const std::string timestamp1 = "2001-01-01T01:01:01.1111000Z";

0 commit comments

Comments
 (0)