Remove the old search. (#7145)

Clean old search service and configure Search http client timeout.

Author: cristinamanum

NuGetGallery.sln

@@ -22,8 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2. Tests", "2. Tests", "{39
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0. Shared", "0. Shared", "{155100FF-524B-4CAF-93C6-A57478B3DBAD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.Search.Client", "src\NuGet.Services.Search.Client\NuGet.Services.Search.Client.csproj", "{6931C2EE-E081-4518-9798-D34D83B35BF6}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4. Tools", "4. Tools", "{2204C510-A559-4ED7-9590-FDC09093575B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GalleryTools", "src\GalleryTools\GalleryTools.csproj", "{C5849063-8CDC-4561-BA5C-7D97BD905DC3}"
@@ -60,10 +58,6 @@ Global
 		{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6931C2EE-E081-4518-9798-D34D83B35BF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6931C2EE-E081-4518-9798-D34D83B35BF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6931C2EE-E081-4518-9798-D34D83B35BF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6931C2EE-E081-4518-9798-D34D83B35BF6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C5849063-8CDC-4561-BA5C-7D97BD905DC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C5849063-8CDC-4561-BA5C-7D97BD905DC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C5849063-8CDC-4561-BA5C-7D97BD905DC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -97,7 +91,6 @@ Global
 		{FDC76BEF-3360-45AC-A13E-AE8F14D343D5} = {39E54EC3-CBAA-453A-BE64-748FE1559A58}
 		{097B2CDD-9623-4C34-93C2-D373D51F5B4E} = {155100FF-524B-4CAF-93C6-A57478B3DBAD}
 		{8AC9E39E-366C-47E5-80AE-38E71CD31386} = {39E54EC3-CBAA-453A-BE64-748FE1559A58}
-		{6931C2EE-E081-4518-9798-D34D83B35BF6} = {05998089-58F5-4A84-8C11-C5C6244A6F89}
 		{C5849063-8CDC-4561-BA5C-7D97BD905DC3} = {2204C510-A559-4ED7-9590-FDC09093575B}
 		{6262F4FC-29BE-4226-B676-DB391C89D396} = {155100FF-524B-4CAF-93C6-A57478B3DBAD}
 		{79C831E9-7C88-4B98-B084-4DE940C73FC7} = {39E54EC3-CBAA-453A-BE64-748FE1559A58}

src/GalleryTools/Commands/BackfillCommand.cs

@@ -8,7 +8,6 @@
 using Microsoft.Extensions.CommandLineUtils;
 using NuGet.Packaging;
 using NuGet.Services.Entities;
-using NuGet.Services.Search.Client;
 using NuGetGallery;
 using NuGetGallery.Configuration;
 using System;
@@ -20,6 +19,7 @@
 using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Linq;
+using GalleryTools.Utils;
 
 namespace GalleryTools.Commands
 {
@@ -43,6 +43,7 @@ public abstract class BackfillCommand<TMetadata>
             var collectData = config.Option("-c | --collect", "Collect metadata and save it in a file", CommandOptionType.NoValue);
             var updateDB = config.Option("-u | --update", "Update the database with collected metadata", CommandOptionType.NoValue);
             var fileName = config.Option("-f | --file", "The file to use", CommandOptionType.SingleValue);
+            var serviceDiscoveryUri = config.Option("-s | --servicediscoveryuri", "The ServiceDiscoveryUri.", CommandOptionType.SingleValue);
 
             config.HelpOption("-? | -h | --help");
 
@@ -53,12 +54,12 @@ public abstract class BackfillCommand<TMetadata>
                 var container = builder.Build();
 
                 var connectionString = container.Resolve<IAppConfiguration>().SqlConnectionString;
-                var serviceDiscoveryUri = container.Resolve<IAppConfiguration>().ServiceDiscoveryUri;
+                var serviceDiscoveryUriValue = new Uri(serviceDiscoveryUri.Value());
 
                 var command = new TCommand();
 
                 var metadataFileName = fileName.HasValue() ? fileName.Value() : command.MetadataFileName;
-
+                
                 if (collectData.HasValue())
                 {
                     var lastCreateTime = DateTime.MaxValue;
@@ -74,7 +75,7 @@ public abstract class BackfillCommand<TMetadata>
                         }
                     }
 
-                    await command.Collect(connectionString, serviceDiscoveryUri, lastCreateTime, metadataFileName);
+                    await command.Collect(connectionString, serviceDiscoveryUriValue, lastCreateTime, metadataFileName);
                 }
 
                 if (updateDB.HasValue())

src/GalleryTools/GalleryTools.csproj

@@ -53,15 +53,12 @@
     <Compile Include="Commands\VerifyApiKeyCommand.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Utils\ServiceDiscoveryClient.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NuGet.Services.Search.Client\NuGet.Services.Search.Client.csproj">
-      <Project>{6931C2EE-E081-4518-9798-D34D83B35BF6}</Project>
-      <Name>NuGet.Services.Search.Client</Name>
-    </ProjectReference>
     <ProjectReference Include="..\NuGet.Services.Entities\NuGet.Services.Entities.csproj">
       <Project>{6262f4fc-29be-4226-b676-db391c89d396}</Project>
       <Name>NuGet.Services.Entities</Name>

….Client/Client/ServiceDiscoveryClient.cs …eryTools/Utils/ServiceDiscoveryClient.cssrc/NuGet.Services.Search.Client/Client/ServiceDiscoveryClient.cs renamed to src/GalleryTools/Utils/ServiceDiscoveryClient.cs src/NuGet.Services.Search.Client/Client/ServiceDiscoveryClient.cs renamed to src/GalleryTools/Utils/ServiceDiscoveryClient.cs

@@ -8,9 +8,9 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 
-namespace NuGet.Services.Search.Client
+namespace GalleryTools.Utils
 {
-    public class ServiceDiscoveryClient : IServiceDiscoveryClient
+    public class ServiceDiscoveryClient 
     {
         private readonly HttpClient _httpClient;
         private readonly Uri _serviceDiscoveryEndpoint;