Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Commit 9cb3e60

Browse files
loic-sharmaloic-sharma
authored
[Search] Generate secondary region's auxiliary data (#555)
Tweaks the `Search.GenerateAuxiliaryData` job to generate auxiliary data for each region, including secondary regions (like US South Central and South East Asia).
1 parent 8377acc commit 9cb3e60

10 files changed

Lines changed: 156 additions & 12 deletions

‎src/Search.GenerateAuxiliaryData/Scripts/Search.GenerateAuxiliaryData.Asia.cmd‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ REM This script is the same as Search.GenerateAuxillaryData.cmd. However, this c
55
cd bin
66

77
:Top
8-
echo "Starting job - #{Jobs.search.generateauxiliarydata.Title}"
8+
echo "Starting job - #{Jobs.Asia.search.generateauxiliarydata.Title}"
99

10-
title #{Jobs.search.generateauxiliarydata.Title}
10+
title #{Jobs.Asia.search.generateauxiliarydata.Title}
1111

12-
start /w search.generateauxiliarydata.exe -Configuration "#{Jobs.search.generateauxiliarydata.Configuration}" -verbose true -Sleep #{Jobs.search.generateauxiliarydata.Sleep} -InstrumentationKey "#{Jobs.search.generateauxiliarydata.ApplicationInsightsInstrumentationKey}"
13-
14-
echo "Finished #{Jobs.search.generateauxiliarydata.Title}"
12+
start /w search.generateauxiliarydata.exe -Configuration "#{Jobs.Asia.search.generateauxiliarydata.Configuration}" -verbose true -Sleep #{Jobs.search.generateauxiliarydata.Sleep} -InstrumentationKey "#{Jobs.search.generateauxiliarydata.ApplicationInsightsInstrumentationKey}"
1513

16-
goto Top
14+
echo "Finished #{Jobs.Asia.search.generateauxiliarydata.Title}"
15+
16+
goto Top

‎src/Search.GenerateAuxiliaryData/Scripts/Search.GenerateAuxiliaryData.SouthEastAsia.cmd‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
@echo OFF
2+
3+
REM This script is the same as Search.GenerateAuxillaryData.cmd. However, this copy is required until "Jobs.ServiceNames" deployment config is consolidated.
4+
5+
cd bin
6+
7+
:Top
8+
echo "Starting job - #{Jobs.SouthEastAsia.search.generateauxiliarydata.Title}"
9+
10+
title #{Jobs.SouthEastAsia.search.generateauxiliarydata.Title}
11+
12+
start /w search.generateauxiliarydata.exe -Configuration "#{Jobs.SouthEastAsia.search.generateauxiliarydata.Configuration}" -verbose true -Sleep #{Jobs.search.generateauxiliarydata.Sleep} -InstrumentationKey "#{Jobs.search.generateauxiliarydata.ApplicationInsightsInstrumentationKey}"
13+
14+
echo "Finished #{Jobs.SouthEastAsia.search.generateauxiliarydata.Title}"
15+
16+
goto Top

‎src/Search.GenerateAuxiliaryData/Scripts/Search.GenerateAuxiliaryData.USSC.cmd‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
@echo OFF
2+
3+
REM This script is the same as Search.GenerateAuxillaryData.cmd. However, this copy is required until "Jobs.ServiceNames" deployment config is consolidated.
4+
5+
cd bin
6+
7+
:Top
8+
echo "Starting job - #{Jobs.USSC.search.generateauxiliarydata.Title}"
9+
10+
title #{Jobs.USSC.search.generateauxiliarydata.Title}
11+
12+
start /w search.generateauxiliarydata.exe -Configuration "#{Jobs.USSC.search.generateauxiliarydata.Configuration}" -verbose true -Sleep #{Jobs.search.generateauxiliarydata.Sleep} -InstrumentationKey "#{Jobs.search.generateauxiliarydata.ApplicationInsightsInstrumentationKey}"
13+
14+
echo "Finished #{Jobs.USSC.search.generateauxiliarydata.Title}"
15+
16+
goto Top

‎src/Search.GenerateAuxiliaryData/Scripts/Search.GenerateAuxiliaryData.cmd‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
cd bin
44

55
:Top
6-
echo "Starting job - #{Jobs.search.generateauxiliarydata.Title}"
6+
echo "Starting job - #{Jobs.search.generateauxiliarydata.Title}"
77

8-
title #{Jobs.search.generateauxiliarydata.Title}
8+
title #{Jobs.search.generateauxiliarydata.Title}
99

