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

Commit a5e602c

Browse files
author
Christy Henriksson
authored
Merge pull request #559 from NuGet/dev
[ReleasePrep][2018.09.19]RI of dev into master
2 parents ea79312 + cca50ac commit a5e602c

29 files changed

Lines changed: 44 additions & 43 deletions

File tree

‎src/ArchivePackages/Settings/int.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77

88
"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"
9+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=nuget-int-0-v2gallery;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=ArchivePackages;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.GalleryDbReader.ClientId};AadCertificate=$$int-gallerydb-reader$$"
1010
},
1111

1212
"KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",

‎src/ArchivePackages/Settings/prod.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77

88
"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;"
9+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=NuGetGallery;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=ArchivePackages;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.GalleryDbReader.ClientId};AadCertificate=$$prod-gallerydb-reader$$"
1010
},
1111

1212
"KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",

‎src/Gallery.CredentialExpiration/Settings/int.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313

1414
"GalleryDb": {
15-
"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;"
15+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=nuget-int-0-v2gallery;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=Gallery.CredentialExpiration;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.GalleryDbReader.ClientId};AadCertificate=$$int-gallerydb-reader$$"
1616
},
1717

1818
"KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",

‎src/Gallery.CredentialExpiration/Settings/prod.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313

1414
"GalleryDb": {
15-
"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;"
15+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=NuGetGallery;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=Gallery.CredentialExpiration;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.GalleryDbReader.ClientId};AadCertificate=$$prod-gallerydb-reader$$"
1616
},
1717

1818
"KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",

‎src/Gallery.Maintenance/Settings/int.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"GalleryDb": {
3-
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=nuget-int-0-v2gallery;User ID=$$Int-GalleryDBWriter-UserName$$;Password=$$Int-GalleryDBWriter-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
3+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=nuget-int-0-v2gallery;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=Gallery.Maintenance;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.GalleryDbWriter.ClientId};AadCertificate=$$int-gallerydb-writer$$"
44
},
55

66
"KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",

‎src/Gallery.Maintenance/Settings/prod.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"GalleryDb": {
3-
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=NuGetGallery;User ID=$$Prod-GalleryDBWriter-UserName$$;Password=$$Prod-GalleryDBWriter-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
3+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=NuGetGallery;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=Gallery.Maintenance;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.GalleryDbWriter.ClientId};AadCertificate=$$prod-gallerydb-writer$$"
44
},
55

66
"KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",

‎src/NuGet.SupportRequests.Notifications/Settings/dev.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88

99
"SupportRequestDb": {
10-
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.SupportRequestDatabaseAddress};Initial Catalog=nuget-dev-supportrequest;User ID=$$Dev-SupportRequestDBWriter-UserName$$;Password=$$Dev-SupportRequestDBWriter-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
10+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.SupportRequestDatabaseAddress};Initial Catalog=nuget-dev-supportrequest;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=SupportRequests.Notifications;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.SupportDbReader.ClientId};AadCertificate=$$dev-supportdb-reader$$"
1111
},
1212

1313
"KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",

‎src/NuGet.SupportRequests.Notifications/Settings/int.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88

99
"SupportRequestDb": {
10-
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.SupportRequestDatabaseAddress};Initial Catalog=nuget-int-supportrequest;User ID=$$Int-SupportRequestDBWriter-UserName$$;Password=$$Int-SupportRequestDBWriter-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
10+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.SupportRequestDatabaseAddress};Initial Catalog=nuget-int-supportrequest;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=SupportRequests.Notifications;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.SupportDbReader.ClientId};AadCertificate=$$int-supportdb-reader$$"
1111
},
1212

1313
"KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",

‎src/NuGet.SupportRequests.Notifications/Settings/prod.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88

99
"SupportRequestDb": {
10-
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.SupportRequestDatabaseAddress};Initial Catalog=nuget-prod-supportrequest;User ID=$$Prod-SupportRequestDBReadOnly-UserName$$;Password=$$Prod-SupportRequestDBReadOnly-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
10+
"ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.SupportRequestDatabaseAddress};Initial Catalog=nuget-prod-supportrequest;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=SupportRequests.Notifications;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.SupportDbReader.ClientId};AadCertificate=$$prod-supportdb-reader$$"
1111
},
1212

1313
"KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",

‎src/PackageLagMonitor/Job.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public override void Init(IServiceContainer serviceContainer, IDictionary<string
4848
_serviceProvider = GetServiceProvider(GetConfigurationRoot(configurationFilename));
4949

5050
_configuration = _serviceProvider.GetService<PackageLagMonitorConfiguration>();
51-
_azureManagementApiWrapper = _serviceProvider.GetService<AzureManagementAPIWrapper>();
51+
_azureManagementApiWrapper = _serviceProvider.GetService<IAzureManagementAPIWrapper>();
5252
_catalogClient = _serviceProvider.GetService<CatalogClient>();
5353
_httpClient = _serviceProvider.GetService<HttpClient>();
5454
_searchServiceClient = _serviceProvider.GetService<ISearchServiceClient>();
@@ -97,6 +97,7 @@ private void ConfigureLibraries(IServiceCollection services)
9797
private void ConfigureJobServices(IServiceCollection services, IConfigurationRoot configurationRoot)
9898
{
9999
services.Configure<PackageLagMonitorConfiguration>(configurationRoot.GetSection(MonitorConfigurationSectionName));
100+
services.Configure<SearchServiceConfiguration>(configurationRoot.GetSection(MonitorConfigurationSectionName));
100101
services.Configure<AzureManagementAPIWrapperConfiguration>(configurationRoot.GetSection(AzureManagementSectionName));
101102

102103
services.AddSingleton(p =>
@@ -122,7 +123,7 @@ private void ConfigureJobServices(IServiceCollection services, IConfigurationRoo
122123
services.AddTransient<IAzureManagementAPIWrapperConfiguration>(p => p.GetService<IOptionsSnapshot<AzureManagementAPIWrapperConfiguration>>().Value);
123124
services.AddTransient<PackageLagMonitorConfiguration>(p => p.GetService<IOptionsSnapshot<PackageLagMonitorConfiguration>>().Value);
124125
services.AddSingleton<CatalogClient>();
125-
services.AddSingleton<AzureManagementAPIWrapper>();
126+
services.AddSingleton<IAzureManagementAPIWrapper, AzureManagementAPIWrapper>();
126127
services.AddTransient<ISearchServiceClient, SearchServiceClient>();
127128
}
128129

0 commit comments

Comments
 (0)