Skip to content

PS cosmos db restore command: Skipping client side restore validation check #28398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 18, 2025
Merged

PS cosmos db restore command: Skipping client side restore validation check #28398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb56cd7
restorable api check removed
dsapaliga Aug 15, 2025
b1c147c
added new recordings for tests
dsapaliga Aug 15, 2025
260d143
revert unwanted file change
dsapaliga Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/CosmosDB/CosmosDB.Test/ScenarioTests/RestoreTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ public RestoreTests(Xunit.Abstractions.ITestOutputHelper output): base(output)
{
}

[Fact(Skip = "Output of DateTime.ToString() is different in MacOs.")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestSqlRestoreAccountCmdlets()
{
TestRunner.RunTestScript("Test-SqlRestoreAccountCmdlets");
}

[Fact(Skip = "Output of DateTime.ToString() is different in MacOs.")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestSqlRestoreAccountPublicNetworkAccessCmdlets()
{
Expand Down Expand Up @@ -65,21 +65,21 @@ public void TestRestoreFailuresAccountCmdlets()
TestRunner.RunTestScript("Test-RestoreFailuresAccountCmdlets");
}

[Fact(Skip = "Output of DateTime.ToString() is different in MacOs.")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestGremlinRestoreAccountCmdlets()
{
TestRunner.RunTestScript("Test-GremlinRestoreAccountCmdlets");
}

[Fact(Skip = "Output of DateTime.ToString() is different in MacOs.")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestGremlinRestoreFromNewAccountCmdlets()
{
TestRunner.RunTestScript("Test-GremlinRestoreFromNewAccountCmdlets");
}

[Fact(Skip = "Output of DateTime.ToString() is different in MacOs.")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestTableRestoreAccountCmdlets()
{
Expand Down
534 changes: 267 additions & 267 deletions ...est.ScenarioTests.ScenarioTest.RestoreTests/TestGremlinGraphBackupInformationCmdLets.json
View file
Open in desktop

Large diffs are not rendered by default.

3,179 changes: 838 additions & 2,341 deletions ...smosDB.Test.ScenarioTests.ScenarioTest.RestoreTests/TestGremlinRestoreAccountCmdlets.json
View file
Open in desktop

Large diffs are not rendered by default.

3,041 changes: 777 additions & 2,264 deletions ...Test.ScenarioTests.ScenarioTest.RestoreTests/TestGremlinRestoreFromNewAccountCmdlets.json
View file
Open in desktop

Large diffs are not rendered by default.

534 changes: 267 additions & 267 deletions ...cenarioTests.ScenarioTest.RestoreTests/TestMongoDBCollectionBackupInformationCmdLets.json
View file
Open in desktop

Large diffs are not rendered by default.

1,090 changes: 512 additions & 578 deletions ...Test.ScenarioTests.ScenarioTest.RestoreTests/TestMongoDBRestoreFromNewAccountCmdlets.json
View file
Open in desktop

Large diffs are not rendered by default.

474 changes: 237 additions & 237 deletions ...CosmosDB.Test.ScenarioTests.ScenarioTest.RestoreTests/TestMongoRestoreAccountCmdlets.json
View file
Open in desktop

Large diffs are not rendered by default.

238 changes: 119 additions & 119 deletions ...Test.RestoreTests/TestProvisionCosmosDBAccountBackupPolicyWithContinuous7DaysCmdLets.json
View file
Open in desktop

Large diffs are not rendered by default.

530 changes: 265 additions & 265 deletions ...est.ScenarioTests.ScenarioTest.RestoreTests/TestSqlContainerBackupInformationCmdLets.json
View file
Open in desktop

Large diffs are not rendered by default.

3,332 changes: 793 additions & 2,539 deletions ...s.CosmosDB.Test.ScenarioTests.ScenarioTest.RestoreTests/TestSqlRestoreAccountCmdlets.json
View file
Open in desktop

Large diffs are not rendered by default.

3,208 changes: 827 additions & 2,381 deletions ...narioTests.ScenarioTest.RestoreTests/TestSqlRestoreAccountPublicNetworkAccessCmdlets.json
View file
Open in desktop

Large diffs are not rendered by default.

1,140 changes: 501 additions & 639 deletions ...sDB.Test.ScenarioTests.ScenarioTest.RestoreTests/TestSqlRestoreFromNewAccountCmdlets.json
View file
Open in desktop

Large diffs are not rendered by default.

402 changes: 201 additions & 201 deletions ...mosDB.Test.ScenarioTests.ScenarioTest.RestoreTests/TestTableBackupInformationCmdLets.json
View file
Open in desktop

Large diffs are not rendered by default.

3,337 changes: 858 additions & 2,479 deletions ...CosmosDB.Test.ScenarioTests.ScenarioTest.RestoreTests/TestTableRestoreAccountCmdlets.json
View file
Open in desktop

Large diffs are not rendered by default.

1,105 changes: 518 additions & 587 deletions ...B.Test.ScenarioTests.ScenarioTest.RestoreTests/TestTableRestoreFromNewAccountCmdlets.json
View file
Open in desktop

Large diffs are not rendered by default.

3,120 changes: 2,388 additions & 732 deletions ...narioTest.RestoreTests/TestUpdateCosmosDBAccountBackupPolicyToContinuous7DaysCmdLets.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/CosmosDB/CosmosDB/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
-->

## Upcoming Release
* Fixed issue where the restore command failed to detect the source account, even when it existed.

## Version 2.0.7
* Added support for throughput buckets.
Expand Down
98 changes: 0 additions & 98 deletions src/CosmosDB/CosmosDB/CosmosDBAccount/RestoreAzCosmosDBAccount.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ public override void ExecuteCmdlet()
return;
}

bool isSourceRestorableAccountDeleted = false;
List<RestorableDatabaseAccountGetResult> restorableDatabaseAccounts = CosmosDBManagementClient.RestorableDatabaseAccounts.ListWithHttpMessagesAsync().GetAwaiter().GetResult().Body.ToList();

RestorableDatabaseAccountGetResult sourceAccountToRestore = null;
Expand All @@ -109,14 +108,12 @@ public override void ExecuteCmdlet()
if (restorableAccount.DeletionTime >= utcRestoreDateTime)
{
sourceAccountToRestore = restorableAccount;
isSourceRestorableAccountDeleted = true;
break;
}
}
else
{
sourceAccountToRestore = restorableAccount;
isSourceRestorableAccountDeleted = false;
break;
}
}
Expand All @@ -129,101 +126,6 @@ public override void ExecuteCmdlet()
return;
}

// Validate if source account is empty if the source account is a live account.
if (!isSourceRestorableAccountDeleted)
{
string sourceLocation = Location;
if (!string.IsNullOrEmpty(SourceBackupLocation))
{
sourceLocation = SourceBackupLocation;
}

bool restorableResourcesNotFound = false;
if (sourceAccountToRestore.ApiType.Equals("Sql", StringComparison.OrdinalIgnoreCase))
{
try
{
IEnumerable<RestorableSqlResourcesGetResult> restorableResources = CosmosDBManagementClient.RestorableSqlResources.ListWithHttpMessagesAsync(
sourceAccountToRestore.Location,
sourceAccountToRestore.Name,
sourceLocation,
utcRestoreDateTime.ToString("u")).GetAwaiter().GetResult().Body;

restorableResourcesNotFound = restorableResources == null || !restorableResources.Any();
}
catch (Exception)
{
WriteWarning($"No database accounts found with matching account name {SourceDatabaseAccountName} that was alive at given utc-timestamp {utcRestoreDateTime} in location {sourceLocation}");
return;
}
}
else if (sourceAccountToRestore.ApiType.Equals("MongoDB", StringComparison.OrdinalIgnoreCase))
{
try
{
IEnumerable<RestorableMongodbResourcesGetResult> restorableResources = CosmosDBManagementClient.RestorableMongodbResources.ListWithHttpMessagesAsync(
sourceAccountToRestore.Location,
sourceAccountToRestore.Name,
sourceLocation,
utcRestoreDateTime.ToString("u")).GetAwaiter().GetResult().Body;

restorableResourcesNotFound = restorableResources == null || !restorableResources.Any();
}
catch (Exception)
{
WriteWarning($"No database accounts found with matching account name {SourceDatabaseAccountName} that was alive at given utc-timestamp {utcRestoreDateTime} in location {sourceLocation}");
return;
}
}
else if (sourceAccountToRestore.ApiType.Equals("Gremlin, Sql", StringComparison.OrdinalIgnoreCase))
{
try
{
IEnumerable<RestorableGremlinResourcesGetResult> restorableResources = CosmosDBManagementClient.RestorableGremlinResources.ListWithHttpMessagesAsync(
sourceAccountToRestore.Location,
sourceAccountToRestore.Name,
sourceLocation,
utcRestoreDateTime.ToString("u")).GetAwaiter().GetResult().Body;

restorableResourcesNotFound = restorableResources == null || !restorableResources.Any();
}
catch (Exception)
{
WriteWarning($"No database accounts found with matching account name {SourceDatabaseAccountName} that was alive at given utc-timestamp {utcRestoreDateTime} in location {sourceLocation}");
return;
}
}
else if (sourceAccountToRestore.ApiType.Equals("Table, Sql", StringComparison.OrdinalIgnoreCase))
{
try
{
IEnumerable<RestorableTableResourcesGetResult> restorableResources = CosmosDBManagementClient.RestorableTableResources.ListWithHttpMessagesAsync(
sourceAccountToRestore.Location,
sourceAccountToRestore.Name,
sourceLocation,
utcRestoreDateTime.ToString("u")).GetAwaiter().GetResult().Body;

restorableResourcesNotFound = restorableResources == null || !restorableResources.Any();
}
catch (Exception)
{
WriteWarning($"No database accounts found with matching account name {SourceDatabaseAccountName} that was alive at given utc-timestamp {utcRestoreDateTime} in location {sourceLocation}");
return;
}
}
else
{
WriteWarning($"Provided API Type {sourceAccountToRestore.ApiType} is not supported");
return;
}

if (restorableResourcesNotFound)
{
WriteWarning($"Database account {SourceDatabaseAccountName} contains no restorable resources in location {sourceLocation} at given restore timestamp {utcRestoreDateTime} in location {sourceLocation}");
return;
}
}

// Trigger restore
PSRestoreParameters restoreParameters = new PSRestoreParameters()
{
Expand Down