1010
start /w search.generateauxiliarydata.exe -Configuration "#{Jobs.search.generateauxiliarydata.Configuration}" -verbose true -Sleep #{Jobs.search.generateauxiliarydata.Sleep} -InstrumentationKey "#{Jobs.search.generateauxiliarydata.ApplicationInsightsInstrumentationKey}"
11-
12-
echo "Finished #{Jobs.search.generateauxiliarydata.Title}"
1311

14-
goto Top
12+
echo "Finished #{Jobs.search.generateauxiliarydata.Title}"
13+
14+
goto Top

‎src/Search.GenerateAuxiliaryData/Search.GenerateAuxiliaryData.nuspec‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package >
33
<metadata>
4-
<id>Search.GenerateAuxiliaryData.$branch$</id>
4+
<id>Search.GenerateAuxiliaryData</id>
55
<version>$version$</version>
66
<title>Search.GenerateAuxiliaryData</title>
77
<authors>.NET Foundation</authors>
@@ -13,6 +13,8 @@
1313
<file src="bin\$configuration$\*.*" target="bin"/>
1414
<file src="Scripts\Search.GenerateAuxiliaryData.cmd" />
1515
<file src="Scripts\Search.GenerateAuxiliaryData.Asia.cmd" />
16+
<file src="Scripts\Search.GenerateAuxiliaryData.SouthEastAsia.cmd" />
17+
<file src="Scripts\Search.GenerateAuxiliaryData.USSC.cmd" />
1618
<file src="Scripts\Functions.ps1" />
1719
<file src="Scripts\PreDeploy.ps1" />
1820
<file src="Scripts\PostDeploy.ps1" />

‎src/Search.GenerateAuxiliaryData/Settings/dev-southeastasia.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"Initialization": {
3+
"AzureCdnCloudStorageAccount": "DefaultEndpointsProtocol=https;AccountName=nugetdevlegacy;AccountKey=$$Dev-NuGetDevLegacyStorage-Key$$",
4+
"AzureCdnCloudStorageContainerName": "nuget-cdnstats",
5+
"PrimaryDestination": "DefaultEndpointsProtocol=https;AccountName=nugetdevsea;AccountKey=$$Dev-NuGetDevSeaStorage-Key$$"
6+
},
7+
8+
"GalleryDb": {
9+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=nuget-dev-0-v2gallery;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=Search.GenerateAuxData.Asia;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.GalleryDbReader.ClientId};AadCertificate=$$dev-gallerydb-reader$$"
10+
},
11+
12+
"StatisticsDb": {
13+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.StatisticsDatabaseAddress};Initial Catalog=nuget-dev-statistics;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=Search.GenerateAuxData.Asia;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.StatisticsDbReader.ClientId};AadCertificate=$$dev-statisticsdb-reader$$"
14+
},
15+
16+
"KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",
17+
"KeyVault_ClientId": "#{Deployment.Azure.KeyVault.ClientId}",
18+
"KeyVault_CertificateThumbprint": "#{Deployment.Azure.KeyVault.CertificateThumbprint}",
19+
"KeyVault_ValidateCertificate": true,
20+
"KeyVault_StoreName": "My",
21+
"KeyVault_StoreLocation": "LocalMachine"
22+
}

‎src/Search.GenerateAuxiliaryData/Settings/dev-ussc.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"Initialization": {
3+
"AzureCdnCloudStorageAccount": "DefaultEndpointsProtocol=https;AccountName=nugetdevlegacy;AccountKey=$$Dev-NuGetDevLegacyStorage-Key$$",
4+
"AzureCdnCloudStorageContainerName": "nuget-cdnstats",
5+
"PrimaryDestination": "DefaultEndpointsProtocol=https;AccountName=nugetdevussc;AccountKey=$$Dev-NuGetDevUsscStorage-Key$$"
6+
},
7+
8+
"GalleryDb": {
9+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=nuget-dev-0-v2gallery;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=Search.GenerateAuxData;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.GalleryDbReader.ClientId};AadCertificate=$$dev-gallerydb-reader$$"
10+
},
11+
12+
"StatisticsDb": {
13+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.StatisticsDatabaseAddress};Initial Catalog=nuget-dev-statistics;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=Search.GenerateAuxData;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.StatisticsDbReader.ClientId};AadCertificate=$$dev-statisticsdb-reader$$"
14+
},
15+
16+
"KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",
17+
"KeyVault_ClientId": "#{Deployment.Azure.KeyVault.ClientId}",
18+
"KeyVault_CertificateThumbprint": "#{Deployment.Azure.KeyVault.CertificateThumbprint}",
19+
"KeyVault_ValidateCertificate": true,
20+
"KeyVault_StoreName": "My",
21+
"KeyVault_StoreLocation": "LocalMachine"
22+
}

