Skip to content

Commit 0299956

Browse files
ddhamotharandsapaligarsharm7
authored
[InAccountRestore] Introducing new PowerShell commands for InAccount Restore of Deleted Database/ Containers feature for Table/Gremlin (#21495)
* InAccount Restore changes for tables and gremlin * generated files using autorest * update proj files * update proj file * update test proj file * add UXMetadataIssues exception * update help files * Revert "generated files using autorest" This reverts commit 52fbdeb. * update proj files * update generated files * update help file headers * update help * update session records except cassandra and account tests * update help files * update session records * update help files * update help files * session records for failing tests with updated account name * cross region restore change * udpated recordings * help file updates * burst capacity changes * update test sleep time --------- Co-authored-by: dsapaliga <[email protected]> Co-authored-by: Richa Sharma <[email protected]>
1 parent 206ef3d commit 0299956

File tree

218 files changed

+65682
-41642
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+65682
-41642
lines changed

src/CosmosDB/CosmosDB.Sdk/CosmosDB.Sdk.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<PropertyGroup>
1010
<TargetFramework>netstandard2.0</TargetFramework>
11-
<AssemblyName>Microsoft.Azure.PowerShell.CosmosDB.Sdk</AssemblyName>
11+
<AssemblyName>Microsoft.Azure.PowerShell.CosmosDB.Management.Sdk</AssemblyName>
1212
<RootNamespace>Microsoft.Azure.Management.CosmosDB</RootNamespace>
1313
<NoWarn>$(NoWarn);CS0108;CS1573</NoWarn>
1414
</PropertyGroup>

src/CosmosDB/CosmosDB.Sdk/Generated/CassandraResourcesOperations.cs

Lines changed: 255 additions & 60 deletions
Large diffs are not rendered by default.

src/CosmosDB/CosmosDB.Sdk/Generated/CassandraResourcesOperationsExtensions.cs

Lines changed: 42 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ public static CassandraKeyspaceGetResults CreateUpdateCassandraKeyspace(this ICa
180180
/// <param name='keyspaceName'>
181181
/// Cosmos DB keyspace name.
182182
/// </param>
183-
public static void DeleteCassandraKeyspace(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName)
183+
public static CassandraResourcesDeleteCassandraKeyspaceHeaders DeleteCassandraKeyspace(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName)
184184
{
185-
operations.DeleteCassandraKeyspaceAsync(resourceGroupName, accountName, keyspaceName).GetAwaiter().GetResult();
185+
return operations.DeleteCassandraKeyspaceAsync(resourceGroupName, accountName, keyspaceName).GetAwaiter().GetResult();
186186
}
187187

188188
/// <summary>
@@ -203,9 +203,12 @@ public static void DeleteCassandraKeyspace(this ICassandraResourcesOperations op
203203
/// <param name='cancellationToken'>
204204
/// The cancellation token.
205205
/// </param>
206-
public static async Task DeleteCassandraKeyspaceAsync(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, CancellationToken cancellationToken = default(CancellationToken))
206+
public static async Task<CassandraResourcesDeleteCassandraKeyspaceHeaders> DeleteCassandraKeyspaceAsync(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, CancellationToken cancellationToken = default(CancellationToken))
207207
{
208-
(await operations.DeleteCassandraKeyspaceWithHttpMessagesAsync(resourceGroupName, accountName, keyspaceName, null, cancellationToken).ConfigureAwait(false)).Dispose();
208+
using (var _result = await operations.DeleteCassandraKeyspaceWithHttpMessagesAsync(resourceGroupName, accountName, keyspaceName, null, cancellationToken).ConfigureAwait(false))
209+
{
210+
return _result.Headers;
211+
}
209212
}
210213

211214
/// <summary>
@@ -584,9 +587,9 @@ public static CassandraTableGetResults CreateUpdateCassandraTable(this ICassandr
584587
/// <param name='tableName'>
585588
/// Cosmos DB table name.
586589
/// </param>
587-
public static void DeleteCassandraTable(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, string tableName)
590+
public static CassandraResourcesDeleteCassandraTableHeaders DeleteCassandraTable(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, string tableName)
588591
{
589-
operations.DeleteCassandraTableAsync(resourceGroupName, accountName, keyspaceName, tableName).GetAwaiter().GetResult();
592+
return operations.DeleteCassandraTableAsync(resourceGroupName, accountName, keyspaceName, tableName).GetAwaiter().GetResult();
590593
}
591594

592595
/// <summary>
@@ -610,9 +613,12 @@ public static void DeleteCassandraTable(this ICassandraResourcesOperations opera
610613
/// <param name='cancellationToken'>
611614
/// The cancellation token.
612615
/// </param>
613-
public static async Task DeleteCassandraTableAsync(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, string tableName, CancellationToken cancellationToken = default(CancellationToken))
616+
public static async Task<CassandraResourcesDeleteCassandraTableHeaders> DeleteCassandraTableAsync(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, string tableName, CancellationToken cancellationToken = default(CancellationToken))
614617
{
615-
(await operations.DeleteCassandraTableWithHttpMessagesAsync(resourceGroupName, accountName, keyspaceName, tableName, null, cancellationToken).ConfigureAwait(false)).Dispose();
618+
using (var _result = await operations.DeleteCassandraTableWithHttpMessagesAsync(resourceGroupName, accountName, keyspaceName, tableName, null, cancellationToken).ConfigureAwait(false))
619+
{
620+
return _result.Headers;
621+
}
616622
}
617623

618624
/// <summary>
@@ -1013,9 +1019,9 @@ public static CassandraViewGetResults CreateUpdateCassandraView(this ICassandraR
10131019
/// <param name='viewName'>
10141020
/// Cosmos DB view name.
10151021
/// </param>
1016-
public static void DeleteCassandraView(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, string viewName)
1022+
public static CassandraResourcesDeleteCassandraViewHeaders DeleteCassandraView(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, string viewName)
10171023
{
1018-
operations.DeleteCassandraViewAsync(resourceGroupName, accountName, keyspaceName, viewName).GetAwaiter().GetResult();
1024+
return operations.DeleteCassandraViewAsync(resourceGroupName, accountName, keyspaceName, viewName).GetAwaiter().GetResult();
10191025
}
10201026

10211027
/// <summary>
@@ -1039,9 +1045,12 @@ public static void DeleteCassandraView(this ICassandraResourcesOperations operat
10391045
/// <param name='cancellationToken'>
10401046
/// The cancellation token.
10411047
/// </param>
1042-
public static async Task DeleteCassandraViewAsync(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, string viewName, CancellationToken cancellationToken = default(CancellationToken))
1048+
public static async Task<CassandraResourcesDeleteCassandraViewHeaders> DeleteCassandraViewAsync(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, string viewName, CancellationToken cancellationToken = default(CancellationToken))
10431049
{
1044-
(await operations.DeleteCassandraViewWithHttpMessagesAsync(resourceGroupName, accountName, keyspaceName, viewName, null, cancellationToken).ConfigureAwait(false)).Dispose();
1050+
using (var _result = await operations.DeleteCassandraViewWithHttpMessagesAsync(resourceGroupName, accountName, keyspaceName, viewName, null, cancellationToken).ConfigureAwait(false))
1051+
{
1052+
return _result.Headers;
1053+
}
10451054
}
10461055

10471056
/// <summary>
@@ -1333,9 +1342,9 @@ public static CassandraKeyspaceGetResults BeginCreateUpdateCassandraKeyspace(thi
13331342
/// <param name='keyspaceName'>
13341343
/// Cosmos DB keyspace name.
13351344
/// </param>
1336-
public static void BeginDeleteCassandraKeyspace(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName)
1345+
public static CassandraResourcesDeleteCassandraKeyspaceHeaders BeginDeleteCassandraKeyspace(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName)
13371346
{
1338-
operations.BeginDeleteCassandraKeyspaceAsync(resourceGroupName, accountName, keyspaceName).GetAwaiter().GetResult();
1347+
return operations.BeginDeleteCassandraKeyspaceAsync(resourceGroupName, accountName, keyspaceName).GetAwaiter().GetResult();
13391348
}
13401349

13411350
/// <summary>
@@ -1356,9 +1365,12 @@ public static void BeginDeleteCassandraKeyspace(this ICassandraResourcesOperatio
13561365
/// <param name='cancellationToken'>
13571366
/// The cancellation token.
13581367
/// </param>
1359-
public static async Task BeginDeleteCassandraKeyspaceAsync(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, CancellationToken cancellationToken = default(CancellationToken))
1368+
public static async Task<CassandraResourcesDeleteCassandraKeyspaceHeaders> BeginDeleteCassandraKeyspaceAsync(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, CancellationToken cancellationToken = default(CancellationToken))
13601369
{
1361-
(await operations.BeginDeleteCassandraKeyspaceWithHttpMessagesAsync(resourceGroupName, accountName, keyspaceName, null, cancellationToken).ConfigureAwait(false)).Dispose();
1370+
using (var _result = await operations.BeginDeleteCassandraKeyspaceWithHttpMessagesAsync(resourceGroupName, accountName, keyspaceName, null, cancellationToken).ConfigureAwait(false))
1371+
{
1372+
return _result.Headers;
1373+
}
13621374
}
13631375

13641376
/// <summary>
@@ -1587,9 +1599,9 @@ public static CassandraTableGetResults BeginCreateUpdateCassandraTable(this ICas
15871599
/// <param name='tableName'>
15881600
/// Cosmos DB table name.
15891601
/// </param>
1590-
public static void BeginDeleteCassandraTable(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, string tableName)
1602+
public static CassandraResourcesDeleteCassandraTableHeaders BeginDeleteCassandraTable(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, string tableName)
15911603
{
1592-
operations.BeginDeleteCassandraTableAsync(resourceGroupName, accountName, keyspaceName, tableName).GetAwaiter().GetResult();
1604+
return operations.BeginDeleteCassandraTableAsync(resourceGroupName, accountName, keyspaceName, tableName).GetAwaiter().GetResult();
15931605
}
15941606

15951607
/// <summary>
@@ -1613,9 +1625,12 @@ public static void BeginDeleteCassandraTable(this ICassandraResourcesOperations
16131625
/// <param name='cancellationToken'>
16141626
/// The cancellation token.
16151627
/// </param>
1616-
public static async Task BeginDeleteCassandraTableAsync(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, string tableName, CancellationToken cancellationToken = default(CancellationToken))
1628+
public static async Task<CassandraResourcesDeleteCassandraTableHeaders> BeginDeleteCassandraTableAsync(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, string tableName, CancellationToken cancellationToken = default(CancellationToken))
16171629
{
1618-
(await operations.BeginDeleteCassandraTableWithHttpMessagesAsync(resourceGroupName, accountName, keyspaceName, tableName, null, cancellationToken).ConfigureAwait(false)).Dispose();
1630+
using (var _result = await operations.BeginDeleteCassandraTableWithHttpMessagesAsync(resourceGroupName, accountName, keyspaceName, tableName, null, cancellationToken).ConfigureAwait(false))
1631+
{
1632+
return _result.Headers;
1633+
}
16191634
}
16201635

16211636
/// <summary>
@@ -1862,9 +1877,9 @@ public static CassandraViewGetResults BeginCreateUpdateCassandraView(this ICassa
18621877
/// <param name='viewName'>
18631878
/// Cosmos DB view name.
18641879
/// </param>
1865-
public static void BeginDeleteCassandraView(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, string viewName)
1880+
public static CassandraResourcesDeleteCassandraViewHeaders BeginDeleteCassandraView(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, string viewName)
18661881
{
1867-
operations.BeginDeleteCassandraViewAsync(resourceGroupName, accountName, keyspaceName, viewName).GetAwaiter().GetResult();
1882+
return operations.BeginDeleteCassandraViewAsync(resourceGroupName, accountName, keyspaceName, viewName).GetAwaiter().GetResult();
18681883
}
18691884

18701885
/// <summary>
@@ -1888,9 +1903,12 @@ public static void BeginDeleteCassandraView(this ICassandraResourcesOperations o
18881903
/// <param name='cancellationToken'>
18891904
/// The cancellation token.
18901905
/// </param>
1891-
public static async Task BeginDeleteCassandraViewAsync(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, string viewName, CancellationToken cancellationToken = default(CancellationToken))
1906+
public static async Task<CassandraResourcesDeleteCassandraViewHeaders> BeginDeleteCassandraViewAsync(this ICassandraResourcesOperations operations, string resourceGroupName, string accountName, string keyspaceName, string viewName, CancellationToken cancellationToken = default(CancellationToken))
18921907
{
1893-
(await operations.BeginDeleteCassandraViewWithHttpMessagesAsync(resourceGroupName, accountName, keyspaceName, viewName, null, cancellationToken).ConfigureAwait(false)).Dispose();
1908+
using (var _result = await operations.BeginDeleteCassandraViewWithHttpMessagesAsync(resourceGroupName, accountName, keyspaceName, viewName, null, cancellationToken).ConfigureAwait(false))
1909+
{
1910+
return _result.Headers;
1911+
}
18941912
}
18951913

18961914
/// <summary>

src/CosmosDB/CosmosDB.Sdk/Generated/CosmosDBManagementClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ private void Initialize()
535535
RestorableTableResources = new RestorableTableResourcesOperations(this);
536536
Service = new ServiceOperations(this);
537537
BaseUri = new System.Uri("https://management.azure.com");
538-
ApiVersion = "2022-08-15-preview";
538+
ApiVersion = "2022-11-15-preview";
539539
AcceptLanguage = "en-US";
540540
LongRunningOperationRetryTimeout = 30;
541541
GenerateClientRequestId = true;

0 commit comments

Comments
 (0)