diff --git a/src/NuGet.Jobs.Catalog2AzureSearch/NuGet.Jobs.Catalog2AzureSearch.csproj b/src/NuGet.Jobs.Catalog2AzureSearch/NuGet.Jobs.Catalog2AzureSearch.csproj index faab6c3f2..b6bcbd986 100644 --- a/src/NuGet.Jobs.Catalog2AzureSearch/NuGet.Jobs.Catalog2AzureSearch.csproj +++ b/src/NuGet.Jobs.Catalog2AzureSearch/NuGet.Jobs.Catalog2AzureSearch.csproj @@ -48,7 +48,6 @@ - diff --git a/src/NuGet.Jobs.Catalog2AzureSearch/NuGet.Jobs.Catalog2AzureSearch.nuspec b/src/NuGet.Jobs.Catalog2AzureSearch/NuGet.Jobs.Catalog2AzureSearch.nuspec index 470526e9e..5982804ee 100644 --- a/src/NuGet.Jobs.Catalog2AzureSearch/NuGet.Jobs.Catalog2AzureSearch.nuspec +++ b/src/NuGet.Jobs.Catalog2AzureSearch/NuGet.Jobs.Catalog2AzureSearch.nuspec @@ -1,11 +1,11 @@ - NuGet.Jobs.Catalog2AzureSearch + Catalog2AzureSearch $version$ .NET Foundation .NET Foundation - NuGet.Jobs.Catalog2AzureSearch + Catalog2AzureSearch Copyright .NET Foundation diff --git a/src/NuGet.Jobs.Catalog2AzureSearch/Program.cs b/src/NuGet.Jobs.Catalog2AzureSearch/Program.cs index 7e016bf48..a87c79434 100644 --- a/src/NuGet.Jobs.Catalog2AzureSearch/Program.cs +++ b/src/NuGet.Jobs.Catalog2AzureSearch/Program.cs @@ -5,10 +5,10 @@ namespace NuGet.Jobs { public class Program { - public static void Main(string[] args) + public static int Main(string[] args) { var job = new Job(); - JobRunner.Run(job, args).GetAwaiter().GetResult(); + return JobRunner.Run(job, args).GetAwaiter().GetResult(); } } } diff --git a/src/NuGet.Jobs.Catalog2AzureSearch/Settings/octopus.json b/src/NuGet.Jobs.Catalog2AzureSearch/Settings/octopus.json deleted file mode 100644 index 9f087f5ec..000000000 --- a/src/NuGet.Jobs.Catalog2AzureSearch/Settings/octopus.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "Catalog2AzureSearch": { - "AzureSearchBatchSize": 1000, - "MaxConcurrentBatches": 32, - "MaxConcurrentVersionListWriters": 32, - "SearchServiceName": "#{SearchServiceName}", - "SearchServiceApiKey": "#{SearchServiceApiKey}", - "SearchIndexName": "#{SearchIndexName}", - "HijackIndexName": "#{HijackIndexName}", - "StorageConnectionString": "DefaultEndpointsProtocol=https;AccountName=#{StorageAccountName};AccountKey=#{StorageAccountKey};EndpointSuffix=#{StorageEndpointSuffix}", - "StorageContainer": "#{StorageContainer}", - "StoragePath": "", - "CreateContainersAndIndexes": "#{CreateContainersAndIndexes}", - "Source": "#{CatalogIndex}", - "HttpClientTimeout": "00:15:00", - "DependencyCursorUrls": [ - "#{RegistrationsCursorUrl}" - ], - "RegistrationsBaseUrl": "#{RegistrationsBaseUrl}" - }, - - "KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}", - "KeyVault_ClientId": "#{Deployment.Azure.KeyVault.ClientId}", - "KeyVault_CertificateThumbprint": "#{Deployment.Azure.KeyVault.CertificateThumbprint}", - "KeyVault_ValidateCertificate": true, - "KeyVault_StoreName": "My", - "KeyVault_StoreLocation": "LocalMachine" -} \ No newline at end of file diff --git a/src/NuGet.Jobs.Db2AzureSearch/NuGet.Jobs.Db2AzureSearch.csproj b/src/NuGet.Jobs.Db2AzureSearch/NuGet.Jobs.Db2AzureSearch.csproj index 95d16153c..ac1c3dced 100644 --- a/src/NuGet.Jobs.Db2AzureSearch/NuGet.Jobs.Db2AzureSearch.csproj +++ b/src/NuGet.Jobs.Db2AzureSearch/NuGet.Jobs.Db2AzureSearch.csproj @@ -46,7 +46,6 @@ - diff --git a/src/NuGet.Jobs.Db2AzureSearch/NuGet.Jobs.Db2AzureSearch.nuspec b/src/NuGet.Jobs.Db2AzureSearch/NuGet.Jobs.Db2AzureSearch.nuspec index c52c246fa..ced5bdd1d 100644 --- a/src/NuGet.Jobs.Db2AzureSearch/NuGet.Jobs.Db2AzureSearch.nuspec +++ b/src/NuGet.Jobs.Db2AzureSearch/NuGet.Jobs.Db2AzureSearch.nuspec @@ -1,11 +1,11 @@ - NuGet.Jobs.Db2AzureSearch + Db2AzureSearch $version$ .NET Foundation .NET Foundation - NuGet.Jobs.Db2AzureSearch + Db2AzureSearch Copyright .NET Foundation diff --git a/src/NuGet.Jobs.Db2AzureSearch/Program.cs b/src/NuGet.Jobs.Db2AzureSearch/Program.cs index 126cf82f0..6fcb99491 100644 --- a/src/NuGet.Jobs.Db2AzureSearch/Program.cs +++ b/src/NuGet.Jobs.Db2AzureSearch/Program.cs @@ -5,10 +5,10 @@ namespace NuGet.Jobs { public class Program { - public static void Main(string[] args) + public static int Main(string[] args) { var job = new Job(); - JobRunner.RunOnce(job, args).GetAwaiter().GetResult(); + return JobRunner.RunOnce(job, args).GetAwaiter().GetResult(); } } } diff --git a/src/NuGet.Jobs.Db2AzureSearch/Scripts/PostDeploy.ps1 b/src/NuGet.Jobs.Db2AzureSearch/Scripts/PostDeploy.ps1 index 5c02e86c0..bfa990c26 100644 --- a/src/NuGet.Jobs.Db2AzureSearch/Scripts/PostDeploy.ps1 +++ b/src/NuGet.Jobs.Db2AzureSearch/Scripts/PostDeploy.ps1 @@ -1,3 +1,5 @@ -Start-Process ` - .\bin\NuGet.Jobs.Db2AzureSearch.exe ` - -ArgumentList "-Configuration `"bin\octopus.json`" -InstrumentationKey `"#{ApplicationInsightsInstrumentationKey}`" -Verbose true" +.\RunJob.cmd + +if ($LastExitCode -ne 0) { + throw "The job failed with exit code $LastExitCode" +} diff --git a/src/NuGet.Jobs.Db2AzureSearch/Settings/octopus.json b/src/NuGet.Jobs.Db2AzureSearch/Settings/octopus.json deleted file mode 100644 index b77aed507..000000000 --- a/src/NuGet.Jobs.Db2AzureSearch/Settings/octopus.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "GalleryDb": { - "ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=#{GalleryDbInitialCatalog};Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=NuGet.Jobs.Db2AzureSearch;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.GalleryDbReader.ClientId};AadCertificate=#{GalleryDbAadCertificate}" - }, - - "Db2AzureSearch": { - "AzureSearchBatchSize": 1000, - "MaxConcurrentBatches": 32, - "MaxConcurrentVersionListWriters": 1, - "SearchServiceName": "#{SearchServiceName}", - "SearchServiceApiKey": "#{SearchServiceApiKey}", - "SearchIndexName": "#{SearchIndexName}", - "HijackIndexName": "#{HijackIndexName}", - "StorageConnectionString": "DefaultEndpointsProtocol=https;AccountName=#{StorageAccountName};AccountKey=#{StorageAccountKey};EndpointSuffix=#{StorageEndpointSuffix}", - "StorageContainer": "#{StorageContainer}", - "StoragePath": "", - "DatabaseBatchSize": 10000, - "ReplaceContainersAndIndexes": "#{ReplaceContainersAndIndexes}", - "CatalogIndexUrl": "#{CatalogIndex}" - }, - - "KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}", - "KeyVault_ClientId": "#{Deployment.Azure.KeyVault.ClientId}", - "KeyVault_CertificateThumbprint": "#{Deployment.Azure.KeyVault.CertificateThumbprint}", - "KeyVault_ValidateCertificate": true, - "KeyVault_StoreName": "My", - "KeyVault_StoreLocation": "LocalMachine" -} \ No newline at end of file diff --git a/src/NuGet.Jobs.Owners2AzureSearch/NuGet.Jobs.Owners2AzureSearch.nuspec b/src/NuGet.Jobs.Owners2AzureSearch/NuGet.Jobs.Owners2AzureSearch.nuspec index b53660f87..2c229d22c 100644 --- a/src/NuGet.Jobs.Owners2AzureSearch/NuGet.Jobs.Owners2AzureSearch.nuspec +++ b/src/NuGet.Jobs.Owners2AzureSearch/NuGet.Jobs.Owners2AzureSearch.nuspec @@ -1,11 +1,11 @@ - NuGet.Jobs.Owners2AzureSearch + Owners2AzureSearch $version$ .NET Foundation .NET Foundation - NuGet.Jobs.Owners2AzureSearch + Owners2AzureSearch Copyright .NET Foundation diff --git a/src/NuGet.Jobs.Owners2AzureSearch/Program.cs b/src/NuGet.Jobs.Owners2AzureSearch/Program.cs index 7e016bf48..e9389c7cb 100644 --- a/src/NuGet.Jobs.Owners2AzureSearch/Program.cs +++ b/src/NuGet.Jobs.Owners2AzureSearch/Program.cs @@ -1,14 +1,22 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.Threading; + namespace NuGet.Jobs { public class Program { - public static void Main(string[] args) + public static int Main(string[] args) { var job = new Job(); - JobRunner.Run(job, args).GetAwaiter().GetResult(); + var exitCode = JobRunner.Run(job, args).GetAwaiter().GetResult(); + + // Sleep to allow Application Insights to flush all logs. See issue: + // https://github.com/Microsoft/ApplicationInsights-dotnet/issues/407 + Thread.Sleep(30000); + + return exitCode; } } } diff --git a/src/NuGet.Services.AzureSearch/NuGet.Services.AzureSearch.csproj b/src/NuGet.Services.AzureSearch/NuGet.Services.AzureSearch.csproj index 811747f86..3d7a58bcc 100644 --- a/src/NuGet.Services.AzureSearch/NuGet.Services.AzureSearch.csproj +++ b/src/NuGet.Services.AzureSearch/NuGet.Services.AzureSearch.csproj @@ -206,7 +206,7 @@ 5.0.3 - 4.1.0-dev-2576357 + 4.1.0-dev-2701693 4.8.0 diff --git a/src/NuGet.Services.Metadata.Catalog.Monitoring/NuGet.Services.Metadata.Catalog.Monitoring.csproj b/src/NuGet.Services.Metadata.Catalog.Monitoring/NuGet.Services.Metadata.Catalog.Monitoring.csproj index 882591276..4b5a6dad3 100644 --- a/src/NuGet.Services.Metadata.Catalog.Monitoring/NuGet.Services.Metadata.Catalog.Monitoring.csproj +++ b/src/NuGet.Services.Metadata.Catalog.Monitoring/NuGet.Services.Metadata.Catalog.Monitoring.csproj @@ -43,7 +43,6 @@ - @@ -158,9 +157,6 @@ runtime; build; native; contentfiles; analyzers all - - 4.8.0 - 2.25.0-sb-queuesize-32353 diff --git a/tests/NuGet.Services.AzureSearch.Tests/SearchService/AuxiliaryDataCacheFacts.cs b/tests/NuGet.Services.AzureSearch.Tests/SearchService/AuxiliaryDataCacheFacts.cs index 5cdd9ce9d..23b91b259 100644 --- a/tests/NuGet.Services.AzureSearch.Tests/SearchService/AuxiliaryDataCacheFacts.cs +++ b/tests/NuGet.Services.AzureSearch.Tests/SearchService/AuxiliaryDataCacheFacts.cs @@ -55,7 +55,7 @@ public async Task DoesNotInitializeAgainWhenAlreadyInitialized() { // Arrange await _target.EnsureInitializedAsync(); - _client.ResetCalls(); + _client.Invocations.Clear(); // Act await _target.EnsureInitializedAsync(); @@ -117,7 +117,7 @@ public async Task InitializesAgainWhenAlreadyInitialized() { // Arrange await _target.TryLoadAsync(_token); - _client.ResetCalls(); + _client.Invocations.Clear(); // Act await _target.TryLoadAsync(_token);