From 93ec9864f60a89bd7b6bf5dacf651c5c790f3206 Mon Sep 17 00:00:00 2001
From: Kate Shin <hyoshi@microsoft.com>
Date: Wed, 1 Nov 2017 10:55:17 -0700
Subject: [PATCH] remove unused metadata queries from backup (#538)

---
 .../BackupOperation/BackupOperation.cs               |  1 -
 .../DisasterRecovery/Contracts/BackupConfigInfo.cs   | 12 ------------
 .../DisasterRecovery/DisasterRecoveryService.cs      |  1 -
 .../DisasterRecovery/BackupServiceTests.cs           |  3 +--
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/BackupOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/BackupOperation.cs
index e1a571cf..c8759bc4 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/BackupOperation.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/BackupOperation.cs
@@ -143,7 +143,6 @@ namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery
             BackupConfigInfo configInfo = new BackupConfigInfo();
             configInfo.RecoveryModel = GetRecoveryModel(databaseName);
             configInfo.DefaultBackupFolder = CommonUtilities.GetDefaultBackupFolder(this.serverConnection);
-            configInfo.LatestBackups = GetLatestBackupLocations(databaseName);
             configInfo.BackupEncryptors = GetBackupEncryptors();
             return configInfo;
         }
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/Contracts/BackupConfigInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/Contracts/BackupConfigInfo.cs
index 17fc6246..361cb0db 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/Contracts/BackupConfigInfo.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/Contracts/BackupConfigInfo.cs
@@ -2,9 +2,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
-using System.Collections;
 using System.Collections.Generic;
-using Microsoft.SqlTools.ServiceLayer.Admin.Contracts;
 
 namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery.Contracts
 {
@@ -13,21 +11,11 @@ namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery.Contracts
     /// </summary>
     public class BackupConfigInfo
     {
-        /// <summary>
-        /// Gets or sets default database info
-        /// </summary>
-        public DatabaseInfo DatabaseInfo { get; set; }
-
         /// <summary>
         /// Gets or sets recovery model of a database
         /// </summary>
         public string RecoveryModel { get; set; }
 
-        /// <summary>
-        /// Gets or sets the latest backup set of a database
-        /// </summary>
-        public List<RestoreItemSource> LatestBackups { get; set; }
-
         /// <summary>
         /// Gets or sets the default backup folder
         /// </summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryService.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryService.cs
index a7eb6f12..046c5c9a 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryService.cs
@@ -153,7 +153,6 @@ namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery
                             if (sqlConn != null && !connInfo.IsCloud)
                             {
                                 BackupConfigInfo backupConfigInfo = this.GetBackupConfigInfo(helper.DataContainer, sqlConn, sqlConn.Database);
-                                backupConfigInfo.DatabaseInfo = AdminService.GetDatabaseInfo(connInfo);
                                 response.BackupConfigInfo = backupConfigInfo;
                             }
                         }
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DisasterRecovery/BackupServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DisasterRecovery/BackupServiceTests.cs
index 78387e37..ce37a9de 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DisasterRecovery/BackupServiceTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DisasterRecovery/BackupServiceTests.cs
@@ -62,8 +62,7 @@ CREATE CERTIFICATE {1} WITH SUBJECT = 'Backup Encryption Certificate'; ";
 
             requestContext.Verify(x => x.SendResult(It.Is<BackupConfigInfoResponse>
                 (p => p.BackupConfigInfo.RecoveryModel != string.Empty
-                && p.BackupConfigInfo.DefaultBackupFolder != string.Empty
-                && p.BackupConfigInfo.DatabaseInfo != null)));
+                && p.BackupConfigInfo.DefaultBackupFolder != string.Empty)));
             
             testDb.Cleanup();
         }