‎src/Search.GenerateAuxiliaryData/Settings/int-ussc.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"Initialization": {
3+
"AzureCdnCloudStorageAccount": "DefaultEndpointsProtocol=https;AccountName=nugetint0;AccountKey=$$Int-NuGetInt0Storage-Key$$",
4+
"AzureCdnCloudStorageContainerName": "nuget-cdnstats",
5+
"PrimaryDestination": "DefaultEndpointsProtocol=https;AccountName=nugetintussc;AccountKey=$$Int-NuGetIntUsscStorage-Key$$"
6+
},
7+
8+
"GalleryDb": {
9+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=nuget-int-0-v2gallery;User ID=$$Int-GalleryDBReadOnly-UserName$$;Password=$$Int-GalleryDBReadOnly-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
10+
},
11+
12+
"StatisticsDb": {
13+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.StatisticsDatabaseAddress};Initial Catalog=nuget-int-statistics;User ID=$$Int-StatisticsDBReadOnly-UserName$$;Password=$$Int-StatisticsDBReadOnly-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
14+
},
15+
16+
"KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",
17+
"KeyVault_ClientId": "#{Deployment.Azure.KeyVault.ClientId}",
18+
"KeyVault_CertificateThumbprint": "#{Deployment.Azure.KeyVault.CertificateThumbprint}",
19+
"KeyVault_ValidateCertificate": true,
20+
"KeyVault_StoreName": "My",
21+
"KeyVault_StoreLocation": "LocalMachine"
22+
}

‎src/Search.GenerateAuxiliaryData/Settings/prod-southeastasia.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"Initialization": {
3+
"AzureCdnCloudStorageAccount": "DefaultEndpointsProtocol=https;AccountName=nugetgallery;AccountKey=$$Prod-NuGetGalleryStorage-Key$$",
4+
"AzureCdnCloudStorageContainerName": "nuget-cdnstats",
5+
"PrimaryDestination": "DefaultEndpointsProtocol=https;AccountName=nugetprodsea;AccountKey=$$Prod-NuGetProdSeaStorage-Key$$"
6+
},
7+
8+
"GalleryDb": {
9+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=NuGetGallery;User ID=$$Prod-GalleryDBReadOnly-UserName$$;Password=$$Prod-GalleryDBReadOnly-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
10+
},
11+
12+
"StatisticsDb": {
13+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.StatisticsDatabaseAddress};Initial Catalog=nuget-prod-statistics;User ID=$$Prod-StatisticsDBReadOnly-UserName$$;Password=$$Prod-StatisticsDBReadOnly-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
14+
},
15+
16+
"KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",
17+
"KeyVault_ClientId": "#{Deployment.Azure.KeyVault.ClientId}",
18+
"KeyVault_CertificateThumbprint": "#{Deployment.Azure.KeyVault.CertificateThumbprint}",
19+
"KeyVault_ValidateCertificate": true,
20+
"KeyVault_StoreName": "My",
21+
"KeyVault_StoreLocation": "LocalMachine"
22+
}

‎src/Search.GenerateAuxiliaryData/Settings/prod-ussc.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"Initialization": {
3+
"AzureCdnCloudStorageAccount": "DefaultEndpointsProtocol=https;AccountName=nugetgallery;AccountKey=$$Prod-NuGetGalleryStorage-Key$$",
4+
"AzureCdnCloudStorageContainerName": "nuget-cdnstats",
5+
"PrimaryDestination": "DefaultEndpointsProtocol=https;AccountName=nugetprodussc;AccountKey=$$Prod-NuGetProdUsscStorage-Key$$"
6+
},
7+
8+
"GalleryDb": {
9+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=NuGetGallery;User ID=$$Prod-GalleryDBReadOnly-UserName$$;Password=$$Prod-GalleryDBReadOnly-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
10+
},
11+
12+
"StatisticsDb": {
13+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.StatisticsDatabaseAddress};Initial Catalog=nuget-prod-statistics;User ID=$$Prod-StatisticsDBReadOnly-UserName$$;Password=$$Prod-StatisticsDBReadOnly-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
14+
},
15+
16+
"KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",
17+
"KeyVault_ClientId": "#{Deployment.Azure.KeyVault.ClientId}",
18+
"KeyVault_CertificateThumbprint": "#{Deployment.Azure.KeyVault.CertificateThumbprint}",
19+
"KeyVault_ValidateCertificate": true,
20+
"KeyVault_StoreName": "My",
21+
"KeyVault_StoreLocation": "LocalMachine"
22+
}

0 commit comments

Comments
 (0)