author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
455,776 | 20.02.2019 20:19:08 | 0 | 6b081e4ff89ef8785e00d1963a62e9c6f3904c17 | Improve implementation of "Skip To Content" link | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common.js",
"diff": "nuget.configureFileInputButton = function (id) {\n// File input buttons should respond to keyboard events.\n$(\"#\" + id).on(\"keypress\", function (e) {\n- var code = (e.keyCode || e.which);\n- var isInteract = (code == 13 /*enter*/ || code == 32 /*space*/) && !e.altKey && !e.ctrlKey && !e.metaKey && !e.shiftKey;\n+ var code = e.keyCode || e.which;\n+ var isInteract = (code === 13 /*enter*/ || code === 32 /*space*/) && !e.altKey && !e.ctrlKey && !e.metaKey && !e.shiftKey;\nif (isInteract) {\n$(this).click();\n}\n});\n- }\n-\n- nuget.canElementBeTabbedTo = function (element) {\n- var isElement = function (type) {\n- return element.is(type);\n- }\n-\n- var hasAttribute = function (attributeName) {\n- var attribute = element.attr(attributeName);\n- return typeof attribute !== typeof undefined && attribute !== false;\n- }\n+ };\n- if (hasAttribute(\"tabindex\")) {\n- // Elements that have had their tabindex set to -1 cannot be tabbed to.\n- return element.attr(\"tabindex\") !== \"-1\";\n+ nuget.canElementBeFocused = function (element) {\n+ element = $(element);\n+ if (!element.is(':visible')) {\n+ return false;\n}\n// See https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Content_categories#Interactive_content\nvar alwaysInteractiveElements = ['a', 'button', 'details', 'embed', 'iframe', 'keygen', 'label', 'select', 'textarea'];\nvar i;\nfor (i = 0; i < alwaysInteractiveElements.length; i++) {\n- if (isElement(alwaysInteractiveElements[i])) {\n+ if (element.is(alwaysInteractiveElements[i])) {\nreturn true;\n}\n}\n- return ((isElement(\"audio\") && hasAttribute(\"controls\")) ||\n- (isElement(\"img\") && hasAttribute(\"usemap\")) ||\n- (isElement(\"input\") && element.attr(\"type\") !== \"hidden\") ||\n- (isElement(\"menu\") && element.attr(\"type\") !== \"toolbar\") ||\n- (isElement(\"object\") && hasAttribute(\"usemap\")) ||\n- (isElement(\"video\") && hasAttribute(\"controls\")));\n- }\n-\n- nuget.getFirstChildThatCanBeTabbedTo = function (element) {\n- if (window.nuget.canElementBeTabbedTo(element)) {\n- return element;\n- }\n-\n- // If an element has its tabindex set to -1, none of its children can be tabbed to.\n- if (element.attr(\"tabindex\") === \"-1\") {\n- return null;\n- }\n-\n- var i;\n- var children = element.children();\n- for (i = 0; i < children.length; i++) {\n- var child = children.eq(i);\n- if (window.nuget.canElementBeTabbedTo(child)) {\n- return child;\n- }\n-\n- var childChild = window.nuget.getFirstChildThatCanBeTabbedTo(child);\n- if (childChild !== null) {\n- return childChild;\n- }\n- }\n+ return element.is(\"audio\") && !!element.attr(\"controls\") ||\n+ element.is(\"img\") && !!element.attr(\"usemap\") ||\n+ element.is(\"input\") && element.attr(\"type\") !== \"hidden\" ||\n+ element.is(\"menu\") && element.attr(\"type\") !== \"toolbar\" ||\n+ element.is(\"object\") && !!element.attr(\"usemap\") ||\n+ element.is(\"video\") && !!element.attr(\"controls\");\n+ };\n- return null;\n- }\n+ nuget.canElementBeTabbedTo = function (element) {\n+ return window.nuget.canElementBeFocused(element) && $(element).attr('tabindex') !== \"-1\";\n+ };\n// Source: https://stackoverflow.com/a/27568129/52749\n// Detects whether SVG is supported in the browser.\nvar $field = $(\"#AntiForgeryForm input[name=__RequestVerificationToken]\");\nif (data instanceof FormData)\n{\n- data.append($tokenKey, $field.val())\n+ data.append($tokenKey, $field.val());\n}\nelse\n{\n}\nreturn stringToFormat;\n- }\n+ };\nwindow.nuget = nuget;\n+ jQuery.extend(jQuery.expr[':'], {\n+ focusable: window.nuget.canElementBeFocused,\n+ tabbable: window.nuget.canElementBeTabbedTo\n+ });\n+\ninitializeJQueryValidator();\n$(function () {\n});\n$(document).on('keydown', function (e) {\n- var code = (e.keyCode || e.which);\n+ var code = e.keyCode || e.which;\nvar isValidInputCharacter =\n- ((code >= 48 && code <= 57) // numbers 0-9\n- || (code >= 64 && code <= 90) // letters a-z\n- || (code >= 96 && code <= 111) // numpad\n- || (code >= 186 && code <= 192) // ; = , - . / `\n- || (code >= 219 && code <= 222)) // [\\ ] '\n+ (code >= 48 && code <= 57 // numbers 0-9\n+ || code >= 64 && code <= 90 // letters a-z\n+ || code >= 96 && code <= 111 // numpad\n+ || code >= 186 && code <= 192 // ; = , - . / `\n+ || code >= 219 && code <= 222) // [\\ ] '\n&& !e.altKey && !e.ctrlKey && !e.metaKey;\n- if (isValidInputCharacter && document.activeElement == document.body) {\n+ if (isValidInputCharacter && document.activeElement === document.body) {\nvar searchbox = $(\"#search\");\nsearchbox.focus();\nvar currInput = searchbox.val();\n$(\"#skipToContent\").on('click', function () {\n// Focus on the first element that can be tabbed to inside the \"skippedToContent\" element.\nvar skippedToContent = $(\"#skippedToContent\");\n- var firstChildThatCanBeTabbedTo = window.nuget.getFirstChildThatCanBeTabbedTo(skippedToContent.first());\n+ var firstChildThatCanBeTabbedTo = skippedToContent.find(':tabbable').first();\nif (firstChildThatCanBeTabbedTo !== null) {\nfirstChildThatCanBeTabbedTo.focus();\n} else {\n});\n});\n}());\n-\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Improve implementation of "Skip To Content" link (#6906) |
455,736 | 25.02.2019 14:25:11 | 28,800 | 5276638fccf406a30f126bf8845dccc75045f0f4 | Remove Atom feed functional tests that depend on 3rd party package
This behavior is asserted by unit tests so a functional test is not strictly necessary | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/AtomFeed/AtomFeedTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/AtomFeed/AtomFeedTests.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n-using System.Linq;\nusing System.Net;\nusing System.Net.Http;\nusing System.ServiceModel.Syndication;\nusing System.Threading.Tasks;\nusing System.Xml;\n-using NuGet.Versioning;\nusing Xunit;\nusing Xunit.Abstractions;\n@@ -47,63 +45,6 @@ public async Task IsParsableForAvailablePackage()\n}\n}\n- [Theory]\n- [Priority(2)]\n- [Category(\"P2Tests\")]\n- [InlineData(false)]\n- [InlineData(true)]\n- public async Task ObservesPrerelParameter(bool prerel)\n- {\n- // Arrange\n- var feedUrl = new Uri(new Uri(UrlHelper.BaseUrl), $\"/packages/Newtonsoft.Json/atom.xml?prerel={prerel}\");\n-\n- // Act\n- using (var httpClient = new HttpClient())\n- using (var response = await httpClient.GetAsync(feedUrl))\n- {\n- // Assert\n- var feed = await ReadFeedAsync(response);\n- foreach (var item in feed.Items)\n- {\n- var version = item.Title.Text.Split(' ').Last();\n- Assert.True(NuGetVersion.TryParse(version, out var parsedVersion), $\"The version '{version}' is not parsable.\");\n- if (!prerel)\n- {\n- Assert.False(parsedVersion.IsPrerelease, $\"The version '{version}' should not be included since it is prerelease.\");\n- }\n- }\n- }\n- }\n-\n- [Fact]\n- [Priority(2)]\n- [Category(\"P2Tests\")]\n- public async Task DefaultsToIncludingPrerel()\n- {\n- // Arrange\n- var feedUrl = new Uri(new Uri(UrlHelper.BaseUrl), $\"/packages/Newtonsoft.Json/atom.xml\");\n-\n- // Act\n- using (var httpClient = new HttpClient())\n- using (var response = await httpClient.GetAsync(feedUrl))\n- {\n- // Assert\n- var feed = await ReadFeedAsync(response);\n- var prerelCount = 0;\n- foreach (var item in feed.Items)\n- {\n- var version = item.Title.Text.Split(' ').Last();\n- Assert.True(NuGetVersion.TryParse(version, out var parsedVersion), $\"The version '{version}' is not parsable.\");\n- if (parsedVersion.IsPrerelease)\n- {\n- prerelCount++;\n- }\n- }\n-\n- Assert.InRange(prerelCount, 1, feed.Items.Count());\n- }\n- }\n-\n[Fact]\n[Priority(2)]\n[Category(\"P2Tests\")]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Remove Atom feed functional tests that depend on 3rd party package (#6929)
This behavior is asserted by unit tests so a functional test is not strictly necessary |
455,736 | 22.02.2019 17:04:04 | 28,800 | 939eaa89ade992d0b4378f2a0daaf5e38f700f2f | Add functional tests for different bad requests
Progress on | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj",
"new_path": "tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj",
"diff": "<Compile Include=\"AtomFeed\\AtomFeedTests.cs\" />\n<Compile Include=\"Commandline\\NuGetCommandLineTests.cs\" />\n<Compile Include=\"Commandline\\NuGetCoreTests.cs\" />\n+ <Compile Include=\"ErrorHandling\\EndpointType.cs\" />\n+ <Compile Include=\"ErrorHandling\\ErrorHandlingTests.cs\" />\n+ <Compile Include=\"ErrorHandling\\Validator.cs\" />\n+ <Compile Include=\"ErrorHandling\\SimulatedErrorRequest.cs\" />\n+ <Compile Include=\"ErrorHandling\\SimulatedErrorType.cs\" />\n+ <Compile Include=\"ErrorHandling\\TestResponse.cs\" />\n<Compile Include=\"ODataFeeds\\CuratedFeedTest.cs\" />\n<Compile Include=\"ODataFeeds\\SearchTest.cs\" />\n<Compile Include=\"ODataFeeds\\V2FeedExtendedTests.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add functional tests for different bad requests (#6918)
Progress on https://github.com/NuGet/NuGetGallery/issues/6601 |
455,736 | 26.02.2019 09:19:12 | 28,800 | 9e8a48f4e39bedcc2d8bf092fbaa3fbca442ab6f | Site admins can see email address on profile page
This is currently already possible with the database admin view, but this makes it much more convenient.
Address | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1265,6 +1265,9 @@ img.reserved-indicator-icon {\n.page-profile .profile-details .statistics .statistic .description {\nfont-size: 24px;\n}\n+.page-profile .profile-details .additional-info {\n+ margin-top: 20px;\n+}\n.page-report-abuse .report-form #alreadycontactedowner-label {\ndisplay: inline;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-profile.less",
"new_path": "src/Bootstrap/less/theme/page-profile.less",
"diff": "}\n}\n}\n+\n+ .additional-info {\n+ margin-top: (@padding-large-vertical * 2);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"diff": "<div class=\"description\">Total @(Model.TotalPackageDownloadCount == 1 ? \"download\" : \"downloads\") of packages</div>\n</div>\n</div>\n+ @if (User.IsAdministrator())\n+ {\n+ <div class=\"additional-info\">\n+ <dl>\n+ <dt>Email Address:</dt>\n+ <dd>@Model.EmailAddress</dd>\n+ @if (Model.UnconfirmedEmailAddress != null)\n+ {\n+ <dt>Unconfirmed Email Address:</dt>\n+ <dd>@Model.UnconfirmedEmailAddress</dd>\n+ }\n+ </dl>\n+ </div>\n+ }\n</aside>\n<article class=\"col-md-9 col-md-pull-3\">\n<div class=\"profile-title\">\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Site admins can see email address on profile page (#6930)
This is currently already possible with the database admin view, but this makes it much more convenient.
Address https://github.com/NuGet/Engineering/issues/609 |
455,736 | 26.02.2019 10:10:59 | 28,800 | 91986c3e8abe91c6a895793087e27fc746cdf3f4 | Remove flaky download count assertion
Address | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/ClientSdkHelper.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/ClientSdkHelper.cs",
"diff": "@@ -575,37 +575,6 @@ public async Task VerifyVersionCountAsync(string packageId, int expectedVersionC\n}));\n}\n- /// <summary>\n- /// Returns the download count of the given package as a formatted string as it would appear in the gallery UI.\n- /// </summary>\n- public static string GetFormattedDownLoadStatistics(string packageId)\n- {\n- var formattedCount = GetDownLoadStatistics(packageId).ToString(\"N1\", CultureInfo.InvariantCulture);\n- if (formattedCount.EndsWith(\".0\"))\n- formattedCount = formattedCount.Remove(formattedCount.Length - 2);\n- return formattedCount;\n- }\n-\n- /// <summary>\n- /// Returns the download count of the given package.\n- /// </summary>\n- public static int GetDownLoadStatistics(string packageId)\n- {\n- var repo = PackageRepositoryFactory.Default.CreateRepository(SourceUrl);\n- var package = repo.FindPackage(packageId);\n- return package.DownloadCount;\n- }\n-\n- /// <summary>\n- /// Returns the download count of the specific version of the package.\n- /// </summary>\n- public static int GetDownLoadStatisticsForPackageVersion(string packageId, string packageVersion)\n- {\n- var repo = PackageRepositoryFactory.Default.CreateRepository(SourceUrl);\n- var package = repo.FindPackage(packageId, new NuGet.SemanticVersion(packageVersion));\n- return package.DownloadCount;\n- }\n-\n/// <summary>\n/// Searchs the gallery to get the packages matching the specific search term and returns their count.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.WebUITests.P1/BasicPages/PackagesPageTest.cs",
"new_path": "tests/NuGetGallery.WebUITests.P1/BasicPages/PackagesPageTest.cs",
"diff": "@@ -29,10 +29,6 @@ public override IEnumerator<WebTestRequest> GetRequestEnumerator()\nvar packageTitleValidationRule = AssertAndValidationHelper.GetValidationRuleForFindText(packageId + \" \" + ClientSdkHelper.GetLatestStableVersion(packageId));\npackagePageRequest.ValidateResponse += packageTitleValidationRule.Validate;\n- // Rule to check that the download count is present in the response.\n- var downloadCountValidationRule = AssertAndValidationHelper.GetValidationRuleForFindText(ClientSdkHelper.GetFormattedDownLoadStatistics(packageId));\n- packagePageRequest.ValidateResponse += downloadCountValidationRule.Validate;\n-\nyield return packagePageRequest;\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Remove flaky download count assertion (#6932)
Address https://github.com/NuGet/Engineering/issues/1952 |
455,751 | 04.03.2019 09:27:31 | 28,800 | cf4911e2a9ef534665e79d2c8e2743cdef2259cb | Add the feature flag for the GallerySearch
Add the feature flag for the Gallery Search | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs",
"new_path": "src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs",
"diff": "@@ -24,7 +24,8 @@ public class ExternalSearchService : ISearchService, IIndexingService, IRawSearc\nprivate static IEndpointHealthIndicatorStore _healthIndicatorStore;\n// Search client that will be deprecated. It is still needed to allow the feature flag until the new search implementation is enabled.\nprivate static ISearchClient _deprecatedSearchClient;\n- private ISearchClient _searchClient;\n+ private readonly ISearchClient _searchClient;\n+ private readonly IFeatureFlagService _featureFlagService;\nprivate JObject _diagCache;\n@@ -65,10 +66,11 @@ public ExternalSearchService()\n}\n}\n- public ExternalSearchService(IAppConfiguration config, IDiagnosticsService diagnostics, ISearchClient searchClient)\n+ public ExternalSearchService(IAppConfiguration config, IDiagnosticsService diagnostics, ISearchClient searchClient, IFeatureFlagService featureFlagService)\n{\nServiceUri = config.ServiceDiscoveryUri;\n_searchClient = searchClient ?? throw new ArgumentNullException(nameof(searchClient));\n+ _featureFlagService = featureFlagService ?? throw new ArgumentNullException(nameof(featureFlagService));\nTrace = diagnostics.SafeGetSource(\"ExternalSearchService\");\n@@ -330,7 +332,10 @@ internal static Package ReadPackage(JObject doc, string semVerLevel)\n/// It will return the client to use based on the feature flag.\n/// </summary>\n/// <returns>The search client in use. Used for the unit tests.</returns>\n- internal ISearchClient GetClient(){ return _deprecatedSearchClient; }\n+ internal ISearchClient GetClient()\n+ {\n+ return _featureFlagService.IsSearchCircuitBreakerEnabled() ? _searchClient : _deprecatedSearchClient;\n+ }\n// Bunch of no-ops to disable indexing because an external search service is doing that.\npublic void UpdateIndex()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Queries/AutocompleteServicePackageIdsQuery.cs",
"new_path": "src/NuGetGallery/Queries/AutocompleteServicePackageIdsQuery.cs",
"diff": "@@ -12,8 +12,8 @@ namespace NuGetGallery\npublic class AutocompleteServicePackageIdsQuery\n: AutocompleteServiceQuery, IAutocompletePackageIdsQuery\n{\n- public AutocompleteServicePackageIdsQuery(IAppConfiguration configuration, IResilientSearchClient resilientSearchClient)\n- : base(configuration, resilientSearchClient)\n+ public AutocompleteServicePackageIdsQuery(IAppConfiguration configuration, IResilientSearchClient resilientSearchClient, IFeatureFlagService featureFlagService)\n+ : base(configuration, resilientSearchClient, featureFlagService)\n{\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Queries/AutocompleteServicePackageVersionsQuery.cs",
"new_path": "src/NuGetGallery/Queries/AutocompleteServicePackageVersionsQuery.cs",
"diff": "@@ -12,8 +12,8 @@ namespace NuGetGallery\npublic class AutocompleteServicePackageVersionsQuery\n: AutocompleteServiceQuery, IAutocompletePackageVersionsQuery\n{\n- public AutocompleteServicePackageVersionsQuery(IAppConfiguration configuration, IResilientSearchClient resilientSearchClient)\n- : base(configuration, resilientSearchClient)\n+ public AutocompleteServicePackageVersionsQuery(IAppConfiguration configuration, IResilientSearchClient resilientSearchClient, IFeatureFlagService featureFlagService)\n+ : base(configuration, resilientSearchClient, featureFlagService)\n{\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Queries/AutocompleteServiceQuery.cs",
"new_path": "src/NuGetGallery/Queries/AutocompleteServiceQuery.cs",
"diff": "@@ -21,8 +21,9 @@ public class AutocompleteServiceQuery\nprivate readonly string _autocompleteServiceResourceType;\nprivate readonly RetryingHttpClientWrapper _httpClientToDeprecate;\nprivate readonly IResilientSearchClient _resilientSearchClient;\n+ private readonly IFeatureFlagService _featureFlagService;\n- public AutocompleteServiceQuery(IAppConfiguration configuration, IResilientSearchClient resilientSearchClient)\n+ public AutocompleteServiceQuery(IAppConfiguration configuration, IResilientSearchClient resilientSearchClient, IFeatureFlagService featureFlagService)\n{\nif (configuration == null)\n{\n@@ -33,6 +34,7 @@ public AutocompleteServiceQuery(IAppConfiguration configuration, IResilientSearc\n_autocompleteServiceResourceType = configuration.AutocompleteServiceResourceType;\n_httpClientToDeprecate = new RetryingHttpClientWrapper(new HttpClient(), QuietLog.LogHandledException);\n_resilientSearchClient = resilientSearchClient;\n+ _featureFlagService = featureFlagService ?? throw new ArgumentNullException(nameof(featureFlagService));\n}\npublic async Task<IEnumerable<string>> RunServiceQuery(\n@@ -41,8 +43,7 @@ public AutocompleteServiceQuery(IAppConfiguration configuration, IResilientSearc\nstring semVerLevel = null)\n{\nqueryString = BuildQueryString(queryString, includePrerelease, semVerLevel);\n- // This will be under the feature flag.\n- var result = await DeprecatedExecuteQuery(queryString);\n+ var result = _featureFlagService.IsSearchCircuitBreakerEnabled() ? await ExecuteQuery(queryString) : await DeprecatedExecuteQuery(queryString);\nvar resultObject = JObject.Parse(result);\nreturn resultObject[\"data\"].Select(entry => entry.ToString());\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/FeatureFlagService.cs",
"new_path": "src/NuGetGallery/Services/FeatureFlagService.cs",
"diff": "@@ -19,6 +19,7 @@ public class FeatureFlagService : IFeatureFlagService\nprivate const string PackagesAtomFeedFeatureName = GalleryPrefix + \"PackagesAtomFeed\";\nprivate const string ManageDeprecationFeatureName = GalleryPrefix + \"ManageDeprecation\";\n+ private const string SearchCircuitBreakerFeatureName = GalleryPrefix + \"SearchCircuitBreaker\";\nprivate readonly IFeatureFlagClient _client;\n@@ -51,5 +52,10 @@ private bool IsEnabled(string flight, User user, bool defaultValue)\n{\nreturn _client.IsEnabled(flight, user, defaultValue);\n}\n+\n+ public bool IsSearchCircuitBreakerEnabled()\n+ {\n+ return _client.IsEnabled(SearchCircuitBreakerFeatureName, defaultValue: false);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IFeatureFlagService.cs",
"new_path": "src/NuGetGallery/Services/IFeatureFlagService.cs",
"diff": "@@ -36,5 +36,11 @@ public interface IFeatureFlagService\n/// <param name=\"user\"></param>\n/// <returns></returns>\nbool IsManageDeprecationEnabled(User user);\n+\n+ /// <summary>\n+ /// Whether or not the search is using circuit breaker.\n+ /// </summary>\n+ /// <returns></returns>\n+ bool IsSearchCircuitBreakerEnabled();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/AutocompleteServicePackageIdsQueryFacts.cs",
"new_path": "tests/NuGetGallery.Facts/AutocompleteServicePackageIdsQueryFacts.cs",
"diff": "@@ -42,10 +42,16 @@ private IResilientSearchClient GetResilientSearchClient()\nreturn new ResilientSearchHttpClient(clients, GetLogger(), mockTelemetryService.Object);\n}\n+ private IFeatureFlagService GetFeatureFlagService()\n+ {\n+ var mockTelemetryService = new Mock<IFeatureFlagService>();\n+ return mockTelemetryService.Object;\n+ }\n+\n[Fact]\npublic async Task ExecuteReturns30ResultsForEmptyQuery()\n{\n- var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient());\n+ var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());\nvar result = await query.Execute(\"\", false);\nAssert.True(result.Count() == 30);\n}\n@@ -53,7 +59,7 @@ public async Task ExecuteReturns30ResultsForEmptyQuery()\n[Fact]\npublic async Task ExecuteReturns30ResultsForNullQuery()\n{\n- var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient());\n+ var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());\nvar result = await query.Execute(null, false);\nAssert.True(result.Count() == 30);\n}\n@@ -61,7 +67,7 @@ public async Task ExecuteReturns30ResultsForNullQuery()\n[Fact]\npublic async Task ExecuteReturnsResultsForSpecificQuery()\n{\n- var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient());\n+ var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());\nvar result = await query.Execute(\"jquery\", false);\nAssert.Contains(\"jquery\", result, StringComparer.OrdinalIgnoreCase);\n}\n@@ -74,7 +80,7 @@ public async Task ExecuteReturnsResultsForSpecificQuery()\npublic void PackageIdQueryBuildsCorrectQueryString(bool includePrerelease, string semVerLevel, string expectedQueryString)\n{\n// Arrange\n- var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient());\n+ var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());\n// Act\nvar actualQueryString = query.BuildQueryString(\"take=30&q=Json\", includePrerelease, semVerLevel);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/AutocompleteServicePackageVersionsQueryFacts.cs",
"new_path": "tests/NuGetGallery.Facts/AutocompleteServicePackageVersionsQueryFacts.cs",
"diff": "@@ -42,10 +42,16 @@ private IResilientSearchClient GetResilientSearchClient()\nreturn new ResilientSearchHttpClient(clients, GetLogger(), mockTelemetryService.Object);\n}\n+ private IFeatureFlagService GetFeatureFlagService()\n+ {\n+ var mockTelemetryService = new Mock<IFeatureFlagService>();\n+ return mockTelemetryService.Object;\n+ }\n+\n[Fact]\npublic async Task ExecuteThrowsForEmptyId()\n{\n- var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient());\n+ var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());\nawait Assert.ThrowsAsync<ArgumentNullException>(async () => await query.Execute(string.Empty, false));\n}\n@@ -53,7 +59,7 @@ public async Task ExecuteThrowsForEmptyId()\npublic async Task ExecuteReturnsResultsForSpecificQuery()\n{\n- var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient());\n+ var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());\nvar result = await query.Execute(\"newtonsoft.json\", false);\nAssert.True(result.Any());\n}\n@@ -66,7 +72,7 @@ public async Task ExecuteReturnsResultsForSpecificQuery()\npublic void PackageVersionsQueryBuildsCorrectQueryString(bool includePrerelease, string semVerLevel, string expectedQueryString)\n{\n// Arrange\n- var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient());\n+ var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());\n// Act\nvar actualQueryString = query.BuildQueryString(\"id=Newtonsoft.Json\", includePrerelease, semVerLevel);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/AutocompleteServiceQueryFacts.cs",
"new_path": "tests/NuGetGallery.Facts/AutocompleteServiceQueryFacts.cs",
"diff": "@@ -71,7 +71,9 @@ private TestAutocompleteServiceQuery(Uri baseAddress, string queryString)\nvar mockIResilientSearchClient = new Mock<IResilientSearchClient>();\nmockIResilientSearchClient.Setup(s => s.GetAsync(_autocompletePath, It.IsAny<string>())).ReturnsAsync(_responseMessage);\n- _instance = new AutocompleteServiceQuery(mockConfiguration.Object, mockIResilientSearchClient.Object);\n+ var mockTelemetryService = new Mock<IFeatureFlagService>();\n+\n+ _instance = new AutocompleteServiceQuery(mockConfiguration.Object, mockIResilientSearchClient.Object, mockTelemetryService.Object);\n}\nprivate static HttpResponseMessage GetResponseMessage(Uri uri, HttpStatusCode statusCode)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Infrastructure/Lucene/ExternalSearchServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Infrastructure/Lucene/ExternalSearchServiceFacts.cs",
"diff": "@@ -41,6 +41,13 @@ private ILogger<ResilientSearchHttpClient> GetLogger()\nreturn mockConfiguration.Object;\n}\n+ private IFeatureFlagService GetFeatureFlagService(bool circuitBreakerIsEnabled)\n+ {\n+ var mockTelemetryService = new Mock<IFeatureFlagService>();\n+ mockTelemetryService.Setup(c => c.IsSearchCircuitBreakerEnabled()).Returns(circuitBreakerIsEnabled);\n+ return mockTelemetryService.Object;\n+ }\n+\nprivate IResilientSearchClient GetResilientSearchClient(string path, string queryString)\n{\nvar content = new JObject(\n@@ -65,17 +72,19 @@ private ISearchClient GetSearchClient(string path, string queryString)\nreturn new GallerySearchClient(GetResilientSearchClient(path, queryString));\n}\n- [Fact]\n- public void ReturnsTheExpectedClient()\n+ [Theory]\n+ [InlineData(true, \"NuGetGallery.Infrastructure.Search.GallerySearchClient\")]\n+ [InlineData(false, \"NuGet.Services.Search.Client.SearchClient\")]\n+ public void ReturnsTheExpectedClient(bool circuitBreakerIsEnabled, string expected)\n{\n// Arrange\n- var service = new ExternalSearchService(GetConfiguration(), GetDiagnosticsService(), GetSearchClient(string.Empty, string.Empty));\n+ var service = new ExternalSearchService(GetConfiguration(), GetDiagnosticsService(), GetSearchClient(string.Empty, string.Empty), GetFeatureFlagService(circuitBreakerIsEnabled));\n// Act\nvar client = service.GetClient();\nvar clientType = client.GetType();\n- Assert.Equal(\"NuGet.Services.Search.Client.SearchClient\", clientType.FullName);\n+ Assert.Equal(expected, clientType.FullName);\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add the feature flag for the GallerySearch (#6947)
Add the feature flag for the Gallery Search |
455,776 | 04.03.2019 13:49:53 | 28,800 | 98475cd808d41bb896e6d2a9c2dc7efe3d4181a9 | Integrate Deprecate form with CVE/CWE autocomplete | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1154,7 +1154,20 @@ img.reserved-indicator-icon {\nwidth: 65px;\nmargin-right: 15px;\n}\n-.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-input {\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-item {\n+ padding: 10px;\n+}\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-item span {\n+ color: black;\n+ text-decoration: none;\n+}\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-item .security-detail-list-item-existing {\n+ color: #31708f;\n+}\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-item .security-detail-list-item-missing {\n+ color: #a94442;\n+}\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-item .security-detail-list-item-header {\ndisplay: -webkit-box;\ndisplay: -webkit-flex;\ndisplay: -ms-flexbox;\n@@ -1165,25 +1178,50 @@ img.reserved-indicator-icon {\n-ms-flex-pack: justify;\njustify-content: space-between;\n}\n-.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-input button {\n- margin-left: 15px;\n-}\n-.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list {\n- margin-top: 10px;\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-item .security-detail-list-item-description {\n+ margin-top: 5px;\n}\n-.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list .security-detail-list-item {\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-input {\ndisplay: -webkit-box;\ndisplay: -webkit-flex;\ndisplay: -ms-flexbox;\ndisplay: flex;\n- padding: 10px;\n- margin-top: 10px;\n-webkit-box-pack: justify;\n-webkit-justify-content: space-between;\n-ms-flex-pack: justify;\njustify-content: space-between;\n}\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-input .security-detail-list-autocomplete {\n+ position: relative;\n+ display: block;\n+ width: 100%;\n+}\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-input .security-detail-list-autocomplete .security-detail-list-autocomplete-content {\n+ position: absolute;\n+ z-index: 1;\n+ width: 100%;\n+ border-top: 0;\n+}\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-input .security-detail-list-autocomplete .security-detail-list-autocomplete-content .security-detail-list-item {\n+ overflow: hidden;\n+ text-overflow: ellipsis;\n+ white-space: nowrap;\n+}\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-input .security-detail-list-autocomplete .security-detail-list-autocomplete-content .security-detail-list-item:focus,\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-input .security-detail-list-autocomplete .security-detail-list-autocomplete-content .security-detail-list-item > :focus,\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-input .security-detail-list-autocomplete .security-detail-list-autocomplete-content .security-detail-list-item:hover {\n+ background-color: #f4f4f4;\n+}\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-input button {\n+ margin-left: 15px;\n+}\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list {\n+ margin-top: 10px;\n+}\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list .security-detail-list-item {\n+ margin-top: 10px;\n+}\n@media (max-width: 768px) {\n.page-manage-deprecation .deprecation-section .deprecation-subsection .alternate-package-container {\nmargin-top: 40px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-manage-deprecation.less",
"new_path": "src/Bootstrap/less/theme/page-manage-deprecation.less",
"diff": "}\n}\n+ .security-detail-list-item {\n+ padding: 10px;\n+\n+ span {\n+ text-decoration: none;\n+ color: black;\n+ }\n+\n+ .security-detail-list-item-existing {\n+ color: @state-info-text;\n+ }\n+\n+ .security-detail-list-item-missing {\n+ color: @state-danger-text;\n+ }\n+\n+ .security-detail-list-item-header {\n+ display: flex;\n+ justify-content: space-between;\n+ }\n+\n+ .security-detail-list-item-description {\n+ margin-top: 5px;\n+ }\n+ }\n+\n.security-detail-list-input {\ndisplay: flex;\njustify-content: space-between;\n+ .security-detail-list-autocomplete {\n+ width: 100%;\n+ position: relative;\n+ display: block;\n+\n+ .security-detail-list-autocomplete-content {\n+ position: absolute;\n+ z-index: 1;\n+ width: 100%;\n+ border-top: 0px;\n+\n+ .security-detail-list-item {\n+ overflow: hidden;\n+ text-overflow: ellipsis;\n+ white-space: nowrap;\n+\n+ &:focus, & > :focus, &:hover {\n+ background-color: @alert-info-bg;\n+ }\n+ }\n+ }\n+ }\n+\nbutton {\nmargin-left: 15px;\n}\nmargin-top: 10px;\n.security-detail-list-item {\n- display: flex;\n- justify-content: space-between;\n- padding: 10px;\nmargin-top: 10px;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs",
"diff": "@@ -45,7 +45,7 @@ public partial class ManageDeprecationJsonApiController\n[HttpGet]\n[UIAuthorize]\n- [ActionName(\"CveIds\")]\n+ [ActionName(ActionName.GetCveIds)]\npublic JsonResult GetCveIds(string query)\n{\n// Get CVE data.\n@@ -61,7 +61,7 @@ public JsonResult GetCveIds(string query)\n[HttpGet]\n[UIAuthorize]\n- [ActionName(\"CweIds\")]\n+ [ActionName(ActionName.GetCweIds)]\npublic JsonResult GetCweIds(string query)\n{\n// Get CWE data.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Reference Include=\"System.Xml\" />\n</ItemGroup>\n<ItemGroup>\n+ <Compile Include=\"ActionName.cs\" />\n<Compile Include=\"App_Start\\NuGetODataV2CuratedFeedConfig.cs\" />\n<Compile Include=\"App_Start\\NuGetODataV2FeedConfig.cs\" />\n<Compile Include=\"App_Start\\NuGetODataV1FeedConfig.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common-multi-select-dropdown.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common-multi-select-dropdown.js",
"diff": "@@ -19,42 +19,11 @@ function MultiSelectDropdown(items, singularItemTitle, pluralItemTitle) {\nself.dropdownOpen(!self.dropdownOpen());\n};\n- this.isAncestor = function (element, ancestorSelector) {\n- var $target = $(element);\n- // '.closest' returns the list of ancestors between this element and the selector.\n- // If the selector is not an ancestor of the element, it returns an empty list.\n- return !!$target.closest(ancestorSelector).length;\n- };\n-\n- this.isElementInsideDropdown = function (element) {\n- return self.isAncestor(element, self.dropdownSelector);\n- };\n-\n- // If the user clicks outside of the dropdown, close it.\n- $(document).click(function (event) {\n- if (!self.isElementInsideDropdown(event.target)) {\n- self.dropdownOpen(false);\n- }\n- });\n-\n- // If an element outside of the dropdown gains focus, close it.\n- $(document).focusin(function (event) {\n- if (!self.isElementInsideDropdown(event.target)) {\n- self.dropdownOpen(false);\n- }\n- });\n-\n- $(document).keydown(function (event) {\n- var target = event.target;\n- if (self.isElementInsideDropdown(target)) {\n- // If we press escape while focus is inside the dropdown, close it\n- if (event.which === 27) { // Escape key\n- self.dropdownOpen(false);\n- event.preventDefault();\n- $(self.dropdownBtnSelector).focus();\n- }\n- }\n- });\n+ window.nuget.configureDropdown(\n+ self.dropdownSelector,\n+ self.dropdownBtnSelector,\n+ self.dropdownOpen,\n+ false);\n// A filter to be applied to the items\nthis.filter = ko.observable('');\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common.js",
"diff": "return stringToFormat;\n};\n+ nuget.isAncestor = function (element, ancestorSelector) {\n+ var $target = $(element);\n+ // '.closest' returns the list of ancestors between this element and the selector.\n+ // If the selector is not an ancestor of the element, it returns an empty list.\n+ return !!$target.closest(ancestorSelector).length;\n+ };\n+\n+ nuget.configureDropdown = function (dropdownSelector, dropdownHeaderSelector, setDropdownOpen, openWhenFocused) {\n+ var isElementInsideDropdown = function (element) {\n+ return window.nuget.isAncestor(element, dropdownSelector);\n+ };\n+\n+ // If the user clicks outside the dropdown, close it\n+ $(document).click(function (event) {\n+ if (!isElementInsideDropdown(event.target)) {\n+ setDropdownOpen(false);\n+ }\n+ });\n+\n+ $(document).focusin(function (event) {\n+ var isInsideDropdown = isElementInsideDropdown(event.target);\n+ if (isInsideDropdown && openWhenFocused) {\n+ // If an element inside the dropdown gains focus, open the dropdown if configured to\n+ setDropdownOpen(true);\n+ } else if (!isInsideDropdown) {\n+ // If an element outside of the dropdown gains focus, close it\n+ setDropdownOpen(false);\n+ }\n+ });\n+\n+ $(document).keydown(function (event) {\n+ var target = event.target;\n+ if (isElementInsideDropdown(target)) {\n+ // If we press escape while focus is inside the dropdown, close it\n+ if (event.which === 27) { // Escape key\n+ setDropdownOpen(false);\n+ event.preventDefault();\n+ $(dropdownHeaderSelector).focus();\n+ }\n+ }\n+ });\n+ };\n+\nwindow.nuget = nuget;\njQuery.extend(jQuery.expr[':'], {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -784,6 +784,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to https://cve.mitre.org/cgi-bin/cvename.cgi?name={0}.\n+ /// </summary>\n+ public static string DeprecatePackage_CveUrlFormat {\n+ get {\n+ return ResourceManager.GetString(\"DeprecatePackage_CveUrlFormat\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to At least one CWE provided was not found!.\n/// </summary>\n@@ -793,6 +802,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to https://cwe.mitre.org/data/definitions/{0}.html.\n+ /// </summary>\n+ public static string DeprecatePackage_CweUrlFormat {\n+ get {\n+ return ResourceManager.GetString(\"DeprecatePackage_CweUrlFormat\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to You do not have permission to deprecate this package..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1130,4 +1130,12 @@ The {1} Team</value>\n<data name=\"DeprecatePackage_CweMissing\" xml:space=\"preserve\">\n<value>At least one CWE provided was not found!</value>\n</data>\n+ <data name=\"DeprecatePackage_CveUrlFormat\" xml:space=\"preserve\">\n+ <value>https://cve.mitre.org/cgi-bin/cvename.cgi?name={0}</value>\n+ <comment>{0} is the CVE's ID (e.g. CVE-2019-0001)</comment>\n+ </data>\n+ <data name=\"DeprecatePackage_CweUrlFormat\" xml:space=\"preserve\">\n+ <value>https://cwe.mitre.org/data/definitions/{0}.html</value>\n+ <comment>{0} is the CWE's ID number (e.g. CWE-999 has an ID number of 999)</comment>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlHelperExtensions.cs",
"new_path": "src/NuGetGallery/UrlHelperExtensions.cs",
"diff": "@@ -1019,13 +1019,41 @@ public static string RemovePackageOwner(this UrlHelper url, bool relativeUrl = t\nreturn GetActionLink(url, \"RemovePackageOwner\", \"JsonApi\", relativeUrl);\n}\n+ public static string GetDeprecationCveIds(\n+ this UrlHelper url,\n+ bool relativeUrl = true)\n+ {\n+ return url.GetDeprecationAction(\n+ ActionName.GetCveIds,\n+ relativeUrl);\n+ }\n+\n+ public static string GetDeprecationCweIds(\n+ this UrlHelper url,\n+ bool relativeUrl = true)\n+ {\n+ return url.GetDeprecationAction(\n+ ActionName.GetCweIds,\n+ relativeUrl);\n+ }\n+\npublic static string GetDeprecationAlternatePackageVersions(\nthis UrlHelper url,\nbool relativeUrl = true)\n+ {\n+ return url.GetDeprecationAction(\n+ nameof(ManageDeprecationJsonApiController.GetAlternatePackageVersions),\n+ relativeUrl);\n+ }\n+\n+ public static string GetDeprecationAction(\n+ this UrlHelper url,\n+ string actionName,\n+ bool relativeUrl = true)\n{\nreturn GetActionLink(\nurl,\n- nameof(ManageDeprecationJsonApiController.GetAlternatePackageVersions),\n+ actionName,\n\"ManageDeprecationJsonApi\",\nrelativeUrl);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ManagePackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ManagePackageViewModel.cs",
"diff": "@@ -101,6 +101,10 @@ public ManagePackageViewModel(Package package, User currentUser, IReadOnlyList<R\npublic Dictionary<string, VersionDeprecationState> VersionDeprecationStateDictionary { get; set; }\n+ /// <remarks>\n+ /// The schema of this class is shared with the client-side Javascript to share information about package listing state.\n+ /// The JS expects the exact naming of its properties. Do not change the naming without updating the JS.\n+ /// </remarks>\npublic class VersionListedState\n{\npublic VersionListedState(Package package)\n@@ -113,6 +117,10 @@ public VersionListedState(Package package)\npublic int DownloadCount { get; }\n}\n+ /// <remarks>\n+ /// The schema of this class is shared with the client-side Javascript to share information about package ReadMe state.\n+ /// The JS expects the exact naming of its properties. Do not change the naming without updating the JS.\n+ /// </remarks>\npublic class VersionReadMeState\n{\npublic VersionReadMeState(string submitUrl, string getReadMeUrl, string readMe)\n@@ -127,6 +135,10 @@ public VersionReadMeState(string submitUrl, string getReadMeUrl, string readMe)\npublic string ReadMe { get; }\n}\n+ /// <remarks>\n+ /// The schema of this class is shared with the client-side Javascript to share information about package deprecation state.\n+ /// The JS expects the exact naming of its properties. Do not change the naming without updating the JS.\n+ /// </remarks>\npublic class VersionDeprecationState\n{\npublic VersionDeprecationState(Package package, string text)\n@@ -140,9 +152,9 @@ public VersionDeprecationState(Package package, string text)\nIsLegacy = deprecation.Status.HasFlag(PackageDeprecationStatus.Legacy);\nIsOther = deprecation.Status.HasFlag(PackageDeprecationStatus.Other);\n- CveIds = deprecation.Cves?.Select(c => c.CveId).ToList();\n+ CveIds = deprecation.Cves?.Select(c => new VulnerabilityDetailState(c)).ToList();\nCvssRating = deprecation.CvssRating;\n- CweIds = deprecation.Cwes?.Select(c => c.CweId).ToList();\n+ CweIds = deprecation.Cwes?.Select(c => new VulnerabilityDetailState(c)).ToList();\n// A deprecation should not have both an alternate package registration and an alternate package.\n// In case a deprecation does have both, we will hide the alternate package registration's ID in this model.\n@@ -163,13 +175,45 @@ public VersionDeprecationState(Package package, string text)\npublic bool IsVulnerable { get; }\npublic bool IsLegacy { get; }\npublic bool IsOther { get; }\n- public IReadOnlyCollection<string> CveIds { get; }\n+ public IReadOnlyCollection<VulnerabilityDetailState> CveIds { get; }\npublic decimal? CvssRating { get; }\n- public IReadOnlyCollection<string> CweIds { get; }\n+ public IReadOnlyCollection<VulnerabilityDetailState> CweIds { get; }\npublic string AlternatePackageId { get; }\npublic string AlternatePackageVersion { get; }\npublic string CustomMessage { get; }\npublic bool ShouldUnlist { get; }\n+\n+ /// <remarks>\n+ /// Ideally, the fields of this class would be pascal-case.\n+ /// Unfortunately, however, the serializer that MVC uses interally (JavaScriptSerializer) does not support changing the serialized name of a property.\n+ /// The JS on the client-side depends on the exact naming of these fields, and it would add unnecessary complexity to do the conversion on the client-side.\n+ /// </remarks>\n+ public class VulnerabilityDetailState\n+ {\n+ public VulnerabilityDetailState(Cve cve)\n+ : this(cve.CveId, cve.Description)\n+ {\n+ cvss = cve.CvssRating;\n+ }\n+\n+ public VulnerabilityDetailState(Cwe cwe)\n+ : this (cwe.CweId, cwe.Description)\n+ {\n+ name = cwe.Name;\n+ }\n+\n+ private VulnerabilityDetailState(string id, string description)\n+ {\n+ this.id = id;\n+ this.description = description;\n+ }\n+\n+ public string id { get; }\n+ public string name { get; }\n+ public string description { get; }\n+ public decimal? cvss { get; }\n+ public bool fromAutocomplete => true;\n+ }\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/Manage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/Manage.cshtml",
"diff": "'@Model.Version',\n'@Url.DeprecatePackage()',\npackageUrl,\n- '@Url.GetDeprecationAlternatePackageVersions()');\n+ '@Url.GetDeprecationAlternatePackageVersions()',\n+ '@Strings.DeprecatePackage_CveUrlFormat',\n+ '@Url.GetDeprecationCveIds()',\n+ '@Strings.DeprecatePackage_CweUrlFormat',\n+ '@Url.GetDeprecationCweIds()');\n});\n</script>\[email protected](this)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ManageDeprecation.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ManageDeprecation.cshtml",
"diff": "<label class=\"security-detail-input-label\" data-bind=\"text: label\"></label>\n</div>\n<div class=\"security-detail-input security-detail-list-input\">\n- <input class=\"form-control\" name=\"addId\" type=\"text\" data-bind=\"textInput: addId, disable: !hasIds(), attr: { placeholder: placeholder, 'aria-label': label }, event: { keydown: addKeyDown }\" />\n- <button class=\"btn btn-primary\" data-bind=\"click: add, disable: !hasIds(), attr: { 'aria-label': addLabel }\">Add</button>\n+ <div class=\"security-detail-list-autocomplete\" data-bind=\"attr: { id: id + '-autocomplete' }\">\n+ <input class=\"form-control\" name=\"addId\" type=\"text\" data-bind=\"textInput: addId, disable: !hasIds(), attr: { placeholder: placeholder, 'aria-label': label }, event: { keydown: addWithoutAutocompleteKeyDown }\" />\n+ <div class=\"security-detail-list-autocomplete-content panel panel-default\" data-bind=\"foreach: autocompleteResults, visible: showAutocompleteResults\">\n+ <a class=\"icon-link\"\n+ href=\"#\"\n+ data-bind=\"click: $parent.addWithAutocomplete.bind($data), attr: { 'aria-label': 'Add ' + id }\">\n+ <div class=\"security-detail-list-item\">\n+ <span class=\"security-detail-list-item-existing\" data-bind=\"text: id\"></span>\n+ <span data-bind=\"visible: name\">\n+ - \n+ <span data-bind=\"text: name\"></span>\n+ </span>\n+ <span data-bind=\"visible: description\">\n+ - \n+ <span data-bind=\"text: description\"></span>\n+ </span>\n+ </div>\n+ </a>\n</div>\n+ </div>\n+ <button class=\"btn btn-primary\" data-bind=\"click: addWithoutAutocomplete, disable: !hasIds(), attr: { 'aria-label': addLabel }\">Add</button>\n+ </div>\n+\n+ <div data-bind=\"visible: addError\">\n+ @ViewHelpers.AlertDanger(@<text><span data-bind=\"text: addError\"></span></text>)\n+ </div>\n+\n<div class=\"security-detail-list\" data-bind=\"visible: $data, foreach: ids\">\n<div class=\"security-detail-list-item alert-info\">\n- <span data-bind=\"text: $data\"></span>\n+ <div class=\"security-detail-list-item-header\">\n+ <div>\n+ <a data-bind=\"text: id, attr: { href: $parent.getUrlFromId(id) }, css: { 'security-detail-list-item-existing': fromAutocomplete, 'security-detail-list-item-missing': !fromAutocomplete }\"></a>\n+ <span data-bind=\"visible: name || !fromAutocomplete\">\n+ - \n+ <span data-bind=\"visible: name, text: name\"></span>\n+ <i data-bind=\"visible: !fromAutocomplete, text: $parent.missingAutocompleteName\"></i>\n+ </span>\n+ </div>\n<a class=\"icon-link\"\nhref=\"#\"\n- data-bind=\"click: $parent.remove.bind($data), attr: { 'aria-label': 'Remove ' + $data }\">\n+ data-bind=\"click: $parent.remove.bind(id), attr: { 'aria-label': 'Remove ' + id }, clickBubble: false\">\n<i class=\"ms-Icon ms-Icon--Cancel\" aria-hidden=\"true\"></i>\n</a>\n</div>\n+ <div class=\"security-detail-list-item-description\">\n+ <span data-bind=\"visible: description, text: description\"></span>\n+ <i data-bind=\"visible: !fromAutocomplete, text: $parent.missingAutocompleteDescription\"></i>\n+ </div>\n+ </div>\n</div>\n</div>\n</script>\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Integrate Deprecate form with CVE/CWE autocomplete (#6944) |
455,776 | 05.03.2019 11:21:28 | 28,800 | 935803e7114609aee71ea6e26fcd866933d5808a | Unlisting a package when deprecating it should update LastEdited | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageDeprecationService.cs",
"new_path": "src/NuGetGallery/Services/PackageDeprecationService.cs",
"diff": "@@ -15,15 +15,21 @@ public class PackageDeprecationService : IPackageDeprecationService\nprivate readonly IEntityRepository<PackageDeprecation> _deprecationRepository;\nprivate readonly IEntityRepository<Cve> _cveRepository;\nprivate readonly IEntityRepository<Cwe> _cweRepository;\n+ private readonly IPackageService _packageService;\n+ private readonly IIndexingService _indexingService;\npublic PackageDeprecationService(\nIEntityRepository<PackageDeprecation> deprecationRepository,\nIEntityRepository<Cve> cveRepository,\n- IEntityRepository<Cwe> cweRepository)\n+ IEntityRepository<Cwe> cweRepository,\n+ IPackageService packageService,\n+ IIndexingService indexingService)\n{\n_deprecationRepository = deprecationRepository ?? throw new ArgumentNullException(nameof(deprecationRepository));\n_cveRepository = cveRepository ?? throw new ArgumentNullException(nameof(cveRepository));\n_cweRepository = cweRepository ?? throw new ArgumentNullException(nameof(cweRepository));\n+ _packageService = packageService ?? throw new ArgumentNullException(nameof(packageService));\n+ _indexingService = indexingService ?? throw new ArgumentNullException(nameof(indexingService));\n}\npublic async Task UpdateDeprecation(\n@@ -101,7 +107,7 @@ public class PackageDeprecationService : IPackageDeprecationService\nif (shouldUnlist)\n{\n- package.Listed = false;\n+ await _packageService.MarkPackageUnlistedAsync(package, commitChanges: false);\n}\n}\n}\n@@ -116,6 +122,12 @@ public class PackageDeprecationService : IPackageDeprecationService\n}\nawait _deprecationRepository.CommitChangesAsync();\n+\n+ // Update the indexing of the packages we updated the deprecation information of.\n+ foreach (var package in packages)\n+ {\n+ _indexingService.UpdatePackage(package);\n+ }\n}\npublic async Task<IReadOnlyCollection<Cve>> GetOrCreateCvesByIdAsync(IEnumerable<string> ids, bool commitChanges)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageDeprecationServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageDeprecationServiceFacts.cs",
"diff": "@@ -77,8 +77,10 @@ public async Task ThrowsIfCwesNull()\nfalse));\n}\n- [Fact]\n- public async Task DeletesExistingDeprecationsIfStatusNotDeprecated()\n+ [Theory]\n+ [InlineData(false)]\n+ [InlineData(true)]\n+ public async Task DeletesExistingDeprecationsIfStatusNotDeprecated(bool shouldUnlist)\n{\n// Arrange\nvar packageWithDeprecation1 = new Package\n@@ -114,6 +116,20 @@ public async Task DeletesExistingDeprecationsIfStatusNotDeprecated()\n.Completes()\n.Verifiable();\n+ var packageService = GetMock<IPackageService>();\n+ var indexingService = GetMock<IIndexingService>();\n+ foreach (var package in packages)\n+ {\n+ // When deleting deprecations, packages should not be unlisted because the option is hidden in the UI.\n+ packageService\n+ .Setup(x => x.MarkPackageUnlistedAsync(package, false))\n+ .Throws<InvalidOperationException>();\n+\n+ indexingService\n+ .Setup(x => x.UpdatePackage(package))\n+ .Verifiable();\n+ }\n+\nvar service = Get<PackageDeprecationService>();\n// Act\n@@ -126,10 +142,11 @@ public async Task DeletesExistingDeprecationsIfStatusNotDeprecated()\nnull,\nnull,\nnull,\n- false);\n+ shouldUnlist);\n// Assert\ndeprecationRepository.Verify();\n+ indexingService.Verify();\nforeach (var package in packages)\n{\n@@ -143,22 +160,27 @@ public async Task DeletesExistingDeprecationsIfStatusNotDeprecated()\npublic async Task ReplacesExistingDeprecations(bool shouldUnlist)\n{\n// Arrange\n- var unlistedPackageWithoutDeprecation = new Package();\n+ var lastEdited = new DateTime(2019, 3, 4);\n+\n+ var unlistedPackageWithoutDeprecation = new Package\n+ {\n+ LastEdited = lastEdited\n+ };\nvar packageWithDeprecation1 = new Package\n{\n- Listed = true,\n- Deprecations = new List<PackageDeprecation> { new PackageDeprecation() }\n+ Deprecations = new List<PackageDeprecation> { new PackageDeprecation() },\n+ LastEdited = lastEdited\n};\nvar packageWithoutDeprecation1 = new Package\n{\n- Listed = true,\n+ LastEdited = lastEdited\n};\nvar packageWithDeprecation2 = new Package\n{\n- Listed = true,\n+ LastEdited = lastEdited,\nDeprecations = new List<PackageDeprecation>\n{\nnew PackageDeprecation\n@@ -176,12 +198,12 @@ public async Task ReplacesExistingDeprecations(bool shouldUnlist)\nvar packageWithoutDeprecation2 = new Package\n{\n- Listed = true,\n+ LastEdited = lastEdited\n};\nvar packageWithDeprecation3 = new Package\n{\n- Listed = true,\n+ LastEdited = lastEdited,\nDeprecations = new List<PackageDeprecation>\n{\nnew PackageDeprecation\n@@ -221,6 +243,30 @@ public async Task ReplacesExistingDeprecations(bool shouldUnlist)\n.Completes()\n.Verifiable();\n+ var packageService = GetMock<IPackageService>();\n+ var indexingService = GetMock<IIndexingService>();\n+ foreach (var package in packages)\n+ {\n+ var unlistPackageSetup = packageService\n+ .Setup(x => x.MarkPackageUnlistedAsync(package, false));\n+\n+ if (shouldUnlist)\n+ {\n+ unlistPackageSetup\n+ .Completes()\n+ .Verifiable();\n+ }\n+ else\n+ {\n+ unlistPackageSetup\n+ .Throws<InvalidOperationException>();\n+ }\n+\n+ indexingService\n+ .Setup(x => x.UpdatePackage(package))\n+ .Verifiable();\n+ }\n+\nvar service = Get<PackageDeprecationService>();\nvar status = (PackageDeprecationStatus)99;\n@@ -272,6 +318,8 @@ public async Task ReplacesExistingDeprecations(bool shouldUnlist)\n// Assert\ndeprecationRepository.Verify();\n+ packageService.Verify();\n+ indexingService.Verify();\nforeach (var package in packages)\n{\n@@ -283,15 +331,6 @@ public async Task ReplacesExistingDeprecations(bool shouldUnlist)\nAssert.Equal(alternatePackageRegistration, deprecation.AlternatePackageRegistration);\nAssert.Equal(alternatePackage, deprecation.AlternatePackage);\nAssert.Equal(customMessage, deprecation.CustomMessage);\n-\n- if (shouldUnlist)\n- {\n- Assert.False(package.Listed);\n- }\n- else if (package != unlistedPackageWithoutDeprecation)\n- {\n- Assert.True(package.Listed);\n- }\n}\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Unlisting a package when deprecating it should update LastEdited (#6955) |
455,776 | 05.03.2019 12:08:37 | 28,800 | e428f5b6a5b6753b2eeba91b1e6feb543189e787 | Minor fixes to the GET DeleteSymbols endpoint | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1497,9 +1497,25 @@ public virtual async Task<ActionResult> Manage(string id, string version = null)\n[RequiresAccountConfirmation(\"delete a symbols package\")]\npublic virtual ActionResult DeleteSymbols(string id, string version)\n{\n- var package = _packageService.FindPackageByIdAndVersion(id, version, SemVerLevelKey.SemVer2);\n+ Package package = null;\n+\n+ // Load all versions of the package.\n+ var packages = _packageService.FindPackagesById(id);\n+ if (version != null)\n+ {\n+ // Try to find the exact version if it was specified.\n+ package = packages.SingleOrDefault(p => p.NormalizedVersion == NuGetVersionFormatter.Normalize(version));\n+ }\n+\nif (package == null)\n{\n+ // If the exact version was not found, fall back to the latest version.\n+ package = _packageService.FilterLatestPackage(packages, SemVerLevelKey.SemVer2, allowPrerelease: true);\n+ }\n+\n+ if (package == null)\n+ {\n+ // If the package has no versions, return not found.\nreturn HttpNotFound();\n}\n@@ -1511,26 +1527,19 @@ public virtual ActionResult DeleteSymbols(string id, string version)\nvar model = new DeletePackageViewModel(package, currentUser, DeleteReasons);\n- // Fetch all the available symbols package for all the versions from the\n- // database since the DisplayPackageViewModel(base class for DeletePackageViewModel) does not\n- // set the `LatestSymbolsPackage` data on the model(since it is an unnecessary and expensive db\n- // query). It is fine to do this here when invoking delete page. Note: this could also potentially\n- // cause unbounded(high number) db calls based on the number of versions associated with a package.\n- var packageViewModelsForAllAvailableSymbolsPackage = package\n- .PackageRegistration\n- .Packages\n+ // Fetch all versions of the package with symbols.\n+ var versionsWithSymbols = packages\n.Where(p => p.PackageStatusKey != PackageStatus.Deleted)\n- .Select(p => p.LatestSymbolPackage())\n- .Where(sp => sp != null && sp.StatusKey == PackageStatus.Available)\n- .Select(sp => new PackageViewModel(sp.Package));\n+ .Where(p => (p.LatestSymbolPackage()?.StatusKey ?? PackageStatus.Deleted) == PackageStatus.Available)\n+ .OrderByDescending(p => new NuGetVersion(p.Version));\n- model.VersionSelectList = new SelectList(\n- packageViewModelsForAllAvailableSymbolsPackage\n- .Select(pvm => new\n+ model.VersionSelectList = versionsWithSymbols\n+ .Select(versionWithSymbols => new SelectListItem\n{\n- text = pvm.NuGetVersion.ToFullString() + (pvm.LatestVersionSemVer2 ? \" (Latest)\" : string.Empty),\n- url = Url.DeleteSymbolsPackage(pvm)\n- }), \"url\", \"text\", Url.DeleteSymbolsPackage(model));\n+ Text = PackageHelper.GetSelectListText(versionWithSymbols),\n+ Value = Url.DeleteSymbolsPackage(new TrivialPackageVersionModel(versionWithSymbols)),\n+ Selected = package == versionWithSymbols\n+ });\nreturn View(model);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -2629,11 +2629,11 @@ public class TheManageMethodWithMissingVersion : TheManageMethodWithLatestVersio\n}\n}\n- public class TheDeleteSymbolsMethod : TestContainer\n+ public abstract class TheDeleteSymbolsMethod : TestContainer\n{\n- private string _packageId = \"CrestedGecko\";\n- private PackageRegistration _packageRegistration;\n- private Package _package;\n+ protected string _packageId = \"CrestedGecko\";\n+ protected PackageRegistration _packageRegistration;\n+ protected Package _package;\npublic TheDeleteSymbolsMethod()\n{\n@@ -2646,6 +2646,7 @@ public TheDeleteSymbolsMethod()\nKey = 2,\nPackageRegistration = _packageRegistration,\nVersion = \"1.0.0+metadata\",\n+ NormalizedVersion = \"1.0.0\",\nListed = true,\nIsLatestSemVer2 = true,\nHasReadMe = false,\n@@ -2656,6 +2657,7 @@ public TheDeleteSymbolsMethod()\nKey = 1,\nPackageRegistration = _packageRegistration,\nVersion = \"1.0.0-alpha\",\n+ NormalizedVersion = \"1.0.0-alpha\",\nIsLatest = true,\nIsLatestSemVer2 = true,\nListed = true,\n@@ -2672,7 +2674,14 @@ public TheDeleteSymbolsMethod()\n[Fact]\npublic void Returns404IfPackageNotFound()\n{\n- var controller = CreateController(GetConfigurationService());\n+ var packageService = new Mock<IPackageService>();\n+ packageService\n+ .Setup(x => x.FindPackagesById(_packageRegistration.Id, false))\n+ .Returns(new Package[0]);\n+\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ packageService: packageService);\nvar result = controller.DeleteSymbols(_packageRegistration.Id, _package.Version);\n@@ -2754,8 +2763,8 @@ public void DisplaysFullVersionStringAndUsesNormalizedVersionsInUrlsInSelectList\nforeach (var pkg in _packageRegistration.Packages)\n{\n- var valueField = controller.Url.DeleteSymbolsPackage(model);\n- var textField = model.NuGetVersion.ToFullString() + (pkg.IsLatestSemVer2 ? \" (Latest)\" : string.Empty);\n+ var valueField = controller.Url.DeleteSymbolsPackage(new TrivialPackageVersionModel(pkg));\n+ var textField = PackageHelper.GetSelectListText(pkg);\nvar selectListItem = model.VersionSelectList\n.SingleOrDefault(i => string.Equals(i.Text, textField) && string.Equals(i.Value, valueField));\n@@ -2766,30 +2775,13 @@ public void DisplaysFullVersionStringAndUsesNormalizedVersionsInUrlsInSelectList\n}\n}\n- [Fact]\n- public void WhenPackageRegistrationIsLockedReturnsLockedState()\n- {\n- // Arrange\n- var user = new User(\"Frodo\") { Key = 1 };\n- var packageRegistration = new PackageRegistration { Id = \"Foo\", IsLocked = true };\n- packageRegistration.Owners.Add(user);\n-\n- var package = new Package\n+ [Theory]\n+ [MemberData(nameof(Owner_Data))]\n+ public void WhenPackageRegistrationIsLockedReturnsLockedState(User currentUser, User owner)\n{\n- Key = 2,\n- PackageRegistration = packageRegistration,\n- Version = \"1.0.0+metadata\",\n- };\n-\n- var packageService = new Mock<IPackageService>(MockBehavior.Strict);\n- packageService.Setup(svc => svc.FindPackageByIdAndVersion(\"Foo\", \"1.0.0\", SemVerLevelKey.SemVer2, true))\n- .Returns(package);\n-\n- var controller = CreateController(GetConfigurationService(), packageService: packageService);\n- controller.SetCurrentUser(user);\n+ _packageRegistration.IsLocked = true;\n- // Act\n- var result = controller.DeleteSymbols(\"Foo\", \"1.0.0\");\n+ var result = GetDeleteSymbolsResult(currentUser, owner, out var controller);\n// Assert\nvar model = ResultAssert.IsView<DeletePackageViewModel>(result);\n@@ -2800,11 +2792,7 @@ private ActionResult GetDeleteSymbolsResult(User currentUser, User owner, out Pa\n{\n_packageRegistration.Owners.Add(owner);\n- var packageService = new Mock<IPackageService>(MockBehavior.Strict);\n- packageService\n- .Setup(svc => svc.FindPackageByIdAndVersion(_packageId, _package.Version, SemVerLevelKey.SemVer2, true))\n- .Returns(_package).Verifiable();\n-\n+ var packageService = CreatePackageService();\ncontroller = CreateController(\nGetConfigurationService(),\npackageService: packageService);\n@@ -2814,11 +2802,70 @@ private ActionResult GetDeleteSymbolsResult(User currentUser, User owner, out Pa\nRoutes.RegisterRoutes(routeCollection);\ncontroller.Url = new UrlHelper(controller.ControllerContext.RequestContext, routeCollection);\n- var result = controller.DeleteSymbols(_packageId, _package.Version);\n+ var result = InvokeDeleteSymbols(controller);\npackageService.Verify();\nreturn result;\n}\n+\n+ protected abstract Mock<IPackageService> CreatePackageService();\n+\n+ protected abstract ActionResult InvokeDeleteSymbols(PackagesController controller);\n+ }\n+\n+ public class TheDeleteSymbolsMethodWithExactVersion : TheDeleteSymbolsMethod\n+ {\n+ protected override Mock<IPackageService> CreatePackageService()\n+ {\n+ var packageService = new Mock<IPackageService>(MockBehavior.Strict);\n+ packageService\n+ .Setup(svc => svc.FindPackagesById(_packageId, false))\n+ .Returns(_packageRegistration.Packages.ToList())\n+ .Verifiable();\n+\n+ return packageService;\n+ }\n+\n+ protected override ActionResult InvokeDeleteSymbols(PackagesController controller)\n+ {\n+ return controller.DeleteSymbols(_packageId, _package.Version);\n+ }\n+ }\n+\n+ public abstract class TheDeleteSymbolsMethodThatFilters : TheDeleteSymbolsMethod\n+ {\n+ protected override Mock<IPackageService> CreatePackageService()\n+ {\n+ var packages = _packageRegistration.Packages.ToList();\n+ var packageService = new Mock<IPackageService>(MockBehavior.Strict);\n+ packageService\n+ .Setup(svc => svc.FindPackagesById(_packageId, false))\n+ .Returns(packages)\n+ .Verifiable();\n+\n+ packageService\n+ .Setup(svc => svc.FilterLatestPackage(packages, SemVerLevelKey.SemVer2, true))\n+ .Returns(_package)\n+ .Verifiable();\n+\n+ return packageService;\n+ }\n+ }\n+\n+ public class TheDeleteSymbolsMethodWithMissingVersion : TheDeleteSymbolsMethodThatFilters\n+ {\n+ protected override ActionResult InvokeDeleteSymbols(PackagesController controller)\n+ {\n+ return controller.DeleteSymbols(_packageId, \"missing\");\n+ }\n+ }\n+\n+ public class TheDeleteSymbolsMethodWithNullVersion : TheDeleteSymbolsMethodThatFilters\n+ {\n+ protected override ActionResult InvokeDeleteSymbols(PackagesController controller)\n+ {\n+ return controller.DeleteSymbols(_packageId, null);\n+ }\n}\npublic class TheDeleteSymbolsPackageMethod : TestContainer\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Minor fixes to the GET DeleteSymbols endpoint (#6937) |
455,776 | 05.03.2019 17:00:05 | 28,800 | 5c98bb04e95a4fd27e6d607f16139ce97269e537 | Improve deprecation information UI on Display Package page with multiple reasons | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -880,6 +880,7 @@ img.reserved-indicator-icon {\ndisplay: -webkit-flex;\ndisplay: -ms-flexbox;\ndisplay: flex;\n+ width: 100%;\nvertical-align: middle;\n-webkit-box-pack: justify;\n@@ -887,26 +888,26 @@ img.reserved-indicator-icon {\n-ms-flex-pack: justify;\njustify-content: space-between;\n}\n-.page-package-details .deprecation-container .deprecation-expander .deprecation-expander-icon-container {\n+.page-package-details .deprecation-container .deprecation-expander .deprecation-expander-container {\ndisplay: -webkit-box;\ndisplay: -webkit-flex;\ndisplay: -ms-flexbox;\ndisplay: flex;\n-\n- -webkit-box-align: center;\n- -webkit-align-items: center;\n- -ms-flex-align: center;\n- align-items: center;\n}\n-.page-package-details .deprecation-container .deprecation-expander .deprecation-expander-icon-container .deprecation-expander-icon {\n+.page-package-details .deprecation-container .deprecation-expander .deprecation-expander-container .deprecation-expander-icon {\nposition: unset;\ntop: unset;\n}\n-.page-package-details .deprecation-container .deprecation-expander .deprecation-expander-info-right {\n+.page-package-details .deprecation-container .deprecation-expander .deprecation-expander-container .deprecation-expander-info-right {\npadding-left: 15px;\n}\n+.page-package-details .deprecation-container .deprecation-expander .deprecation-expander-container .deprecation-expander-severity-rating {\n+ margin-left: 5px;\n+}\n.page-package-details .deprecation-container .deprecation-content-container {\n+ padding-top: 15px;\nmargin-top: 15px;\n+ border-top: 1px solid lightgray;\n}\n.page-package-details .deprecation-container .deprecation-content-container p {\nmargin-top: 5px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-display-package.less",
"new_path": "src/Bootstrap/less/theme/page-display-package.less",
"diff": "display: flex;\njustify-content: space-between;\nvertical-align: middle;\n+ width: 100%;\n- .deprecation-expander-icon-container {\n+ .deprecation-expander-container {\ndisplay: flex;\n- align-items: center;\n.deprecation-expander-icon {\nposition: unset;\ntop: unset;\n}\n- }\n.deprecation-expander-info-right {\npadding-left: 15px;\n}\n+\n+ .deprecation-expander-severity-rating {\n+ margin-left: 5px;\n+ }\n+ }\n}\n.deprecation-content-container {\nmargin-top: 15px;\n+ padding-top: 15px;\n+ border-top: 1px solid lightgray;\np {\nmargin-top: 5px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -52,9 +52,29 @@ public DisplayPackageViewModel(Package package, User currentUser, PackageDepreca\nDeprecationStatus = deprecation.Status;\nCveIds = deprecation.Cves?.Select(c => c.CveId).ToList();\n- CvssRating = deprecation.CvssRating;\nCweIds = deprecation.Cwes?.Select(c => c.CweId).ToList();\n+ if (deprecation.CvssRating.HasValue)\n+ {\n+ var cvssRating = deprecation.CvssRating.Value;\n+ if (cvssRating < 4)\n+ {\n+ Severity = \"Low\";\n+ }\n+ else if (cvssRating < 7)\n+ {\n+ Severity = \"Medium\";\n+ }\n+ else if (cvssRating < 9)\n+ {\n+ Severity = \"High\";\n+ }\n+ else\n+ {\n+ Severity = \"Critical\";\n+ }\n+ }\n+\nAlternatePackageId = deprecation.AlternatePackageRegistration?.Id;\nvar alternatePackage = deprecation.AlternatePackage;\n@@ -165,7 +185,7 @@ public bool HasNewerRelease\npublic PackageDeprecationStatus DeprecationStatus { get; set; }\npublic IReadOnlyCollection<string> CveIds { get; set; }\n- public decimal? CvssRating { get; set; }\n+ public string Severity { get; set; }\npublic IReadOnlyCollection<string> CweIds { get; set; }\npublic string AlternatePackageId { get; set; }\npublic string AlternatePackageVersion { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_DisplayPackageDeprecation.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_DisplayPackageDeprecation.cshtml",
"diff": "<div class=\"icon-text alert alert-warning\">\n<div id=\"show-deprecation-content-container\" class=\"deprecation-expander\" tabindex=\"0\" data-toggle=\"collapse\" data-target=\"#deprecation-content-container\" aria-expanded=\"false\" aria-controls=\"deprecation-content-container\" aria-labelledby=\"deprecation-container-label\">\n<div class=\"deprecation-expander\">\n- <div class=\"deprecation-expander-icon-container\">\n+ <div class=\"deprecation-expander-container\">\n<i class=\"deprecation-expander-icon ms-Icon ms-Icon--Warning\" aria-hidden=\"true\"></i>\n- </div>\n+ <div id=\"deprecation-container-label\" class=\"deprecation-expander-info-right\">\n@{\nvar isVulnerable = Model.DeprecationStatus.HasFlag(PackageDeprecationStatus.Vulnerable);\nvar isLegacy = Model.DeprecationStatus.HasFlag(PackageDeprecationStatus.Legacy);\n- var deprecationReasonString = string.Empty;\n- if (isVulnerable || isLegacy)\n- {\n- deprecationReasonString += \" because it \";\nif (isVulnerable)\n{\n- deprecationReasonString += \"has vulnerabilities\";\n- }\n+ @:This package has been deprecated due to <b>vulnerabilities</b>.\nif (isLegacy)\n{\n- if (isVulnerable)\n- {\n- deprecationReasonString += \" and \";\n- }\n-\n- deprecationReasonString += \"is no longer maintained by its owners\";\n- }\n- }\n- }\n- <div id=\"deprecation-container-label\" class=\"deprecation-expander-info-right\">This package has been deprecated@(deprecationReasonString).</div>\n- </div>\n-\n- <div class=\"deprecation-expander\">\n- @if (Model.CvssRating.HasValue)\n- {\n- string ratingString;\n- if (Model.CvssRating < 4)\n- {\n- ratingString = \"Low\";\n+ <br />\n+ @:This package is also <b>legacy</b> and is no longer maintained.\n}\n- else if (Model.CvssRating < 7)\n- {\n- ratingString = \"Medium\";\n}\n- else if (Model.CvssRating < 9)\n+ else if (isLegacy)\n{\n- ratingString = \"High\";\n+ @:This package has been deprecated because it is <b>legacy</b> and is no longer maintained.\n}\nelse\n{\n- ratingString = \"Critical\";\n+ @:This package has been deprecated.\n+ }\n}\n+ </div>\n+ </div>\n- <div class=\"deprecation-expander-info-right\">CVSS rating: <b>@ratingString</b></div>\n+ <div class=\"deprecation-expander-container\">\n+ @if (Model.Severity != null)\n+ {\n+ <div class=\"deprecation-expander-info-right deprecation-expander-container\">Severity: <b class=\"deprecation-expander-severity-rating\">@Model.Severity</b></div>\n}\n- <div class=\"deprecation-expander-icon-container\">\n<i id=\"deprecation-expander-icon-right\" class=\"deprecation-expander-icon deprecation-expander-info-right ms-Icon ms-Icon--ChevronDown\" aria-hidden=\"true\"></i>\n</div>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"diff": "@@ -736,9 +736,19 @@ public void ReturnsExpectedUser(Package package, User currentUser, string expect\n}\n}\n+ public enum SeverityString_State\n+ {\n+ None,\n+ Low,\n+ Medium,\n+ High,\n+ Critical\n+ }\n+\npublic static IEnumerable<object[]> DeprecationFieldsAreSetAsExpected_Data =\nMemberDataHelper.Combine(\nMemberDataHelper.FlagEnumDataSet<PackageDeprecationStatus>(),\n+ MemberDataHelper.EnumDataSet<SeverityString_State>(),\nMemberDataHelper.BooleanDataSet(),\nMemberDataHelper.BooleanDataSet(),\nMemberDataHelper.BooleanDataSet(),\n@@ -748,16 +758,39 @@ public void ReturnsExpectedUser(Package package, User currentUser, string expect\n[MemberData(nameof(DeprecationFieldsAreSetAsExpected_Data))]\npublic void DeprecationFieldsAreSetAsExpected(\nPackageDeprecationStatus status,\n+ SeverityString_State severity,\nbool hasCves,\nbool hasCwes,\nbool hasAlternateRegistration,\nbool hasAlternatePackage)\n{\n// Arrange\n+ decimal? cvss;\n+ switch (severity)\n+ {\n+ case SeverityString_State.Critical:\n+ cvss = (decimal)9.5;\n+ break;\n+ case SeverityString_State.High:\n+ cvss = (decimal)7.5;\n+ break;\n+ case SeverityString_State.Medium:\n+ cvss = (decimal)5;\n+ break;\n+ case SeverityString_State.Low:\n+ cvss = (decimal)2;\n+ break;\n+ case SeverityString_State.None:\n+ cvss = null;\n+ break;\n+ default:\n+ throw new ArgumentOutOfRangeException(nameof(severity));\n+ }\n+\nvar deprecation = new PackageDeprecation\n{\nStatus = status,\n- CvssRating = (decimal)5.5,\n+ CvssRating = cvss,\nCustomMessage = \"hello\"\n};\n@@ -825,9 +858,32 @@ public void ReturnsExpectedUser(Package package, User currentUser, string expect\n// Assert\nAssert.Equal(status, model.DeprecationStatus);\n- Assert.Equal(deprecation.CvssRating, model.CvssRating);\nAssert.Equal(deprecation.CustomMessage, model.CustomMessage);\n+ string expectedString;\n+ switch (severity)\n+ {\n+ case SeverityString_State.Critical:\n+ expectedString = \"Critical\";\n+ break;\n+ case SeverityString_State.High:\n+ expectedString = \"High\";\n+ break;\n+ case SeverityString_State.Medium:\n+ expectedString = \"Medium\";\n+ break;\n+ case SeverityString_State.Low:\n+ expectedString = \"Low\";\n+ break;\n+ case SeverityString_State.None:\n+ expectedString = null;\n+ break;\n+ default:\n+ throw new ArgumentOutOfRangeException(nameof(severity));\n+ }\n+\n+ Assert.Equal(expectedString, model.Severity);\n+\nif (hasCves)\n{\nAssert.Equal(cveIds, model.CveIds);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Improve deprecation information UI on Display Package page with multiple reasons (#6961) |
455,776 | 05.03.2019 17:00:24 | 28,800 | 28aa4257002dee19765042951657eeee1e5a970b | Remove unlist checkbox from Manage Deprecation form | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1194,6 +1194,9 @@ img.reserved-indicator-icon {\nwidth: 65px;\nmargin-right: 15px;\n}\n+.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-input .cvss-bold {\n+ font-weight: bold;\n+}\n.page-manage-deprecation .deprecation-section .deprecation-subsection .security-detail .security-detail-list-item {\npadding: 10px;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-manage-deprecation.less",
"new_path": "src/Bootstrap/less/theme/page-manage-deprecation.less",
"diff": "width: 65px;\nmargin-right: 15px;\n}\n+\n+ .cvss-bold {\n+ font-weight: bold;\n+ }\n}\n.security-detail-list-item {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs",
"diff": "@@ -105,8 +105,7 @@ public virtual JsonResult GetAlternatePackageVersions(string id)\nIEnumerable<string> cweIds,\nstring alternatePackageId,\nstring alternatePackageVersion,\n- string customMessage,\n- bool shouldUnlist)\n+ string customMessage)\n{\nvar currentUser = GetCurrentUser();\nif (!_featureFlagService.IsManageDeprecationEnabled(GetCurrentUser()))\n@@ -248,8 +247,7 @@ public virtual JsonResult GetAlternatePackageVersions(string id)\ncwes,\nalternatePackageRegistration,\nalternatePackage,\n- customMessage,\n- shouldUnlist);\n+ customMessage);\nreturn Json(HttpStatusCode.OK);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-deprecation.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-deprecation.js",
"diff": "@@ -462,9 +462,6 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\n// The custom message to submit with the form.\nthis.customMessage = ko.observable('');\n- // Whether or not the packages should be unlisted.\n- this.shouldUnlist = ko.observable(true);\n-\nthis.submitError = ko.observable();\nthis.submit = function () {\nself.submitError(null);\n@@ -489,8 +486,7 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\ncweIds: self.cwes.exportIds(),\nalternatePackageId: self.alternatePackageId(),\nalternatePackageVersion: self.alternatePackageVersion(),\n- customMessage: self.customMessage(),\n- shouldUnlist: self.shouldUnlist()\n+ customMessage: self.customMessage()\n}),\nsuccess: function () {\nwindow.location.href = packageUrl;\n@@ -522,7 +518,6 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\nversionData.AlternatePackageId = self.alternatePackageId();\nversionData.AlternatePackageVersion = self.alternatePackageVersion();\nversionData.CustomMessage = self.customMessage();\n- versionData.ShouldUnlist = self.shouldUnlist();\n};\nvar loadDeprecationFormState = function (version) {\n@@ -549,7 +544,6 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\n}\nself.customMessage(versionData.CustomMessage);\n- self.shouldUnlist(versionData.ShouldUnlist);\n};\n// When the chosen versions are changed, remember the contents of the form in case the user navigates back to this version.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IPackageDeprecationService.cs",
"new_path": "src/NuGetGallery/Services/IPackageDeprecationService.cs",
"diff": "@@ -24,8 +24,7 @@ public interface IPackageDeprecationService\nIReadOnlyCollection<Cwe> cwe,\nPackageRegistration alternatePackageRegistration,\nPackage alternatePackage,\n- string customMessage,\n- bool shouldUnlist);\n+ string customMessage);\n/// <summary>\n/// Fetches all <see cref=\"Cve\"/>s with a <see cref=\"Cve.CveId\"/> contained in <paramref name=\"ids\"/>.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageDeprecationService.cs",
"new_path": "src/NuGetGallery/Services/PackageDeprecationService.cs",
"diff": "@@ -15,21 +15,15 @@ public class PackageDeprecationService : IPackageDeprecationService\nprivate readonly IEntityRepository<PackageDeprecation> _deprecationRepository;\nprivate readonly IEntityRepository<Cve> _cveRepository;\nprivate readonly IEntityRepository<Cwe> _cweRepository;\n- private readonly IPackageService _packageService;\n- private readonly IIndexingService _indexingService;\npublic PackageDeprecationService(\nIEntityRepository<PackageDeprecation> deprecationRepository,\nIEntityRepository<Cve> cveRepository,\n- IEntityRepository<Cwe> cweRepository,\n- IPackageService packageService,\n- IIndexingService indexingService)\n+ IEntityRepository<Cwe> cweRepository)\n{\n_deprecationRepository = deprecationRepository ?? throw new ArgumentNullException(nameof(deprecationRepository));\n_cveRepository = cveRepository ?? throw new ArgumentNullException(nameof(cveRepository));\n_cweRepository = cweRepository ?? throw new ArgumentNullException(nameof(cweRepository));\n- _packageService = packageService ?? throw new ArgumentNullException(nameof(packageService));\n- _indexingService = indexingService ?? throw new ArgumentNullException(nameof(indexingService));\n}\npublic async Task UpdateDeprecation(\n@@ -40,8 +34,7 @@ public class PackageDeprecationService : IPackageDeprecationService\nIReadOnlyCollection<Cwe> cwes,\nPackageRegistration alternatePackageRegistration,\nPackage alternatePackage,\n- string customMessage,\n- bool shouldUnlist)\n+ string customMessage)\n{\nif (packages == null || !packages.Any())\n{\n@@ -104,11 +97,6 @@ public class PackageDeprecationService : IPackageDeprecationService\ndeprecation.AlternatePackage = alternatePackage;\ndeprecation.CustomMessage = customMessage;\n-\n- if (shouldUnlist)\n- {\n- await _packageService.MarkPackageUnlistedAsync(package, commitChanges: false);\n- }\n}\n}\n@@ -122,12 +110,6 @@ public class PackageDeprecationService : IPackageDeprecationService\n}\nawait _deprecationRepository.CommitChangesAsync();\n-\n- // Update the indexing of the packages we updated the deprecation information of.\n- foreach (var package in packages)\n- {\n- _indexingService.UpdatePackage(package);\n- }\n}\npublic async Task<IReadOnlyCollection<Cve>> GetOrCreateCvesByIdAsync(IEnumerable<string> ids, bool commitChanges)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ManagePackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ManagePackageViewModel.cs",
"diff": "@@ -168,10 +168,6 @@ public VersionDeprecationState(Package package, string text)\n}\nCustomMessage = deprecation.CustomMessage;\n-\n- // It doesn't make sense to unlist packages that are already unlisted.\n- // Additionally, if a package was not unlisted when it was deprecated, we shouldn't unlist it when its deprecation information is updated.\n- ShouldUnlist = package.Listed && deprecation.Status == PackageDeprecationStatus.NotDeprecated;\n}\n}\n@@ -185,7 +181,6 @@ public VersionDeprecationState(Package package, string text)\npublic string AlternatePackageId { get; }\npublic string AlternatePackageVersion { get; }\npublic string CustomMessage { get; }\n- public bool ShouldUnlist { get; }\n/// <remarks>\n/// Ideally, the fields of this class would be pascal-case.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ManageDeprecation.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ManageDeprecation.cshtml",
"diff": "</div>\n<div class=\"security-detail-input\">\n<input id=\"selectedCvssRating\" class=\"form-control cvss-input\" name=\"selectedCvssRating\" type=\"text\" placeholder=\"0.0\" size=\"4\" maxlength=\"4\" data-bind=\"textInput: selectedCvssRating, disable: !hasCvss()\" />\n- <span data-bind=\"text: cvssRatingLabel, css: { 'text-danger': cvssRatingIsInvalid }\"></span>\n+ <span data-bind=\"text: cvssRatingLabel, css: { 'text-danger': cvssRatingIsInvalid, 'cvss-bold': !cvssRatingIsInvalid() }\"></span>\n</div>\n</div>\n<div data-bind=\"template: { name: 'deprecation-security-detail-list-input-template', data: cwes }\"></div>\n<label for=\"customMessage\" class=\"deprecation-section-header\">Provide custom message</label>\n<textarea id=\"customMessage\" name=\"customMessage\" class=\"form-control full-line\" data-bind=\"textInput: customMessage\" rows=\"2\"></textarea>\n</div>\n- <div class=\"deprecation-section form-group\">\n- <label>\n- <input type=\"checkbox\" value=\"true\" data-bind=\"checked: shouldUnlist\" />\n- Unlist this package from search results\n- </label>\n- </div>\n</div>\n<div data-bind=\"visible: submitError\">\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ManageDeprecationJsonApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ManageDeprecationJsonApiControllerFacts.cs",
"diff": "@@ -289,7 +289,7 @@ public async Task ReturnsForbiddenIfFeatureFlagDisabled()\n// Act\nvar result = await controller.Deprecate(\n- \"id\", null, false, false, false, null, null, null, null, null, null, false);\n+ \"id\", null, false, false, false, null, null, null, null, null, null);\n// Assert\nAssertErrorResponse(controller, result, HttpStatusCode.Forbidden, Strings.DeprecatePackage_Forbidden);\n@@ -317,7 +317,7 @@ public async Task ReturnsBadRequestIfNoVersions(IEnumerable<string> versions)\n// Act\nvar result = await controller.Deprecate(\n- \"id\", versions, false, false, false, null, null, null, null, null, null, false);\n+ \"id\", versions, false, false, false, null, null, null, null, null, null);\n// Assert\nAssertErrorResponse(controller, result, HttpStatusCode.BadRequest, Strings.DeprecatePackage_NoVersions);\n@@ -357,7 +357,7 @@ public async Task ReturnsBadRequestIfCveIdInvalid(string invalidId)\n// Act\nvar result = await controller.Deprecate(\n- \"id\", new[] { \"1.0.0\" }, false, false, false, new[] { \"CVE-2019-1111\", invalidId }, null, null, null, null, null, false);\n+ \"id\", new[] { \"1.0.0\" }, false, false, false, new[] { \"CVE-2019-1111\", invalidId }, null, null, null, null, null);\n// Assert\nAssertErrorResponse(\n@@ -387,7 +387,7 @@ public async Task ReturnsBadRequestIfCweIdInvalid()\n// Act\nvar result = await controller.Deprecate(\n- \"id\", new[] { \"1.0.0\" }, false, false, false, null, null, new[] { \"CWE-1\", invalidId }, null, null, null, false);\n+ \"id\", new[] { \"1.0.0\" }, false, false, false, null, null, new[] { \"CWE-1\", invalidId }, null, null, null);\n// Assert\nAssertErrorResponse(\n@@ -417,7 +417,7 @@ public async Task ReturnsBadRequestIfCvssInvalid(decimal cvss)\n// Act\nvar result = await controller.Deprecate(\n- \"id\", new[] { \"1.0.0\" }, false, false, false, null, cvss, null, null, null, null, false);\n+ \"id\", new[] { \"1.0.0\" }, false, false, false, null, cvss, null, null, null, null);\n// Assert\nAssertErrorResponse(controller, result, HttpStatusCode.BadRequest, Strings.DeprecatePackage_InvalidCvss);\n@@ -449,7 +449,7 @@ public async Task ReturnsNotFoundIfNoPackagesOrRegistrationMissing(IEnumerable<P\n// Act\nvar result = await controller.Deprecate(\n- id, new[] { \"1.0.0\" }, false, false, false, null, null, null, null, null, null, false);\n+ id, new[] { \"1.0.0\" }, false, false, false, null, null, null, null, null, null);\n// Assert\nAssertErrorResponse(controller, result, HttpStatusCode.NotFound, string.Format(Strings.DeprecatePackage_MissingRegistration, id));\n@@ -511,7 +511,7 @@ public async Task ReturnsForbiddenIfNotOwner(User currentUser, User owner)\n// Act\nvar result = await controller.Deprecate(\n- id, new[] { \"1.0.0\" }, false, false, false, null, null, null, null, null, null, false);\n+ id, new[] { \"1.0.0\" }, false, false, false, null, null, null, null, null, null);\n// Assert\nAssertErrorResponse(controller, result, HttpStatusCode.Forbidden, Strings.DeprecatePackage_Forbidden);\n@@ -586,7 +586,7 @@ public async Task ReturnsForbiddenIfLocked(User currentUser, User owner)\n// Act\nvar result = await controller.Deprecate(\n- id, new[] { \"1.0.0\" }, false, false, false, null, null, null, null, null, null, false);\n+ id, new[] { \"1.0.0\" }, false, false, false, null, null, null, null, null, null);\n// Assert\nAssertErrorResponse(\n@@ -640,7 +640,7 @@ public async Task ReturnsNotFoundIfAlternatePackageRegistrationMissing(User curr\n// Act\nvar result = await controller.Deprecate(\n- id, new[] { \"1.0.0\" }, false, false, false, null, null, null, alternatePackageId, null, null, false);\n+ id, new[] { \"1.0.0\" }, false, false, false, null, null, null, alternatePackageId, null, null);\n// Assert\nAssertErrorResponse(\n@@ -695,7 +695,7 @@ public async Task ReturnsNotFoundIfAlternatePackageVersionMissing(User currentUs\n// Act\nvar result = await controller.Deprecate(\n- id, new[] { \"1.0.0\" }, false, false, false, null, null, null, alternatePackageId, alternatePackageVersion, null, false);\n+ id, new[] { \"1.0.0\" }, false, false, false, null, null, null, alternatePackageId, alternatePackageVersion, null);\n// Assert\nAssertErrorResponse(\n@@ -744,7 +744,7 @@ public async Task ReturnsNotFoundIfVersionMissing(User currentUser, User owner)\n// Act\nvar result = await controller.Deprecate(\n- id, new[] { \"1.0.0\" }, false, false, false, null, null, null, null, null, null, false);\n+ id, new[] { \"1.0.0\" }, false, false, false, null, null, null, null, null, null);\n// Assert\nAssertErrorResponse(\n@@ -793,7 +793,7 @@ public async Task ReturnsNotFoundIfSomeVersionMissing(User currentUser, User own\n// Act\nvar result = await controller.Deprecate(\n- id, new[] { package.NormalizedVersion, \"1.0.0\" }, false, false, false, null, null, null, null, null, null, false);\n+ id, new[] { package.NormalizedVersion, \"1.0.0\" }, false, false, false, null, null, null, null, null, null);\n// Assert\nAssertErrorResponse(\n@@ -855,7 +855,7 @@ public async Task ReturnsNotFoundIfGetCwesByIdThrowsArgumentException(User curre\n// Act\nvar result = await controller.Deprecate(\n- id, new[] { package.NormalizedVersion }, false, false, false, null, null, null, null, null, null, false);\n+ id, new[] { package.NormalizedVersion }, false, false, false, null, null, null, null, null, null);\n// Assert\nAssertErrorResponse(\n@@ -916,7 +916,6 @@ public enum ReturnsSuccessful_AlternatePackage_State\nOwner_Data,\nPackageDeprecationStates_Data,\nMemberDataHelper.EnumDataSet<ReturnsSuccessful_AlternatePackage_State>(),\n- MemberDataHelper.BooleanDataSet(),\nMemberDataHelper.BooleanDataSet()).ToList();\n[Theory]\n@@ -929,8 +928,7 @@ public enum ReturnsSuccessful_AlternatePackage_State\nbool isOther,\nPackageDeprecationStatus expectedStatus,\nReturnsSuccessful_AlternatePackage_State alternatePackageState,\n- bool hasAdditionalData,\n- bool shouldUnlist)\n+ bool hasAdditionalData)\n{\n// Arrange\nvar id = \"id\";\n@@ -1029,8 +1027,7 @@ public enum ReturnsSuccessful_AlternatePackage_State\ncwes,\nalternatePackageState == ReturnsSuccessful_AlternatePackage_State.Registration ? alternatePackageRegistration : null,\nalternatePackageState == ReturnsSuccessful_AlternatePackage_State.Package ? alternatePackage : null,\n- customMessage,\n- shouldUnlist))\n+ customMessage))\n.Completes()\n.Verifiable();\n@@ -1049,8 +1046,7 @@ public enum ReturnsSuccessful_AlternatePackage_State\ncweIds,\nalternatePackageId,\nalternatePackageVersion,\n- customMessage,\n- shouldUnlist);\n+ customMessage);\n// Assert\nAssertSuccessResponse(controller);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageDeprecationServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageDeprecationServiceFacts.cs",
"diff": "@@ -33,8 +33,7 @@ public async Task ThrowsIfPackagesEmpty(IReadOnlyCollection<Package> packages)\nnew Cwe[0],\nnull,\nnull,\n- null,\n- false));\n+ null));\n}\n[Fact]\n@@ -53,8 +52,7 @@ public async Task ThrowsIfCvesNull()\nnew Cwe[0],\nnull,\nnull,\n- null,\n- false));\n+ null));\n}\n[Fact]\n@@ -73,14 +71,11 @@ public async Task ThrowsIfCwesNull()\nnull,\nnull,\nnull,\n- null,\n- false));\n+ null));\n}\n- [Theory]\n- [InlineData(false)]\n- [InlineData(true)]\n- public async Task DeletesExistingDeprecationsIfStatusNotDeprecated(bool shouldUnlist)\n+ [Fact]\n+ public async Task DeletesExistingDeprecationsIfStatusNotDeprecated()\n{\n// Arrange\nvar packageWithDeprecation1 = new Package\n@@ -116,20 +111,6 @@ public async Task DeletesExistingDeprecationsIfStatusNotDeprecated(bool shouldUn\n.Completes()\n.Verifiable();\n- var packageService = GetMock<IPackageService>();\n- var indexingService = GetMock<IIndexingService>();\n- foreach (var package in packages)\n- {\n- // When deleting deprecations, packages should not be unlisted because the option is hidden in the UI.\n- packageService\n- .Setup(x => x.MarkPackageUnlistedAsync(package, false))\n- .Throws<InvalidOperationException>();\n-\n- indexingService\n- .Setup(x => x.UpdatePackage(package))\n- .Verifiable();\n- }\n-\nvar service = Get<PackageDeprecationService>();\n// Act\n@@ -141,12 +122,10 @@ public async Task DeletesExistingDeprecationsIfStatusNotDeprecated(bool shouldUn\nnew Cwe[0],\nnull,\nnull,\n- null,\n- shouldUnlist);\n+ null);\n// Assert\ndeprecationRepository.Verify();\n- indexingService.Verify();\nforeach (var package in packages)\n{\n@@ -162,11 +141,6 @@ public async Task ReplacesExistingDeprecations(bool shouldUnlist)\n// Arrange\nvar lastEdited = new DateTime(2019, 3, 4);\n- var unlistedPackageWithoutDeprecation = new Package\n- {\n- LastEdited = lastEdited\n- };\n-\nvar packageWithDeprecation1 = new Package\n{\nDeprecations = new List<PackageDeprecation> { new PackageDeprecation() },\n@@ -221,7 +195,6 @@ public async Task ReplacesExistingDeprecations(bool shouldUnlist)\nvar packages = new[]\n{\n- unlistedPackageWithoutDeprecation,\npackageWithDeprecation1,\npackageWithoutDeprecation1,\npackageWithDeprecation2,\n@@ -243,30 +216,6 @@ public async Task ReplacesExistingDeprecations(bool shouldUnlist)\n.Completes()\n.Verifiable();\n- var packageService = GetMock<IPackageService>();\n- var indexingService = GetMock<IIndexingService>();\n- foreach (var package in packages)\n- {\n- var unlistPackageSetup = packageService\n- .Setup(x => x.MarkPackageUnlistedAsync(package, false));\n-\n- if (shouldUnlist)\n- {\n- unlistPackageSetup\n- .Completes()\n- .Verifiable();\n- }\n- else\n- {\n- unlistPackageSetup\n- .Throws<InvalidOperationException>();\n- }\n-\n- indexingService\n- .Setup(x => x.UpdatePackage(package))\n- .Verifiable();\n- }\n-\nvar service = Get<PackageDeprecationService>();\nvar status = (PackageDeprecationStatus)99;\n@@ -313,13 +262,10 @@ public async Task ReplacesExistingDeprecations(bool shouldUnlist)\ncwes,\nalternatePackageRegistration,\nalternatePackage,\n- customMessage,\n- shouldUnlist);\n+ customMessage);\n// Assert\ndeprecationRepository.Verify();\n- packageService.Verify();\n- indexingService.Verify();\nforeach (var package in packages)\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Remove unlist checkbox from Manage Deprecation form (#6965) |
455,751 | 07.03.2019 14:35:18 | 28,800 | 7fa9bd9769348eb3706392355963cfabd1b74679 | Snupkgs without symbols will be rejected.
Validate that the snupkg contains symbols. Reject if they do not. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/SymbolPackageService.cs",
"new_path": "src/NuGetGallery/Services/SymbolPackageService.cs",
"diff": "@@ -153,6 +153,11 @@ private static void ValidateSymbolPackage(PackageArchiveReader symbolPackage, Pa\n{\nthrow new InvalidDataException(string.Format(Strings.SymbolsPackage_InvalidFiles, PDBExtension));\n}\n+\n+ if (!CheckForPDBFiles(symbolPackage))\n+ {\n+ throw new InvalidDataException(string.Format(Strings.SymbolsPackage_NoSymbols));\n+ }\n}\nprivate static bool CheckForAllowedFiles(PackageArchiveReader symbolPackage)\n@@ -171,6 +176,17 @@ private static bool CheckForAllowedFiles(PackageArchiveReader symbolPackage)\nreturn true;\n}\n+ /// <summary>\n+ /// If there are not any pdb files in the snupkg the publish action will be rejected.\n+ /// </summary>\n+ /// <param name=\"symbolPackage\"></param>\n+ /// <returns></returns>\n+ private static bool CheckForPDBFiles(PackageArchiveReader symbolPackage)\n+ {\n+ return symbolPackage.GetFiles()\n+ .Any(filePath => !string.IsNullOrEmpty(Path.GetFileName(filePath)) && Path.GetExtension(filePath) == PDBExtension);\n+ }\n+\nprivate static bool IsPortable(string pdbFile)\n{\nbyte[] currentPDBStamp = new byte[4];\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -19,7 +19,7 @@ namespace NuGetGallery {\n// class via a tool like ResGen or Visual Studio.\n// To add or remove a member, edit your .ResX file then rerun ResGen\n// with the /str option, or rebuild your VS project.\n- [global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Resources.Tools.StronglyTypedResourceBuilder\", \"16.0.0.0\")]\n+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Resources.Tools.StronglyTypedResourceBuilder\", \"15.0.0.0\")]\n[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\n[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\npublic class Strings {\n@@ -2057,6 +2057,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The package does not contain any symbol (.pdb) files..\n+ /// </summary>\n+ public static string SymbolsPackage_NoSymbols {\n+ get {\n+ return ResourceManager.GetString(\"SymbolsPackage_NoSymbols\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The uploaded package is not a valid symbols package. The required 'SymbolsPackage' package type is missing..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1138,4 +1138,7 @@ The {1} Team</value>\n<value>https://cwe.mitre.org/data/definitions/{0}.html</value>\n<comment>{0} is the CWE's ID number (e.g. CWE-999 has an ID number of 999)</comment>\n</data>\n+ <data name=\"SymbolsPackage_NoSymbols\" xml:space=\"preserve\">\n+ <value>The package does not contain any symbol (.pdb) files.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/SymbolPackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/SymbolPackageServiceFacts.cs",
"diff": "using System.Collections.Generic;\nusing System.IO;\nusing System.IO.Compression;\n+using System.Linq;\nusing System.Threading.Tasks;\nusing Moq;\nusing NuGet.Services.Entities;\n@@ -47,13 +48,12 @@ private static List<ClientPackageType> CreateSymbolPackageTypesObject()\n};\n}\n- private static Action<ZipArchive> CreatePopulatePackageAction(string extension)\n+ private static Action<ZipArchive> CreatePopulatePackageAction(params string[] extensions)\n{\nreturn archive =>\n{\n- var entryList = new List<ZipArchiveEntry>() {\n- archive.CreateEntry(\"file1\" + extension)\n- };\n+ int fileIndex = 0;\n+ var entryList = extensions.Select(extension => archive.CreateEntry($\"file{fileIndex++}{extension}\"));\nforeach (var entry in entryList)\n{\n@@ -162,13 +162,25 @@ public async Task WillThrowForInvalidFilesInSnupkg(string extension)\npublic async Task WillNotThrowForValidSnupkgFile(string extension)\n{\nvar service = CreateService();\n- var action = CreatePopulatePackageAction(extension);\n+ var action = CreatePopulatePackageAction(new string[] { extension, \".pdb\" });\nvar validSymbolPackageStream = TestPackage.CreateTestSymbolPackageStream(\"theId\", \"1.0.42\", populatePackage: action);\nvar packageArchiveReader = PackageServiceUtility.CreateArchiveReader(validSymbolPackageStream);\nawait service.EnsureValidAsync(packageArchiveReader);\n}\n+\n+ [Fact]\n+ public async Task WillThrowForSnupkgFileWithoutSymbols()\n+ {\n+ var service = CreateService();\n+ var action = CreatePopulatePackageAction(\".p7s\");\n+\n+ var validSymbolPackageStream = TestPackage.CreateTestSymbolPackageStream(\"theId\", \"1.0.42\", populatePackage: action);\n+ var packageArchiveReader = PackageServiceUtility.CreateArchiveReader(validSymbolPackageStream);\n+\n+ await Assert.ThrowsAsync<InvalidDataException>(async () => await service.EnsureValidAsync(packageArchiveReader));\n+ }\n}\npublic class TheCreateSymbolPackageMethod\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Snupkgs without symbols will be rejected. (#6968)
Validate that the snupkg contains symbols. Reject if they do not. |
455,751 | 07.03.2019 14:36:23 | 28,800 | ff93be230c005cf1231746623935c144116a60b4 | Search: Extend telemetry information
Extend the telemetry information | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Lucene/HttpClientWrapper.cs",
"new_path": "src/NuGetGallery/Infrastructure/Lucene/HttpClientWrapper.cs",
"diff": "using System;\nusing System.Net.Http;\nusing System.Threading.Tasks;\n+using NuGetGallery.Infrastructure.Search;\n+using Polly;\nnamespace NuGetGallery.Infrastructure\n{\n@@ -18,9 +20,18 @@ public HttpClientWrapper(HttpClient httpClient)\npublic Uri BaseAddress => _httpClient.BaseAddress;\n- public Task<HttpResponseMessage> GetAsync(Uri uri)\n+ public async Task<HttpResponseMessage> GetAsync(Uri uri)\n{\n- return _httpClient.GetAsync(uri);\n+ // Add the request Uri to the Polly context to be used for logging.\n+ // https://docs.microsoft.com/en-us/dotnet/api/polly.httprequestmessageextensions.setpolicyexecutioncontext?view=aspnetcore-2.2\n+ // http://www.thepollyproject.org/2017/05/04/putting-the-context-into-polly/\n+ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))\n+ {\n+ var context = new Context();\n+ context.Add(SearchClientPolicies.ContextKey_RequestUri, uri.AbsoluteUri);\n+ request.SetPolicyExecutionContext(context);\n+ return await _httpClient.SendAsync(request);\n+ }\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Lucene/SearchClientPolicies.cs",
"new_path": "src/NuGetGallery/Infrastructure/Lucene/SearchClientPolicies.cs",
"diff": "using Polly;\nusing Polly.CircuitBreaker;\nusing Polly.Extensions.Http;\n-using NuGetGallery;\nnamespace NuGetGallery.Infrastructure.Search\n{\n// Implements Polly policies\n// Samples at https://github.com/App-vNext/Polly-Samples\n+ // Docs: https://github.com/App-vNext/Polly/wiki/Circuit-Breaker\npublic class SearchClientPolicies\n{\n+ internal const string ContextKey_RequestUri = \"RequestUri\";\n+ internal const string ContextKey_CircuitBreakerStatus = \"CircuitBreakerStatus\";\n+\n/// <summary>\n- /// Builds the CircuitBreakerPolicy. Through this policy a request will be retried for <paramref name=\"breakAfterCount\"/> and break after. This will move the circuit breaker into Open state.\n+ /// Builds the CircuitBreakerPolicy. Through this policy if <paramref name=\"breakAfterCount\"/> consecutive requests will fail with transient HttpErrors\n+ /// the circuit breaker will move into Open state.\n/// It will stay in this state(Open) for the <paramref name=\"breakDuration\"/>. This means that requests made while the circuit is in this state will fail fast.\n/// When the timeout expires trial requsts are allowed. The state will be changed to a Close state if they succeed.\n/// If they do not succeed the circuit will be moved back in the Open state for another <paramref name=\"breakDuration\"/>.\n@@ -35,9 +39,10 @@ public static IAsyncPolicy<HttpResponseMessage> SearchClientCircuitBreakerPolicy\n.HandleTransientHttpError()\n.CircuitBreakerAsync(breakAfterCount,\nbreakDuration,\n- onBreak: (delegateResult, breakDelay, context) =>\n+ onBreak: (delegateResult, circuitBreakerStatus, breakDelay, context) =>\n{\n- telemetryService.TrackMetricForSearchCircuitBreakerOnBreak(searchName, delegateResult.Exception, delegateResult.Result);\n+ context.Add(ContextKey_CircuitBreakerStatus, circuitBreakerStatus);\n+ telemetryService.TrackMetricForSearchCircuitBreakerOnBreak(searchName, delegateResult.Exception, delegateResult.Result, context.CorrelationId.ToString(), GetValueFromContext(\"RequestUri\",context));\nlogger.LogWarning(\"SearchCircuitBreaker logging: Breaking the circuit for {BreakDelayInMilliseconds} milliseconds due to {Exception} {SearchName}.\",\nbreakDelay.TotalMilliseconds,\ndelegateResult.Exception,\n@@ -45,7 +50,7 @@ public static IAsyncPolicy<HttpResponseMessage> SearchClientCircuitBreakerPolicy\n},\nonReset: (context) =>\n{\n- telemetryService.TrackMetricForSearchCircuitBreakerOnReset(searchName);\n+ telemetryService.TrackMetricForSearchCircuitBreakerOnReset(searchName, context.CorrelationId.ToString(), GetValueFromContext(\"RequestUri\", context));\nlogger.LogInformation(\"SearchCircuitBreaker logging: Call ok! Closed the circuit again! {SearchName}\", searchName);\n},\nonHalfOpen: () => logger.LogInformation(\"SearchCircuitBreaker logging: Half-open: Next call is a trial! {SearchName}\", searchName));\n@@ -69,10 +74,14 @@ public static IAsyncPolicy<HttpResponseMessage> SearchClientWaitAndRetryForeverP\nreturn false;\n}).\nWaitAndRetryForeverAsync(\n- sleepDurationProvider: retryAttempt => TimeSpan.FromMilliseconds(SearchClientConfiguration.WaitAndRetryDefaultIntervalInMilliseconds),\n- onRetry: (delegateResult, waitDuration) =>\n+ sleepDurationProvider: (retryAttempt, context) => TimeSpan.FromMilliseconds(SearchClientConfiguration.WaitAndRetryDefaultIntervalInMilliseconds),\n+ onRetry: (delegateResult, waitDuration, context) =>\n{\n- telemetryService.TrackMetricForSearchOnRetry(searchName, delegateResult.Exception);\n+ telemetryService.TrackMetricForSearchOnRetry(searchName,\n+ delegateResult.Exception,\n+ context.CorrelationId.ToString(),\n+ GetValueFromContext(ContextKey_RequestUri, context),\n+ GetValueFromContext(ContextKey_CircuitBreakerStatus, context));\nlogger.LogInformation(\"Policy retry - it will retry after {RetryMilliseconds} milliseconds. {Exception} {SearchName}\", waitDuration.TotalMilliseconds, delegateResult.Exception, searchName);\n});\n}\n@@ -101,5 +110,11 @@ public static IAsyncPolicy<HttpResponseMessage> SearchClientFallBackCircuitBreak\nlogger.LogInformation(\"On circuit breaker fallback. {SearchName} {Exception} {Result}\", searchName, delegateResult.Exception, delegateResult.Result);\n});\n}\n+\n+ private static string GetValueFromContext(string contextKey, Context context)\n+ {\n+ object objValue = null;\n+ return context.TryGetValue(contextKey, out objValue) ? objValue.ToString() : string.Empty;\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"new_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"diff": "@@ -272,20 +272,26 @@ public interface ITelemetryService\n/// <param name=\"searchName\">A name to identify the search instance.</param>\n/// <param name=\"exception\">The exception if any.</param>\n/// <param name=\"responseMessage\">The response message.</param>\n- void TrackMetricForSearchCircuitBreakerOnBreak(string searchName, Exception exception, HttpResponseMessage responseMessage);\n+ /// <param name=\"correlationId\">CorrelationId set by Polly context.</param>\n+ /// <param name=\"uri\">The request uri.</param>\n+ void TrackMetricForSearchCircuitBreakerOnBreak(string searchName, Exception exception, HttpResponseMessage responseMessage, string correlationId, string uri);\n/// <summary>\n/// Tracks the OnReset for the search circuit breaker.\n/// </summary>\n/// <param name=\"searchName\">A name to identify the search instance.</param>\n- void TrackMetricForSearchCircuitBreakerOnReset(string searchName);\n+ /// <param name=\"correlationId\">CorrelationId set by Polly context.</param>\n+ /// <param name=\"uri\">The request uri.</param>\n+ void TrackMetricForSearchCircuitBreakerOnReset(string searchName, string correlationId, string uri);\n/// <summary>\n/// Tracks the OnRetry for the search retry policy.\n/// </summary>\n/// <param name=\"searchName\">A name to identify the search instance.</param>\n/// <param name=\"exception\">The exception.</param>\n- /// <param name=\"\"></param>\n- void TrackMetricForSearchOnRetry(string searchName, Exception exception);\n+ /// <param name=\"correlationId\">CorrelationId set by Polly context.</param>\n+ /// <param name=\"uri\">The request uri.</param>\n+ /// <param name=\"circuitBreakerStatus\">The CircuitBreakerStatus at the time of the Retry action.</param>\n+ void TrackMetricForSearchOnRetry(string searchName, Exception exception, string correlationId, string uri, string circuitBreakerStatus);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "@@ -173,6 +173,8 @@ internal class Events\npublic const string SearchSuccessExecutionStatus = \"SearchSuccessExecutionStatus\";\npublic const string SearchException = \"SearchException\";\npublic const string SearchName = \"SearchName\";\n+ public const string SearchPollyCorrelationId = \"SearchPollyCorrelationId\";\n+ public const string SearchCircuitBreakerStatus = \"SearchCircuitBreakerStatus\";\npublic TelemetryService(IDiagnosticsService diagnosticsService, ITelemetryClient telemetryClient = null)\n{\n@@ -803,27 +805,34 @@ public void TrackMetricForSearchExecutionDuration(string url, TimeSpan duration,\n});\n}\n- public void TrackMetricForSearchCircuitBreakerOnBreak(string searchName, Exception exception, HttpResponseMessage responseMessage)\n+ public void TrackMetricForSearchCircuitBreakerOnBreak(string searchName, Exception exception, HttpResponseMessage responseMessage, string correlationId, string uri)\n{\nTrackMetric(Events.SearchCircuitBreakerOnBreak, 1, properties => {\nproperties.Add(SearchName, searchName);\nproperties.Add(SearchException, exception?.ToString() ?? string.Empty);\nproperties.Add(SearchHttpResponseCode, responseMessage?.StatusCode.ToString() ?? string.Empty);\n+ properties.Add(SearchPollyCorrelationId, correlationId);\n+ properties.Add(SearchUrl, uri);\n});\n}\n- public void TrackMetricForSearchCircuitBreakerOnReset(string searchName)\n+ public void TrackMetricForSearchCircuitBreakerOnReset(string searchName, string correlationId, string uri)\n{\nTrackMetric(Events.SearchCircuitBreakerOnReset, 1, properties => {\nproperties.Add(SearchName, searchName);\n+ properties.Add(SearchPollyCorrelationId, correlationId);\n+ properties.Add(SearchUrl, uri);\n});\n}\n- public void TrackMetricForSearchOnRetry(string searchName, Exception exception)\n+ public void TrackMetricForSearchOnRetry(string searchName, Exception exception, string correlationId, string uri, string circuitBreakerStatus)\n{\nTrackMetric(Events.SearchOnRetry, 1, properties => {\nproperties.Add(SearchName, searchName);\nproperties.Add(SearchException, exception?.ToString() ?? string.Empty);\n+ properties.Add(SearchPollyCorrelationId, correlationId);\n+ properties.Add(SearchUrl, uri);\n+ properties.Add(SearchCircuitBreakerStatus, circuitBreakerStatus);\n});\n}\n/// <summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"diff": "@@ -259,15 +259,15 @@ public static IEnumerable<object[]> TrackMetricNames_Data\n};\nyield return new object[] { \"SearchCircuitBreakerOnBreak\",\n- (TrackAction)(s => s.TrackMetricForSearchCircuitBreakerOnBreak(\"SomeName\", exception: null, responseMessage: null))\n+ (TrackAction)(s => s.TrackMetricForSearchCircuitBreakerOnBreak(\"SomeName\", exception: null, responseMessage: null, correlationId: string.Empty, uri: string.Empty))\n};\nyield return new object[] { \"SearchCircuitBreakerOnReset\",\n- (TrackAction)(s => s.TrackMetricForSearchCircuitBreakerOnReset(\"SomeName\"))\n+ (TrackAction)(s => s.TrackMetricForSearchCircuitBreakerOnReset(\"SomeName\", correlationId: string.Empty, uri: string.Empty))\n};\nyield return new object[] { \"SearchOnRetry\",\n- (TrackAction)(s => s.TrackMetricForSearchOnRetry(\"SomeName\", exception: null))\n+ (TrackAction)(s => s.TrackMetricForSearchOnRetry(\"SomeName\", exception: null, correlationId: string.Empty, uri: string.Empty, circuitBreakerStatus: string.Empty))\n};\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Search: Extend telemetry information (#6967)
Extend the telemetry information |
455,776 | 11.03.2019 13:21:03 | 25,200 | 0e467a3315856611e113b33cc8021cf3e33fa13c | Mark deprecated versions in Display Package page's version history | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -866,6 +866,9 @@ img.reserved-indicator-icon {\n.page-package-details h1 {\nmargin-bottom: 0;\n}\n+.page-package-details tr {\n+ border-bottom: 1px solid lightgray;\n+}\n.page-package-details .package-title {\nmargin-bottom: 24px;\n}\n@@ -926,13 +929,14 @@ img.reserved-indicator-icon {\noverflow-wrap: break-word;\n}\n-.page-package-details .package-details-main .signature-info-cell {\n- max-width: 1em;\n+.page-package-details .package-details-main .package-icon-cell {\npadding-right: 0;\npadding-left: 0;\n+ text-align: right;\ncursor: default;\n}\n-.page-package-details .package-details-main .signature-info-cell .signature-info {\n+.page-package-details .package-details-main .package-icon-cell .package-icon {\n+ padding-right: 6px;\npadding-left: 6px;\n}\n.page-package-details .package-details-info .ms-Icon-ul li {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-display-package.less",
"new_path": "src/Bootstrap/less/theme/page-display-package.less",
"diff": "margin-bottom: 0;\n}\n+ tr {\n+ border-bottom: 1px solid lightgray;\n+ }\n+\n.package-title {\nmargin-bottom: 24px;\n.package-details-main {\n.break-word;\n- .signature-info-cell {\n+ .package-icon-cell {\ncursor: default;\n- max-width: 1em;\npadding-left: 0;\npadding-right: 0;\n+ text-align: right;\n- .signature-info {\n+ .package-icon {\npadding-left: 6px;\n+ padding-right: 6px;\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Services\\IFileMetadataService.cs\" />\n<Compile Include=\"Services\\IRevalidationStateService.cs\" />\n<Compile Include=\"Services\\ISimpleCloudBlob.cs\" />\n+ <Compile Include=\"Services\\PackageDeprecationFieldsToInclude.cs\" />\n<Compile Include=\"Services\\SymbolPackageFileServiceMetadata.cs\" />\n<Compile Include=\"Services\\PackageFileServiceMetadata.cs\" />\n<Compile Include=\"Services\\RevalidationState.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CorePackageService.cs",
"new_path": "src/NuGetGallery.Core/Services/CorePackageService.cs",
"diff": "@@ -285,7 +285,9 @@ public virtual async Task UpdatePackageSigningCertificateAsync(string packageId,\n}\n}\n- protected IQueryable<Package> GetPackagesByIdQueryable(string id, bool withDeprecations = false)\n+ protected IQueryable<Package> GetPackagesByIdQueryable(\n+ string id,\n+ PackageDeprecationFieldsToInclude deprecationFields = PackageDeprecationFieldsToInclude.None)\n{\nvar packages = _packageRepository\n.GetAll()\n@@ -295,7 +297,12 @@ protected IQueryable<Package> GetPackagesByIdQueryable(string id, bool withDepre\n.Include(p => p.SymbolPackages)\n.Where(p => p.PackageRegistration.Id == id);\n- if (withDeprecations)\n+ if (deprecationFields == PackageDeprecationFieldsToInclude.Deprecation)\n+ {\n+ packages = packages\n+ .Include(p => p.Deprecations);\n+ }\n+ else if (deprecationFields == PackageDeprecationFieldsToInclude.DeprecationAndRelationships)\n{\npackages = packages\n.Include(p => p.Deprecations.Select(d => d.AlternatePackage.PackageRegistration))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs",
"diff": "@@ -145,7 +145,7 @@ public virtual JsonResult GetAlternatePackageVersions(string id)\nreturn DeprecateErrorResponse(HttpStatusCode.BadRequest, Strings.DeprecatePackage_InvalidCvss);\n}\n- var packages = _packageService.FindPackagesById(id, withDeprecations: true);\n+ var packages = _packageService.FindPackagesById(id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships);\nvar registration = packages.FirstOrDefault()?.PackageRegistration;\nif (registration == null)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -710,7 +710,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\nPackage package = null;\n// Load all packages with the ID.\n- var packages = _packageService.FindPackagesById(id);\n+ var packages = _packageService.FindPackagesById(id, PackageDeprecationFieldsToInclude.Deprecation);\nif (version != null)\n{\nif (version.Equals(GalleryConstants.AbsoluteLatestUrlString, StringComparison.InvariantCultureIgnoreCase))\n@@ -1456,7 +1456,8 @@ public virtual async Task<ActionResult> Manage(string id, string version = null)\nPackage package = null;\n// Load all versions of the package.\n- var packages = _packageService.FindPackagesById(id, withDeprecations: true);\n+ var packages = _packageService.FindPackagesById(\n+ id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships);\nif (version != null)\n{\n// Try to find the exact version if it was specified.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IPackageService.cs",
"new_path": "src/NuGetGallery/Services/IPackageService.cs",
"diff": "@@ -19,9 +19,11 @@ public interface IPackageService : ICorePackageService\n{\n/// <summary>\n/// Returns all packages with an <see cref=\"Package.Id\"/> of <paramref name=\"id\"/>.\n- /// Includes deprecation entities if <paramref name=\"withDeprecations\"/> is true.\n+ /// Includes deprecation fields based on <paramref name=\"deprecationFields\"/>.\n/// </summary>\n- IReadOnlyCollection<Package> FindPackagesById(string id, bool withDeprecations = false);\n+ IReadOnlyCollection<Package> FindPackagesById(\n+ string id,\n+ PackageDeprecationFieldsToInclude deprecationFields = PackageDeprecationFieldsToInclude.None);\n/// <summary>\n/// Gets the package with the given ID and version when exists;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -135,9 +135,11 @@ public override PackageRegistration FindPackageRegistrationById(string packageId\n.SingleOrDefault(pr => pr.Id == packageId);\n}\n- public virtual IReadOnlyCollection<Package> FindPackagesById(string id, bool withDeprecations = false)\n+ public virtual IReadOnlyCollection<Package> FindPackagesById(\n+ string id,\n+ PackageDeprecationFieldsToInclude deprecationFields = PackageDeprecationFieldsToInclude.None)\n{\n- return GetPackagesByIdQueryable(id, withDeprecations).ToList();\n+ return GetPackagesByIdQueryable(id, deprecationFields).ToList();\n}\npublic virtual Package FindPackageByIdAndVersion(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -49,8 +49,6 @@ public DisplayPackageViewModel(Package package, User currentUser, PackageDepreca\nif (deprecation != null)\n{\n- DeprecationStatus = deprecation.Status;\n-\nCveIds = deprecation.Cves?.Select(c => c.CveId).ToList();\nCweIds = deprecation.Cwes?.Select(c => c.CweId).ToList();\n@@ -123,6 +121,9 @@ private DisplayPackageViewModel(Package package, User currentUser, string pushed\nLicenseNames = licenseNames.Split(',').Select(l => l.Trim());\n}\n}\n+\n+ DeprecationStatus = package.Deprecations.SingleOrDefault()?.Status\n+ ?? PackageDeprecationStatus.NotDeprecated;\n}\npublic bool ValidatingTooLong { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "<table class=\"table borderless\">\n<thead>\n<tr>\n- <th colspan=\"2\">Version</th>\n+ <th>Version</th>\n<th>Downloads</th>\n<th>Last updated</th>\n@if (Model.CanDisplayPrivateMetadata)\n{\n<th>Status</th>\n}\n+ <th colspan=\"2\"></th>\n</tr>\n</thead>\n<tbody class=\"no-border\">\nrowCount++;\n@VersionListDivider(rowCount, versionsExpanded)\n<tr class=\"@(packageVersion.IsCurrent(Model) ? \"bg-info\" : null)\">\n- <td class=\"signature-info-cell\">\n- @if (Model.IsCertificatesUIEnabled && !string.IsNullOrEmpty(packageVersion.SignatureInformation))\n- {\n- <i class=\"ms-Icon ms-Icon--Ribbon signature-info\" title=\"@packageVersion.SignatureInformation\"></i>\n- }\n- </td>\n<td>\n<a href=\"@Url.Package(packageVersion)\" title=\"@packageVersion.FullVersion\">\[email protected](30)\n{\nvar packageStatusSummary = packageVersion.PackageStatusSummary;\n- if (packageStatusSummary == PackageStatusSummary.Listed ||\n+ <td>\n+ @if (packageStatusSummary == PackageStatusSummary.Listed ||\npackageStatusSummary == PackageStatusSummary.Unlisted)\n{\n- <td>\n<a href=\"@Url.ManagePackage(packageVersion)\">@NuGetGallery.Helpers.EnumHelper.GetDescription(packageStatusSummary)</a>\n- </td>\n}\nelse\n{\n- <td>\[email protected](packageStatusSummary)\n+ }\n</td>\n}\n+\n+ <td class=\"package-icon-cell\">\n+ @if (Model.IsCertificatesUIEnabled && !string.IsNullOrEmpty(packageVersion.SignatureInformation))\n+ {\n+ <i class=\"ms-Icon ms-Icon--Ribbon package-icon\" title=\"@packageVersion.SignatureInformation\"></i>\n}\n+ </td>\n+\n+ <td class=\"package-icon-cell\">\n+ @if (packageVersion.DeprecationStatus != PackageDeprecationStatus.NotDeprecated)\n+ {\n+ var deprecationTitle = packageVersion.Version;\n+ var isVulnerable = packageVersion.DeprecationStatus.HasFlag(PackageDeprecationStatus.Vulnerable);\n+ var isLegacy = packageVersion.DeprecationStatus.HasFlag(PackageDeprecationStatus.Legacy);\n+ if (isVulnerable)\n+ {\n+ deprecationTitle += \" is deprecated because it has vulnerabilities\";\n+\n+ if (isLegacy)\n+ {\n+ deprecationTitle += \" and is legacy and is no longer maintained\";\n+ }\n+\n+ deprecationTitle += \".\";\n+ }\n+ else if (isLegacy)\n+ {\n+ deprecationTitle += \" is deprecated because it is legacy and is no longer maintained.\";\n+ }\n+ else\n+ {\n+ deprecationTitle += \" is deprecated.\";\n+ }\n+\n+ <i class=\"ms-Icon ms-Icon--Warning package-icon\" title=\"@deprecationTitle\"></i>\n+ }\n+ </td>\n</tr>\n}\nelse if (packageVersion.Deleted && packageVersion.CanDisplayPrivateMetadata)\nrowCount++;\n@VersionListDivider(rowCount, versionsExpanded)\n<tr class=\"deleted\">\n- <td class=\"version\" colspan=\"2\">\n- @packageVersion.Version (deleted)\n+ <td class=\"version\">\n+ @packageVersion.Version\n</td>\n<td>\[email protected]\n<td>\n<span data-datetime=\"@packageVersion.LastUpdated.ToString(\"O\")\">@packageVersion.LastUpdated.ToNuGetShortDateString()</span>\n</td>\n- <td></td>\n+ <td>\n+ Deleted\n+ </td>\n+ <td colspan=\"2\"></td>\n</tr>\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ManageDeprecationJsonApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ManageDeprecationJsonApiControllerFacts.cs",
"diff": "@@ -187,7 +187,7 @@ public void ReturnsEmptyIfNoVersions()\n// Arrange\nvar id = \"Crested.Gecko\";\nGetMock<IPackageService>()\n- .Setup(x => x.FindPackagesById(id, false))\n+ .Setup(x => x.FindPackagesById(id, PackageDeprecationFieldsToInclude.None))\n.Returns(new Package[0]);\nvar controller = GetController<ManageDeprecationJsonApiController>();\n@@ -250,7 +250,7 @@ public void ReturnsAllAvailableVersionsInReverseVersionOrder()\n};\nGetMock<IPackageService>()\n- .Setup(x => x.FindPackagesById(id, false))\n+ .Setup(x => x.FindPackagesById(id, PackageDeprecationFieldsToInclude.None))\n.Returns(packages);\nvar controller = GetController<ManageDeprecationJsonApiController>();\n@@ -440,7 +440,7 @@ public async Task ReturnsNotFoundIfNoPackagesOrRegistrationMissing(IEnumerable<P\nvar packageService = GetMock<IPackageService>();\npackageService\n- .Setup(x => x.FindPackagesById(id, true))\n+ .Setup(x => x.FindPackagesById(id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships))\n.Returns(packages.ToList())\n.Verifiable();\n@@ -502,7 +502,7 @@ public async Task ReturnsForbiddenIfNotOwner(User currentUser, User owner)\nvar packageService = GetMock<IPackageService>();\npackageService\n- .Setup(x => x.FindPackagesById(id, true))\n+ .Setup(x => x.FindPackagesById(id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships))\n.Returns(new[] { package })\n.Verifiable();\n@@ -577,7 +577,7 @@ public async Task ReturnsForbiddenIfLocked(User currentUser, User owner)\nvar packageService = GetMock<IPackageService>();\npackageService\n- .Setup(x => x.FindPackagesById(id, true))\n+ .Setup(x => x.FindPackagesById(id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships))\n.Returns(new[] { package })\n.Verifiable();\n@@ -625,7 +625,7 @@ public async Task ReturnsNotFoundIfAlternatePackageRegistrationMissing(User curr\nvar packageService = GetMock<IPackageService>();\npackageService\n- .Setup(x => x.FindPackagesById(id, true))\n+ .Setup(x => x.FindPackagesById(id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships))\n.Returns(new[] { package })\n.Verifiable();\n@@ -679,7 +679,7 @@ public async Task ReturnsNotFoundIfAlternatePackageVersionMissing(User currentUs\nvar packageService = GetMock<IPackageService>();\npackageService\n- .Setup(x => x.FindPackagesById(id, true))\n+ .Setup(x => x.FindPackagesById(id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships))\n.Returns(new[] { package })\n.Verifiable();\n@@ -735,7 +735,7 @@ public async Task ReturnsNotFoundIfVersionMissing(User currentUser, User owner)\nvar packageService = GetMock<IPackageService>();\npackageService\n- .Setup(x => x.FindPackagesById(id, true))\n+ .Setup(x => x.FindPackagesById(id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships))\n.Returns(new[] { package })\n.Verifiable();\n@@ -784,7 +784,7 @@ public async Task ReturnsNotFoundIfSomeVersionMissing(User currentUser, User own\nvar packageService = GetMock<IPackageService>();\npackageService\n- .Setup(x => x.FindPackagesById(id, true))\n+ .Setup(x => x.FindPackagesById(id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships))\n.Returns(new[] { package })\n.Verifiable();\n@@ -833,7 +833,7 @@ public async Task ReturnsNotFoundIfGetCwesByIdThrowsArgumentException(User curre\nvar packageService = GetMock<IPackageService>();\npackageService\n- .Setup(x => x.FindPackagesById(id, true))\n+ .Setup(x => x.FindPackagesById(id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships))\n.Returns(new[] { package })\n.Verifiable();\n@@ -966,7 +966,7 @@ public enum ReturnsSuccessful_AlternatePackage_State\nvar packageService = GetMock<IPackageService>();\npackageService\n- .Setup(x => x.FindPackagesById(id, true))\n+ .Setup(x => x.FindPackagesById(id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships))\n.Returns(new[] { package, package2, unselectedPackage })\n.Verifiable();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -374,7 +374,7 @@ public async Task GivenANonExistentPackageIt404s()\nGetConfigurationService(),\npackageService: packageService);\n- packageService.Setup(p => p.FindPackagesById(\"Foo\", false))\n+ packageService.Setup(p => p.FindPackagesById(\"Foo\", PackageDeprecationFieldsToInclude.Deprecation))\n.Returns(new Package[0]);\n// Act\n@@ -518,7 +518,7 @@ public async Task GivenAValidatingPackageThatTheCurrentUserDoesNotOwnThenHideIt(\nvar packages = new[] { package };\npackageService\n- .Setup(p => p.FindPackagesById(id, false))\n+ .Setup(p => p.FindPackagesById(id, PackageDeprecationFieldsToInclude.Deprecation))\n.Returns(packages);\nvar getDeprecationByPackageSetup = deprecationService\n@@ -641,7 +641,7 @@ private async Task CheckValidPackage(User currentUser, User owner)\nvar packages = new[] { package };\npackageService\n- .Setup(p => p.FindPackagesById(id, false))\n+ .Setup(p => p.FindPackagesById(id, PackageDeprecationFieldsToInclude.Deprecation))\n.Returns(packages);\ndeprecationService\n@@ -717,7 +717,7 @@ public async Task GivenAnAbsoluteLatestVersionItReturnsTheFirstLatestSemVer2()\n};\npackageService\n- .Setup(p => p.FindPackagesById(id, false))\n+ .Setup(p => p.FindPackagesById(id, PackageDeprecationFieldsToInclude.Deprecation))\n.Returns(new[] { notLatestPackage, latestPackage, latestButNotPackage });\ndeprecationService\n@@ -770,7 +770,7 @@ public async Task GivenAnAbsoluteLatestVersionAndNoLatestSemVer2ItFiltersTheList\nvar packages = new[] { notLatestPackage };\npackageService\n- .Setup(p => p.FindPackagesById(id, false))\n+ .Setup(p => p.FindPackagesById(id, PackageDeprecationFieldsToInclude.Deprecation))\n.Returns(packages);\npackageService\n@@ -825,7 +825,7 @@ public async Task GivenAValidPackageWithNoVersionThatTheCurrentUserDoesNotOwnItD\nvar packages = new[] { package };\npackageService\n- .Setup(p => p.FindPackagesById(\"Foo\", false))\n+ .Setup(p => p.FindPackagesById(\"Foo\", PackageDeprecationFieldsToInclude.Deprecation))\n.Returns(packages);\npackageService\n@@ -933,7 +933,7 @@ private async Task<ActionResult> GetResultWithReadMe(string readMeHtml, bool has\nvar packages = new[] { package };\npackageService\n- .Setup(p => p.FindPackagesById(id, false))\n+ .Setup(p => p.FindPackagesById(id, PackageDeprecationFieldsToInclude.Deprecation))\n.Returns(packages);\npackageService\n@@ -990,7 +990,7 @@ public async Task GetsValidationIssues()\n};\nvar packages = new[] { package };\n- packageService.Setup(p => p.FindPackagesById(\"Foo\", false))\n+ packageService.Setup(p => p.FindPackagesById(\"Foo\", PackageDeprecationFieldsToInclude.Deprecation))\n.Returns(packages);\npackageService.Setup(p => p.FilterLatestPackage(packages, SemVerLevelKey.SemVer2, true))\n.Returns(package);\n@@ -1051,7 +1051,7 @@ public async Task ShowsAtomFeedIfEnabled(bool isAtomFeedEnabled)\nvar packages = new[] { package };\npackageService\n- .Setup(p => p.FindPackagesById(id, false))\n+ .Setup(p => p.FindPackagesById(id, PackageDeprecationFieldsToInclude.Deprecation))\n.Returns(packages);\npackageService\n@@ -1106,7 +1106,7 @@ public async Task SplitsLicenseExpressionWhenProvided()\nvar packages = new[] { package };\npackageService\n- .Setup(p => p.FindPackagesById(id, false))\n+ .Setup(p => p.FindPackagesById(id, PackageDeprecationFieldsToInclude.Deprecation))\n.Returns(packages);\npackageService\n@@ -2576,7 +2576,7 @@ protected override Mock<IPackageService> SetupPackageService(bool isPackageMissi\nvar packageService = new Mock<IPackageService>(MockBehavior.Strict);\nvar packages = isPackageMissing ? new Package[0] : new[] { Package };\npackageService\n- .Setup(p => p.FindPackagesById(PackageRegistration.Id, true))\n+ .Setup(p => p.FindPackagesById(PackageRegistration.Id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships))\n.Returns(packages)\n.Verifiable();\n@@ -2598,7 +2598,7 @@ protected override Mock<IPackageService> SetupPackageService(bool isPackageMissi\nvar packageService = new Mock<IPackageService>(MockBehavior.Strict);\nvar packages = new[] { Package };\npackageService\n- .Setup(p => p.FindPackagesById(PackageRegistration.Id, true))\n+ .Setup(p => p.FindPackagesById(PackageRegistration.Id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships))\n.Returns(packages)\n.Verifiable();\n@@ -2676,7 +2676,7 @@ public void Returns404IfPackageNotFound()\n{\nvar packageService = new Mock<IPackageService>();\npackageService\n- .Setup(x => x.FindPackagesById(_packageRegistration.Id, false))\n+ .Setup(x => x.FindPackagesById(_packageRegistration.Id, PackageDeprecationFieldsToInclude.None))\n.Returns(new Package[0]);\nvar controller = CreateController(\n@@ -2819,7 +2819,7 @@ protected override Mock<IPackageService> CreatePackageService()\n{\nvar packageService = new Mock<IPackageService>(MockBehavior.Strict);\npackageService\n- .Setup(svc => svc.FindPackagesById(_packageId, false))\n+ .Setup(svc => svc.FindPackagesById(_packageId, PackageDeprecationFieldsToInclude.None))\n.Returns(_packageRegistration.Packages.ToList())\n.Verifiable();\n@@ -2839,7 +2839,7 @@ protected override Mock<IPackageService> CreatePackageService()\nvar packages = _packageRegistration.Packages.ToList();\nvar packageService = new Mock<IPackageService>(MockBehavior.Strict);\npackageService\n- .Setup(svc => svc.FindPackagesById(_packageId, false))\n+ .Setup(svc => svc.FindPackagesById(_packageId, PackageDeprecationFieldsToInclude.None))\n.Returns(packages)\n.Verifiable();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"diff": "@@ -789,7 +789,6 @@ public enum SeverityString_State\nvar deprecation = new PackageDeprecation\n{\n- Status = status,\nCvssRating = cvss,\nCustomMessage = \"hello\"\n};\n@@ -853,6 +852,13 @@ public enum SeverityString_State\nvar package = CreateTestPackage(\"1.0.0\");\n+ var linkedDeprecation = new PackageDeprecation\n+ {\n+ Status = status\n+ };\n+\n+ package.Deprecations.Add(linkedDeprecation);\n+\n// Act\nvar model = new DisplayPackageViewModel(package, null, deprecation);\n@@ -917,6 +923,15 @@ public enum SeverityString_State\nAssert.Null(model.AlternatePackageId);\nAssert.Null(model.AlternatePackageVersion);\n}\n+\n+ var versionModel = model.PackageVersions.Single();\n+ Assert.Equal(status, versionModel.DeprecationStatus);\n+ Assert.Null(versionModel.Severity);\n+ Assert.Null(versionModel.CveIds);\n+ Assert.Null(versionModel.CweIds);\n+ Assert.Null(versionModel.AlternatePackageId);\n+ Assert.Null(versionModel.AlternatePackageVersion);\n+ Assert.Null(versionModel.CustomMessage);\n}\n}\n}\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Mark deprecated versions in Display Package page's version history (#6973) |
455,751 | 11.03.2019 17:56:31 | 25,200 | cf0a12ee51a81044386f37fd4a97d269bb2ef92d | Upper bound individual retries, move configurations in web config.
Upper bound individual retries, move configurations in web config. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -744,9 +744,14 @@ private static void ConfigureResilientSearch(ILoggerFactory loggerFactory, IGall\n.AddHttpMessageHandler<TracingHttpHandler>()\n.AddHttpMessageHandler<CorrelatingHttpClientHandler>()\n.AddPolicyHandler(SearchClientPolicies.SearchClientFallBackCircuitBreakerPolicy(logger, searchClient.name, telemetryService))\n- .AddPolicyHandler(SearchClientPolicies.SearchClientWaitAndRetryForeverPolicy(logger, searchClient.name, telemetryService))\n+ .AddPolicyHandler(SearchClientPolicies.SearchClientWaitAndRetryPolicy(\n+ configuration.Current.SearchCircuitBreakerWaitAndRetryCount,\n+ configuration.Current.SearchCircuitBreakerWaitAndRetryIntervalInMilliseconds,\n+ logger,\n+ searchClient.name,\n+ telemetryService))\n.AddPolicyHandler(SearchClientPolicies.SearchClientCircuitBreakerPolicy(\n- SearchClientConfiguration.SearchRetryCount,\n+ configuration.Current.SearchCircuitBreakerBreakAfterCount,\nTimeSpan.FromSeconds(configuration.Current.SearchCircuitBreakerDelayInSeconds),\nlogger,\nsearchClient.name,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"diff": "@@ -378,6 +378,20 @@ public string ExternalBrandingMessage\n/// </summary>\npublic Uri SearchServiceUriSecondary { get; set; }\n+ [DefaultValue(600)]\npublic int SearchCircuitBreakerDelayInSeconds { get; set; }\n+\n+ // The default value was chosen to have searchRetryCount*retryInterval to be close to 1 second in order to keep the user still engaged.\n+ // https://www.nngroup.com/articles/website-response-times/\n+ [DefaultValue(500)]\n+ public int SearchCircuitBreakerWaitAndRetryIntervalInMilliseconds { get; set; }\n+\n+ [DefaultValue(3)]\n+ public int SearchCircuitBreakerWaitAndRetryCount { get; set; }\n+\n+ // Default value was chosen using the AI data.\n+ // It is the average of the search request count per second during the last 90 days.\n+ [DefaultValue(200)]\n+ public int SearchCircuitBreakerBreakAfterCount { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"diff": "@@ -405,5 +405,20 @@ public interface IAppConfiguration : IMessageServiceConfiguration\n/// The time in seconds for the circuit breaker delay. (The time the circuit breaker will stay in open state)\n/// </summary>\nint SearchCircuitBreakerDelayInSeconds { get; set; }\n+\n+ /// <summary>\n+ /// The wait time in milliseconds for the WaitAndRetry policy.\n+ /// </summary>\n+ int SearchCircuitBreakerWaitAndRetryIntervalInMilliseconds { get; set; }\n+\n+ /// <summary>\n+ /// A request will fail after this number of retries. In total a request will fail after this number of retries + 1.\n+ /// </summary>\n+ int SearchCircuitBreakerWaitAndRetryCount { get; set; }\n+\n+ /// <summary>\n+ /// CircuitBreaker will open after this number of consecutive failed requests.\n+ /// </summary>\n+ int SearchCircuitBreakerBreakAfterCount { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Lucene/SearchClientConfiguration.cs",
"new_path": "src/NuGetGallery/Infrastructure/Lucene/SearchClientConfiguration.cs",
"diff": "@@ -7,8 +7,5 @@ public class SearchClientConfiguration\n{\npublic static string SearchPrimaryInstance = \"SearchPrimary\";\npublic static string SearchSecondaryInstance = \"SearchSecondary\";\n- public static int SearchRetryCount = 3;\n- // Try to have searchRetryCount*retryInterval to be close to 1 second in order to keep the user still engaged. https://www.nngroup.com/articles/website-response-times/\n- public static int WaitAndRetryDefaultIntervalInMilliseconds = 500;\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Lucene/SearchClientPolicies.cs",
"new_path": "src/NuGetGallery/Infrastructure/Lucene/SearchClientPolicies.cs",
"diff": "@@ -27,7 +27,7 @@ public class SearchClientPolicies\n/// When the timeout expires trial requsts are allowed. The state will be changed to a Close state if they succeed.\n/// If they do not succeed the circuit will be moved back in the Open state for another <paramref name=\"breakDuration\"/>.\n/// </summary>\n- /// <param name=\"breakAfterCount\">The number of retries until circuit will be open.</param>\n+ /// <param name=\"breakAfterCount\">The number of allowed failures until circuit will be open.</param>\n/// <param name=\"breakDuration\">The <see cref=\"TimeSpan\"/> for the circuit to stay open.</param>\n/// <param name=\"logger\">An <see cref=\"ILogger\"/> instance.</param>\n/// <returns>The policy.</returns>\n@@ -58,11 +58,15 @@ public static IAsyncPolicy<HttpResponseMessage> SearchClientCircuitBreakerPolicy\n/// <summary>\n/// A WaitAndRetryForever policy to be used with the SearchClientCircuitBreakerPolicy.\n- /// The policy will retry on any transient error and will not retry on <see cref=\"BrokenCircuitException\"/> to avoid non-necessary retries due to circuit breaker exceptions.\n+ /// The policy will retry for <paramref name=\"retryCount\"/> on any transient error and will not retry on <see cref=\"BrokenCircuitException\"/> to avoid non-necessary retries due to circuit breaker exceptions.\n/// </summary>\n- /// <param name=\"logger\">An <see cref=\"ILogger\"/> instance.</param>\n+ /// <param name=\"retryCount\">The allowed number of retries.</param>\n+ /// <param name=\"waitInMilliseconds\">The time to wait between retries.</param>\n+ /// <param name=\"logger\">The logger</param>\n+ /// <param name=\"searchName\">The search name.</param>\n+ /// <param name=\"telemetryService\">Telemetry service</param>\n/// <returns>The policy.</returns>\n- public static IAsyncPolicy<HttpResponseMessage> SearchClientWaitAndRetryForeverPolicy(ILogger logger, string searchName, ITelemetryService telemetryService)\n+ public static IAsyncPolicy<HttpResponseMessage> SearchClientWaitAndRetryPolicy(int retryCount, int waitInMilliseconds, ILogger logger, string searchName, ITelemetryService telemetryService)\n{\nreturn HttpPolicyExtensions.\nHandleTransientHttpError()\n@@ -73,8 +77,9 @@ public static IAsyncPolicy<HttpResponseMessage> SearchClientWaitAndRetryForeverP\n// There should not be any retry in this case\nreturn false;\n}).\n- WaitAndRetryForeverAsync(\n- sleepDurationProvider: (retryAttempt, context) => TimeSpan.FromMilliseconds(SearchClientConfiguration.WaitAndRetryDefaultIntervalInMilliseconds),\n+ WaitAndRetryAsync(\n+ retryCount: retryCount,\n+ sleepDurationProvider: (retryAttempt, context) => TimeSpan.FromMilliseconds(waitInMilliseconds),\nonRetry: (delegateResult, waitDuration, context) =>\n{\ntelemetryService.TrackMetricForSearchOnRetry(searchName,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add key=\"Gallery.SearchServiceUriPrimary\" value=\"\"/>\n<add key=\"Gallery.SearchServiceUriSecondary\" value=\"\"/>\n<add key=\"Gallery.SearchCircuitBreakerDelayInSeconds\" value=\"600\"/>\n+ <add key=\"Gallery.SearchCircuitBreakerWaitAndRetryIntervalInMilliseconds\" value=\"500\"/>\n+ <add key=\"Gallery.SearchCircuitBreakerWaitAndRetryCount\" value=\"3\"/>\n+ <add key=\"Gallery.SearchCircuitBreakerBreakAfterCount\" value=\"200\"/>\n<add key=\"Gallery.Brand\" value=\"NuGet Gallery\"/>\n<add key=\"Gallery.GalleryOwner\" value=\"NuGet Gallery <[email protected]>\"/>\n<add key=\"Gallery.GalleryNoReplyAddress\" value=\"NuGet Gallery <[email protected]>\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Infrastructure/Lucene/SearchPolicyFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Infrastructure/Lucene/SearchPolicyFacts.cs",
"diff": "@@ -17,7 +17,12 @@ namespace NuGetGallery.Infrastructure.Search\n{\npublic class SearchPolicyFacts\n{\n- private static int _retryCount = 2;\n+ private static int _waitBetweenRetriesInMilliseconds = 500;\n+ private static int _circuitBreakerFailAfter = 2;\n+ private static int _retryCount = 10;\n+ // set the circuit breker to be larger than the retryCount\n+ private static int _circuitBreakerFailAfter_2 = 10;\n+ private static int _retryCount_2 = 2;\nprivate static int _circuitBreakerLongDelaySeconds = 600;\nprivate static int _circuitBreakerShortDelaySeconds = 1;\nprivate static ServiceCollection _services = null;\n@@ -26,11 +31,14 @@ public class SearchPolicyFacts\nprivate static LoggerFor_TestSearchHttpClient _loggerFor_InvalidTestSearchHttpClientWithShortCircuitBreakDelay;\nprivate static LoggerFor_TestSearchHttpClient _loggerFor_ValidTestSearchHttpClient;\nprivate static string _nameFor_InvalidTestSearchHttpClientWithLongCircuitBreakDelay = \"InvalidTestSearchHttpClientWithLongCircuitBreakDelay\";\n- private static string _nameFor_InvalidTestSearchHttpClientWithShortCircuitBreakDelay = \"InvalidTestSearchHttpClientWithSWhortCircuitBreakDelay\";\n+ private static string _nameFor_InvalidTestSearchHttpClientWithShortCircuitBreakDelay = \"InvalidTestSearchHttpClientWithShortCircuitBreakDelay\";\nprivate static string _nameFor_ValidTestSearchHttpClient = \"ValidTestSearchHttpClient\";\nprivate static readonly string _longInvalidAddress = \"https://api-v2v3search-long.nuget.org\";\nprivate static readonly string _shortInvalidAddress = \"https://api-v2v3search-short.nuget.org\";\nprivate static readonly string _validAddress = \"https://api-v2v3search-0.nuget.org\";\n+ private static readonly string _shortInvalidAddress_2 = \"https://api-v2v3search-short-2.nuget.org\";\n+ private static string _nameFor_InvalidTestSearchHttpClientRetryCountExpires = \"InvalidTestSearchHttpClientRetryCountExpires\";\n+ private static LoggerFor_TestSearchHttpClient _loggerFor_InvalidTestSearchHttpClientRetryCountExpires;\npublic SearchPolicyFacts()\n{\n@@ -163,6 +171,28 @@ public async Task TestCircuitBreakerForValidRequests()\nAssert.Equal(HttpStatusCode.OK, r.StatusCode);\n}\n+ [Fact]\n+ public async Task TestWaitAndRetryForInvalidRequests()\n+ {\n+ var invalidClient = _services.BuildServiceProvider().GetServices<TestSearchHttpClient>().Where(s => s.BaseAddress == new Uri(_shortInvalidAddress_2)).ElementAt(0);\n+ var uri = new Uri($\"{invalidClient.BaseAddress}query?q=packageid:Newtonsoft.Json version:12.0.1\");\n+\n+ var r = await invalidClient.GetAsync(uri);\n+\n+ var retryInfo = _loggerFor_InvalidTestSearchHttpClientRetryCountExpires.Informations.Where(s => s.StartsWith(\"Policy retry - it will retry after\")).Count();\n+ var onCircuitBreakerfallBackInfo = _loggerFor_InvalidTestSearchHttpClientRetryCountExpires.Informations.Where(s => s.StartsWith(\"On circuit breaker fallback.\")).Count();\n+ var circuitBreakerWarning = _loggerFor_InvalidTestSearchHttpClientRetryCountExpires.Warnings.Where(s => s.StartsWith(\"SearchCircuitBreaker logging: Breaking the circuit for\")).Count();\n+ var onCircuitBreakerReset = _loggerFor_InvalidTestSearchHttpClientRetryCountExpires.Informations.Where(s => s.StartsWith(\"SearchCircuitBreaker logging: Call ok! Closed the circuit again!\")).Count();\n+ var onCircuitBreakerHalfOpen = _loggerFor_InvalidTestSearchHttpClientRetryCountExpires.Informations.Where(s => s.StartsWith(\"SearchCircuitBreaker logging: Half-open: Next call is a trial!\")).Count();\n+\n+ Assert.Equal(_retryCount_2, retryInfo);\n+ Assert.Equal(1, onCircuitBreakerfallBackInfo);\n+ Assert.Equal(0, circuitBreakerWarning);\n+ Assert.Equal(0, onCircuitBreakerReset);\n+ Assert.Equal(0, onCircuitBreakerHalfOpen);\n+ Assert.Equal(HttpStatusCode.ServiceUnavailable, r.StatusCode);\n+ }\n+\nprivate static ILogger<ResilientSearchHttpClient> GetLogger()\n{\nvar mockConfiguration = new Mock<ILogger<ResilientSearchHttpClient>>();\n@@ -178,34 +208,44 @@ private static ServiceCollection ConfigureServices()\n_loggerFor_InvalidTestSearchHttpClientWithLongCircuitBreakDelay = new LoggerFor_TestSearchHttpClient();\n_loggerFor_InvalidTestSearchHttpClientWithShortCircuitBreakDelay = new LoggerFor_TestSearchHttpClient();\n_loggerFor_ValidTestSearchHttpClient = new LoggerFor_TestSearchHttpClient();\n+ _loggerFor_InvalidTestSearchHttpClientRetryCountExpires = new LoggerFor_TestSearchHttpClient();\nservices.AddHttpClient<TestSearchHttpClient>(_nameFor_InvalidTestSearchHttpClientWithLongCircuitBreakDelay, c => c.BaseAddress = new Uri(_longInvalidAddress))\n.AddPolicyHandler(SearchClientPolicies.SearchClientFallBackCircuitBreakerPolicy(_loggerFor_InvalidTestSearchHttpClientWithLongCircuitBreakDelay, \"InvalidTestSearchHttpClientWithLongCircuitBreakDelay\", telemetryServiceResolver))\n- .AddPolicyHandler(SearchClientPolicies.SearchClientWaitAndRetryForeverPolicy(_loggerFor_InvalidTestSearchHttpClientWithLongCircuitBreakDelay, \"InvalidTestSearchHttpClientWithLongCircuitBreakDelay\", telemetryServiceResolver))\n+ .AddPolicyHandler(SearchClientPolicies.SearchClientWaitAndRetryPolicy(_retryCount, _waitBetweenRetriesInMilliseconds, _loggerFor_InvalidTestSearchHttpClientWithLongCircuitBreakDelay, \"InvalidTestSearchHttpClientWithLongCircuitBreakDelay\", telemetryServiceResolver))\n.AddPolicyHandler(SearchClientPolicies.SearchClientCircuitBreakerPolicy(\n- _retryCount,\n+ _circuitBreakerFailAfter,\nTimeSpan.FromSeconds(_circuitBreakerLongDelaySeconds),\n_loggerFor_InvalidTestSearchHttpClientWithLongCircuitBreakDelay,\n\"InvalidTestSearchHttpClientWithLongCircuitBreakDelay\", telemetryServiceResolver));\nservices.AddHttpClient<TestSearchHttpClient>(_nameFor_InvalidTestSearchHttpClientWithShortCircuitBreakDelay, c => c.BaseAddress = new Uri(_shortInvalidAddress))\n.AddPolicyHandler(SearchClientPolicies.SearchClientFallBackCircuitBreakerPolicy(_loggerFor_InvalidTestSearchHttpClientWithShortCircuitBreakDelay, \"InvalidTestSearchHttpClientWithShortCircuitBreakDelay\", telemetryServiceResolver))\n- .AddPolicyHandler(SearchClientPolicies.SearchClientWaitAndRetryForeverPolicy(_loggerFor_InvalidTestSearchHttpClientWithShortCircuitBreakDelay, \"InvalidTestSearchHttpClientWithShortCircuitBreakDelay\", telemetryServiceResolver))\n+ .AddPolicyHandler(SearchClientPolicies.SearchClientWaitAndRetryPolicy(_retryCount, _waitBetweenRetriesInMilliseconds, _loggerFor_InvalidTestSearchHttpClientWithShortCircuitBreakDelay, \"InvalidTestSearchHttpClientWithShortCircuitBreakDelay\", telemetryServiceResolver))\n.AddPolicyHandler(SearchClientPolicies.SearchClientCircuitBreakerPolicy(\n- _retryCount,\n+ _circuitBreakerFailAfter,\nTimeSpan.FromSeconds(_circuitBreakerShortDelaySeconds),\n_loggerFor_InvalidTestSearchHttpClientWithShortCircuitBreakDelay,\n\"InvalidTestSearchHttpClientWithShortCircuitBreakDelay\", telemetryServiceResolver));\nservices.AddHttpClient<TestSearchHttpClient>(_nameFor_ValidTestSearchHttpClient, c => c.BaseAddress = new Uri(_validAddress))\n- .AddPolicyHandler(SearchClientPolicies.SearchClientFallBackCircuitBreakerPolicy(_loggerFor_ValidTestSearchHttpClient, \"ValidTestSearchHttpClient\", telemetryServiceResolver))\n- .AddPolicyHandler(SearchClientPolicies.SearchClientWaitAndRetryForeverPolicy(_loggerFor_ValidTestSearchHttpClient, \"InvalidTestSearchHttpClientWithShortCircuitBreakDelay\", telemetryServiceResolver))\n+ .AddPolicyHandler(SearchClientPolicies.SearchClientFallBackCircuitBreakerPolicy(_loggerFor_ValidTestSearchHttpClient, \"InvalidTestSearchHttpClientWithShortCircuitBreakDelay\", telemetryServiceResolver))\n+ .AddPolicyHandler(SearchClientPolicies.SearchClientWaitAndRetryPolicy(_retryCount, _waitBetweenRetriesInMilliseconds, _loggerFor_ValidTestSearchHttpClient, \"InvalidTestSearchHttpClientWithShortCircuitBreakDelay\", telemetryServiceResolver))\n.AddPolicyHandler(SearchClientPolicies.SearchClientCircuitBreakerPolicy(\n- _retryCount,\n+ _circuitBreakerFailAfter,\nTimeSpan.FromSeconds(_circuitBreakerShortDelaySeconds),\n_loggerFor_ValidTestSearchHttpClient,\n\"InvalidTestSearchHttpClientWithShortCircuitBreakDelay\", telemetryServiceResolver));\n+ services.AddHttpClient<TestSearchHttpClient>(_nameFor_InvalidTestSearchHttpClientRetryCountExpires, c => c.BaseAddress = new Uri(_shortInvalidAddress_2))\n+ .AddPolicyHandler(SearchClientPolicies.SearchClientFallBackCircuitBreakerPolicy(_loggerFor_InvalidTestSearchHttpClientRetryCountExpires, \"InvalidTestSearchHttpClientRetryCountExpires\", telemetryServiceResolver))\n+ .AddPolicyHandler(SearchClientPolicies.SearchClientWaitAndRetryPolicy(_retryCount_2, _waitBetweenRetriesInMilliseconds, _loggerFor_InvalidTestSearchHttpClientRetryCountExpires, \"InvalidTestSearchHttpClientRetryCountExpires\", telemetryServiceResolver))\n+ .AddPolicyHandler(SearchClientPolicies.SearchClientCircuitBreakerPolicy(\n+ _circuitBreakerFailAfter_2,\n+ TimeSpan.FromSeconds(_circuitBreakerShortDelaySeconds),\n+ _loggerFor_InvalidTestSearchHttpClientRetryCountExpires,\n+ \"InvalidTestSearchHttpClientRetryCountExpires\", telemetryServiceResolver));\n+\nreturn services;\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Upper bound individual retries, move configurations in web config. (#6975)
Upper bound individual retries, move configurations in web config. |
455,776 | 13.03.2019 13:14:28 | 25,200 | cac9cc3598723a59e2b5a8736fd3edb1722c8169 | Use separate model binding classes | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1387,7 +1387,7 @@ public virtual ActionResult ContactOwners(string id, string version)\nPackageId = id,\nPackageVersion = package.Version,\nProjectUrl = package.ProjectUrl,\n- Owners = package.PackageRegistration.Owners.Where(u => u.EmailAllowed),\n+ Owners = package.PackageRegistration.Owners.Where(u => u.EmailAllowed).Select(u => u.Username),\nCopySender = true,\nHasOwners = hasOwners\n};\n@@ -2141,7 +2141,7 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\n}\n}\n- public virtual async Task<JsonResult> VerifySymbolsPackageInternal(\n+ protected virtual async Task<JsonResult> VerifySymbolsPackageInternal(\nVerifyPackageRequest formData,\nStream uploadFile,\nPackageArchiveReader packageArchiveReader,\n@@ -2241,7 +2241,7 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat\n}\n}\n- public virtual async Task<JsonResult> VerifyPackageInternal(\n+ protected virtual async Task<JsonResult> VerifyPackageInternal(\nVerifyPackageRequest formData,\nStream uploadFile,\nPackageArchiveReader packageArchiveReader,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ContactOwnersViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ContactOwnersViewModel.cs",
"diff": "@@ -17,7 +17,7 @@ public class ContactOwnersViewModel\npublic string ProjectUrl { get; set; }\n- public IEnumerable<User> Owners { get; set; }\n+ public IEnumerable<string> Owners { get; set; }\n[Display(Name = \"Send me a copy\")]\npublic bool CopySender { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ContactOwners.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ContactOwners.cshtml",
"diff": "<p>\n@foreach (var owner in Model.Owners)\n{\n- <a href=\"@Url.User(owner)\" title=\"View @owner.Username's profile\" class=\"ms-font-xl\">@owner.Username</a>\n+ <a href=\"@Url.User(owner)\" title=\"View @owner's profile\" class=\"ms-font-xl\">@owner</a>\n}\n</p>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -2161,7 +2161,7 @@ public void OnlyShowsOwnersWhoAllowReceivingEmails()\n// assert\nAssert.Equal(2, model.Owners.Count());\n- Assert.Empty(model.Owners.Where(u => u.Username == notAllowedUser));\n+ Assert.Empty(model.Owners.Where(u => u == notAllowedUser));\n}\n[Fact]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Use separate model binding classes (#6993) |
455,776 | 13.03.2019 16:04:17 | 25,200 | 5972daf9e924f9c3715bb655f7537ea1aa068f6b | Fix minor bugs in Deprecation UI found in bug bash | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -589,7 +589,7 @@ img.reserved-indicator-icon {\nborder-top: 0;\n}\n.multi-select-dropdown .dropdown-content .dropdown-selector {\n- height: 300px;\n+ max-height: 300px;\noverflow: auto;\n}\n.multi-select-dropdown .dropdown-content .dropdown-selector .dropdown-filter {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/common-multi-select-dropdown.less",
"new_path": "src/Bootstrap/less/theme/common-multi-select-dropdown.less",
"diff": "border-top: 0px;\n.dropdown-selector {\n- height: 300px;\n+ max-height: 300px;\noverflow: auto;\n.dropdown-filter {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common.js",
"diff": "return false;\n}\n+ // Elements with tabindex set to a value besides -1 are focusable.\n+ var tabIndex = element.attr('tabindex');\n+ if (!!tabIndex && tabIndex >= 0) {\n+ return true;\n+ }\n+\n// See https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Content_categories#Interactive_content\nvar alwaysInteractiveElements = ['a', 'button', 'details', 'embed', 'iframe', 'keygen', 'label', 'select', 'textarea'];\nvar i;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-deprecation.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-deprecation.js",
"diff": "@@ -234,7 +234,7 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\n// Show a warning if multiple versions are selected and at least one has an existing deprecation\n// The user should be aware they are replacing existing deprecations\n// Don't show an alert if a single version is selected because it is clear that the deprecation is being replaced\n- warningMessage = \"Some of the package versions you selected have already been deprecated. These versions will have their deprecation information overriden or removed based on your actions.\";\n+ warningMessage = \"Some of the package versions you selected have already been deprecated. All selected versions will have their deprecation information overridden or removed when you submit this form.\";\n}\n} else if (hasVersionsWithExistingDeprecationState) {\n// Show a warning if no reasons are selected and at least one selected version has an existing deprecation\n@@ -572,5 +572,10 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\n// Load the state for the default version.\nloadDeprecationFormState(defaultVersion);\n- ko.applyBindings(this, $(\".page-manage-deprecation\")[0]);\n+ var section = $(\".page-manage-deprecation\")[0];\n+ // Only apply bindings if the form exists.\n+ // In certain situations (the package is locked, user doesn't have permissions, etc) we do not render the form.\n+ if (section) {\n+ ko.applyBindings(this, section);\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/Manage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/Manage.cshtml",
"diff": "ViewBag.MdPageColumns = GalleryConstants.ColumnsFormMd;\n}\[email protected](\"_MultiSelectDropdown\")\n+\n<section role=\"main\" class=\"container main-container\">\[email protected](Html)\n<div class=\"row\">\n\"Manage\",\nlinkIdOnly: true))\n+ @if (Model.IsLocked)\n+ {\n+ @ViewHelpers.AlertDanger(\n+ @<text>\n+ Package '@Model.Id' has been locked. Please contact\n+ <a href=\"mailto:[email protected][email protected](string.Format(\"Requesting support for a locked package - '{0}'\", Model.Id))\">[email protected]</a>\n+ </text>)\n+ }\n+\[email protected](\nthis,\n\"Owners\",\nvar state = versionListedState[version];\n// Update the listed checkbox to match the state of the package.\nvar listed = state.Listed;\n- $(\".page-delete-package input#Listed\")[0].checked = listed;\n+ $(\".page-delete-package input#Listed\").prop('checked', listed);\n// Update the text stating the download count on the delete form.\nvar downloadCount = state.DownloadCount;\n$(\".page-delete-package #downloadCount\").text(downloadCount);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_DisplayPackageDeprecation.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_DisplayPackageDeprecation.cshtml",
"diff": "<div class=\"deprecation-container\">\n<div class=\"icon-text alert alert-warning\">\n<div id=\"show-deprecation-content-container\" class=\"deprecation-expander\" tabindex=\"0\" data-toggle=\"collapse\" data-target=\"#deprecation-content-container\" aria-expanded=\"false\" aria-controls=\"deprecation-content-container\" aria-labelledby=\"deprecation-container-label\">\n- <div class=\"deprecation-expander\">\n+ <div class=\"deprecation-expander\" role=\"button\">\n<div class=\"deprecation-expander-container\">\n<i class=\"deprecation-expander-icon ms-Icon ms-Icon--Warning\" aria-hidden=\"true\"></i>\n}\n<b>Suggested Alternatives</b>\n- <p>\n- Consider using <a href=\"@alternateUrl\">@alternateText</a> instead of this package.\n- </p>\n+ <p><a href=\"@alternateUrl\">@alternateText</a></p>\n}\n@if (!string.IsNullOrEmpty(Model.CustomMessage))\n{\n- <b>Package owner message</b>\n+ <b>Additional Details</b>\n<p>@Model.CustomMessage</p>\n}\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ManageDocumentation.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ManageDocumentation.cshtml",
"diff": "@ViewHelpers.AlertDanger(\n@<text>\n<span>\n- Package '@Model.Id' has been locked. This means you cannot publish a new version or change the listing status of a published package version. Please contact\n- <a href=\"mailto:[email protected][email protected](string.Format(\"Requesting support for a locked package - '{0}'\", Model.Id))\">[email protected]</a>.\n+ You cannot update the documentation of a locked package.\n</span>\n</text>)\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ManageListing.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ManageListing.cshtml",
"diff": "@if (!Model.VersionSelectList.Any())\n{\n- @ViewHelpers.AlertInfo(\n- @<text>\n- <span>There are no versions that can have their listing state changed.</span>\n- </text>)\n+ @ViewHelpers.AlertInfo(@<text>There are no versions that can have their listing state changed.</text>)\n}\nelse if (Model.IsLocked && !User.IsAdministrator())\n{\n<div class=\"validation-error-message-list\">\n- @ViewHelpers.AlertDanger(\n- @<text>\n- <span>\n- Package '@Model.Id' has been locked. This means you cannot publish a new version or change the listing status of a published package version. Please contact\n- <a href=\"mailto:[email protected][email protected](string.Format(\"Requesting support for a locked package - '{0}'\", Model.Id))\">[email protected]</a>.\n- </span>\n- </text>)\n+ @ViewHelpers.AlertDanger(@<text>You cannot change the listing state of a locked package.</text>)\n</div>\n}\nelse\n{\n- if (Model.IsLocked && User.IsAdministrator())\n- {\n- <div class=\"validation-error-message-list\">\n- @ViewHelpers.AlertDanger(\n- @<text>\n- <span>Package '@Model.Id' has been locked.</span>\n- </text>)\n- </div>\n- }\n-\n<label for=\"input-select-version\" id=\"package-version-label\">Select version</label>\[email protected](\"version-selection\", Model.VersionSelectList,\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix minor bugs in Deprecation UI found in bug bash (#6994) |
455,736 | 15.03.2019 16:27:19 | 25,200 | 88518550d9f3282c9f7f658ca8afa8d537047b6e | Sign the NuGet packages produced by the build
Progress on | [
{
"change_type": "MODIFY",
"old_path": "build.ps1",
"new_path": "build.ps1",
"diff": "@@ -10,7 +10,7 @@ param (\n[string]$PackageSuffix,\n[string]$Branch,\n[string]$CommitSHA,\n- [string]$BuildBranch = '5fd8377a9abf3ff411918dbb973948a6677432db'\n+ [string]$BuildBranch = '2d8feecabe3aeaed7f5b4d50b9be78c94faf39ec'\n)\nSet-StrictMode -Version 1.0\n@@ -99,6 +99,11 @@ Invoke-BuildStep 'Creating artifacts' { `\n} `\n-ev +BuildErrors\n+Invoke-BuildStep 'Signing the packages' {\n+ Sign-Packages -Configuration $Configuration -BuildNumber $BuildNumber -MSBuildVersion \"15\" `\n+} `\n+-ev +BuildErrors\n+\nTrace-Log ('-' * 60)\n## Calculating Build time\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Sign the NuGet packages produced by the build (#6999)
Progress on https://github.com/NuGet/Engineering/issues/2244 |
455,759 | 18.03.2019 10:38:56 | 25,200 | a9b0e17559fbe77bcdc2e1f96edda40044f2cc74 | Ensure trace enabled=false in Release config | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.Release.config",
"new_path": "src/NuGetGallery/Web.Release.config",
"diff": "-->\n<system.web>\n<compilation xdt:Transform=\"RemoveAttributes(debug)\" />\n+\n+ <!-- This is set to 'false' for security reasons. -->\n+ <trace xdt:Transform=\"Remove\"/>\n+ <trace xdt:Transform=\"InsertAfter(/configuration/system.web/compilation)\" enabled=\"false\"/>\n+\n<!--\nIn the example below, the \"Replace\" transform will replace the entire\n<customErrors> section of your web.config file.\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Ensure trace enabled=false in Release config (#6998) |
455,759 | 19.03.2019 17:22:52 | 25,200 | b4908d424a4f49e5b50f11c1c650d46b01793bac | Exception messages should not expose infrastructure information | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/DatabaseWrapper.cs",
"new_path": "src/NuGetGallery.Core/Entities/DatabaseWrapper.cs",
"diff": "@@ -46,7 +46,7 @@ public async Task<int> ExecuteSqlResourceAsync(string name, params object[] para\nif (string.IsNullOrEmpty(sqlCommand))\n{\n- throw new ArgumentException($\"SQL resource '{name}' is empty.\", \"name\");\n+ throw new ArgumentException($\"SQL resource '{name}' is empty.\", nameof(name));\n}\nreturn await ExecuteSqlCommandAsync(sqlCommand, parameters);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/SmtpUri.cs",
"new_path": "src/NuGetGallery/Configuration/SmtpUri.cs",
"diff": "@@ -24,7 +24,7 @@ public SmtpUri(Uri uri)\nSecure = uri.Scheme.Equals(\"smtps\", StringComparison.OrdinalIgnoreCase);\nif (!Secure && !uri.Scheme.Equals(\"smtp\", StringComparison.OrdinalIgnoreCase))\n{\n- throw new FormatException(\"Invalid SMTP URL: \" + uri.ToString());\n+ throw new FormatException(\"Invalid SMTP URL\");\n}\nvar m = UserInfoParser.Match(uri.UserInfo);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Exception messages should not expose infrastructure information (#7007) |
455,776 | 25.03.2019 16:13:06 | 25,200 | 888bffcb95b600a3213c84375d41d17e9ce878fd | Hotfix: Deprecation UI should be hidden when feature flag is disabled | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -748,6 +748,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\nmodel.SymbolsPackageValidationIssues = _validationService.GetLatestPackageValidationIssues(model.LatestSymbolsPackage);\nmodel.IsCertificatesUIEnabled = _contentObjectService.CertificatesConfiguration?.IsUIEnabledForUser(currentUser) ?? false;\nmodel.IsAtomFeedEnabled = _featureFlagService.IsPackagesAtomFeedEnabled();\n+ model.IsPackageDeprecationEnabled = _featureFlagService.IsManageDeprecationEnabled(currentUser);\nmodel.ReadMeHtml = await _readMeService.GetReadMeHtmlAsync(package);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"diff": "@@ -19,6 +19,9 @@ $(function () {\ncontainer.removeAttr(expanderAttributes[i]);\n}\n+ // The expander should not be clickable when it doesn't have content\n+ container.find('.deprecation-expander').removeAttr('role');\n+\n$('#deprecation-expander-icon-right').hide();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -143,6 +143,7 @@ private DisplayPackageViewModel(Package package, User currentUser, string pushed\npublic bool HasSemVer2Dependency { get; }\npublic bool IsDotnetToolPackageType { get; set; }\npublic bool IsAtomFeedEnabled { get; set; }\n+ public bool IsPackageDeprecationEnabled { get; set; }\npublic bool HasNewerPrerelease\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": ")\n}\n- @if (Model.DeprecationStatus != PackageDeprecationStatus.NotDeprecated)\n+ @if (Model.IsPackageDeprecationEnabled && Model.DeprecationStatus != PackageDeprecationStatus.NotDeprecated)\n{\[email protected](\"_DisplayPackageDeprecation\")\n}\n</td>\n<td class=\"package-icon-cell\">\n- @if (packageVersion.DeprecationStatus != PackageDeprecationStatus.NotDeprecated)\n+ @if (Model.IsPackageDeprecationEnabled && packageVersion.DeprecationStatus != PackageDeprecationStatus.NotDeprecated)\n{\nvar deprecationTitle = packageVersion.Version;\nvar isVulnerable = packageVersion.DeprecationStatus.HasFlag(PackageDeprecationStatus.Vulnerable);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1076,6 +1076,61 @@ public async Task ShowsAtomFeedIfEnabled(bool isAtomFeedEnabled)\ndeprecationService.Verify();\n}\n+ [Theory]\n+ [InlineData(false)]\n+ [InlineData(true)]\n+ public async Task ShowsDeprecationIfEnabled(bool isDeprecationEnabled)\n+ {\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ var packageService = new Mock<IPackageService>();\n+ var deprecationService = new Mock<IPackageDeprecationService>();\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ packageService: packageService,\n+ featureFlagService: featureFlagService,\n+ deprecationService: deprecationService);\n+ controller.SetCurrentUser(TestUtility.FakeUser);\n+\n+ var id = \"Foo\";\n+ var package = new Package()\n+ {\n+ PackageRegistration = new PackageRegistration()\n+ {\n+ Id = id,\n+ Owners = new List<User>()\n+ },\n+ Version = \"01.1.01\",\n+ NormalizedVersion = \"1.1.1\",\n+ Title = \"A test package!\"\n+ };\n+\n+ var packages = new[] { package };\n+ packageService\n+ .Setup(p => p.FindPackagesById(id, PackageDeprecationFieldsToInclude.Deprecation))\n+ .Returns(packages);\n+\n+ packageService\n+ .Setup(p => p.FilterLatestPackage(packages, SemVerLevelKey.SemVer2, true))\n+ .Returns(package);\n+\n+ featureFlagService\n+ .Setup(x => x.IsManageDeprecationEnabled(TestUtility.FakeUser))\n+ .Returns(isDeprecationEnabled);\n+\n+ deprecationService\n+ .Setup(x => x.GetDeprecationByPackage(package))\n+ .Verifiable();\n+\n+ // Arrange and Act\n+ var result = await controller.DisplayPackage(id, version: null);\n+\n+ // Assert\n+ var model = ResultAssert.IsView<DisplayPackageViewModel>(result);\n+ Assert.Equal(isDeprecationEnabled, model.IsPackageDeprecationEnabled);\n+\n+ deprecationService.Verify();\n+ }\n+\n[Fact]\npublic async Task SplitsLicenseExpressionWhenProvided()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Hotfix: Deprecation UI should be hidden when feature flag is disabled (#7016) |
455,776 | 26.03.2019 10:13:51 | 25,200 | a06b22b62c7aa8ac64134231b543dad3e6ea01c7 | Hotfix: ManageDeprecation is not enabled for logged out users | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -748,7 +748,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\nmodel.SymbolsPackageValidationIssues = _validationService.GetLatestPackageValidationIssues(model.LatestSymbolsPackage);\nmodel.IsCertificatesUIEnabled = _contentObjectService.CertificatesConfiguration?.IsUIEnabledForUser(currentUser) ?? false;\nmodel.IsAtomFeedEnabled = _featureFlagService.IsPackagesAtomFeedEnabled();\n- model.IsPackageDeprecationEnabled = _featureFlagService.IsManageDeprecationEnabled(currentUser);\n+ model.IsPackageDeprecationEnabled = currentUser != null && _featureFlagService.IsManageDeprecationEnabled(currentUser);\nmodel.ReadMeHtml = await _readMeService.GetReadMeHtmlAsync(package);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1076,6 +1076,60 @@ public async Task ShowsAtomFeedIfEnabled(bool isAtomFeedEnabled)\ndeprecationService.Verify();\n}\n+ [Theory]\n+ [InlineData(false)]\n+ [InlineData(true)]\n+ public async Task DoesNotShowDeprecationToLoggedOutUsers(bool isDeprecationEnabled)\n+ {\n+ var featureFlagService = new Mock<IFeatureFlagService>();\n+ var packageService = new Mock<IPackageService>();\n+ var deprecationService = new Mock<IPackageDeprecationService>();\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ packageService: packageService,\n+ featureFlagService: featureFlagService,\n+ deprecationService: deprecationService);\n+\n+ var id = \"Foo\";\n+ var package = new Package()\n+ {\n+ PackageRegistration = new PackageRegistration()\n+ {\n+ Id = id,\n+ Owners = new List<User>()\n+ },\n+ Version = \"01.1.01\",\n+ NormalizedVersion = \"1.1.1\",\n+ Title = \"A test package!\"\n+ };\n+\n+ var packages = new[] { package };\n+ packageService\n+ .Setup(p => p.FindPackagesById(id, PackageDeprecationFieldsToInclude.Deprecation))\n+ .Returns(packages);\n+\n+ packageService\n+ .Setup(p => p.FilterLatestPackage(packages, SemVerLevelKey.SemVer2, true))\n+ .Returns(package);\n+\n+ featureFlagService\n+ .Setup(x => x.IsManageDeprecationEnabled(It.IsAny<User>()))\n+ .Returns(isDeprecationEnabled);\n+\n+ deprecationService\n+ .Setup(x => x.GetDeprecationByPackage(package))\n+ .Verifiable();\n+\n+ // Arrange and Act\n+ var result = await controller.DisplayPackage(id, version: null);\n+\n+ // Assert\n+ var model = ResultAssert.IsView<DisplayPackageViewModel>(result);\n+ Assert.False(model.IsPackageDeprecationEnabled);\n+\n+ deprecationService.Verify();\n+ }\n+\n[Theory]\n[InlineData(false)]\n[InlineData(true)]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Hotfix: ManageDeprecation is not enabled for logged out users (#7020) |
455,751 | 26.03.2019 17:11:06 | 25,200 | c968679f224b1201e8a67f24861b78e216023ae2 | Add new symbol validation issues.
Add the new validation issues. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Extensions/ValidationIssueExtensions.cs",
"new_path": "src/NuGetGallery.Core/Extensions/ValidationIssueExtensions.cs",
"diff": "@@ -59,6 +59,10 @@ public static string ToMarkdownString(this ValidationIssue validationIssue, stri\nreturn \"The uploaded symbols package contains pdb(s) for a corresponding dll(s) not found in the nuget package.\";\ncase ValidationIssueCode.SymbolErrorCode_PdbIsNotPortable:\nreturn \"The uploaded symbols package contains one or more pdbs that are not portable.\";\n+ case ValidationIssueCode.SymbolErrorCode_SnupkgDoesNotContainSymbols:\n+ return \"The uploaded symbols package does not contain any symbol files.\";\n+ case ValidationIssueCode.SymbolErrorCode_SnupkgContainsEntriesNotSafeForExtraction:\n+ return \"The uploaded symbols package contains entries that are not safe for extraction.\";\ndefault:\nreturn \"There was an unknown failure when validating your package.\";\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<PackageReference Include=\"NuGet.Services.Entities\">\n- <Version>2.43.0</Version>\n+ <Version>2.44.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.FeatureFlags\">\n- <Version>2.43.0</Version>\n+ <Version>2.44.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging.Email\">\n- <Version>2.43.0</Version>\n+ <Version>2.44.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.43.0</Version>\n+ <Version>2.44.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Issues\">\n- <Version>2.43.0</Version>\n+ <Version>2.44.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Version>2.2.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Licenses\">\n- <Version>2.43.0</Version>\n+ <Version>2.44.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n<Version>5.0.0-preview1.5665</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>2.43.0</Version>\n+ <Version>2.44.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n- <Version>2.43.0</Version>\n+ <Version>2.44.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Owin\">\n- <Version>2.43.0</Version>\n+ <Version>2.44.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Sql\">\n- <Version>2.43.0</Version>\n+ <Version>2.44.0</Version>\n</PackageReference>\n<PackageReference Include=\"Owin\">\n<Version>1.0.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ValidationIssue.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ValidationIssue.cshtml",
"diff": "The uploaded symbols package contains one or more pdbs that are not portable.\n</text>\nbreak;\n+ case ValidationIssueCode.SymbolErrorCode_SnupkgDoesNotContainSymbols:\n+ <text>\n+ The uploaded symbols package does not contain any symbol files.\n+ </text>\n+ break;\n+ case ValidationIssueCode.SymbolErrorCode_SnupkgContainsEntriesNotSafeForExtraction:\n+ <text>\n+ The uploaded symbols package contains entries that are not safe for extraction.\n+ </text>\n+ break;\ndefault:\n<text>\nThere was an unknown failure when validating your package.\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Infrastructure/Mail/MarkdownMessageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Infrastructure/Mail/MarkdownMessageServiceFacts.cs",
"diff": "@@ -2326,6 +2326,10 @@ private static string ParseValidationIssue(ValidationIssue validationIssue, stri\nreturn \"The uploaded symbols package contains pdb(s) for a corresponding dll(s) not found in the nuget package.\";\ncase ValidationIssueCode.SymbolErrorCode_PdbIsNotPortable:\nreturn \"The uploaded symbols package contains one or more pdbs that are not portable.\";\n+ case ValidationIssueCode.SymbolErrorCode_SnupkgDoesNotContainSymbols:\n+ return \"The uploaded symbols package does not contain any symbol files.\";\n+ case ValidationIssueCode.SymbolErrorCode_SnupkgContainsEntriesNotSafeForExtraction:\n+ return \"The uploaded symbols package contains entries that are not safe for extraction.\";\ndefault:\nreturn \"There was an unknown failure when validating your package.\";\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Views/Packages/ValidationIssueFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Views/Packages/ValidationIssueFacts.cs",
"diff": "@@ -102,6 +102,8 @@ public static IEnumerable<ValidationIssue> KnownValidationIssues\nyield return ValidationIssue.SymbolErrorCode_ChecksumDoesNotMatch;\nyield return ValidationIssue.SymbolErrorCode_MatchingAssemblyNotFound;\nyield return ValidationIssue.SymbolErrorCode_PdbIsNotPortable;\n+ yield return ValidationIssue.SymbolErrorCode_SnupkgDoesNotContainSymbols;\n+ yield return ValidationIssue.SymbolErrorCode_SnupkgContainsEntriesNotSafeForExtraction;\nyield return new UnauthorizedCertificateFailure(\"thumbprint\");\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add new symbol validation issues. (#7015)
Add the new validation issues. |
455,776 | 01.04.2019 15:04:11 | 25,200 | b04e27aa4de6b73013e2eb99a721584a0e2c99fa | Deprecation - CVEs, CWEs, and CVSS should not be submitted with the form if unchecked | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-deprecation.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-deprecation.js",
"diff": "@@ -301,12 +301,21 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\nreturn self.cvssRatingLabel() === invalidCvssRatingString;\n}, this);\n- // The CVSS rating to submit with the form.\n- this.cvssRating = ko.pureComputed(function () {\n+ this.chosenCvssRating = ko.pureComputed(function () {\nif (self.hasCvss()) {\nreturn self.selectedCvssRating();\n} else {\n- // If the CVSS section is unchecked, don't submit the CVSS rating with the form.\n+ // If the CVSS section is unchecked, there is no CVSS rating chosen.\n+ return null;\n+ }\n+ }, this);\n+\n+ // The CVSS rating to submit with the form.\n+ this.cvssRating = ko.pureComputed(function () {\n+ if (self.isVulnerable()) {\n+ return self.chosenCvssRating();\n+ } else {\n+ // If the package is not vulnerable, don't submit the CVSS rating with the form.\nreturn null;\n}\n}, this);\n@@ -328,7 +337,7 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\n};\n// The model for the CVEs view.\n- this.cves = new ManageDeprecationSecurityDetailListViewModel(\n+ this.chosenCves = new ManageDeprecationSecurityDetailListViewModel(\n\"cve\",\n\"CVE ID(s)\",\n\"Add one or more CVEs applicable to the vulnerability.\",\n@@ -350,8 +359,17 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\n\"We could not find this CVE. Is it correct?\",\n\"NuGet.org refreshes its CVE data often and if we find this ID, your deprecation will be updated with the latest data.\");\n+ this.cves = ko.pureComputed(function () {\n+ if (self.isVulnerable()) {\n+ return self.chosenCves.exportIds();\n+ } else {\n+ // If the package is not vulnerable, do not submit the CVEs with the form.\n+ return [];\n+ }\n+ }, this);\n+\n// The model for the CWEs view\n- this.cwes = new ManageDeprecationSecurityDetailListViewModel(\n+ this.chosenCwes = new ManageDeprecationSecurityDetailListViewModel(\n\"cwe\",\n\"CWE(s)\",\n\"Add one or more CWEs applicable to the vulnerability.\",\n@@ -373,6 +391,15 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\nnull,\nnull);\n+ this.cwes = ko.pureComputed(function () {\n+ if (self.isVulnerable()) {\n+ return self.chosenCwes.exportIds();\n+ } else {\n+ // If the package is not vulnerable, do not submit the CWEs with the form.\n+ return [];\n+ }\n+ }, this);\n+\n// The ID entered into the alternate package ID textbox.\nthis.chosenAlternatePackageId = ko.observable('');\n@@ -481,9 +508,9 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\nisVulnerable: self.isVulnerable(),\nisLegacy: self.isLegacy(),\nisOther: self.isOther(),\n- cveIds: self.cves.exportIds(),\n+ cveIds: self.cves(),\ncvssRating: self.cvssRating(),\n- cweIds: self.cwes.exportIds(),\n+ cweIds: self.cwes(),\nalternatePackageId: self.alternatePackageId(),\nalternatePackageVersion: self.alternatePackageVersion(),\ncustomMessage: self.customMessage()\n@@ -512,9 +539,9 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\nversionData.IsVulnerable = self.isVulnerable();\nversionData.IsLegacy = self.isLegacy();\nversionData.IsOther = self.isOther();\n- versionData.CveIds = self.cves.export();\n- versionData.CvssRating = self.cvssRating();\n- versionData.CweIds = self.cwes.export();\n+ versionData.CveIds = self.chosenCves.export();\n+ versionData.CvssRating = self.chosenCvssRating();\n+ versionData.CweIds = self.chosenCwes.export();\nversionData.AlternatePackageId = self.alternatePackageId();\nversionData.AlternatePackageVersion = self.alternatePackageVersion();\nversionData.CustomMessage = self.customMessage();\n@@ -530,12 +557,12 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\nself.isLegacy(versionData.IsLegacy);\nself.isOther(versionData.IsOther);\n- self.cves.import(versionData.CveIds);\n+ self.chosenCves.import(versionData.CveIds);\n- self.hasCvss(versionData.CvssRating);\n+ self.hasCvss(!!versionData.CvssRating);\nself.selectedCvssRating(versionData.CvssRating);\n- self.cwes.import(versionData.CweIds);\n+ self.chosenCwes.import(versionData.CweIds);\nself.chosenAlternatePackageId(versionData.AlternatePackageId);\nif (versionData.AlternatePackageVersion) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ManageDeprecation.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ManageDeprecation.cshtml",
"diff": "<div class=\"deprecation-section-header\">\n<b>Provide additional security details</b>\n</div>\n- <div data-bind=\"template: { name: 'deprecation-security-detail-list-input-template', data: cves }\"></div>\n+ <div data-bind=\"template: { name: 'deprecation-security-detail-list-input-template', data: chosenCves }\"></div>\n<div class=\"security-detail panel panel-default\">\n<div>\n<label>\n<span data-bind=\"text: cvssRatingLabel, css: { 'text-danger': cvssRatingIsInvalid, 'cvss-bold': !cvssRatingIsInvalid() }\"></span>\n</div>\n</div>\n- <div data-bind=\"template: { name: 'deprecation-security-detail-list-input-template', data: cwes }\"></div>\n+ <div data-bind=\"template: { name: 'deprecation-security-detail-list-input-template', data: chosenCwes }\"></div>\n</div>\n<div class=\"form-group unbolded-label\">\n<label>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Deprecation - CVEs, CWEs, and CVSS should not be submitted with the form if unchecked (#6996) |
455,736 | 03.04.2019 08:48:19 | 25,200 | f69f5476d3ff900e732bfedcf30ed4874a99387f | Fix curated feed delete script
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Migrations/201811291758016_RemoveCuratedFeedEntities.cs",
"new_path": "src/NuGetGallery/Migrations/201811291758016_RemoveCuratedFeedEntities.cs",
"diff": "@@ -28,9 +28,9 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE name = N'IX_CuratedFeedKey' AND ob\nDROP INDEX [IX_CuratedFeedKey] ON [dbo].[CuratedFeedManagers]\nIF EXISTS (SELECT name FROM sys.indexes WHERE name = N'IX_UserKey' AND object_id = object_id(N'[dbo].[CuratedFeedManagers]', N'U'))\nDROP INDEX [IX_UserKey] ON [dbo].[CuratedFeedManagers]\n- DROP TABLE [dbo].[CuratedFeeds]\nDROP TABLE [dbo].[CuratedPackages]\nDROP TABLE [dbo].[CuratedFeedManagers]\n+ DROP TABLE [dbo].[CuratedFeeds]\n*/\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix curated feed delete script (#7039)
Progress on https://github.com/NuGet/Engineering/issues/2353 |
455,759 | 03.04.2019 19:20:10 | -7,200 | 4d1e4371712fbe7f6e81ea36c45612ceb639ce2f | Verify nuspec file size | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"new_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"diff": "@@ -100,6 +100,15 @@ public async Task<PackageValidationResult> ValidateBeforeGeneratePackageAsync(Pa\nreturn result;\n}\n+ var nuspecFileEntry = nuGetPackage.GetEntry(nuGetPackage.GetNuspecFile());\n+ using (var nuspecFileStream = await nuGetPackage.GetNuspecAsync(CancellationToken.None))\n+ {\n+ if (!await IsStreamLengthMatchesReportedAsync(nuspecFileStream, nuspecFileEntry.Length))\n+ {\n+ return PackageValidationResult.Invalid(Strings.UploadPackage_CorruptNupkg);\n+ }\n+ }\n+\nresult = await CheckForUnsignedPushAfterAuthorSignedAsync(\nnuGetPackage,\nwarnings);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Helpers\\StreamHelperFacts.cs\" />\n<Compile Include=\"Queries\\AutocompleteCweIdsQueryFacts.cs\" />\n<Compile Include=\"Services\\PackageDeprecationServiceFacts.cs\" />\n+ <Compile Include=\"TestData\\TestDataResourceUtility.cs\" />\n<Compile Include=\"UsernameValidationRegex.cs\" />\n<Compile Include=\"Extensions\\NumberExtensionsFacts.cs\" />\n<Compile Include=\"Extensions\\RouteExtensionsFacts.cs\" />\n<SubType>Designer</SubType>\n</None>\n<EmbeddedResource Include=\"TestData\\certificate.cer\" />\n+ <EmbeddedResource Include=\"TestData\\theId.nuspec\" />\n</ItemGroup>\n<ItemGroup>\n<ProjectReference Include=\"..\\..\\src\\NuGet.Services.Search.Client\\NuGet.Services.Search.Client.csproj\">\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/CertificateValidatorFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/CertificateValidatorFacts.cs",
"diff": "@@ -183,19 +183,9 @@ public void Validate_WhenStreamIsDerEncodedCertificate_Succeeds(string fileName)\n}\n}\n- private byte[] GetResourceBytes(string name)\n- {\n- var resourceName = $\"NuGetGallery.TestData.{name}\";\n-\n- using (var reader = new BinaryReader(GetType().Assembly.GetManifestResourceStream(resourceName)))\n- {\n- return reader.ReadBytes((int)reader.BaseStream.Length);\n- }\n- }\n-\nprivate X509Certificate2 GetCertificate()\n{\n- return new X509Certificate2(GetResourceBytes(\"certificate.cer\"));\n+ return new X509Certificate2(TestDataResourceUtility.GetResourceBytes(\"certificate.cer\"));\n}\nprivate MemoryStream GetDerEncodedCertificateStream()\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/NuGetGallery.Facts/TestData/TestDataResourceUtility.cs",
"diff": "+// Copyright (c) .NET Foundation. All rights reserved.\n+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n+\n+using System.Globalization;\n+using System.IO;\n+using System.Reflection;\n+\n+namespace NuGetGallery\n+{\n+ internal static class TestDataResourceUtility\n+ {\n+ private static readonly string ResourceNameFormat = \"NuGetGallery.TestData.{0}\";\n+ private static readonly Assembly CurrentAssembly = typeof(TestDataResourceUtility).Assembly;\n+\n+ internal static byte[] GetResourceBytes(string name)\n+ {\n+ using (var reader = new BinaryReader(GetManifestResourceStream(name)))\n+ {\n+ return reader.ReadBytes((int)reader.BaseStream.Length);\n+ }\n+ }\n+\n+ internal static string GetResourceString(string name)\n+ {\n+ using (var resourceStream = GetManifestResourceStream(name))\n+ using (var streamReader = new StreamReader(resourceStream))\n+ {\n+ return streamReader.ReadToEnd();\n+ }\n+ }\n+\n+ private static Stream GetManifestResourceStream(string name)\n+ {\n+ var resourceName = GetResourceName(name);\n+\n+ return CurrentAssembly.GetManifestResourceStream(resourceName);\n+ }\n+\n+ private static string GetResourceName(string name)\n+ {\n+ return string.Format(\n+ CultureInfo.InvariantCulture,\n+ ResourceNameFormat,\n+ name);\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/NuGetGallery.Facts/TestData/theId.nuspec",
"diff": "+<?xml version=\"1.0\"?>\n+ <package xmlns=\"http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd\">\n+ <metadata>\n+ <id>theId</id>\n+ <version>1.2.3-alpha.0</version>\n+ <title>theTitle</title>\n+ <summary>theSummary</summary>\n+ <description>theDescription</description>\n+ <tags>theTags</tags>\n+ <requireLicenseAcceptance>True</requireLicenseAcceptance>\n+ <authors>theFirstAuthor, theSecondAuthor</authors>\n+ <owners>Package owners</owners>\n+ <language></language>\n+ <copyright>theCopyright</copyright>\n+ <releaseNotes>theReleaseNotes</releaseNotes>\n+ <licenseUrl></licenseUrl>\n+\n+ <projectUrl></projectUrl>\n+ <iconUrl></iconUrl>\n+ <packageTypes><packageType name=\"dependency\" version=\"1.0.0\"/><packageType name=\"DotNetCliTool\" version=\"2.1.1\"/></packageTypes>\n+ <dependencies><group targetFramework=\"net40\"><dependency id=\"theFirstDependency\" version=\"[1.0.0, 2.0.0)\"></dependency><dependency id=\"theSecondDependency\" version=\"[1.0.0, 1.0.0]\"></dependency><dependency id=\"theThirdDependency\" version=\"(, )\"></dependency></group><group targetFramework=\"net35\"><dependency id=\"theFourthDependency\" version=\"[1.0.0, 1.0.0]\"></dependency></group></dependencies>\n+\n+\n+ </metadata>\n+ </package>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Verify nuspec file size (#7038) |
455,736 | 03.04.2019 10:23:36 | 25,200 | 5efe0d9f062449c91ed41e14731be12030906233 | Remove leftover curated feed entities
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Entities/NuGet.Services.Entities.csproj",
"new_path": "src/NuGet.Services.Entities/NuGet.Services.Entities.csproj",
"diff": "<Compile Include=\"Certificate.cs\" />\n<Compile Include=\"Constants.cs\" />\n<Compile Include=\"Credential.cs\" />\n- <Compile Include=\"CuratedFeed.cs\" />\n- <Compile Include=\"CuratedPackage.cs\" />\n<Compile Include=\"Cve.cs\" />\n<Compile Include=\"CveStatus.cs\" />\n<Compile Include=\"Cwe.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ODataV2CuratedFeedControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ODataV2CuratedFeedControllerFacts.cs",
"diff": "@@ -26,7 +26,6 @@ public class ODataV2CuratedFeedControllerFacts\npublic class TheGetMethod\n{\n- private readonly CuratedFeed _curatedFeed;\nprivate readonly Package _curatedFeedPackage;\nprivate readonly Package _mainFeedPackage;\nprivate readonly FeatureConfiguration _featureConfiguration;\n@@ -41,7 +40,6 @@ public class TheGetMethod\npublic TheGetMethod()\n{\n- _curatedFeed = new CuratedFeed { Name = _curatedFeedName };\n_curatedFeedPackage = new Package\n{\nPackageRegistration = new PackageRegistration\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Remove leftover curated feed entities (#7040)
Progress on https://github.com/NuGet/Engineering/issues/2353 |
455,751 | 04.04.2019 13:58:50 | 25,200 | 9f65fe80c95162a5fee82b0bb67c3eeb05524726 | Reduce the Search related telemetry. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -741,7 +741,6 @@ private static void ConfigureResilientSearch(ILoggerFactory loggerFactory, IGall\nservices.AddHttpClient<IHttpClientWrapper, HttpClientWrapper>(searchClient.name, c =>\nc.BaseAddress = searchClient.searchUri)\n.ConfigurePrimaryHttpMessageHandler(() => new HttpClientHandler() { AllowAutoRedirect = true })\n- .AddHttpMessageHandler<TracingHttpHandler>()\n.AddHttpMessageHandler<CorrelatingHttpClientHandler>()\n.AddPolicyHandler(SearchClientPolicies.SearchClientFallBackCircuitBreakerPolicy(logger, searchClient.name, telemetryService))\n.AddPolicyHandler(SearchClientPolicies.SearchClientWaitAndRetryPolicy(\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Reduce the Search related telemetry. (#7046) |
455,772 | 04.04.2019 15:18:33 | 25,200 | 206c21411cb2c07ec29b7246a8e445b0f85e0564 | 400 errors shouln't show 500 page | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<customErrors mode=\"RemoteOnly\" defaultRedirect=\"~/Errors/500\" redirectMode=\"ResponseRedirect\">\n<!-- Adding ? at the end of the redirect URL prevents the illegal request to be passed\nas a query parameter to the redirect URL and causing additional failures -->\n+ <error statusCode=\"400\" redirect=\"~/Errors/400\"/>\n<error statusCode=\"404\" redirect=\"~/Errors/404\"/>\n<error statusCode=\"500\" redirect=\"~/Errors/500\"/>\n</customErrors>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | 400 errors shouln't show 500 page (#7048) |
455,776 | 08.04.2019 11:36:42 | -3,600 | 4f33488a59bac9fd5018590c4bd1af5f17112bec | Pass anonymous users to FeatureFlagService in Manage | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -748,7 +748,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\nmodel.SymbolsPackageValidationIssues = _validationService.GetLatestPackageValidationIssues(model.LatestSymbolsPackage);\nmodel.IsCertificatesUIEnabled = _contentObjectService.CertificatesConfiguration?.IsUIEnabledForUser(currentUser) ?? false;\nmodel.IsAtomFeedEnabled = _featureFlagService.IsPackagesAtomFeedEnabled();\n- model.IsPackageDeprecationEnabled = currentUser != null && _featureFlagService.IsManageDeprecationEnabled(currentUser);\n+ model.IsPackageDeprecationEnabled = _featureFlagService.IsManageDeprecationEnabled(currentUser);\nmodel.ReadMeHtml = await _readMeService.GetReadMeHtmlAsync(package);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1125,7 +1125,7 @@ public async Task DoesNotShowDeprecationToLoggedOutUsers(bool isDeprecationEnabl\n// Assert\nvar model = ResultAssert.IsView<DisplayPackageViewModel>(result);\n- Assert.False(model.IsPackageDeprecationEnabled);\n+ Assert.Equal(isDeprecationEnabled, model.IsPackageDeprecationEnabled);\ndeprecationService.Verify();\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Pass anonymous users to FeatureFlagService in Manage (#7051) |
455,736 | 08.04.2019 16:48:15 | 25,200 | 3732c0b204640300c4581bb346a5fd439947250f | Add OpenWriteAsync to ISimpleCloudBlob to allow streaming writes
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobWrapper.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobWrapper.cs",
"diff": "@@ -54,6 +54,14 @@ public async Task<Stream> OpenReadAsync(AccessCondition accessCondition)\noperationContext: null);\n}\n+ public async Task<Stream> OpenWriteAsync(AccessCondition accessCondition)\n+ {\n+ return await _blob.OpenWriteAsync(\n+ accessCondition: accessCondition,\n+ options: null,\n+ operationContext: null);\n+ }\n+\npublic async Task DeleteIfExistsAsync()\n{\nawait _blob.DeleteIfExistsAsync(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ISimpleCloudBlob.cs",
"new_path": "src/NuGetGallery.Core/Services/ISimpleCloudBlob.cs",
"diff": "@@ -22,6 +22,7 @@ public interface ISimpleCloudBlob\nstring ETag { get; }\nTask<Stream> OpenReadAsync(AccessCondition accessCondition);\n+ Task<Stream> OpenWriteAsync(AccessCondition accessCondition);\nTask DeleteIfExistsAsync();\nTask DownloadToStreamAsync(Stream target);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceIntegrationTests.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceIntegrationTests.cs",
"diff": "using System.Collections.Concurrent;\nusing System.IO;\nusing System.Net;\n+using System.Security.Cryptography;\nusing System.Text;\nusing System.Threading;\nusing System.Threading.Tasks;\n@@ -59,6 +60,110 @@ public CloudBlobCoreFileStorageServiceIntegrationTests(BlobStorageFixture fixtur\n_targetB = new CloudBlobCoreFileStorageService(_clientB, Mock.Of<IDiagnosticsService>());\n}\n+ [BlobStorageFact]\n+ public async Task OpenWriteAsyncReturnsWritableStream()\n+ {\n+ // Arrange\n+ var folderName = CoreConstants.Folders.ValidationFolderName;\n+ var fileName = _prefixA;\n+ var expectedContent = \"Hello, world.\";\n+ var bytes = Encoding.UTF8.GetBytes(expectedContent);\n+ string expectedContentMD5;\n+ using (var md5 = MD5.Create())\n+ {\n+ expectedContentMD5 = Convert.ToBase64String(md5.ComputeHash(bytes));\n+ }\n+\n+ var container = _clientA.GetContainerReference(folderName);\n+ var file = container.GetBlobReference(fileName);\n+\n+ // Act\n+ using (var stream = await file.OpenWriteAsync(accessCondition: null))\n+ {\n+ await stream.WriteAsync(bytes, 0, bytes.Length);\n+ }\n+\n+ // Assert\n+ // Reinitialize the blob to verify the metadata is fresh.\n+ file = container.GetBlobReference(fileName);\n+ using (var memoryStream = new MemoryStream())\n+ {\n+ await file.DownloadToStreamAsync(memoryStream);\n+ var actualContent = Encoding.ASCII.GetString(memoryStream.ToArray());\n+ Assert.Equal(expectedContent, actualContent);\n+\n+ Assert.NotNull(file.ETag);\n+ Assert.NotEmpty(file.ETag);\n+ Assert.Equal(expectedContentMD5, file.Properties.ContentMD5);\n+ }\n+ }\n+\n+ [BlobStorageFact]\n+ public async Task OpenWriteAsyncRejectsETagMismatchFoundBeforeUploadStarts()\n+ {\n+ // Arrange\n+ var folderName = CoreConstants.Folders.ValidationFolderName;\n+ var fileName = _prefixA;\n+ var expectedContent = \"Hello, world.\";\n+\n+ await _targetA.SaveFileAsync(\n+ folderName,\n+ fileName,\n+ new MemoryStream(Encoding.ASCII.GetBytes(expectedContent)),\n+ overwrite: false);\n+\n+ var container = _clientA.GetContainerReference(folderName);\n+ var file = container.GetBlobReference(fileName);\n+\n+ // Act & Assert\n+ var ex = await Assert.ThrowsAsync<StorageException>(\n+ async () =>\n+ {\n+ using (var stream = await file.OpenWriteAsync(AccessCondition.GenerateIfNotExistsCondition()))\n+ {\n+ await stream.WriteAsync(new byte[0], 0, 0);\n+ }\n+ });\n+ Assert.Equal(HttpStatusCode.Conflict, (HttpStatusCode)ex.RequestInformation.HttpStatusCode);\n+ }\n+\n+ [BlobStorageFact]\n+ public async Task OpenWriteAsyncRejectsETagMismatchFoundAfterUploadStarts()\n+ {\n+ // Arrange\n+ var folderName = CoreConstants.Folders.ValidationFolderName;\n+ var fileName = _prefixA;\n+ var expectedContent = \"Hello, world.\";\n+\n+ var container = _clientA.GetContainerReference(folderName);\n+ var file = container.GetBlobReference(fileName);\n+ var writeCount = 0;\n+\n+ // Act & Assert\n+ var ex = await Assert.ThrowsAsync<StorageException>(\n+ async () =>\n+ {\n+ using (var stream = await file.OpenWriteAsync(AccessCondition.GenerateIfNotExistsCondition()))\n+ {\n+ stream.Write(new byte[1], 0, 1);\n+ await stream.FlushAsync();\n+ writeCount++;\n+\n+ await _targetA.SaveFileAsync(\n+ folderName,\n+ fileName,\n+ new MemoryStream(Encoding.ASCII.GetBytes(expectedContent)),\n+ overwrite: false);\n+\n+ stream.Write(new byte[1], 0, 1);\n+ await stream.FlushAsync();\n+ writeCount++;\n+ }\n+ });\n+ Assert.Equal(HttpStatusCode.Conflict, (HttpStatusCode)ex.RequestInformation.HttpStatusCode);\n+ Assert.Equal(2, writeCount);\n+ }\n+\n[BlobStorageFact]\npublic async Task OpenReadAsyncReturnsReadableStreamWhenBlobExistsAndPopulatesProperties()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add OpenWriteAsync to ISimpleCloudBlob to allow streaming writes (#7056)
Progress on https://github.com/NuGet/NuGetGallery/issues/6475 |
455,776 | 12.04.2019 19:30:36 | -3,600 | 70868c68f40f1dad7a8750042535485170bb2f7a | Remove FeaturesControllerFacts temporarily so that FXCop succeeds | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Authentication\\Providers\\CommonAuth\\AzureActiveDirectoryV2AuthenticatorFacts.cs\" />\n<Compile Include=\"Authentication\\TestCredentialHelper.cs\" />\n<Compile Include=\"AutocompleteServiceQueryFacts.cs\" />\n- <Compile Include=\"Controllers\\FeaturesControllerFacts.cs\" />\n<Compile Include=\"Controllers\\ManageDeprecationJsonApiControllerFacts.cs\" />\n<Compile Include=\"Queries\\CweQueryStringValidatorFacts.cs\" />\n<Compile Include=\"Queries\\CweIdHelperFacts.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Remove FeaturesControllerFacts temporarily so that FXCop succeeds (#7075) |
455,776 | 25.04.2019 18:46:04 | -3,600 | 62dd09aacfdc54a99bf4af1ac7105cda5667781d | Add back FeaturesControllerFacts | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/ViewModels/IModifyFeatureFlagsViewModel.cs",
"new_path": "src/NuGetGallery/Areas/Admin/ViewModels/IModifyFeatureFlagsViewModel.cs",
"diff": "namespace NuGetGallery.Areas.Admin.ViewModels\n{\n- public interface IModifyFeatureFlagsViewModel<TBase> : IFeatureFlagsObjectViewModel\n+ public interface IModifyFeatureFlagsViewModel<TBase> : IModifyFeatureFlagsViewModel\nwhere TBase : IFeatureFlagsObjectViewModel\n{\n- string ContentId { get; set; }\n-\n- string PrettyName { get; }\nvoid ApplyTo(TBase target);\nList<TBase> GetExistingList(FeatureFlagsViewModel model);\nstring GetValidationError(IUserService userService);\n}\n+\n+ public interface IModifyFeatureFlagsViewModel : IFeatureFlagsObjectViewModel\n+ {\n+ string ContentId { get; set; }\n+\n+ string PrettyName { get; }\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Authentication\\Providers\\CommonAuth\\AzureActiveDirectoryV2AuthenticatorFacts.cs\" />\n<Compile Include=\"Authentication\\TestCredentialHelper.cs\" />\n<Compile Include=\"AutocompleteServiceQueryFacts.cs\" />\n+ <Compile Include=\"Controllers\\FeaturesControllerFacts.cs\" />\n<Compile Include=\"Controllers\\ManageDeprecationJsonApiControllerFacts.cs\" />\n<Compile Include=\"Queries\\CweQueryStringValidatorFacts.cs\" />\n<Compile Include=\"Queries\\CweIdHelperFacts.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add back FeaturesControllerFacts (#7096) |
455,759 | 26.04.2019 09:33:56 | -7,200 | a598acf84bdae447c6a82c211e8346f189e4faa5 | Upgrade grunt devDependency from 1.0.3 to 1.0.4 | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/package-lock.json",
"new_path": "src/Bootstrap/package-lock.json",
"diff": "\"version\": \"1.0.0\",\n\"resolved\": \"https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz\",\n\"integrity\": \"sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=\",\n- \"dev\": true\n+ \"dev\": true,\n+ \"optional\": true\n},\n\"async\": {\n\"version\": \"1.5.2\",\n- \"resolved\": \"http://registry.npmjs.org/async/-/async-1.5.2.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/async/-/async-1.5.2.tgz\",\n\"integrity\": \"sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=\",\n\"dev\": true\n},\n\"resolved\": \"https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz\",\n\"integrity\": \"sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==\",\n\"dev\": true,\n+ \"optional\": true,\n\"requires\": {\n\"delayed-stream\": \"~1.0.0\"\n}\n\"version\": \"1.0.0\",\n\"resolved\": \"https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz\",\n\"integrity\": \"sha1-3zrhmayt+31ECqrgsp4icrJOxhk=\",\n- \"dev\": true\n+ \"dev\": true,\n+ \"optional\": true\n},\n\"diff\": {\n\"version\": \"3.5.0\",\n\"dev\": true\n},\n\"esprima\": {\n- \"version\": \"2.7.3\",\n- \"resolved\": \"https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz\",\n- \"integrity\": \"sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=\",\n+ \"version\": \"4.0.1\",\n+ \"resolved\": \"https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz\",\n+ \"integrity\": \"sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==\",\n\"dev\": true\n},\n\"eventemitter2\": {\n\"version\": \"0.4.14\",\n- \"resolved\": \"http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz\",\n\"integrity\": \"sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=\",\n\"dev\": true\n},\n\"version\": \"1.3.0\",\n\"resolved\": \"https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz\",\n\"integrity\": \"sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=\",\n- \"dev\": true\n+ \"dev\": true,\n+ \"optional\": true\n},\n\"fast-deep-equal\": {\n\"version\": \"2.0.1\",\n\"dev\": true\n},\n\"grunt\": {\n- \"version\": \"1.0.3\",\n- \"resolved\": \"https://registry.npmjs.org/grunt/-/grunt-1.0.3.tgz\",\n- \"integrity\": \"sha512-/JzmZNPfKorlCrrmxWqQO4JVodO+DVd5XX4DkocL/1WlLlKVLE9+SdEIempOAxDhWPysLle6afvn/hg7Ck2k9g==\",\n+ \"version\": \"1.0.4\",\n+ \"resolved\": \"https://registry.npmjs.org/grunt/-/grunt-1.0.4.tgz\",\n+ \"integrity\": \"sha512-PYsMOrOC+MsdGEkFVwMaMyc6Ob7pKmq+deg1Sjr+vvMWp35sztfwKE7qoN51V+UEtHsyNuMcGdgMLFkBHvMxHQ==\",\n\"dev\": true,\n\"requires\": {\n\"coffeescript\": \"~1.10.0\",\n\"grunt-legacy-log\": \"~2.0.0\",\n\"grunt-legacy-util\": \"~1.1.1\",\n\"iconv-lite\": \"~0.4.13\",\n- \"js-yaml\": \"~3.5.2\",\n+ \"js-yaml\": \"~3.13.0\",\n\"minimatch\": \"~3.0.2\",\n\"mkdirp\": \"~0.5.1\",\n\"nopt\": \"~3.0.6\",\n\"optional\": true\n},\n\"js-yaml\": {\n- \"version\": \"3.5.5\",\n- \"resolved\": \"https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz\",\n- \"integrity\": \"sha1-A3fDgBfKvHMisNH7zSWkkWQfL74=\",\n+ \"version\": \"3.13.1\",\n+ \"resolved\": \"https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz\",\n+ \"integrity\": \"sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==\",\n\"dev\": true,\n\"requires\": {\n- \"argparse\": \"^1.0.2\",\n- \"esprima\": \"^2.6.0\"\n+ \"argparse\": \"^1.0.7\",\n+ \"esprima\": \"^4.0.0\"\n}\n},\n\"jsbn\": {\n\"version\": \"0.1.1\",\n\"resolved\": \"https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz\",\n\"integrity\": \"sha1-peZUwuWi3rXyAdls77yoDA7y9RM=\",\n- \"dev\": true\n+ \"dev\": true,\n+ \"optional\": true\n},\n\"json-schema\": {\n\"version\": \"0.2.3\",\n},\n\"load-json-file\": {\n\"version\": \"1.1.0\",\n- \"resolved\": \"http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz\",\n\"integrity\": \"sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=\",\n\"dev\": true,\n\"requires\": {\n\"version\": \"1.37.0\",\n\"resolved\": \"https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz\",\n\"integrity\": \"sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==\",\n- \"dev\": true\n+ \"dev\": true,\n+ \"optional\": true\n},\n\"mime-types\": {\n\"version\": \"2.1.21\",\n\"resolved\": \"https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz\",\n\"integrity\": \"sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==\",\n\"dev\": true,\n+ \"optional\": true,\n\"requires\": {\n\"mime-db\": \"~1.37.0\"\n}\n\"version\": \"5.1.2\",\n\"resolved\": \"https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz\",\n\"integrity\": \"sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==\",\n- \"dev\": true\n+ \"dev\": true,\n+ \"optional\": true\n},\n\"safe-json-parse\": {\n\"version\": \"1.0.1\",\n}\n},\n\"spdx-license-ids\": {\n- \"version\": \"3.0.3\",\n- \"resolved\": \"https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz\",\n- \"integrity\": \"sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==\",\n+ \"version\": \"3.0.4\",\n+ \"resolved\": \"https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz\",\n+ \"integrity\": \"sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==\",\n\"dev\": true\n},\n\"sprintf-js\": {\n\"version\": \"0.14.5\",\n\"resolved\": \"https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz\",\n\"integrity\": \"sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=\",\n- \"dev\": true\n+ \"dev\": true,\n+ \"optional\": true\n},\n\"uc.micro\": {\n\"version\": \"1.0.6\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/package.json",
"new_path": "src/Bootstrap/package.json",
"diff": "\"btoa\": \"^1.2.1\",\n\"cross-env\": \"^5.2.0\",\n\"glob\": \"^7.1.3\",\n- \"grunt\": \"^1.0.3\",\n+ \"grunt\": \"^1.0.4\",\n\"grunt-contrib-clean\": \"^2.0.0\",\n\"grunt-contrib-concat\": \"^1.0.1\",\n\"grunt-contrib-copy\": \"^1.0.0\",\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Upgrade grunt devDependency from 1.0.3 to 1.0.4 (#7099) |
455,776 | 27.04.2019 00:34:13 | -3,600 | 33ef003176b482de6a88ea565601e4fa207c096c | DeleteAccountService should clean up Package.User and PackageDeprecation.DeprecatedBy | [
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Entities/Package.cs",
"new_path": "src/NuGet.Services.Entities/Package.cs",
"diff": "@@ -217,9 +217,11 @@ public bool HasReadMe\npublic string MinClientVersion { get; set; }\n/// <summary>\n- /// The logged in user when this package version was created.\n- /// NULL for older packages.\n+ /// The user that uploaded this package or <c>null</c> if the user was deleted.\n/// </summary>\n+ /// <remarks>\n+ /// Packages uploaded before this field was added have <c>null</c>.\n+ /// </remarks>\npublic User User { get; set; }\npublic int? UserKey { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Entities/PackageDeprecation.cs",
"new_path": "src/NuGet.Services.Entities/PackageDeprecation.cs",
"diff": "@@ -72,6 +72,9 @@ public PackageDeprecation()\n/// <summary>\n/// Gets or sets the user that executed the package deprecation.\n/// </summary>\n+ /// <remarks>\n+ /// This field will be <c>null</c> if the user that deprecated the package has been deleted.\n+ /// </remarks>\npublic virtual User DeprecatedByUser { get; set; }\n/// <summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"diff": "@@ -49,6 +49,7 @@ public EntitiesContext(DbConnection connection, bool readOnly)\n}\npublic bool ReadOnly { get; private set; }\n+ public DbSet<Package> Packages { get; set; }\npublic DbSet<PackageRegistration> PackageRegistrations { get; set; }\npublic DbSet<Credential> Credentials { get; set; }\npublic DbSet<Scope> Scopes { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/IEntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/IEntitiesContext.cs",
"diff": "@@ -10,6 +10,7 @@ namespace NuGetGallery\npublic interface IEntitiesContext\n{\nDbSet<Certificate> Certificates { get; set; }\n+ DbSet<Package> Packages { get; set; }\nDbSet<PackageRegistration> PackageRegistrations { get; set; }\nDbSet<Credential> Credentials { get; set; }\nDbSet<Scope> Scopes { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/DeleteAccountService.cs",
"new_path": "src/NuGetGallery/Services/DeleteAccountService.cs",
"diff": "using System;\nusing System.Collections.Generic;\n-using System.Data.Entity;\nusing System.Globalization;\nusing System.Linq;\nusing System.Threading.Tasks;\n@@ -26,6 +25,7 @@ public class DeleteAccountService : IDeleteAccountService\nprivate readonly IReservedNamespaceService _reservedNamespaceService;\nprivate readonly ISecurityPolicyService _securityPolicyService;\nprivate readonly AuthenticationService _authService;\n+ private readonly IEntityRepository<PackageDeprecation> _deprecationRepository;\nprivate readonly IEntityRepository<User> _userRepository;\nprivate readonly IEntityRepository<Scope> _scopeRepository;\nprivate readonly ISupportRequestService _supportRequestService;\n@@ -35,6 +35,7 @@ public class DeleteAccountService : IDeleteAccountService\npublic DeleteAccountService(\nIEntityRepository<AccountDelete> accountDeleteRepository,\n+ IEntityRepository<PackageDeprecation> deprecationRepository,\nIEntityRepository<User> userRepository,\nIEntityRepository<Scope> scopeRepository,\nIEntitiesContext entitiesContext,\n@@ -49,6 +50,7 @@ public class DeleteAccountService : IDeleteAccountService\nITelemetryService telemetryService)\n{\n_accountDeleteRepository = accountDeleteRepository ?? throw new ArgumentNullException(nameof(accountDeleteRepository));\n+ _deprecationRepository = deprecationRepository ?? throw new ArgumentNullException(nameof(deprecationRepository));\n_userRepository = userRepository ?? throw new ArgumentNullException(nameof(userRepository));\n_scopeRepository = scopeRepository ?? throw new ArgumentNullException(nameof(scopeRepository));\n_entitiesContext = entitiesContext ?? throw new ArgumentNullException(nameof(entitiesContext));\n@@ -110,6 +112,9 @@ private async Task DeleteAccountImplAsync(User userToBeDeleted, User userToExecu\nawait RemoveUserCredentials(userToBeDeleted);\nawait RemovePackageOwnershipRequests(userToBeDeleted);\n+ RemovePackagePushedBy(userToBeDeleted);\n+ RemovePackageDeprecatedBy(userToBeDeleted);\n+\nvar organizationToBeDeleted = userToBeDeleted as Organization;\nif (organizationToBeDeleted != null)\n{\n@@ -209,6 +214,17 @@ private async Task RemovePackageOwnership(User user, User requestingUser, Accoun\n}\n}\n+ private void RemovePackagePushedBy(User user)\n+ {\n+ foreach (var package in _entitiesContext\n+ .Packages\n+ .Where(p => p.UserKey == user.Key)\n+ .ToList())\n+ {\n+ package.User = null;\n+ }\n+ }\n+\nprivate List<Package> GetPackagesOwnedByUser(User user)\n{\nreturn _packageService\n@@ -218,16 +234,33 @@ private List<Package> GetPackagesOwnedByUser(User user)\nprivate async Task RemovePackageOwnershipRequests(User user)\n{\n- var requests = _packageOwnershipManagementService\n+ var toRequests = _packageOwnershipManagementService\n.GetPackageOwnershipRequests(newOwner: user)\n.ToList();\n+ var fromRequests = _packageOwnershipManagementService\n+ .GetPackageOwnershipRequests(requestingOwner: user)\n+ .ToList();\n+\n+ var requests = toRequests.Concat(fromRequests).ToList();\n+\nforeach (var request in requests)\n{\nawait _packageOwnershipManagementService.DeletePackageOwnershipRequestAsync(request.PackageRegistration, request.NewOwner, commitChanges: false);\n}\n}\n+ private void RemovePackageDeprecatedBy(User user)\n+ {\n+ foreach (var deprecation in _deprecationRepository\n+ .GetAll()\n+ .Where(d => d.DeprecatedByUserKey == user.Key)\n+ .ToList())\n+ {\n+ deprecation.DeprecatedByUser = null;\n+ }\n+ }\n+\nprivate async Task RemoveMemberships(User user, User requestingUser, AccountDeletionOrphanPackagePolicy orphanPackagePolicy)\n{\nforeach (var membership in user.Organizations.ToList())\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -368,6 +368,7 @@ public async Task RemovePackageOwnerAsync(PackageRegistration package, User user\n{\n// To support the delete account scenario, the admin can delete the last owner of a package.\npackage.Owners.Remove(user);\n+\nif (commitChanges)\n{\nawait _packageRepository.CommitChangesAsync();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"diff": "@@ -131,6 +131,8 @@ public async Task DeleteHappyUser(bool isPackageOrphaned, AccountDeletionOrphanP\nAssert.NotEmpty(testUser.SecurityPolicies);\nAssert.True(registration.Packages.Single().Listed);\nAssert.NotNull(testUser.EmailAddress);\n+ Assert.NotNull(testableService.PackagePushedByUser.User);\n+ Assert.NotNull(testableService.DeprecationDeprecatedByUser.DeprecatedByUser);\nAssert.Empty(testableService.DeletedAccounts);\nAssert.NotEmpty(testableService.PackageOwnerRequests);\nAssert.False(testableService.HasDeletedOwnerScope);\n@@ -148,6 +150,8 @@ public async Task DeleteHappyUser(bool isPackageOrphaned, AccountDeletionOrphanP\norphanPolicy == AccountDeletionOrphanPackagePolicy.UnlistOrphans && isPackageOrphaned,\n!registration.Packages.Single().Listed);\nAssert.Null(testUser.EmailAddress);\n+ Assert.Null(testableService.PackagePushedByUser.User);\n+ Assert.Null(testableService.DeprecationDeprecatedByUser.DeprecatedByUser);\nAssert.Single(testableService.DeletedAccounts);\nAssert.Empty(testableService.PackageOwnerRequests);\nAssert.True(testableService.HasDeletedOwnerScope);\n@@ -259,6 +263,8 @@ public async Task DeleteOrganization(bool isPackageOrphaned, AccountDeletionOrph\nAssert.Equal(organization.Confirmed, organization.EmailAddress != null);\nAssert.True(registration.Owners.Any(o => o.MatchesUser(organization)));\nAssert.NotEmpty(organization.SecurityPolicies);\n+ Assert.NotNull(testableService.PackagePushedByUser.User);\n+ Assert.NotNull(testableService.DeprecationDeprecatedByUser.DeprecatedByUser);\nAssert.Empty(testableService.DeletedAccounts);\nAssert.NotEmpty(testableService.PackageOwnerRequests);\nAssert.Empty(testableService.AuditService.Records);\n@@ -274,6 +280,8 @@ public async Task DeleteOrganization(bool isPackageOrphaned, AccountDeletionOrph\n!registration.Packages.Single().Listed);\nAssert.False(registration.Owners.Any(o => o.MatchesUser(organization)));\nAssert.Empty(organization.SecurityPolicies);\n+ Assert.Null(testableService.PackagePushedByUser.User);\n+ Assert.Null(testableService.DeprecationDeprecatedByUser.DeprecatedByUser);\nAssert.Single(testableService.DeletedAccounts);\nAssert.Empty(testableService.PackageOwnerRequests);\nAssert.Single(testableService.AuditService.Records);\n@@ -334,6 +342,8 @@ public async Task DeleteUnconfirmedOrganization(bool isPackageOrphaned)\nAssert.Empty(registration.Owners);\nAssert.Empty(organization.SecurityPolicies);\nAssert.Empty(organization.ReservedNamespaces);\n+ Assert.Null(testableService.PackagePushedByUser.User);\n+ Assert.Null(testableService.DeprecationDeprecatedByUser.DeprecatedByUser);\nAssert.Empty(testableService.DeletedAccounts);\nAssert.Single(testableService.SupportRequests);\nAssert.Empty(testableService.PackageOwnerRequests);\n@@ -467,6 +477,8 @@ public class DeleteAccountTestService\npublic List<AccountDelete> DeletedAccounts = new List<AccountDelete>();\npublic List<User> DeletedUsers = new List<User>();\npublic List<Issue> SupportRequests = new List<Issue>();\n+ public Package PackagePushedByUser;\n+ public PackageDeprecation DeprecationDeprecatedByUser;\npublic List<PackageOwnerRequest> PackageOwnerRequests = new List<PackageOwnerRequest>();\npublic FakeAuditingService AuditService = new FakeAuditingService();\npublic bool HasDeletedOwnerScope => _hasDeletedCredentialWithOwnerScope;\n@@ -520,6 +532,18 @@ public DeleteAccountTestService(User user, PackageRegistration userPackagesRegis\nPackageRegistration = new PackageRegistration() { Id = $\"{user.Username}_second\" },\nNewOwner = _user\n});\n+\n+ PackagePushedByUser = new Package\n+ {\n+ User = _user,\n+ UserKey = _user.Key\n+ };\n+\n+ DeprecationDeprecatedByUser = new PackageDeprecation\n+ {\n+ DeprecatedByUser = _user,\n+ DeprecatedByUserKey = _user.Key\n+ };\n}\npublic DeleteAccountTestService()\n@@ -528,7 +552,9 @@ public DeleteAccountTestService()\npublic DeleteAccountService GetDeleteAccountService(bool isPackageOrphaned, bool isFeatureFlagsRemovalSuccessful = true)\n{\n- return new DeleteAccountService(SetupAccountDeleteRepository().Object,\n+ return new DeleteAccountService(\n+ SetupAccountDeleteRepository().Object,\n+ SetupDeprecationRepository().Object,\nSetupUserRepository().Object,\nSetupScopeRepository().Object,\nSetupEntitiesContext().Object,\n@@ -563,8 +589,24 @@ private Mock<IEntitiesContext> SetupEntitiesContext()\n{\nvar mockContext = new Mock<IEntitiesContext>();\nvar database = new Mock<IDatabase>();\n- database.Setup(x => x.BeginTransaction()).Returns(() => new Mock<IDbContextTransaction>().Object);\n- mockContext.Setup(m => m.GetDatabase()).Returns(database.Object);\n+ database\n+ .Setup(x => x.BeginTransaction())\n+ .Returns(() => new Mock<IDbContextTransaction>().Object);\n+\n+ mockContext\n+ .Setup(m => m.GetDatabase())\n+ .Returns(database.Object);\n+\n+ var packageDbSet = FakeEntitiesContext.CreateDbSet<Package>();\n+ mockContext\n+ .Setup(x => x.Packages)\n+ .Returns(packageDbSet);\n+\n+ if (PackagePushedByUser != null)\n+ {\n+ packageDbSet.Add(PackagePushedByUser);\n+ }\n+\nreturn mockContext;\n}\n@@ -597,11 +639,27 @@ private Mock<ISecurityPolicyService> SetupSecurityPolicyService()\nprivate Mock<IEntityRepository<AccountDelete>> SetupAccountDeleteRepository()\n{\nvar accountDeleteRepository = new Mock<IEntityRepository<AccountDelete>>();\n- accountDeleteRepository.Setup(m => m.InsertOnCommit(It.IsAny<AccountDelete>()))\n+ accountDeleteRepository\n+ .Setup(m => m.InsertOnCommit(It.IsAny<AccountDelete>()))\n.Callback<AccountDelete>(account => DeletedAccounts.Add(account));\n+\nreturn accountDeleteRepository;\n}\n+ private Mock<IEntityRepository<PackageDeprecation>> SetupDeprecationRepository()\n+ {\n+ var deprecationRepository = new Mock<IEntityRepository<PackageDeprecation>>();\n+ var deprecations = DeprecationDeprecatedByUser == null\n+ ? Enumerable.Empty<PackageDeprecation>()\n+ : new[] { DeprecationDeprecatedByUser };\n+\n+ deprecationRepository\n+ .Setup(x => x.GetAll())\n+ .Returns(deprecations.AsQueryable());\n+\n+ return deprecationRepository;\n+ }\n+\nprivate Mock<IEntityRepository<User>> SetupUserRepository()\n{\nvar userRepository = new Mock<IEntityRepository<User>>();\n@@ -715,7 +773,8 @@ private Mock<IPackageOwnershipManagementService> SetupPackageOwnershipManagement\nvar packageOwnershipManagementService = new Mock<IPackageOwnershipManagementService>();\nif (_user != null)\n{\n- packageOwnershipManagementService.Setup(m => m.RemovePackageOwnerAsync(It.IsAny<PackageRegistration>(), It.IsAny<User>(), It.IsAny<User>(), false))\n+ packageOwnershipManagementService\n+ .Setup(m => m.RemovePackageOwnerAsync(It.IsAny<PackageRegistration>(), It.IsAny<User>(), It.IsAny<User>(), false))\n.Returns(Task.CompletedTask)\n.Callback(() =>\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -1986,7 +1986,7 @@ public async Task EnsureValidThrowsForSymbolsPackage()\npublic class TheRemovePackageOwnerMethod\n{\n[Fact]\n- public async Task RemovesPackageOwner()\n+ public async Task WillRemoveOneOfManyOwners()\n{\nvar service = CreateService();\nvar owner1 = new User { Key = 1, Username = \"Owner1\" };\n@@ -1999,7 +1999,7 @@ public async Task RemovesPackageOwner()\n}\n[Fact]\n- public async Task WontRemoveLastOwner()\n+ public async Task WillRemoveLastOwner()\n{\nvar service = CreateService();\nvar singleOwner = new User { Key = 1, Username = \"Owner\" };\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | DeleteAccountService should clean up Package.User and PackageDeprecation.DeprecatedBy (#7076) |
455,776 | 29.04.2019 18:57:54 | -3,600 | 6d80fdea9c58b8567a1a23f2ba789e284b64f723 | AccountDelete.DeletedBy and PackageDelete.DeletedBy should be set to null when the User is deleted | [
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Entities/AccountDelete.cs",
"new_path": "src/NuGet.Services.Entities/AccountDelete.cs",
"diff": "@@ -28,13 +28,19 @@ public class AccountDelete\npublic User DeletedAccount { get; set; }\n/// <summary>\n- /// The User(admin) key that executed the delete action.\n+ /// The User key that executed the delete action.\n/// </summary>\n- public int DeletedByKey { get; set; }\n+ /// <remarks>\n+ /// <c>null</c> if the user was deleted.\n+ /// </remarks>\n+ public int? DeletedByKey { get; set; }\n/// <summary>\n- /// The User(admin) that executed the delete action.\n+ /// The User that executed the delete action.\n/// </summary>\n+ /// <remarks>\n+ /// <c>null</c> if the user was deleted.\n+ /// </remarks>\npublic User DeletedBy { get; set; }\n/// <summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Entities/PackageDelete.cs",
"new_path": "src/NuGet.Services.Entities/PackageDelete.cs",
"diff": "@@ -20,9 +20,15 @@ public PackageDelete()\n[Required]\npublic DateTime DeletedOn { get; set; }\n- [Required]\n+ /// <remarks>\n+ /// <c>null</c> if the user was deleted.\n+ /// </remarks>\npublic User DeletedBy { get; set; }\n- public int DeletedByKey { get; set; }\n+\n+ /// <remarks>\n+ /// <c>null</c> if the user was deleted.\n+ /// </remarks>\n+ public int? DeletedByKey { get; set; }\n[Required]\npublic string Reason { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"new_path": "src/NuGetGallery.Core/Entities/EntitiesContext.cs",
"diff": "@@ -356,7 +356,7 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)\n.HasRequired(a => a.DeletedAccount);\nmodelBuilder.Entity<AccountDelete>()\n- .HasRequired(a => a.DeletedBy)\n+ .HasOptional(a => a.DeletedBy)\n.WithMany()\n.WillCascadeOnDelete(false);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201904252152567_DeletedByOptional.Designer.cs",
"diff": "+// <auto-generated />\n+namespace NuGetGallery.Migrations\n+{\n+ using System.CodeDom.Compiler;\n+ using System.Data.Entity.Migrations;\n+ using System.Data.Entity.Migrations.Infrastructure;\n+ using System.Resources;\n+\n+ [GeneratedCode(\"EntityFramework.Migrations\", \"6.1.3-40302\")]\n+ public sealed partial class DeletedByOptional : IMigrationMetadata\n+ {\n+ private readonly ResourceManager Resources = new ResourceManager(typeof(DeletedByOptional));\n+\n+ string IMigrationMetadata.Id\n+ {\n+ get { return \"201904252152567_DeletedByOptional\"; }\n+ }\n+\n+ string IMigrationMetadata.Source\n+ {\n+ get { return null; }\n+ }\n+\n+ string IMigrationMetadata.Target\n+ {\n+ get { return Resources.GetString(\"Target\"); }\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201904252152567_DeletedByOptional.cs",
"diff": "+namespace NuGetGallery.Migrations\n+{\n+ using System;\n+ using System.Data.Entity.Migrations;\n+\n+ public partial class DeletedByOptional : DbMigration\n+ {\n+ public override void Up()\n+ {\n+ DropForeignKey(\"dbo.PackageDeletes\", \"DeletedByKey\", \"dbo.Users\");\n+ DropIndex(\"dbo.PackageDeletes\", new[] { \"DeletedByKey\" });\n+ DropIndex(\"dbo.AccountDeletes\", new[] { \"DeletedByKey\" });\n+ AlterColumn(\"dbo.PackageDeletes\", \"DeletedByKey\", c => c.Int());\n+ AlterColumn(\"dbo.AccountDeletes\", \"DeletedByKey\", c => c.Int());\n+ CreateIndex(\"dbo.PackageDeletes\", \"DeletedByKey\");\n+ CreateIndex(\"dbo.AccountDeletes\", \"DeletedByKey\");\n+ AddForeignKey(\"dbo.PackageDeletes\", \"DeletedByKey\", \"dbo.Users\", \"Key\");\n+ }\n+\n+ public override void Down()\n+ {\n+ DropForeignKey(\"dbo.PackageDeletes\", \"DeletedByKey\", \"dbo.Users\");\n+ DropIndex(\"dbo.AccountDeletes\", new[] { \"DeletedByKey\" });\n+ DropIndex(\"dbo.PackageDeletes\", new[] { \"DeletedByKey\" });\n+ AlterColumn(\"dbo.AccountDeletes\", \"DeletedByKey\", c => c.Int(nullable: false));\n+ AlterColumn(\"dbo.PackageDeletes\", \"DeletedByKey\", c => c.Int(nullable: false));\n+ CreateIndex(\"dbo.AccountDeletes\", \"DeletedByKey\");\n+ CreateIndex(\"dbo.PackageDeletes\", \"DeletedByKey\");\n+ AddForeignKey(\"dbo.PackageDeletes\", \"DeletedByKey\", \"dbo.Users\", \"Key\", cascadeDelete: true);\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Migrations\\201904081230004_AddIndexToUserSecurityPolicy.Designer.cs\">\n<DependentUpon>201904081230004_AddIndexToUserSecurityPolicy.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"Migrations\\201904252152567_DeletedByOptional.cs\" />\n+ <Compile Include=\"Migrations\\201904252152567_DeletedByOptional.Designer.cs\">\n+ <DependentUpon>201904252152567_DeletedByOptional.cs</DependentUpon>\n+ </Compile>\n<Compile Include=\"Queries\\AutocompleteCveIdQueryResults.cs\" />\n<Compile Include=\"Queries\\AutocompleteCweIdQueryResults.cs\" />\n<Compile Include=\"Queries\\AutocompleteCveIdQueryResult.cs\" />\n<EmbeddedResource Include=\"Migrations\\201904081230004_AddIndexToUserSecurityPolicy.resx\">\n<DependentUpon>201904081230004_AddIndexToUserSecurityPolicy.cs</DependentUpon>\n</EmbeddedResource>\n+ <EmbeddedResource Include=\"Migrations\\201904252152567_DeletedByOptional.resx\">\n+ <DependentUpon>201904252152567_DeletedByOptional.cs</DependentUpon>\n+ </EmbeddedResource>\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1packages.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1search.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv2getupdates.json\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/DeleteAccountService.cs",
"new_path": "src/NuGetGallery/Services/DeleteAccountService.cs",
"diff": "@@ -19,6 +19,7 @@ namespace NuGetGallery\npublic class DeleteAccountService : IDeleteAccountService\n{\nprivate readonly IEntityRepository<AccountDelete> _accountDeleteRepository;\n+ private readonly IEntityRepository<PackageDelete> _packageDeleteRepository;\nprivate readonly IEntitiesContext _entitiesContext;\nprivate readonly IPackageService _packageService;\nprivate readonly IPackageOwnershipManagementService _packageOwnershipManagementService;\n@@ -35,6 +36,7 @@ public class DeleteAccountService : IDeleteAccountService\npublic DeleteAccountService(\nIEntityRepository<AccountDelete> accountDeleteRepository,\n+ IEntityRepository<PackageDelete> packageDeleteRepository,\nIEntityRepository<PackageDeprecation> deprecationRepository,\nIEntityRepository<User> userRepository,\nIEntityRepository<Scope> scopeRepository,\n@@ -50,6 +52,7 @@ public class DeleteAccountService : IDeleteAccountService\nITelemetryService telemetryService)\n{\n_accountDeleteRepository = accountDeleteRepository ?? throw new ArgumentNullException(nameof(accountDeleteRepository));\n+ _packageDeleteRepository = packageDeleteRepository ?? throw new ArgumentNullException(nameof(packageDeleteRepository));\n_deprecationRepository = deprecationRepository ?? throw new ArgumentNullException(nameof(deprecationRepository));\n_userRepository = userRepository ?? throw new ArgumentNullException(nameof(userRepository));\n_scopeRepository = scopeRepository ?? throw new ArgumentNullException(nameof(scopeRepository));\n@@ -111,6 +114,7 @@ private async Task DeleteAccountImplAsync(User userToBeDeleted, User userToExecu\nawait RemoveSecurityPolicies(userToBeDeleted);\nawait RemoveUserCredentials(userToBeDeleted);\nawait RemovePackageOwnershipRequests(userToBeDeleted);\n+ ResetPackagesAndAccountsDeletedBy(userToBeDeleted);\nRemovePackagePushedBy(userToBeDeleted);\nRemovePackageDeprecatedBy(userToBeDeleted);\n@@ -318,6 +322,25 @@ private void RemoveMembers(Organization organization)\n}\n}\n+ private void ResetPackagesAndAccountsDeletedBy(User user)\n+ {\n+ foreach (var deletedPackage in _packageDeleteRepository\n+ .GetAll()\n+ .Where(d => d.DeletedByKey == user.Key)\n+ .ToList())\n+ {\n+ deletedPackage.DeletedBy = null;\n+ }\n+\n+ foreach (var deletedAccount in _accountDeleteRepository\n+ .GetAll()\n+ .Where(d => d.DeletedByKey == user.Key)\n+ .ToList())\n+ {\n+ deletedAccount.DeletedBy = null;\n+ }\n+ }\n+\nprivate void RemoveUserDataInUserTable(User user)\n{\nuser.SetAccountAsDeleted();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"diff": "@@ -141,6 +141,8 @@ public async Task DeleteHappyUser(bool isPackageOrphaned, AccountDeletionOrphanP\nAssert.NotEmpty(testUser.OrganizationMigrationRequests);\nAssert.NotEmpty(testUser.OrganizationRequests);\nAssert.NotEmpty(testUser.Organizations);\n+ Assert.NotNull(testableService.PackageDeletedByUser.DeletedBy);\n+ Assert.NotNull(testableService.AccountDeletedByUser.DeletedBy);\n}\nelse\n{\n@@ -159,6 +161,8 @@ public async Task DeleteHappyUser(bool isPackageOrphaned, AccountDeletionOrphanP\nAssert.Null(testUser.OrganizationMigrationRequest);\nAssert.Empty(testUser.OrganizationMigrationRequests);\nAssert.Empty(testUser.OrganizationRequests);\n+ Assert.Null(testableService.PackageDeletedByUser.DeletedBy);\n+ Assert.Null(testableService.AccountDeletedByUser.DeletedBy);\nAssert.Empty(testUser.Organizations);\nforeach (var testUserOrganization in testUserOrganizations)\n@@ -185,6 +189,9 @@ public async Task DeleteHappyUser(bool isPackageOrphaned, AccountDeletionOrphanP\n// In production, they would not be deleted because the transaction they were deleted in would fail.\nAssert.Single(testableService.SupportRequests);\nAssert.Empty(testUser.ReservedNamespaces);\n+\n+ Assert.NotNull(testableService.PackageDeletedByDifferentUser.DeletedBy);\n+ Assert.NotNull(testableService.AccountDeletedByDifferentUser.DeletedBy);\n}\n[Theory]\n@@ -270,6 +277,8 @@ public async Task DeleteOrganization(bool isPackageOrphaned, AccountDeletionOrph\nAssert.Empty(testableService.AuditService.Records);\nAssert.False(testableService.HasDeletedOwnerScope);\nAssert.Empty(testableService.AuditService.Records);\n+ Assert.NotNull(testableService.PackageDeletedByUser.DeletedBy);\n+ Assert.NotNull(testableService.AccountDeletedByUser.DeletedBy);\n}\nelse\n{\n@@ -286,6 +295,8 @@ public async Task DeleteOrganization(bool isPackageOrphaned, AccountDeletionOrph\nAssert.Empty(testableService.PackageOwnerRequests);\nAssert.Single(testableService.AuditService.Records);\nAssert.True(testableService.HasDeletedOwnerScope);\n+ Assert.Null(testableService.PackageDeletedByUser.DeletedBy);\n+ Assert.Null(testableService.AccountDeletedByUser.DeletedBy);\nvar deleteRecord = testableService.AuditService.Records[0] as DeleteAccountAuditRecord;\nAssert.True(deleteRecord != null);\n@@ -296,6 +307,9 @@ public async Task DeleteOrganization(bool isPackageOrphaned, AccountDeletionOrph\n// In production, they would not be deleted because the transaction they were deleted in would fail.\nAssert.Empty(organization.ReservedNamespaces);\nAssert.Single(testableService.SupportRequests);\n+\n+ Assert.NotNull(testableService.PackageDeletedByDifferentUser.DeletedBy);\n+ Assert.NotNull(testableService.AccountDeletedByDifferentUser.DeletedBy);\n}\n[Theory]\n@@ -483,6 +497,12 @@ public class DeleteAccountTestService\npublic FakeAuditingService AuditService = new FakeAuditingService();\npublic bool HasDeletedOwnerScope => _hasDeletedCredentialWithOwnerScope;\n+ public AccountDelete AccountDeletedByUser { get; }\n+ public AccountDelete AccountDeletedByDifferentUser { get; }\n+ public PackageDelete PackageDeletedByUser { get; }\n+ public PackageDelete PackageDeletedByDifferentUser { get; }\n+\n+\npublic DeleteAccountTestService(User user)\n{\n_user = user;\n@@ -533,6 +553,11 @@ public DeleteAccountTestService(User user, PackageRegistration userPackagesRegis\nNewOwner = _user\n});\n+ AccountDeletedByUser = new AccountDelete { DeletedBy = _user, DeletedByKey = _user.Key };\n+ AccountDeletedByDifferentUser = new AccountDelete { DeletedBy = new User { Key = 1111 }, DeletedByKey = 1111 };\n+ PackageDeletedByUser = new PackageDelete { DeletedBy = _user, DeletedByKey = _user.Key };\n+ PackageDeletedByDifferentUser = new PackageDelete { DeletedBy = new User { Key = 1111 }, DeletedByKey = 1111 };\n+\nPackagePushedByUser = new Package\n{\nUser = _user,\n@@ -554,6 +579,7 @@ public DeleteAccountService GetDeleteAccountService(bool isPackageOrphaned, bool\n{\nreturn new DeleteAccountService(\nSetupAccountDeleteRepository().Object,\n+ SetupPackageDeleteRepository().Object,\nSetupDeprecationRepository().Object,\nSetupUserRepository().Object,\nSetupScopeRepository().Object,\n@@ -639,6 +665,14 @@ private Mock<ISecurityPolicyService> SetupSecurityPolicyService()\nprivate Mock<IEntityRepository<AccountDelete>> SetupAccountDeleteRepository()\n{\nvar accountDeleteRepository = new Mock<IEntityRepository<AccountDelete>>();\n+\n+ if (AccountDeletedByUser != null)\n+ {\n+ accountDeleteRepository\n+ .Setup(m => m.GetAll())\n+ .Returns(new[] { AccountDeletedByUser, AccountDeletedByDifferentUser }.AsQueryable());\n+ }\n+\naccountDeleteRepository\n.Setup(m => m.InsertOnCommit(It.IsAny<AccountDelete>()))\n.Callback<AccountDelete>(account => DeletedAccounts.Add(account));\n@@ -646,6 +680,20 @@ private Mock<IEntityRepository<AccountDelete>> SetupAccountDeleteRepository()\nreturn accountDeleteRepository;\n}\n+ private Mock<IEntityRepository<PackageDelete>> SetupPackageDeleteRepository()\n+ {\n+ var packageDeleteRepository = new Mock<IEntityRepository<PackageDelete>>();\n+\n+ if (PackageDeletedByUser != null)\n+ {\n+ packageDeleteRepository\n+ .Setup(m => m.GetAll())\n+ .Returns(new[] { PackageDeletedByUser, PackageDeletedByDifferentUser }.AsQueryable());\n+ }\n+\n+ return packageDeleteRepository;\n+ }\n+\nprivate Mock<IEntityRepository<PackageDeprecation>> SetupDeprecationRepository()\n{\nvar deprecationRepository = new Mock<IEntityRepository<PackageDeprecation>>();\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | AccountDelete.DeletedBy and PackageDelete.DeletedBy should be set to null when the User is deleted (#7104) |
455,776 | 30.04.2019 17:54:48 | -3,600 | 71896c6317704163bca0955b607b321830aeaa75 | Add auditing for feature flags | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Features/FeatureFlagFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Features/FeatureFlagFileStorageService.cs",
"diff": "using Microsoft.WindowsAzure.Storage;\nusing Newtonsoft.Json;\nusing Newtonsoft.Json.Converters;\n-using Newtonsoft.Json.Linq;\nusing NuGet.Services.Entities;\nusing NuGet.Services.FeatureFlags;\n+using NuGetGallery.Auditing;\nnamespace NuGetGallery.Features\n{\n@@ -23,6 +23,7 @@ public class FeatureFlagFileStorageService : IEditableFeatureFlagStorageService\nprivate static readonly JsonSerializer Serializer;\nprivate readonly ICoreFileStorageService _storage;\n+ private readonly IAuditingService _auditing;\nprivate readonly ILogger<FeatureFlagFileStorageService> _logger;\nstatic FeatureFlagFileStorageService()\n@@ -40,9 +41,11 @@ static FeatureFlagFileStorageService()\npublic FeatureFlagFileStorageService(\nICoreFileStorageService storage,\n+ IAuditingService auditing,\nILogger<FeatureFlagFileStorageService> logger)\n{\n_storage = storage ?? throw new ArgumentNullException(nameof(storage));\n+ _auditing = auditing ?? throw new ArgumentNullException(nameof(auditing));\n_logger = logger ?? throw new ArgumentNullException(nameof(logger));\n}\n@@ -118,6 +121,19 @@ public async Task RemoveUserAsync(User user)\n}\npublic async Task<FeatureFlagSaveResult> TrySaveAsync(FeatureFlags flags, string contentId)\n+ {\n+ var result = await TrySaveInternalAsync(flags, contentId);\n+ await _auditing.SaveAuditRecordAsync(\n+ new FeatureFlagsAuditRecord(\n+ AuditedFeatureFlagsAction.Update,\n+ flags,\n+ contentId,\n+ result));\n+\n+ return result;\n+ }\n+\n+ private async Task<FeatureFlagSaveResult> TrySaveInternalAsync(FeatureFlags flags, string contentId)\n{\nvar accessCondition = AccessConditionWrapper.GenerateIfMatchCondition(contentId);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<Compile Include=\"Auditing\\AggregateAuditingService.cs\" />\n+ <Compile Include=\"Auditing\\AuditedEntities\\AuditedFeatureFlagFlight.cs\" />\n+ <Compile Include=\"Auditing\\AuditedEntities\\AuditedFeatureFlagFeature.cs\" />\n+ <Compile Include=\"Auditing\\AuditedFeatureFlagsAction.cs\" />\n<Compile Include=\"Auditing\\AuditedCertificateAction.cs\" />\n<Compile Include=\"Auditing\\AuditedDeleteAccountAction.cs\" />\n+ <Compile Include=\"Auditing\\FeatureFlagsAuditRecord.cs\" />\n<Compile Include=\"Auditing\\CertificateAuditRecord.cs\" />\n<Compile Include=\"Auditing\\Obfuscation\\ObfuscateAttribute.cs\" />\n<Compile Include=\"Auditing\\Obfuscation\\ObfuscationType.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Auditing/AuditRecordTests.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Auditing/AuditRecordTests.cs",
"diff": "@@ -18,6 +18,7 @@ public void SubclassingTypeSet_HasNotChanged()\n\"NuGetGallery.Auditing.CertificateAuditRecord\",\n\"NuGetGallery.Auditing.DeleteAccountAuditRecord\",\n\"NuGetGallery.Auditing.FailedAuthenticatedOperationAuditRecord\",\n+ \"NuGetGallery.Auditing.FeatureFlagsAuditRecord\",\n\"NuGetGallery.Auditing.PackageAuditRecord\",\n\"NuGetGallery.Auditing.PackageRegistrationAuditRecord\",\n\"NuGetGallery.Auditing.ReservedNamespaceAuditRecord\",\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Features/FeatureFlagFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Features/FeatureFlagFileStorageServiceFacts.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.IO;\n+using System.Linq;\nusing System.Net;\nusing System.Text;\nusing System.Threading.Tasks;\nusing Newtonsoft.Json;\nusing NuGet.Services.Entities;\nusing NuGet.Services.FeatureFlags;\n+using NuGetGallery.Auditing;\nusing Xunit;\nnamespace NuGetGallery.Features\n@@ -136,8 +138,10 @@ public class TrySaveAsync : FactsBase\n[Fact]\npublic async Task ReturnsOk()\n{\n+ var contentId = \"123\";\n+\n// Act\n- var result = await _target.TrySaveAsync(Example, \"123\");\n+ var result = await _target.TrySaveAsync(Example, contentId);\n// Assert - the saved JSON should be formatted\nAssert.Equal(FeatureFlagSaveResult.Ok, result);\n@@ -149,6 +153,23 @@ public async Task ReturnsOk()\nIt.IsAny<Stream>(),\nIt.Is<IAccessCondition>(c => c.IfNoneMatchETag == null && c.IfMatchETag != null)),\nTimes.Once);\n+\n+ _auditing.Verify(\n+ a => a.SaveAuditRecordAsync(\n+ It.Is<FeatureFlagsAuditRecord>(\n+ r => r.Action == AuditedFeatureFlagsAction.Update\n+ && r.ContentId == contentId\n+ && r.Result == FeatureFlagSaveResult.Ok\n+ && r.Features.SingleOrDefault(\n+ f => f.Name == \"NuGetGallery.Typosquatting\"\n+ && f.Status == FeatureStatus.Enabled) != null\n+ && r.Flights.SingleOrDefault(\n+ f => f.Name == \"NuGetGallery.TyposquattingFlight\"\n+ && f.All\n+ && f.SiteAdmins\n+ && f.Accounts.Single() == \"a\"\n+ && f.Domains.Single() == \"b\") != null)),\n+ Times.Once());\n}\n[Fact]\n@@ -168,8 +189,10 @@ public async Task FormatsSavedJson()\n})\n.Returns(Task.CompletedTask);\n+ var contentId = \"123\";\n+\n// Act\n- var result = await _target.TrySaveAsync(Example, \"123\");\n+ var result = await _target.TrySaveAsync(Example, contentId);\n// Assert - the saved JSON should be formatted\nAssert.Equal(FeatureFlagSaveResult.Ok, result);\n@@ -182,6 +205,23 @@ public async Task FormatsSavedJson()\nIt.IsAny<Stream>(),\nIt.Is<IAccessCondition>(c => c.IfNoneMatchETag == null && c.IfMatchETag != null)),\nTimes.Once);\n+\n+ _auditing.Verify(\n+ a => a.SaveAuditRecordAsync(\n+ It.Is<FeatureFlagsAuditRecord>(\n+ r => r.Action == AuditedFeatureFlagsAction.Update\n+ && r.ContentId == contentId\n+ && r.Result == FeatureFlagSaveResult.Ok\n+ && r.Features.SingleOrDefault(\n+ f => f.Name == \"NuGetGallery.Typosquatting\"\n+ && f.Status == FeatureStatus.Enabled) != null\n+ && r.Flights.SingleOrDefault(\n+ f => f.Name == \"NuGetGallery.TyposquattingFlight\"\n+ && f.All\n+ && f.SiteAdmins\n+ && f.Accounts.Single() == \"a\"\n+ && f.Domains.Single() == \"b\") != null)),\n+ Times.Once());\n}\n[Fact]\n@@ -196,8 +236,10 @@ public async Task IfStorageThrowsPreconditionFailedException_ReturnsConflict()\nIt.IsAny<IAccessCondition>()))\n.ThrowsAsync(_preconditionException);\n+ var contentId = \"123\";\n+\n// Act\n- var result = await _target.TrySaveAsync(Example, \"123\");\n+ var result = await _target.TrySaveAsync(Example, contentId);\n// Assert\nAssert.Equal(FeatureFlagSaveResult.Conflict, result);\n@@ -209,6 +251,23 @@ public async Task IfStorageThrowsPreconditionFailedException_ReturnsConflict()\nIt.IsAny<Stream>(),\nIt.Is<IAccessCondition>(c => c.IfNoneMatchETag == null && c.IfMatchETag != null)),\nTimes.Once);\n+\n+ _auditing.Verify(\n+ a => a.SaveAuditRecordAsync(\n+ It.Is<FeatureFlagsAuditRecord>(\n+ r => r.Action == AuditedFeatureFlagsAction.Update\n+ && r.ContentId == contentId\n+ && r.Result == FeatureFlagSaveResult.Conflict\n+ && r.Features.SingleOrDefault(\n+ f => f.Name == \"NuGetGallery.Typosquatting\"\n+ && f.Status == FeatureStatus.Enabled) != null\n+ && r.Flights.SingleOrDefault(\n+ f => f.Name == \"NuGetGallery.TyposquattingFlight\"\n+ && f.All\n+ && f.SiteAdmins\n+ && f.Accounts.Single() == \"a\"\n+ && f.Domains.Single() == \"b\") != null)),\n+ Times.Once());\n}\n}\n@@ -237,6 +296,11 @@ public async Task WhenUserNotInFlags_DoesntSave()\nIt.IsAny<Stream>(),\nIt.IsAny<IAccessCondition>()),\nTimes.Never);\n+\n+ _auditing.Verify(\n+ a => a.SaveAuditRecordAsync(\n+ It.IsAny<FeatureFlagsAuditRecord>()),\n+ Times.Never());\n}\n[Fact]\n@@ -252,6 +316,19 @@ public async Task WhenExtraDataInJson_Throws()\n// Assert\nAssert.Contains(\"Could not find member 'Invalid' on object of type 'FeatureFlags'\", exception.Message);\n+\n+ _storage.Verify(\n+ s => s.SaveFileAsync(\n+ It.IsAny<string>(),\n+ It.IsAny<string>(),\n+ It.IsAny<Stream>(),\n+ It.IsAny<IAccessCondition>()),\n+ Times.Never);\n+\n+ _auditing.Verify(\n+ a => a.SaveAuditRecordAsync(\n+ It.IsAny<FeatureFlagsAuditRecord>()),\n+ Times.Never());\n}\n[Fact]\n@@ -303,6 +380,33 @@ public async Task RemovesUser()\nIt.IsAny<Stream>(),\nIt.IsAny<IAccessCondition>()),\nTimes.Once);\n+\n+ _auditing.Verify(\n+ a => a.SaveAuditRecordAsync(\n+ It.Is<FeatureFlagsAuditRecord>(\n+ r => r.Action == AuditedFeatureFlagsAction.Update\n+ && r.ContentId == \"fake-content-id\"\n+ && r.Result == FeatureFlagSaveResult.Ok\n+ && !r.Features.Any()\n+ && r.Flights.SingleOrDefault(\n+ f => f.Name == \"A\"\n+ && !f.All\n+ && !f.SiteAdmins\n+ && f.Accounts.Single() == \"user2\"\n+ && !f.Domains.Any()) != null\n+ && r.Flights.SingleOrDefault(\n+ f => f.Name == \"B\"\n+ && !f.All\n+ && !f.SiteAdmins\n+ && !f.Accounts.Any()\n+ && !f.Domains.Any()) != null\n+ && r.Flights.SingleOrDefault(\n+ f => f.Name == \"C\"\n+ && !f.All\n+ && !f.SiteAdmins\n+ && f.Accounts.Single() == \"user2\"\n+ && !f.Domains.Any()) != null)),\n+ Times.Once());\n}\n[Fact]\n@@ -356,6 +460,36 @@ public async Task WhenSavePreconditionFailsOnce_Retries()\nIt.IsAny<Stream>(),\nIt.IsAny<IAccessCondition>()),\nTimes.Exactly(2));\n+\n+ _auditing.Verify(\n+ a => a.SaveAuditRecordAsync(\n+ It.Is<FeatureFlagsAuditRecord>(\n+ r => r.Action == AuditedFeatureFlagsAction.Update\n+ && r.ContentId == \"fake-content-id\"\n+ && r.Result == FeatureFlagSaveResult.Conflict\n+ && !r.Features.Any()\n+ && r.Flights.SingleOrDefault(\n+ f => f.Name == \"A\"\n+ && !f.All\n+ && !f.SiteAdmins\n+ && f.Accounts.Single() == \"user2\"\n+ && !f.Domains.Any()) != null)),\n+ Times.Once());\n+\n+ _auditing.Verify(\n+ a => a.SaveAuditRecordAsync(\n+ It.Is<FeatureFlagsAuditRecord>(\n+ r => r.Action == AuditedFeatureFlagsAction.Update\n+ && r.ContentId == \"fake-content-id\"\n+ && r.Result == FeatureFlagSaveResult.Ok\n+ && !r.Features.Any()\n+ && r.Flights.SingleOrDefault(\n+ f => f.Name == \"A\"\n+ && !f.All\n+ && !f.SiteAdmins\n+ && f.Accounts.Single() == \"user2\"\n+ && !f.Domains.Any()) != null)),\n+ Times.Once());\n}\n[Fact]\n@@ -391,6 +525,21 @@ public async Task WhenSavePreconditionAlwaysFails_Throws()\nIt.IsAny<Stream>(),\nIt.IsAny<IAccessCondition>()),\nTimes.Exactly(3));\n+\n+ _auditing.Verify(\n+ a => a.SaveAuditRecordAsync(\n+ It.Is<FeatureFlagsAuditRecord>(\n+ r => r.Action == AuditedFeatureFlagsAction.Update\n+ && r.ContentId == \"fake-content-id\"\n+ && r.Result == FeatureFlagSaveResult.Conflict\n+ && !r.Features.Any()\n+ && r.Flights.SingleOrDefault(\n+ f => f.Name == \"A\"\n+ && !f.All\n+ && !f.SiteAdmins\n+ && f.Accounts.Single() == \"user2\"\n+ && !f.Domains.Any()) != null)),\n+ Times.Exactly(3));\n}\n[Fact]\n@@ -469,6 +618,7 @@ public FeatureFlags Build()\npublic class FactsBase\n{\nprotected readonly Mock<ICoreFileStorageService> _storage;\n+ protected readonly Mock<IAuditingService> _auditing;\nprotected readonly FeatureFlagFileStorageService _target;\nprotected readonly StorageException _preconditionException;\n@@ -477,7 +627,9 @@ public FactsBase()\nvar logger = Mock.Of<ILogger<FeatureFlagFileStorageService>>();\n_storage = new Mock<ICoreFileStorageService>();\n- _target = new FeatureFlagFileStorageService(_storage.Object, logger);\n+ _auditing = new Mock<IAuditingService>();\n+ _target = new FeatureFlagFileStorageService(\n+ _storage.Object, _auditing.Object, logger);\n_preconditionException = new StorageException(\nnew RequestResult\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add auditing for feature flags (#7058) |
455,776 | 30.04.2019 13:27:39 | 25,200 | ea460702c9be1f639a405048c81cca1bcae1b0a3 | Custom message should be required if deprecating package due to "Other" reason | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs",
"diff": "@@ -58,6 +58,28 @@ public virtual JsonResult GetAlternatePackageVersions(string id)\nstring alternatePackageVersion,\nstring customMessage)\n{\n+ var status = PackageDeprecationStatus.NotDeprecated;\n+\n+ if (isLegacy)\n+ {\n+ status |= PackageDeprecationStatus.Legacy;\n+ }\n+\n+ if (hasCriticalBugs)\n+ {\n+ status |= PackageDeprecationStatus.CriticalBugs;\n+ }\n+\n+ if (isOther)\n+ {\n+ if (string.IsNullOrWhiteSpace(customMessage))\n+ {\n+ return DeprecateErrorResponse(HttpStatusCode.BadRequest, Strings.DeprecatePackage_CustomMessageRequired);\n+ }\n+\n+ status |= PackageDeprecationStatus.Other;\n+ }\n+\nvar currentUser = GetCurrentUser();\nif (!_featureFlagService.IsManageDeprecationEnabled(GetCurrentUser()))\n{\n@@ -135,23 +157,6 @@ public virtual JsonResult GetAlternatePackageVersions(string id)\n}\n}\n- var status = PackageDeprecationStatus.NotDeprecated;\n-\n- if (isLegacy)\n- {\n- status |= PackageDeprecationStatus.Legacy;\n- }\n-\n- if (hasCriticalBugs)\n- {\n- status |= PackageDeprecationStatus.CriticalBugs;\n- }\n-\n- if (isOther)\n- {\n- status |= PackageDeprecationStatus.Other;\n- }\n-\nawait _deprecationService.UpdateDeprecation(\npackagesToUpdate,\nstatus,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-deprecation.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-deprecation.js",
"diff": "@@ -155,6 +155,9 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\n// The custom message to submit with the form.\nthis.customMessage = ko.observable('');\n+ this.requiresCustomMessage = ko.pureComputed(function () {\n+ return self.isOther() && !self.customMessage();\n+ }, this);\nthis.submitError = ko.observable();\nthis.submit = function () {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -766,6 +766,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to You must add a custom message if you are deprecating a package due to another reason!.\n+ /// </summary>\n+ public static string DeprecatePackage_CustomMessageRequired {\n+ get {\n+ return ResourceManager.GetString(\"DeprecatePackage_CustomMessageRequired\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to You do not have permission to deprecate this package..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1112,6 +1112,9 @@ The {1} Team</value>\n<data name=\"DeprecatePackage_MissingRegistration\" xml:space=\"preserve\">\n<value>Package '{0}' could not be found.</value>\n</data>\n+ <data name=\"DeprecatePackage_CustomMessageRequired\" xml:space=\"preserve\">\n+ <value>You must add a custom message if you are deprecating a package due to another reason!</value>\n+ </data>\n<data name=\"SymbolsPackage_NoSymbols\" xml:space=\"preserve\">\n<value>The package does not contain any symbol (.pdb) files.</value>\n</data>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ManageDeprecation.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ManageDeprecation.cshtml",
"diff": "<div class=\"form-group unbolded-label\">\n<label>\n<input name=\"isOther\" type=\"checkbox\" value=\"true\" data-bind=\"checked: isOther\" />\n- This package should be deprecated for <b>other</b> reasons\n+ <b>Other</b>\n</label>\n</div>\n</div>\n<label for=\"customMessage\" class=\"deprecation-section-header\">Provide custom message</label>\n<textarea id=\"customMessage\" name=\"customMessage\" class=\"form-control full-line\" data-bind=\"textInput: customMessage\" rows=\"2\"></textarea>\n</div>\n+ <div data-bind=\"visible: requiresCustomMessage()\">\n+ @ViewHelpers.AlertDanger(@<text>You must add a custom message if <b>Other</b> is selected.</text>)\n+ </div>\n</div>\n<div data-bind=\"visible: submitError\">\n</div>\n<div class=\"deprecation-section form-group\">\n- <button class=\"btn btn-primary full-line\" type=\"submit\" aria-label=\"Save package deprecation information\" data-bind=\"click: submit\">Save</button>\n+ <button class=\"btn btn-primary full-line\" type=\"submit\" aria-label=\"Save package deprecation information\" data-bind=\"click: submit, disable: requiresCustomMessage\">Save</button>\n</div>\n</script>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ManageDeprecationJsonApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ManageDeprecationJsonApiControllerFacts.cs",
"diff": "@@ -108,6 +108,27 @@ public void ReturnsAllAvailableVersionsInReverseVersionOrder()\npublic class TheDeprecateMethod : TestContainer\n{\n+ [Fact]\n+ public async Task ReturnsBadRequestIfOtherAndNoCustomMessage()\n+ {\n+ // Arrange\n+ var controller = GetController<ManageDeprecationJsonApiController>();\n+\n+ // Act\n+ var result = await controller.Deprecate(\n+ id: \"id\",\n+ versions: null,\n+ isLegacy: false,\n+ hasCriticalBugs: false,\n+ isOther: true,\n+ alternatePackageId: null,\n+ alternatePackageVersion: null,\n+ customMessage: null);\n+\n+ // Assert\n+ AssertErrorResponse(controller, result, HttpStatusCode.BadRequest, Strings.DeprecatePackage_CustomMessageRequired);\n+ }\n+\n[Fact]\npublic async Task ReturnsForbiddenIfFeatureFlagDisabled()\n{\n@@ -125,7 +146,14 @@ public async Task ReturnsForbiddenIfFeatureFlagDisabled()\n// Act\nvar result = await controller.Deprecate(\n- \"id\", null, false, false, false, null, null, null);\n+ id: \"id\",\n+ versions: null,\n+ isLegacy: false,\n+ hasCriticalBugs: false,\n+ isOther: false,\n+ alternatePackageId: null,\n+ alternatePackageVersion: null,\n+ customMessage: null);\n// Assert\nAssertErrorResponse(controller, result, HttpStatusCode.Forbidden, Strings.DeprecatePackage_Forbidden);\n@@ -153,7 +181,14 @@ public async Task ReturnsBadRequestIfNoVersions(IEnumerable<string> versions)\n// Act\nvar result = await controller.Deprecate(\n- \"id\", versions, false, false, false, null, null, null);\n+ id: \"id\",\n+ versions: versions,\n+ isLegacy: false,\n+ hasCriticalBugs: false,\n+ isOther: false,\n+ alternatePackageId: null,\n+ alternatePackageVersion: null,\n+ customMessage: null);\n// Assert\nAssertErrorResponse(controller, result, HttpStatusCode.BadRequest, Strings.DeprecatePackage_NoVersions);\n@@ -196,7 +231,14 @@ public async Task ReturnsNotFoundIfNoPackagesOrRegistrationMissing(IEnumerable<P\n// Act\nvar result = await controller.Deprecate(\n- id, new[] { \"1.0.0\" }, false, false, false, null, null, null);\n+ id: id,\n+ versions: new[] { \"1.0.0\" },\n+ isLegacy: false,\n+ hasCriticalBugs: false,\n+ isOther: false,\n+ alternatePackageId: null,\n+ alternatePackageVersion: null,\n+ customMessage: null);\n// Assert\nAssertErrorResponse(controller, result, HttpStatusCode.NotFound, string.Format(Strings.DeprecatePackage_MissingRegistration, id));\n@@ -258,7 +300,14 @@ public async Task ReturnsForbiddenIfNotOwner(User currentUser, User owner)\n// Act\nvar result = await controller.Deprecate(\n- id, new[] { \"1.0.0\" }, false, false, false, null, null, null);\n+ id: id,\n+ versions: new[] { \"1.0.0\" },\n+ isLegacy: false,\n+ hasCriticalBugs: false,\n+ isOther: false,\n+ alternatePackageId: null,\n+ alternatePackageVersion: null,\n+ customMessage: null);\n// Assert\nAssertErrorResponse(controller, result, HttpStatusCode.Forbidden, Strings.DeprecatePackage_Forbidden);\n@@ -333,7 +382,14 @@ public async Task ReturnsForbiddenIfLocked(User currentUser, User owner)\n// Act\nvar result = await controller.Deprecate(\n- id, new[] { \"1.0.0\" }, false, false, false, null, null, null);\n+ id: id,\n+ versions: new[] { \"1.0.0\" },\n+ isLegacy: false,\n+ hasCriticalBugs: false,\n+ isOther: false,\n+ alternatePackageId: null,\n+ alternatePackageVersion: null,\n+ customMessage: null);\n// Assert\nAssertErrorResponse(\n@@ -387,7 +443,14 @@ public async Task ReturnsNotFoundIfAlternatePackageRegistrationMissing(User curr\n// Act\nvar result = await controller.Deprecate(\n- id, new[] { \"1.0.0\" }, false, false, false, alternatePackageId, null, null);\n+ id: id,\n+ versions: new[] { \"1.0.0\" },\n+ isLegacy: false,\n+ hasCriticalBugs: false,\n+ isOther: false,\n+ alternatePackageId: alternatePackageId,\n+ alternatePackageVersion: null,\n+ customMessage: null);\n// Assert\nAssertErrorResponse(\n@@ -442,7 +505,14 @@ public async Task ReturnsNotFoundIfAlternatePackageVersionMissing(User currentUs\n// Act\nvar result = await controller.Deprecate(\n- id, new[] { \"1.0.0\" }, false, false, false, alternatePackageId, alternatePackageVersion, null);\n+ id: id,\n+ versions: new[] { \"1.0.0\" },\n+ isLegacy: false,\n+ hasCriticalBugs: false,\n+ isOther: false,\n+ alternatePackageId: alternatePackageId,\n+ alternatePackageVersion: alternatePackageVersion,\n+ customMessage: null);\n// Assert\nAssertErrorResponse(\n@@ -491,7 +561,14 @@ public async Task ReturnsNotFoundIfVersionMissing(User currentUser, User owner)\n// Act\nvar result = await controller.Deprecate(\n- id, new[] { \"1.0.0\" }, false, false, false, null, null, null);\n+ id: id,\n+ versions: new[] { \"1.0.0\" },\n+ isLegacy: false,\n+ hasCriticalBugs: false,\n+ isOther: false,\n+ alternatePackageId: null,\n+ alternatePackageVersion: null,\n+ customMessage: null);\n// Assert\nAssertErrorResponse(\n@@ -540,7 +617,14 @@ public async Task ReturnsNotFoundIfSomeVersionMissing(User currentUser, User own\n// Act\nvar result = await controller.Deprecate(\n- id, new[] { package.NormalizedVersion, \"1.0.0\" }, false, false, false, null, null, null);\n+ id: id,\n+ versions: new[] { \"1.0.0\" },\n+ isLegacy: false,\n+ hasCriticalBugs: false,\n+ isOther: false,\n+ alternatePackageId: null,\n+ alternatePackageVersion: null,\n+ customMessage: null);\n// Assert\nAssertErrorResponse(\n@@ -600,12 +684,59 @@ public enum ReturnsSuccessful_AlternatePackage_State\nMemberDataHelper.Combine(\nOwner_Data,\nPackageDeprecationStates_Data,\n- MemberDataHelper.EnumDataSet<ReturnsSuccessful_AlternatePackage_State>(),\n- MemberDataHelper.BooleanDataSet()).ToList();\n+ MemberDataHelper.EnumDataSet<ReturnsSuccessful_AlternatePackage_State>()).ToList();\n[Theory]\n[MemberData(nameof(ReturnsSuccessful_Data))]\n- public async Task ReturnsSuccessful(\n+ public Task ReturnsSuccessfulWithCustomMessage(\n+ User currentUser,\n+ User owner,\n+ bool isLegacy,\n+ bool hasCriticalBugs,\n+ bool isOther,\n+ PackageDeprecationStatus expectedStatus,\n+ ReturnsSuccessful_AlternatePackage_State alternatePackageState)\n+ {\n+ return AssertSuccessful(\n+ currentUser,\n+ owner,\n+ isLegacy,\n+ hasCriticalBugs,\n+ isOther,\n+ expectedStatus,\n+ alternatePackageState,\n+ true);\n+ }\n+\n+ /// <remarks>\n+ /// Deprecations where the only reason is \"other\" must have a custom message.\n+ /// </remarks>\n+ public static IEnumerable<object[]> ReturnsSuccessfulWithoutCustomMessage_Data =\n+ ReturnsSuccessful_Data.Where(x => !(bool)x[4]);\n+\n+ [Theory]\n+ [MemberData(nameof(ReturnsSuccessfulWithoutCustomMessage_Data))]\n+ public Task ReturnsSuccessfulWithoutCustomMessage(\n+ User currentUser,\n+ User owner,\n+ bool isLegacy,\n+ bool hasCriticalBugs,\n+ bool isOther,\n+ PackageDeprecationStatus expectedStatus,\n+ ReturnsSuccessful_AlternatePackage_State alternatePackageState)\n+ {\n+ return AssertSuccessful(\n+ currentUser,\n+ owner,\n+ isLegacy,\n+ hasCriticalBugs,\n+ isOther,\n+ expectedStatus,\n+ alternatePackageState,\n+ false);\n+ }\n+\n+ private async Task AssertSuccessful(\nUser currentUser,\nUser owner,\nbool isLegacy,\n@@ -613,7 +744,7 @@ public enum ReturnsSuccessful_AlternatePackage_State\nbool isOther,\nPackageDeprecationStatus expectedStatus,\nReturnsSuccessful_AlternatePackage_State alternatePackageState,\n- bool hasAdditionalData)\n+ bool hasCustomMessage)\n{\n// Arrange\nvar id = \"id\";\n@@ -686,7 +817,7 @@ public enum ReturnsSuccessful_AlternatePackage_State\nvar deprecationService = GetMock<IPackageDeprecationService>();\n- var customMessage = hasAdditionalData ? \"message\" : null;\n+ var customMessage = hasCustomMessage ? \"message\" : null;\ndeprecationService\n.Setup(x => x.UpdateDeprecation(\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Custom message should be required if deprecating package due to "Other" reason (#7108) |
455,772 | 01.05.2019 15:26:36 | 25,200 | e592344be9089333f3ce3ffd5d22dbc4dacdfce4 | web.config compilation->debug should be set to false | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "-->\n<system.web>\n<httpCookies requireSSL=\"true\" httpOnlyCookies=\"true\"/>\n- <compilation debug=\"true\" targetFramework=\"4.6.2\"/>\n+ <compilation debug=\"false\" targetFramework=\"4.6.2\"/>\n<pages controlRenderingCompatibilityVersion=\"4.0\">\n<namespaces>\n<add namespace=\"System.Web.Helpers\"/>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | web.config compilation->debug should be set to false (#7121) |
455,747 | 02.05.2019 21:26:05 | 0 | 7f4c4f0b5b681fd52010bed65274901afb581075 | Add isPersistent flag to cookie | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"new_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"diff": "using System.Threading.Tasks;\nusing System.Web.Mvc;\nusing Microsoft.Owin;\n+using Microsoft.Owin.Security;\nusing NuGet.Services.Entities;\nusing NuGetGallery.Auditing;\nusing NuGetGallery.Authentication.Providers;\n@@ -245,7 +246,7 @@ public virtual async Task CreateSessionAsync(IOwinContext owinContext, Authentic\nClaimsIdentity identity = CreateIdentity(authenticatedUser.User, AuthenticationTypes.LocalUser, await GetUserLoginClaims(authenticatedUser, wasMultiFactorAuthenticated));\n// Issue the session token and clean up the external token if present\n- owinContext.Authentication.SignIn(identity);\n+ owinContext.Authentication.SignIn(new AuthenticationProperties() { IsPersistent = true }, identity);\nowinContext.Authentication.SignOut(AuthenticationTypes.External);\n_telemetryService.TrackUserLogin(authenticatedUser.User, authenticatedUser.CredentialUsed, wasMultiFactorAuthenticated);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add isPersistent flag to cookie (#7127) |
455,737 | 06.05.2019 15:52:44 | 25,200 | 7ee5ff0f6c82e954b8d4a5f202e1cd184b137455 | Move call to AddPackageOwner to requrie an object so we can allow html characters for message only. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/JsonApiController.cs",
"new_path": "src/NuGetGallery/Controllers/JsonApiController.cs",
"diff": "@@ -103,8 +103,12 @@ public virtual ActionResult GetPackageOwners(string id)\n[HttpPost]\n[ValidateAntiForgeryToken]\n- public async Task<JsonResult> AddPackageOwner(string id, string username, string message)\n+ public async Task<JsonResult> AddPackageOwner(AddPackageOwnerViewModel addOwnerData)\n{\n+ string id = addOwnerData.Id;\n+ string username = addOwnerData.Username;\n+ string message = addOwnerData.Message;\n+\nif (Regex.IsMatch(username, GalleryConstants.EmailValidationRegex, RegexOptions.None, GalleryConstants.EmailValidationRegexTimeout))\n{\nreturn Json(new { success = false, message = Strings.AddOwner_NameIsEmail }, JsonRequestBehavior.AllowGet);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Telemetry\\UserPackageDeleteOutcome.cs\" />\n<Compile Include=\"UrlHelperExtensions.cs\" />\n<Compile Include=\"ViewModels\\AddOrganizationViewModel.cs\" />\n+ <Compile Include=\"ViewModels\\AddPackageOwnerViewModel.cs\" />\n<Compile Include=\"ViewModels\\CompositeLicenseExpressionSegmentViewModel.cs\" />\n<Compile Include=\"ViewModels\\DeleteOrganizationViewModel.cs\" />\n<Compile Include=\"ViewModels\\DeleteUserViewModel.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Move call to AddPackageOwner to requrie an object so we can allow html characters for message only. |
455,737 | 06.05.2019 15:52:54 | 25,200 | 6abf0987e2f78206bff5159761cfce5ad1cf267b | Fix tests to use new object. | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs",
"diff": "@@ -355,9 +355,15 @@ public async Task FailsIfUserInputIsEmailAddress(Func<Fakes, User> getCurrentUse\nvar package = fakes.Package;\nvar controller = GetController<JsonApiController>();\ncontroller.SetCurrentUser(currentUser);\n+ AddPackageOwnerViewModel testData = new AddPackageOwnerViewModel\n+ {\n+ Id = package.Id,\n+ Username = usernameToAdd,\n+ Message = \"a message\"\n+ };\n// Act\n- var result = await controller.AddPackageOwner(package.Id, usernameToAdd, \"a message\");\n+ var result = await controller.AddPackageOwner(testData);\ndynamic data = result.Data;\n// Assert\n@@ -444,8 +450,15 @@ public async Task CreatesPackageOwnerRequestSendsEmailAndReturnsPendingState(Fun\n.Verifiable();\n}\n}\n+ AddPackageOwnerViewModel testData = new AddPackageOwnerViewModel\n+ {\n+ Id = fakes.Package.Id,\n+ Username = userToAdd.Username,\n+ Message = \"Hello World! Html Encoded <3\"\n+ };\n- JsonResult result = await controller.AddPackageOwner(fakes.Package.Id, userToAdd.Username, \"Hello World! Html Encoded <3\");\n+\n+ JsonResult result = await controller.AddPackageOwner(testData);\ndynamic data = result.Data;\nPackageOwnersResultViewModel model = data.model;\n@@ -679,7 +692,14 @@ public async Task RemovesExistingOwner(Func<Fakes, User> getCurrentUser, Func<Fa\nprivate static async Task<ActionResult> AddPackageOwner(JsonApiController jsonApiController, string packageId, string username)\n{\n- return await jsonApiController.AddPackageOwner(packageId, username, \"message\");\n+ AddPackageOwnerViewModel testData = new AddPackageOwnerViewModel\n+ {\n+ Id = packageId,\n+ Username = username,\n+ Message = \"message\"\n+ };\n+\n+ return await jsonApiController.AddPackageOwner(testData);\n}\nprivate static async Task<ActionResult> RemovePackageOwner(JsonApiController jsonApiController, string packageId, string username)\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix tests to use new object. |
455,736 | 07.05.2019 09:45:10 | 25,200 | 79d96b631a01d6885dddda3f527b80b803d56739 | Add pending migration test
Address | [
{
"change_type": "MODIFY",
"old_path": "src/DatabaseMigrationTools/MigrationTargetDatabaseArgumentNames.cs",
"new_path": "src/DatabaseMigrationTools/MigrationTargetDatabaseArgumentNames.cs",
"diff": "namespace NuGetGallery.DatabaseMigrationTools\n{\n- internal static class MigrationTargetDatabaseArgumentNames\n+ public static class MigrationTargetDatabaseArgumentNames\n{\npublic const string GalleryDatabase = \"GalleryDatabase\";\npublic const string SupportRequestDatabase = \"SupportRequestDatabase\";\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGet.Services.DatabaseMigration.Facts/NuGet.Services.DatabaseMigration.Facts.csproj",
"new_path": "tests/NuGet.Services.DatabaseMigration.Facts/NuGet.Services.DatabaseMigration.Facts.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<Compile Include=\"DatabaseMigrationFacts.cs\" />\n+ <Compile Include=\"PendingMigrationsFacts.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n</ItemGroup>\n<ItemGroup>\n+ <PackageReference Include=\"Moq\">\n+ <Version>4.8.2</Version>\n+ </PackageReference>\n<PackageReference Include=\"xunit\">\n<Version>2.4.1</Version>\n</PackageReference>\n</PackageReference>\n</ItemGroup>\n<ItemGroup>\n+ <ProjectReference Include=\"..\\..\\src\\DatabaseMigrationTools\\DatabaseMigrationTools.csproj\">\n+ <Project>{dced7162-a24c-4579-96c8-544bfaf4c305}</Project>\n+ <Name>DatabaseMigrationTools</Name>\n+ </ProjectReference>\n<ProjectReference Include=\"..\\..\\src\\NuGet.Services.DatabaseMigration\\NuGet.Services.DatabaseMigration.csproj\">\n<Project>{f4c8c34f-72a9-4773-a315-8fa3f2d5ce4e}</Project>\n<Name>NuGet.Services.DatabaseMigration</Name>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGet.Services.DatabaseMigration.Facts/Properties/AssemblyInfo.cs",
"new_path": "tests/NuGet.Services.DatabaseMigration.Facts/Properties/AssemblyInfo.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System.Reflection;\n+using Xunit;\n[assembly: AssemblyTitle(\"NuGet.Services.DatabaseMigration.Facts\")]\n+\n+[assembly: CollectionBehavior(DisableTestParallelization = true)]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add pending migration test (#7143)
Address https://github.com/NuGet/NuGetGallery/issues/4934 |
455,736 | 14.05.2019 14:22:38 | 25,200 | 0adfac33b06a0fdc5fa428becd549bd61dd4279d | Add Google Analytics events for search pages and search selections
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common.js",
"diff": "});\n};\n+ nuget.sendAnalyticsEvent = function (category, action, label, eventValue, options) {\n+ if (window.nuget.isGaAvailable()) {\n+ ga('send', 'event', category, action, label, eventValue, options);\n+ }\n+ }\n+\nwindow.nuget = nuget;\njQuery.extend(jQuery.expr[':'], {\n$(this).click(function (e) {\nvar href = $(this).attr('href');\nvar category = $(this).data().track;\n+ var trackValue = $(this).data().trackValue;\nif (window.nuget.isGaAvailable() && href && category) {\nif (e.altKey || e.ctrlKey || e.metaKey) {\n- ga('send', 'event', category, 'click', href);\n+ window.nuget.sendAnalyticsEvent(category, 'click', href, trackValue);\n} else {\ne.preventDefault();\n- ga('send', 'event', category, 'click', href, {\n+ window.nuget.sendAnalyticsEvent(category, 'click', href, trackValue, {\n'transport': 'beacon',\n'hitCallback': window.nuget.createFunctionWithTimeout(function () {\ndocument.location = href;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/ListPackages.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/ListPackages.cshtml",
"diff": "}\n<div class=\"list-packages\" role=\"list\">\n+ @{ var itemIndex = Model.PageIndex * Model.PageSize; }\n@foreach (var package in Model.Items)\n{\n- @Html.Partial(\"_ListPackage\", package)\n+ // Only set an item index when there is a search query, for now.\n+ var thisItemIndex = string.IsNullOrWhiteSpace(Model.SearchTerm) ? null : (int?) itemIndex;\n+ @Html.Partial(\"_ListPackage\", package, new ViewDataDictionary { { \"itemIndex\", thisItemIndex } })\n+ itemIndex++;\n}\n</div>\n@section bottomScripts {\n<script type=\"text/javascript\">\n+\n+ @if (!string.IsNullOrWhiteSpace(Model.SearchTerm) && (Model.PageIndex == 0 || Model.Items.Count() > 0))\n+ {\n+ var action = Model.IncludePrerelease ? \"search-prerel\" : \"search-stable\";\n+ // Emit an event representing the search page and the page index. This make it easier for the search selection\n+ // event to be correlated in Google Analytics.\n+ <text>\n+ window.nuget.sendAnalyticsEvent('search-page', '@action', @Html.Raw(Json.Encode(Model.SearchTerm)), @Model.PageIndex);\n+ </text>\n+ }\n+\n$(function () {\n$(\"#include-prerelease\").on('change', function () {\nvar parameters = {};\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add Google Analytics events for search pages and search selections (#7157)
Address https://github.com/NuGet/NuGetGallery/issues/6803 |
455,776 | 15.05.2019 15:15:14 | 25,200 | 9980106511c71cc4e8e94bb234fe138c75c2fa9f | UI should return Forbidden when symbols feature flag is disabled | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -2520,7 +2520,7 @@ private JsonResult GetJsonResultOrNull(SymbolPackageValidationResult validationR\nhttpStatusCode = HttpStatusCode.Conflict;\nbreak;\ncase SymbolPackageValidationResultType.UserNotAllowedToUpload:\n- httpStatusCode = HttpStatusCode.Unauthorized;\n+ httpStatusCode = HttpStatusCode.Forbidden;\nbreak;\ndefault:\nthrow new NotImplementedException($\"The symbol package validation result type {validationResult.Type} is not supported.\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/async-file-upload.js",
"new_path": "src/NuGetGallery/Scripts/gallery/async-file-upload.js",
"diff": "}\nfunction displayErrors(errors) {\n- if (errors == null || errors.length < 1) {\n+ if (!errors || errors.length < 1) {\nreturn;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -5613,6 +5613,43 @@ public async Task WillPreventSymbolsUploadIfOriginalPackageIsLocked()\nAssert.Equal(string.Format(Strings.PackageIsLocked, packageId), (result.Data as JsonValidationMessage[])[0].PlainTextMessage);\n}\n+ [Fact]\n+ public async Task WillPreventSymbolsUploadIfUserNotAllowedToUpload()\n+ {\n+ var packageId = \"theId\";\n+ var package = new Package()\n+ {\n+ PackageRegistration = new PackageRegistration()\n+ {\n+ Id = packageId,\n+ Owners = new List<User>() { TestUtility.FakeUser },\n+ IsLocked = true\n+ }\n+ };\n+\n+ var fakeUploadedFile = new Mock<HttpPostedFileBase>();\n+ fakeUploadedFile.Setup(x => x.FileName).Returns(\"theFile.snupkg\");\n+ var fakeFileStream = TestPackage.CreateTestSymbolPackageStream(\"theId\", \"1.0.0\");\n+ fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);\n+ var symbolPackageUploadService = new Mock<ISymbolPackageUploadService>();\n+ var message = \"message\";\n+ symbolPackageUploadService\n+ .Setup(x => x.ValidateUploadedSymbolsPackage(It.IsAny<Stream>(), It.IsAny<User>()))\n+ .ReturnsAsync(SymbolPackageValidationResult.UserNotAllowedToUpload(message));\n+\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ fakeNuGetPackage: fakeFileStream,\n+ symbolPackageUploadService: symbolPackageUploadService);\n+ controller.SetCurrentUser(TestUtility.FakeUser);\n+\n+ var result = await controller.UploadPackage(fakeUploadedFile.Object) as JsonResult;\n+\n+ Assert.NotNull(result);\n+ Assert.Equal((int)HttpStatusCode.Forbidden, controller.Response.StatusCode);\n+ Assert.Equal(message, (result.Data as JsonValidationMessage[])[0].PlainTextMessage);\n+ }\n+\npublic static IEnumerable<object[]> SymbolValidationResultTypes => Enum\n.GetValues(typeof(SymbolPackageValidationResultType))\n.Cast<SymbolPackageValidationResultType>()\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | UI should return Forbidden when symbols feature flag is disabled (#7162) |
455,776 | 15.05.2019 15:34:01 | 25,200 | eea4ac7f17443777efce41d30302de4ccca05ded | DisplayPackage, Manage, and DeleteSymbols pages should find exact version case-insensitively | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -720,7 +720,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\n}\nelse\n{\n- package = packages.SingleOrDefault(p => p.NormalizedVersion == NuGetVersionFormatter.Normalize(version));\n+ package = _packageService.FilterExactPackage(packages, version);\n}\n}\n@@ -1462,7 +1462,7 @@ public virtual async Task<ActionResult> Manage(string id, string version = null)\nif (version != null)\n{\n// Try to find the exact version if it was specified.\n- package = packages.SingleOrDefault(p => p.NormalizedVersion == NuGetVersionFormatter.Normalize(version));\n+ package = _packageService.FilterExactPackage(packages, version);\n}\nif (package == null)\n@@ -1506,7 +1506,7 @@ public virtual ActionResult DeleteSymbols(string id, string version)\nif (version != null)\n{\n// Try to find the exact version if it was specified.\n- package = packages.SingleOrDefault(p => p.NormalizedVersion == NuGetVersionFormatter.Normalize(version));\n+ package = _packageService.FilterExactPackage(packages, version);\n}\nif (package == null)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IPackageService.cs",
"new_path": "src/NuGetGallery/Services/IPackageService.cs",
"diff": "@@ -40,6 +40,29 @@ public interface IPackageService : ICorePackageService\nint? semVerLevelKey = null,\nbool allowPrerelease = true);\n+ /// <summary>\n+ /// Filters a list of packages for an exact version.\n+ /// </summary>\n+ /// <param name=\"packages\">The list of packages to search.</param>\n+ /// <param name=\"version\">The version to search for. This version is normalized and compared case-insensitively.</param>\n+ /// <returns>\n+ /// Returns the package in <paramref name=\"packages\"/> with the exact version.\n+ /// Returns null if no such package exists.\n+ /// </returns>\n+ Package FilterExactPackage(\n+ IReadOnlyCollection<Package> packages,\n+ string version);\n+\n+ /// <summary>\n+ /// Filters a list of packages and returns the latest that follows some criteria.\n+ /// </summary>\n+ /// <param name=\"packages\">The list of packages to search.</param>\n+ /// <param name=\"semVerLevelKey\">The SemVer-level key that determines the SemVer filter to be applied.</param>\n+ /// <param name=\"allowPrerelease\"><c>True</c> indicating pre-release packages are allowed, otherwise <c>false</c>.</param>\n+ /// <returns>\n+ /// Returns the latest package in <paramref name=\"packages\"/> that follows the criteria.\n+ /// Returns null if no such package exists.\n+ /// </returns>\nPackage FilterLatestPackage(\nIReadOnlyCollection<Package> packages,\nint? semVerLevelKey = SemVerLevelKey.SemVer2,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -183,6 +183,17 @@ public override PackageRegistration FindPackageRegistrationById(string packageId\nreturn package;\n}\n+ public virtual Package FilterExactPackage(\n+ IReadOnlyCollection<Package> packages,\n+ string version)\n+ {\n+ var normalizedVersion = NuGetVersionFormatter.Normalize(version);\n+ return packages.SingleOrDefault(p => string.Equals(\n+ p.NormalizedVersion,\n+ normalizedVersion,\n+ StringComparison.OrdinalIgnoreCase));\n+ }\n+\npublic virtual Package FilterLatestPackage(\nIReadOnlyCollection<Package> packages,\nint? semVerLevelKey = SemVerLevelKey.SemVer2,\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -376,11 +376,17 @@ public async Task GivenANonExistentPackageIt404s()\nGetConfigurationService(),\npackageService: packageService);\n+ var version = \"1.1.1\";\n+ var packages = new Package[0];\npackageService.Setup(p => p.FindPackagesById(\"Foo\", PackageDeprecationFieldsToInclude.Deprecation))\n- .Returns(new Package[0]);\n+ .Returns(packages);\n+\n+ packageService\n+ .Setup(p => p.FilterExactPackage(packages, version))\n+ .Returns((Package)null);\n// Act\n- var result = await controller.DisplayPackage(\"Foo\", \"1.1.1\");\n+ var result = await controller.DisplayPackage(\"Foo\", version);\n// Assert\nResultAssert.IsNotFound(result);\n@@ -523,6 +529,10 @@ public async Task GivenAValidatingPackageThatTheCurrentUserDoesNotOwnThenHideIt(\n.Setup(p => p.FindPackagesById(id, PackageDeprecationFieldsToInclude.Deprecation))\n.Returns(packages);\n+ packageService\n+ .Setup(p => p.FilterExactPackage(packages, version))\n+ .Returns(package);\n+\nvar getDeprecationByPackageSetup = deprecationService\n.Setup(x => x.GetDeprecationByPackage(package));\n@@ -646,6 +656,10 @@ private async Task CheckValidPackage(User currentUser, User owner)\n.Setup(p => p.FindPackagesById(id, PackageDeprecationFieldsToInclude.Deprecation))\n.Returns(packages);\n+ packageService\n+ .Setup(p => p.FilterExactPackage(packages, normalizedVersion))\n+ .Returns(package);\n+\ndeprecationService\n.Setup(x => x.GetDeprecationByPackage(package))\n.Verifiable();\n@@ -994,6 +1008,7 @@ public async Task GetsValidationIssues()\nvar packages = new[] { package };\npackageService.Setup(p => p.FindPackagesById(\"Foo\", PackageDeprecationFieldsToInclude.Deprecation))\n.Returns(packages);\n+\npackageService.Setup(p => p.FilterLatestPackage(packages, SemVerLevelKey.SemVer2, true))\n.Returns(package);\n@@ -2691,12 +2706,18 @@ protected override Mock<IPackageService> SetupPackageService(bool isPackageMissi\n.Returns(packages)\n.Verifiable();\n- if (isPackageMissing)\n- {\npackageService\n- .Setup(p => p.FilterLatestPackage(packages, SemVerLevelKey.SemVer2, true))\n+ .Setup(p => p.FilterExactPackage(packages, It.Is<string>(s => s == Package.Version || s == Package.NormalizedVersion)))\n+ .Returns(isPackageMissing ? null : Package)\n+ .Verifiable();\n+\n+ packageService\n+ .Setup(svc => svc.FilterExactPackage(packages, It.Is<string>(s => s != Package.Version && s != Package.NormalizedVersion)))\n+ .Returns((Package)null);\n+\n+ packageService\n+ .Setup(svc => svc.FilterLatestPackage(packages, It.IsAny<int>(), It.IsAny<bool>()))\n.Returns((Package)null);\n- }\nreturn packageService;\n}\n@@ -2713,6 +2734,14 @@ protected override Mock<IPackageService> SetupPackageService(bool isPackageMissi\n.Returns(packages)\n.Verifiable();\n+ packageService\n+ .Setup(p => p.FilterExactPackage(packages, It.Is<string>(s => s == Package.Version || s == Package.NormalizedVersion)))\n+ .Returns(isPackageMissing ? null : Package);\n+\n+ packageService\n+ .Setup(svc => svc.FilterExactPackage(packages, It.Is<string>(s => s != Package.Version && s != Package.NormalizedVersion)))\n+ .Returns((Package)null);\n+\npackageService\n.Setup(p => p.FilterLatestPackage(packages, SemVerLevelKey.SemVer2, true))\n.Returns(isPackageMissing ? null : Package)\n@@ -2790,6 +2819,11 @@ public void Returns404IfPackageNotFound()\n.Setup(x => x.FindPackagesById(_packageRegistration.Id, PackageDeprecationFieldsToInclude.None))\n.Returns(new Package[0]);\n+ packageService\n+ .Setup(p => p.FilterExactPackage(It.IsAny<IReadOnlyCollection<Package>>(), It.IsAny<string>()))\n+ .Returns((Package)null)\n+ .Verifiable();\n+\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService);\n@@ -2929,11 +2963,24 @@ public class TheDeleteSymbolsMethodWithExactVersion : TheDeleteSymbolsMethod\nprotected override Mock<IPackageService> CreatePackageService()\n{\nvar packageService = new Mock<IPackageService>(MockBehavior.Strict);\n+ var packages = _packageRegistration.Packages.ToList();\npackageService\n.Setup(svc => svc.FindPackagesById(_packageId, PackageDeprecationFieldsToInclude.None))\n- .Returns(_packageRegistration.Packages.ToList())\n+ .Returns(packages)\n.Verifiable();\n+ packageService\n+ .Setup(p => p.FilterExactPackage(packages, It.Is<string>(s => s == _package.Version || s == _package.NormalizedVersion)))\n+ .Returns(_package);\n+\n+ packageService\n+ .Setup(svc => svc.FilterExactPackage(packages, It.Is<string>(s => s != _package.Version && s != _package.NormalizedVersion)))\n+ .Returns((Package)null);\n+\n+ packageService\n+ .Setup(svc => svc.FilterLatestPackage(packages, It.IsAny<int>(), It.IsAny<bool>()))\n+ .Returns((Package)null);\n+\nreturn packageService;\n}\n@@ -2954,6 +3001,14 @@ protected override Mock<IPackageService> CreatePackageService()\n.Returns(packages)\n.Verifiable();\n+ packageService\n+ .Setup(p => p.FilterExactPackage(packages, It.Is<string>(s => s == _package.Version || s == _package.NormalizedVersion)))\n+ .Returns(_package);\n+\n+ packageService\n+ .Setup(svc => svc.FilterExactPackage(packages, It.Is<string>(s => s != _package.Version && s != _package.NormalizedVersion)))\n+ .Returns((Package)null);\n+\npackageService\n.Setup(svc => svc.FilterLatestPackage(packages, SemVerLevelKey.SemVer2, true))\n.Returns(_package)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -864,6 +864,71 @@ private async Task WillThrowIfTheRepositoryUrlIsLongerThan4000()\n}\n}\n+ public class TheFilterExactPackageMethod\n+ {\n+ [Fact]\n+ public void ThrowsIfPackagesNull()\n+ {\n+ Assert.Throws<ArgumentNullException>(() => InvokeMethod(null, null));\n+ }\n+\n+ [Theory]\n+ [InlineData(null)]\n+ [InlineData(\"1.0.0\")]\n+ public void ReturnsNullIfEmptyList(string version)\n+ {\n+ Assert.Equal(null, InvokeMethod(new Package[0], version));\n+ }\n+\n+ [Theory]\n+ [InlineData(null)]\n+ [InlineData(\"1.0.0-afakepackage\")]\n+ public void ReturnsNullIfMissing(string version)\n+ {\n+ var packages = new[]\n+ {\n+ CreateTestPackage(\"1.0.0\"),\n+ CreateTestPackage(\"2.0.0\")\n+ };\n+\n+ Assert.Equal(null, InvokeMethod(packages, version));\n+ }\n+\n+ /// <remarks>\n+ /// The method should compare the normalized version of the package and be case-insensitive.\n+ /// </remarks>\n+ [Theory]\n+ [InlineData(\"1.0.0-a\")]\n+ [InlineData(\"1.0.0-A\")]\n+ [InlineData(\"1.0.0-a+metadata\")]\n+ [InlineData(\"1.0.0-A+metadata\")]\n+ public void ReturnsVersionIfExists(string version)\n+ {\n+ var package = CreateTestPackage(\"1.0.0-a\");\n+ var packages = new[]\n+ {\n+ package,\n+ CreateTestPackage(\"2.0.0\")\n+ };\n+\n+ Assert.Equal(package, InvokeMethod(packages, version));\n+ }\n+\n+ private Package InvokeMethod(IReadOnlyCollection<Package> packages, string version)\n+ {\n+ var service = CreateService();\n+ return service.FilterExactPackage(packages, version);\n+ }\n+\n+ private Package CreateTestPackage(string normalizedVersion)\n+ {\n+ return new Package\n+ {\n+ NormalizedVersion = normalizedVersion\n+ };\n+ }\n+ }\n+\npublic class TheFilterLatestPackageMethod\n{\nprotected const string Id = \"theId\";\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | DisplayPackage, Manage, and DeleteSymbols pages should find exact version case-insensitively (#7161) |
455,736 | 15.05.2019 16:09:58 | 25,200 | c5befcee2d7e76cc945e54019b72b894b13e8a37 | Make IEntitiesContext implement IDisposable | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/FakeEntitiesContext.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/FakeEntitiesContext.cs",
"diff": "@@ -237,5 +237,9 @@ public IDatabase GetDatabase()\nreturn mockSet.Object;\n}\n+\n+ public void Dispose()\n+ {\n+ }\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Make IEntitiesContext implement IDisposable (#7164) |
455,751 | 16.05.2019 14:23:04 | 25,200 | 7b30ebf592ed4d6736afb32e0085df1b47e36f2f | StorageStatusService
Gallery status service will verify the storage primary or secondary for status depending on the read only mode. The readOnly will verify the secondary storage and the readWrite will verify the primary storage. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/CloudAuditingService.cs",
"new_path": "src/NuGetGallery.Core/Auditing/CloudAuditingService.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n-using System.Collections.Generic;\nusing System.Globalization;\nusing System.IO;\n-using System.Linq;\n-using System.Reflection;\nusing System.Threading.Tasks;\nusing Microsoft.WindowsAzure.Storage;\nusing Microsoft.WindowsAzure.Storage.Blob;\nusing Microsoft.WindowsAzure.Storage.Blob.Protocol;\nusing Microsoft.WindowsAzure.Storage.RetryPolicies;\nusing Newtonsoft.Json;\n-using Newtonsoft.Json.Converters;\n-using Newtonsoft.Json.Linq;\n-using Newtonsoft.Json.Serialization;\nusing NuGetGallery.Auditing.Obfuscation;\nnamespace NuGetGallery.Auditing\n@@ -133,9 +127,9 @@ private static async Task WriteBlob(string auditData, string fullPath, CloudBloc\n}\n}\n- public Task<bool> IsAvailableAsync()\n+ public Task<bool> IsAvailableAsync(BlobRequestOptions options, OperationContext operationContext)\n{\n- return _auditContainer.ExistsAsync();\n+ return _auditContainer.ExistsAsync(options, operationContext);\n}\npublic override string RenderAuditEntry(AuditEntry entry)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/ICloudStorageStatusDependency.cs",
"new_path": "src/NuGetGallery.Core/ICloudStorageStatusDependency.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System.Threading.Tasks;\n+using Microsoft.WindowsAzure.Storage;\n+using Microsoft.WindowsAzure.Storage.Blob;\nnamespace NuGetGallery\n{\n@@ -11,6 +13,6 @@ namespace NuGetGallery\n/// </summary>\npublic interface ICloudStorageStatusDependency\n{\n- Task<bool> IsAvailableAsync();\n+ Task<bool> IsAvailableAsync(BlobRequestOptions options, OperationContext operationContext);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobContainerWrapper.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobContainerWrapper.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System.Threading.Tasks;\n+using Microsoft.WindowsAzure.Storage;\nusing Microsoft.WindowsAzure.Storage.Blob;\nnamespace NuGetGallery\n@@ -34,9 +35,9 @@ public ISimpleCloudBlob GetBlobReference(string blobAddressUri)\nreturn new CloudBlobWrapper(_blobContainer.GetBlockBlobReference(blobAddressUri));\n}\n- public Task<bool> ExistsAsync()\n+ public Task<bool> ExistsAsync(BlobRequestOptions blobRequestOptions, OperationContext context)\n{\n- return _blobContainer.ExistsAsync();\n+ return _blobContainer.ExistsAsync(blobRequestOptions, context);\n}\npublic async Task<bool> DeleteIfExistsAsync()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/ICloudBlobContainer.cs",
"new_path": "src/NuGetGallery.Core/Services/ICloudBlobContainer.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System.Threading.Tasks;\n+using Microsoft.WindowsAzure.Storage;\nusing Microsoft.WindowsAzure.Storage.Blob;\nnamespace NuGetGallery\n@@ -11,7 +12,7 @@ public interface ICloudBlobContainer\nTask CreateIfNotExistAsync();\nTask SetPermissionsAsync(BlobContainerPermissions permissions);\nISimpleCloudBlob GetBlobReference(string blobAddressUri);\n- Task<bool> ExistsAsync();\n+ Task<bool> ExistsAsync(BlobRequestOptions options, OperationContext operationContext);\nTask<bool> DeleteIfExistsAsync();\nTask CreateAsync();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -863,6 +863,8 @@ private static void ConfigureForAzureStorage(ContainerBuilder builder, IGalleryC\n.SingleInstance()\n.Keyed<ICloudBlobClient>(dependent.BindingKey);\n+ // Do not register the service as ICloudStorageStatusDependency because\n+ // the CloudAuditingService registers it and the gallery uses the same storage account for all the containers.\nbuilder.RegisterType<CloudBlobFileStorageService>()\n.WithParameter(new ResolvedParameter(\n(pi, ctx) => pi.ParameterType == typeof(ICloudBlobClient),\n@@ -870,7 +872,6 @@ private static void ConfigureForAzureStorage(ContainerBuilder builder, IGalleryC\n.AsSelf()\n.As<IFileStorageService>()\n.As<ICoreFileStorageService>()\n- .As<ICloudStorageStatusDependency>()\n.SingleInstance()\n.Keyed<IFileStorageService>(dependent.BindingKey);\n}\n@@ -902,7 +903,6 @@ private static void ConfigureForAzureStorage(ContainerBuilder builder, IGalleryC\nbuilder.RegisterInstance(new CloudReportService(configuration.Current.AzureStorage_Statistics_ConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant))\n.AsSelf()\n.As<IReportService>()\n- .As<ICloudStorageStatusDependency>()\n.SingleInstance();\n// when running on Windows Azure, download counts come from the downloads.v1.json blob\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/CloudBlobFileStorageService.cs",
"new_path": "src/NuGetGallery/Services/CloudBlobFileStorageService.cs",
"diff": "namespace NuGetGallery\n{\n- public class CloudBlobFileStorageService : CloudBlobCoreFileStorageService, IFileStorageService, ICloudStorageStatusDependency\n+ public class CloudBlobFileStorageService : CloudBlobCoreFileStorageService, IFileStorageService\n{\nprivate readonly IAppConfiguration _configuration;\nprivate readonly ISourceDestinationRedirectPolicy _redirectPolicy;\n@@ -98,7 +98,7 @@ internal Uri GetRedirectUri(Uri requestUrl, Uri blobUri)\npublic async Task<bool> IsAvailableAsync()\n{\nvar container = await GetContainerAsync(CoreConstants.Folders.PackagesFolderName);\n- return await container.ExistsAsync();\n+ return await container.ExistsAsync(options: null, operationContext: null);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/CloudReportService.cs",
"new_path": "src/NuGetGallery/Services/CloudReportService.cs",
"diff": "namespace NuGetGallery\n{\n- public class CloudReportService : IReportService, ICloudStorageStatusDependency\n+ public class CloudReportService : IReportService\n{\nprivate const string _statsContainerName = \"nuget-cdnstats\";\nprivate readonly string _connectionString;\n@@ -20,12 +20,6 @@ public CloudReportService(string connectionString, bool readAccessGeoRedundant)\n_readAccessGeoRedundant = readAccessGeoRedundant;\n}\n- public Task<bool> IsAvailableAsync()\n- {\n- var container = GetCloudBlobContainer();\n- return container.ExistsAsync();\n- }\n-\npublic async Task<StatisticsReport> Load(string reportName)\n{\n// In NuGet we always use lowercase names for all blobs in Azure Storage\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/StatusService.cs",
"new_path": "src/NuGetGallery/Services/StatusService.cs",
"diff": "using System.Net.Http;\nusing System.Threading.Tasks;\nusing System.Web.Mvc;\n+using Microsoft.WindowsAzure.Storage.Blob;\n+using Microsoft.WindowsAzure.Storage.RetryPolicies;\nusing NuGetGallery.Configuration;\nusing NuGetGallery.Helpers;\n@@ -80,7 +82,7 @@ private bool IsSqlAzureAvailable()\nreturn sqlAzureAvailable;\n}\n- private async Task<bool?> IsAzureStorageAvailable()\n+ internal async Task<bool?> IsAzureStorageAvailable()\n{\nif (_config == null || _config.StorageType != StorageType.AzureStorage)\n{\n@@ -91,7 +93,12 @@ private bool IsSqlAzureAvailable()\ntry\n{\n// Check Storage Availability\n- var tasks = _cloudStorageAvailabilityChecks.Select(s => s.IsAvailableAsync());\n+ BlobRequestOptions options = new BlobRequestOptions();\n+ // Used the LocationMode.SecondaryOnly and not PrimaryThenSecondary for two reasons:\n+ // 1. When the primary is down and secondary is up if PrimaryThenSecondary is used there will be an extra and not needed call to the primary.\n+ // 2. When the primary is up the secondary status check will return the primary status instead of secondary.\n+ options.LocationMode = _config.ReadOnlyMode ? LocationMode.SecondaryOnly : LocationMode.PrimaryOnly;\n+ var tasks = _cloudStorageAvailabilityChecks.Select(s => s.IsAvailableAsync(options, operationContext : null));\nvar eachAvailable = await Task.WhenAll(tasks);\nstorageAvailable = eachAvailable.All(a => a);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Infrastructure\\Lucene\\GallerySearchServiceFacts.cs\" />\n<Compile Include=\"Helpers\\StreamHelperFacts.cs\" />\n<Compile Include=\"Services\\PackageDeprecationServiceFacts.cs\" />\n+ <Compile Include=\"Services\\StatusServiceFacts.cs\" />\n<Compile Include=\"TestData\\TestDataResourceUtility.cs\" />\n<Compile Include=\"UsernameValidationRegex.cs\" />\n<Compile Include=\"Extensions\\NumberExtensionsFacts.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | StorageStatusService (#7165)
Gallery status service will verify the storage primary or secondary for status depending on the read only mode. The readOnly will verify the secondary storage and the readWrite will verify the primary storage. |
455,736 | 15.05.2019 08:38:19 | 25,200 | ebda79a87b72210bfbeb5574e5f88784a0cb33b7 | Add capability of a preview ISearchService
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "using NuGetGallery.Infrastructure.Search.Correlation;\nusing NuGetGallery.Security;\nusing SecretReaderFactory = NuGetGallery.Configuration.SecretReader.SecretReaderFactory;\n+using Microsoft.Extensions.Http;\nnamespace NuGetGallery\n{\n@@ -62,6 +63,8 @@ public static class BindingKeys\npublic const string PackageValidationEnqueuer = \"PackageValidationEnqueuerBindingKey\";\npublic const string SymbolsPackageValidationEnqueuer = \"SymbolsPackageValidationEnqueuerBindingKey\";\npublic const string EmailPublisherTopic = \"EmailPublisherBindingKey\";\n+\n+ public const string PreviewSearchClient = \"PreviewSearchClientBindingKey\";\n}\nprotected override void Load(ContainerBuilder builder)\n@@ -137,8 +140,7 @@ protected override void Load(ContainerBuilder builder)\n.As<Lucene.Net.Store.Directory>()\n.SingleInstance();\n- ConfigureResilientSearch(loggerFactory, configuration, telemetryService, services);\n- ConfigureSearch(builder, configuration);\n+ ConfigureSearch(loggerFactory, configuration, telemetryService, services, builder);\nbuilder.RegisterType<DateTimeProvider>().AsSelf().As<IDateTimeProvider>().SingleInstance();\n@@ -671,59 +673,103 @@ private static DbConnection CreateDbConnection(ISqlConnectionFactory connectionF\n.InstancePerLifetimeScope();\n}\n- private static void ConfigureSearch(ContainerBuilder builder, IGalleryConfigurationService configuration)\n+ private static List<(string name, Uri searchUri)> GetSearchClientsFromConfiguration(IGalleryConfigurationService configuration)\n{\n- if (configuration.Current.SearchServiceUriPrimary == null && configuration.Current.SearchServiceUriSecondary == null)\n+ var searchClients = new List<(string name, Uri searchUri)>();\n+\n+ if (configuration.Current.SearchServiceUriPrimary != null)\n{\n- builder.RegisterType<LuceneSearchService>()\n- .AsSelf()\n- .As<ISearchService>()\n- .InstancePerLifetimeScope();\n- builder.RegisterType<LuceneIndexingService>()\n- .AsSelf()\n- .As<IIndexingService>()\n- .InstancePerLifetimeScope();\n+ searchClients.Add((SearchClientConfiguration.SearchPrimaryInstance, configuration.Current.SearchServiceUriPrimary));\n}\n- else\n+ if (configuration.Current.SearchServiceUriSecondary != null)\n{\n- builder.RegisterType<ExternalSearchService>()\n- .AsSelf()\n- .As<ISearchService>()\n- .As<IIndexingService>()\n- .InstancePerLifetimeScope();\n+ searchClients.Add((SearchClientConfiguration.SearchSecondaryInstance, configuration.Current.SearchServiceUriSecondary));\n}\n+\n+ return searchClients;\n}\n- private static List<(string name, Uri searchUri)> GetSearchClientsFromConfiguration(IGalleryConfigurationService configuration)\n+ private static List<(string name, Uri searchUri)> GetPreviewSearchClientsFromConfiguration(IGalleryConfigurationService configuration)\n{\n- List<(string name, Uri searchUri)> searchClients = new List<(string name, Uri searchUri)>();\n- if (configuration.Current.SearchServiceUriPrimary != null)\n+ var searchClients = new List<(string name, Uri searchUri)>();\n+\n+ if (configuration.Current.PreviewSearchServiceUriPrimary != null)\n{\n- searchClients.Add((SearchClientConfiguration.SearchPrimaryInstance, configuration.Current.SearchServiceUriPrimary));\n+ searchClients.Add((SearchClientConfiguration.PreviewSearchPrimaryInstance, configuration.Current.PreviewSearchServiceUriPrimary));\n}\n- if (configuration.Current.SearchServiceUriSecondary != null)\n+ if (configuration.Current.PreviewSearchServiceUriSecondary != null)\n{\n- searchClients.Add((SearchClientConfiguration.SearchSecondaryInstance, configuration.Current.SearchServiceUriSecondary));\n+ searchClients.Add((SearchClientConfiguration.PreviewSearchSecondaryInstance, configuration.Current.PreviewSearchServiceUriSecondary));\n}\nreturn searchClients;\n}\n- private static void ConfigureResilientSearch(ILoggerFactory loggerFactory, IGalleryConfigurationService configuration, ITelemetryService telemetryService, ServiceCollection services)\n+ private static void ConfigureSearch(\n+ ILoggerFactory loggerFactory,\n+ IGalleryConfigurationService configuration,\n+ ITelemetryService telemetryService,\n+ ServiceCollection services,\n+ ContainerBuilder builder)\n{\nvar searchClients = GetSearchClientsFromConfiguration(configuration);\nif (searchClients.Count >= 1)\n{\n- var logger = loggerFactory.CreateLogger<SearchClientPolicies>();\nservices.AddTransient<CorrelatingHttpClientHandler>();\nservices.AddTransient((s) => new TracingHttpHandler(DependencyResolver.Current.GetService<IDiagnosticsService>().SafeGetSource(\"ExternalSearchService\")));\n+ // Register the default search service implementation and its dependencies.\n+ RegisterSearchService(\n+ loggerFactory,\n+ configuration,\n+ telemetryService,\n+ services,\n+ builder,\n+ searchClients);\n+\n+ // Register the preview search service and its dependencies with a binding key.\n+ var previewSearchClients = GetPreviewSearchClientsFromConfiguration(configuration);\n+ RegisterSearchService(\n+ loggerFactory,\n+ configuration,\n+ telemetryService,\n+ services,\n+ builder,\n+ previewSearchClients,\n+ BindingKeys.PreviewSearchClient);\n+ }\n+ else\n+ {\n+ builder.RegisterType<LuceneSearchService>()\n+ .AsSelf()\n+ .As<ISearchService>()\n+ .InstancePerLifetimeScope();\n+ builder.RegisterType<LuceneIndexingService>()\n+ .AsSelf()\n+ .As<IIndexingService>()\n+ .InstancePerLifetimeScope();\n+ }\n+ }\n+\n+ private static void RegisterSearchService(\n+ ILoggerFactory loggerFactory,\n+ IGalleryConfigurationService configuration,\n+ ITelemetryService telemetryService,\n+ ServiceCollection services,\n+ ContainerBuilder builder,\n+ List<(string name, Uri searchUri)> searchClients,\n+ string bindingKey = null)\n+ {\n+ var logger = loggerFactory.CreateLogger<SearchClientPolicies>();\n+\nforeach (var searchClient in searchClients)\n{\n// The policy handlers will be applied from the bottom to the top.\n// The most inner one is the one added last.\n- services.AddHttpClient<IHttpClientWrapper, HttpClientWrapper>(searchClient.name,\n+ services\n+ .AddHttpClient<IHttpClientWrapper, HttpClientWrapper>(\n+ searchClient.name,\nc =>\n{\nc.BaseAddress = searchClient.searchUri;\n@@ -745,11 +791,65 @@ private static void ConfigureResilientSearch(ILoggerFactory loggerFactory, IGall\nsearchClient.name,\ntelemetryService));\n}\n- services.AddTransient<IResilientSearchClient, ResilientSearchHttpClient>();\n- services.AddTransient<ISearchClient, GallerySearchClient>();\n+\n+ var registrationBuilder = builder\n+ .Register(c =>\n+ {\n+ var httpClientFactory = c.Resolve<IHttpClientFactory>();\n+ var httpClientWrapperFactory = c.Resolve<ITypedHttpClientFactory<HttpClientWrapper>>();\n+ var httpClientWrappers = new List<IHttpClientWrapper>(searchClients.Count);\n+ foreach (var searchClient in searchClients)\n+ {\n+ var httpClient = httpClientFactory.CreateClient(searchClient.name);\n+ var httpClientWrapper = httpClientWrapperFactory.CreateClient(httpClient);\n+ httpClientWrappers.Add(httpClientWrapper);\n}\n+\n+ return new ResilientSearchHttpClient(\n+ httpClientWrappers,\n+ c.Resolve<ILogger<ResilientSearchHttpClient>>(),\n+ c.Resolve<ITelemetryService>());\n+ });\n+\n+ if (bindingKey != null)\n+ {\n+ registrationBuilder\n+ .Named<IResilientSearchClient>(bindingKey)\n+ .InstancePerLifetimeScope();\n+\n+ builder\n+ .RegisterType<GallerySearchClient>()\n+ .WithParameter(new ResolvedParameter(\n+ (pi, ctx) => pi.ParameterType == typeof(IResilientSearchClient),\n+ (pi, ctx) => ctx.ResolveKeyed<IResilientSearchClient>(bindingKey)))\n+ .Named<ISearchClient>(bindingKey)\n+ .InstancePerLifetimeScope();\n+\n+ builder.RegisterType<ExternalSearchService>()\n+ .WithParameter(new ResolvedParameter(\n+ (pi, ctx) => pi.ParameterType == typeof(ISearchClient),\n+ (pi, ctx) => ctx.ResolveKeyed<ISearchClient>(bindingKey)))\n+ .Named<ISearchService>(bindingKey)\n+ .InstancePerLifetimeScope();\n}\n+ else\n+ {\n+ registrationBuilder\n+ .As<IResilientSearchClient>()\n+ .InstancePerLifetimeScope();\n+ builder\n+ .RegisterType<GallerySearchClient>()\n+ .As<ISearchClient>()\n+ .InstancePerLifetimeScope();\n+\n+ builder.RegisterType<ExternalSearchService>()\n+ .AsSelf()\n+ .As<ISearchService>()\n+ .As<IIndexingService>()\n+ .InstancePerLifetimeScope();\n+ }\n+ }\nprivate static void ConfigureAutocomplete(ContainerBuilder builder, IGalleryConfigurationService configuration)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/AppConfiguration.cs",
"diff": "@@ -355,16 +355,14 @@ public string ExternalBrandingMessage\n[DefaultValue(true)]\npublic bool AllowLicenselessPackages { get; set; }\n- /// <summary>\n- /// The Uri for the Primary Search endpoint\n- /// </summary>\npublic Uri SearchServiceUriPrimary { get; set; }\n- /// <summary>\n- /// The Uri for the Secondary Search endpoint\n- /// </summary>\npublic Uri SearchServiceUriSecondary { get; set; }\n+ public Uri PreviewSearchServiceUriPrimary { get; set; }\n+\n+ public Uri PreviewSearchServiceUriSecondary { get; set; }\n+\n[DefaultValue(600)]\npublic int SearchCircuitBreakerDelayInSeconds { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"new_path": "src/NuGetGallery/Configuration/IAppConfiguration.cs",
"diff": "@@ -382,15 +382,25 @@ public interface IAppConfiguration : IMessageServiceConfiguration\nbool AllowLicenselessPackages { get; set; }\n/// <summary>\n- /// The Uri for the Primary Search endpoint\n+ /// The URL for the primary search endpoint, for stable behavior.\n/// </summary>\nUri SearchServiceUriPrimary { get; set; }\n/// <summary>\n- /// The Uri for the Secondary Search endpoint\n+ /// The URL for the secondary search endpoint, for stable behavior.\n/// </summary>\nUri SearchServiceUriSecondary { get; set; }\n+ /// <summary>\n+ /// The URL for the primary search endpoint, for preview behavior.\n+ /// </summary>\n+ Uri PreviewSearchServiceUriPrimary { get; set; }\n+\n+ /// <summary>\n+ /// The URL for the secondary search endpoint, for preview behavior.\n+ /// </summary>\n+ Uri PreviewSearchServiceUriSecondary { get; set; }\n+\n/// <summary>\n/// The time in seconds for the circuit breaker delay. (The time the circuit breaker will stay in open state)\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs",
"new_path": "src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs",
"diff": "using System.Collections.Generic;\nusing System.Diagnostics;\nusing System.Linq;\n-using System.Net;\nusing System.Threading.Tasks;\nusing System.Web;\nusing Newtonsoft.Json.Linq;\n@@ -36,10 +35,6 @@ public bool IsLocal\npublic bool ContainsAllVersions { get { return true; } }\n- public ExternalSearchService()\n- {\n- }\n-\npublic ExternalSearchService(IAppConfiguration config, IDiagnosticsService diagnostics, ISearchClient searchClient)\n{\n_searchClient = searchClient ?? throw new ArgumentNullException(nameof(searchClient));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Lucene/SearchClientConfiguration.cs",
"new_path": "src/NuGetGallery/Infrastructure/Lucene/SearchClientConfiguration.cs",
"diff": "namespace NuGetGallery.Infrastructure.Search\n{\n- public class SearchClientConfiguration\n+ public static class SearchClientConfiguration\n{\npublic static string SearchPrimaryInstance = \"SearchPrimary\";\npublic static string SearchSecondaryInstance = \"SearchSecondary\";\n+\n+ public static string PreviewSearchPrimaryInstance = \"PreviewSearchPrimary\";\n+ public static string PreviewSearchSecondaryInstance = \"PreviewSearchSecondary\";\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/FeedServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/FeedServiceFacts.cs",
"diff": "using Moq;\nusing NuGet.Services.Entities;\nusing NuGetGallery.Configuration;\n+using NuGetGallery.Diagnostics;\nusing NuGetGallery.Infrastructure.Search;\nusing NuGetGallery.OData;\nusing NuGetGallery.OData.QueryFilter;\n@@ -554,7 +555,11 @@ public async Task V2FeedPackagesUsesSearchHijackForIdOrIdVersionQueries(string f\nconfiguration.Setup(c => c.Features).Returns(new FeatureConfiguration() { FriendlyLicenses = true });\nconfiguration.Setup(c => c.Current).Returns(new AppConfiguration() { IsODataFilterEnabled = false });\n- var searchService = new Mock<ExternalSearchService>(MockBehavior.Loose);\n+ var searchService = new Mock<ExternalSearchService>(\n+ MockBehavior.Loose,\n+ Mock.Of<IAppConfiguration>(),\n+ Mock.Of<IDiagnosticsService>(),\n+ Mock.Of<ISearchClient>());\nsearchService.CallBase = true;\nsearchService\n.Setup(x => x.RawSearch(It.IsAny<SearchFilter>()))\n@@ -614,7 +619,11 @@ public async Task V2FeedPackagesDoesNotUseSearchHijackForFunkyQueries(string fil\nconfiguration.Setup(c => c.Current).Returns(new AppConfiguration() { IsODataFilterEnabled = false });\nbool called = false;\n- var searchService = new Mock<ExternalSearchService>(MockBehavior.Loose);\n+ var searchService = new Mock<ExternalSearchService>(\n+ MockBehavior.Loose,\n+ Mock.Of<IAppConfiguration>(),\n+ Mock.Of<IDiagnosticsService>(),\n+ Mock.Of<ISearchClient>());\nsearchService\n.Setup(x => x.RawSearch(It.IsAny<SearchFilter>()))\n.ReturnsAsync(new SearchResults(0, indexTimestampUtc: null));\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add capability of a preview ISearchService (#7171)
Progress on https://github.com/NuGet/NuGetGallery/issues/7152 |
455,736 | 21.05.2019 11:32:03 | 25,200 | 04a844fbe170e1b6c6f5120a07b4b061b6569383 | Add initial infrastructure for search side-by-side page
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"new_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"diff": "\"SiteAdmins\": true,\n\"Accounts\": [],\n\"Domains\": []\n+ },\n+ \"NuGetGallery.SearchSideBySide\": {\n+ \"All\": true,\n+ \"SiteAdmins\": false,\n+ \"Accounts\": [],\n+ \"Domains\": []\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Infrastructure\\Lucene\\Models\\SearchResults.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\Models\\SortOrder.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\ServiceResponse.cs\" />\n+ <Compile Include=\"Infrastructure\\Mail\\Messages\\SearchSideBySideMessage.cs\" />\n<Compile Include=\"Migrations\\201903020136235_CvesCanBeEmpty.cs\" />\n<Compile Include=\"Migrations\\201903020136235_CvesCanBeEmpty.Designer.cs\">\n<DependentUpon>201903020136235_CvesCanBeEmpty.cs</DependentUpon>\n<Compile Include=\"ViewModels\\HandleOrganizationMembershipRequestModel.cs\" />\n<Compile Include=\"ViewModels\\ListPackageItemRequiredSignerViewModel.cs\" />\n<Compile Include=\"ViewModels\\ManagePackageViewModel.cs\" />\n+ <Compile Include=\"ViewModels\\SearchSideBySideViewModel.cs\" />\n<Compile Include=\"ViewModels\\SignerViewModel.cs\" />\n<Compile Include=\"WebRole.cs\" />\n<Compile Include=\"Areas\\Admin\\AdminAreaRegistration.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/FeatureFlagService.cs",
"new_path": "src/NuGetGallery/Services/FeatureFlagService.cs",
"diff": "@@ -16,6 +16,7 @@ public class FeatureFlagService : IFeatureFlagService\nprivate const string TyposquattingFeatureName = GalleryPrefix + \"Typosquatting\";\nprivate const string TyposquattingFlightName = GalleryPrefix + \"TyposquattingFlight\";\nprivate const string EmbeddedIconFlightName = GalleryPrefix + \"EmbeddedIcons\";\n+ private const string SearchSideBySideFlightName = GalleryPrefix + \"SearchSideBySide\";\nprivate const string PackagesAtomFeedFeatureName = GalleryPrefix + \"PackagesAtomFeed\";\n@@ -63,5 +64,10 @@ public bool IsSearchCircuitBreakerEnabled()\n{\nreturn _client.IsEnabled(SearchCircuitBreakerFeatureName, defaultValue: false);\n}\n+\n+ public bool IsSearchSideBySideEnabled(User user)\n+ {\n+ return _client.IsEnabled(SearchSideBySideFlightName, user, defaultValue: false);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IFeatureFlagService.cs",
"new_path": "src/NuGetGallery/Services/IFeatureFlagService.cs",
"diff": "@@ -47,5 +47,10 @@ public interface IFeatureFlagService\n/// Whether the user is allowed to publish packages with an embedded icon.\n/// </summary>\nbool AreEmbeddedIconsEnabled(User user);\n+\n+ /// <summary>\n+ /// Whether the user is able to access the search side-by-side experiment.\n+ /// </summary>\n+ bool IsSearchSideBySideEnabled(User user);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"new_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"diff": "using System;\nusing System.Collections.Generic;\n-using System.Net;\nusing System.Net.Http;\nusing System.Security.Principal;\nusing NuGet.Services.Entities;\n@@ -293,5 +292,41 @@ public interface ITelemetryService\n/// <param name=\"uri\">The request uri.</param>\n/// <param name=\"circuitBreakerStatus\">The CircuitBreakerStatus at the time of the Retry action.</param>\nvoid TrackMetricForSearchOnRetry(string searchName, Exception exception, string correlationId, string uri, string circuitBreakerStatus);\n+\n+ /// <summary>\n+ /// Tracks that some feedback was left on the search side-by-side page.\n+ /// </summary>\n+ /// <param name=\"searchTerm\">The search term used.</param>\n+ /// <param name=\"oldHits\">The total count of old results.</param>\n+ /// <param name=\"newHits\">The total count of new results.</param>\n+ /// <param name=\"betterSide\">Which side was better.</param>\n+ /// <param name=\"mostRelevantPackage\">The most relevant package.</param>\n+ /// <param name=\"expectedPackages\">The expected packages.</param>\n+ /// <param name=\"hasComments\">Whether or not comments were provided.</param>\n+ /// <param name=\"hasEmailAddress\">Whether or not an email address was provided.</param>\n+ void TrackSearchSideBySideFeedback(\n+ string searchTerm,\n+ int oldHits,\n+ int newHits,\n+ string betterSide,\n+ string mostRelevantPackage,\n+ string expectedPackages,\n+ bool hasComments,\n+ bool hasEmailAddress);\n+\n+ /// <summary>\n+ /// Track a search request made on the search side-by-side page.\n+ /// </summary>\n+ /// <param name=\"searchTerm\">The search term used.</param>\n+ /// <param name=\"oldSuccess\">Whether or not the old query succeeded.</param>\n+ /// <param name=\"oldHits\">The total count of old results.</param>\n+ /// <param name=\"oldSuccess\">Whether or not the old query succeeded.</param>\n+ /// <param name=\"newHits\">The total count of new results.</param>\n+ void TrackSearchSideBySide(\n+ string searchTerm,\n+ bool oldSuccess,\n+ int oldHits,\n+ bool newSuccess,\n+ int newHits);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Linq;\n-using System.Net;\nusing System.Net.Http;\nusing System.Security.Principal;\nusing System.Web;\n@@ -75,6 +74,8 @@ internal class Events\npublic const string SearchCircuitBreakerOnBreak = \"SearchCircuitBreakerOnBreak\";\npublic const string SearchCircuitBreakerOnReset = \"SearchCircuitBreakerOnReset\";\npublic const string SearchOnRetry = \"SearchOnRetry\";\n+ public const string SearchSideBySideFeedback = \"SearchSideBySideFeedback\";\n+ public const string SearchSideBySide = \"SearchSideBySide\";\n}\nprivate IDiagnosticsSource _diagnosticsSource;\n@@ -176,6 +177,18 @@ internal class Events\npublic const string SearchPollyCorrelationId = \"SearchPollyCorrelationId\";\npublic const string SearchCircuitBreakerStatus = \"SearchCircuitBreakerStatus\";\n+ // Search side-by-side properties\n+ public const string SearchTerm = \"SearchTerm\";\n+ public const string OldHits = \"OldHits\";\n+ public const string OldSuccess = \"OldSuccess\";\n+ public const string NewHits = \"NewHits\";\n+ public const string NewSuccess = \"NewSuccess\";\n+ public const string BetterSide = \"BetterSide\";\n+ public const string MostRelevantPackage = \"MostRelevantPackage\";\n+ public const string ExpectedPackages = \"ExpectedPackages\";\n+ public const string HasComments = \"HasComments\";\n+ public const string HasEmailAddress = \"HasEmailAddress\";\n+\npublic TelemetryService(IDiagnosticsService diagnosticsService, ITelemetryClient telemetryClient = null)\n{\nif (diagnosticsService == null)\n@@ -835,6 +848,45 @@ public void TrackMetricForSearchOnRetry(string searchName, Exception exception,\nproperties.Add(SearchCircuitBreakerStatus, circuitBreakerStatus);\n});\n}\n+\n+ public void TrackSearchSideBySideFeedback(\n+ string searchTerm,\n+ int oldHits,\n+ int newHits,\n+ string betterSide,\n+ string mostRelevantPackage,\n+ string expectedPackages,\n+ bool hasComments,\n+ bool hasEmailAddress)\n+ {\n+ TrackMetric(Events.SearchSideBySideFeedback, 1, properties => {\n+ properties.Add(SearchTerm, searchTerm);\n+ properties.Add(OldHits, oldHits.ToString());\n+ properties.Add(NewHits, newHits.ToString());\n+ properties.Add(BetterSide, betterSide);\n+ properties.Add(MostRelevantPackage, mostRelevantPackage);\n+ properties.Add(ExpectedPackages, expectedPackages);\n+ properties.Add(HasComments, hasComments.ToString());\n+ properties.Add(HasEmailAddress, hasEmailAddress.ToString());\n+ });\n+ }\n+\n+ public void TrackSearchSideBySide(\n+ string searchTerm,\n+ bool oldSuccess,\n+ int oldHits,\n+ bool newSuccess,\n+ int newHits)\n+ {\n+ TrackMetric(Events.SearchSideBySide, 1, properties => {\n+ properties.Add(SearchTerm, searchTerm);\n+ properties.Add(OldSuccess, oldSuccess.ToString());\n+ properties.Add(OldHits, oldHits.ToString());\n+ properties.Add(NewSuccess, newSuccess.ToString());\n+ properties.Add(NewHits, newHits.ToString());\n+ });\n+ }\n+\n/// <summary>\n/// We use <see cref=\"ITelemetryClient.TrackMetric(string, double, IDictionary{string, string})\"/> instead of\n/// <see cref=\"ITelemetryClient.TrackEvent(string, IDictionary{string, string}, IDictionary{string, double})\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<!-- Set this values to use a remote search service. This overrides ALL other Lucene-related settings and disables indexing jobs. -->\n<add key=\"Gallery.SearchServiceUriPrimary\" value=\"\"/>\n<add key=\"Gallery.SearchServiceUriSecondary\" value=\"\"/>\n+ <add key=\"Gallery.PreviewSearchServiceUriPrimary\" value=\"\"/>\n+ <add key=\"Gallery.PreviewSearchServiceUriSecondary\" value=\"\"/>\n<add key=\"Gallery.SearchCircuitBreakerDelayInSeconds\" value=\"600\"/>\n<add key=\"Gallery.SearchCircuitBreakerWaitAndRetryIntervalInMilliseconds\" value=\"500\"/>\n<add key=\"Gallery.SearchCircuitBreakerWaitAndRetryCount\" value=\"3\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGet.Services.DatabaseMigration.Facts/ValidateMigrationsFacts.cs",
"new_path": "tests/NuGet.Services.DatabaseMigration.Facts/ValidateMigrationsFacts.cs",
"diff": "@@ -73,7 +73,7 @@ public void ValidateMigrationsDoesNotThrowExceptions(List<string> databaseMigrat\n{\n_migrationJob.CheckIsValidMigration(databaseMigrations, localMigrations);\n}\n- catch (Exception ex)\n+ catch (Exception)\n{\nAssert.True(false);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Infrastructure\\Lucene\\ResilientSearchServiceFacts.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\GallerySearchServiceFacts.cs\" />\n<Compile Include=\"Helpers\\StreamHelperFacts.cs\" />\n+ <Compile Include=\"Infrastructure\\Mail\\Messages\\SearchSideBySideMessageFacts.cs\" />\n<Compile Include=\"Services\\PackageDeprecationServiceFacts.cs\" />\n<Compile Include=\"Services\\StatusServiceFacts.cs\" />\n<Compile Include=\"TestData\\TestDataResourceUtility.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"diff": "@@ -269,6 +269,14 @@ public static IEnumerable<object[]> TrackMetricNames_Data\nyield return new object[] { \"SearchOnRetry\",\n(TrackAction)(s => s.TrackMetricForSearchOnRetry(\"SomeName\", exception: null, correlationId: string.Empty, uri: string.Empty, circuitBreakerStatus: string.Empty))\n};\n+\n+ yield return new object[] { \"SearchSideBySideFeedback\",\n+ (TrackAction)(s => s.TrackSearchSideBySideFeedback(\"nuget\", 1, 2, \"new\", \"nuget.core\", null, true, true))\n+ };\n+\n+ yield return new object[] { \"SearchSideBySide\",\n+ (TrackAction)(s => s.TrackSearchSideBySide(\"nuget\", true, 1, true, 2))\n+ };\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add initial infrastructure for search side-by-side page (#7175)
Progress on https://github.com/NuGet/NuGetGallery/issues/7152 |
455,736 | 21.05.2019 11:35:30 | 25,200 | e37915d8b3e55d8e46146b6989a5a8573e549a88 | Add SearchSideBySideService to do the two searches
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -744,12 +744,23 @@ private static List<(string name, Uri searchUri)> GetPreviewSearchClientsFromCon\nbuilder.RegisterType<LuceneSearchService>()\n.AsSelf()\n.As<ISearchService>()\n+ .Keyed<ISearchService>(BindingKeys.PreviewSearchClient)\n.InstancePerLifetimeScope();\nbuilder.RegisterType<LuceneIndexingService>()\n.AsSelf()\n.As<IIndexingService>()\n.InstancePerLifetimeScope();\n}\n+\n+ builder\n+ .Register(c => new SearchSideBySideService(\n+ c.Resolve<ISearchService>(),\n+ c.ResolveKeyed<ISearchService>(BindingKeys.PreviewSearchClient),\n+ c.Resolve<ITelemetryService>(),\n+ c.Resolve<IMessageService>(),\n+ c.Resolve<IMessageServiceConfiguration>()))\n+ .As<ISearchSideBySideService>()\n+ .InstancePerLifetimeScope();\n}\nprivate static void RegisterSearchService(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Services\\IFeatureFlagService.cs\" />\n<Compile Include=\"Services\\InvalidLicenseUrlValidationMessage.cs\" />\n<Compile Include=\"Services\\InvalidUrlEncodingForLicenseUrlValidationMessage.cs\" />\n+ <Compile Include=\"Services\\ISearchSideBySideService.cs\" />\n<Compile Include=\"Services\\ISymbolPackageUploadService.cs\" />\n<Compile Include=\"Services\\ISymbolPackageFileService.cs\" />\n<Compile Include=\"Services\\ITyposquattingCheckListCacheService.cs\" />\n<Compile Include=\"Services\\PackageDeprecationService.cs\" />\n<Compile Include=\"Services\\PackageShouldNotBeSignedUserFixableValidationMessage.cs\" />\n<Compile Include=\"Services\\PlainTextOnlyValidationMessage.cs\" />\n+ <Compile Include=\"Services\\SearchSideBySideService.cs\" />\n<Compile Include=\"Services\\SymbolPackageValidationResult.cs\" />\n<Compile Include=\"Services\\FlatContainerContentFileMetadataService.cs\" />\n<Compile Include=\"Infrastructure\\Mail\\MarkdownMessageService.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Helpers\\StreamHelperFacts.cs\" />\n<Compile Include=\"Infrastructure\\Mail\\Messages\\SearchSideBySideMessageFacts.cs\" />\n<Compile Include=\"Services\\PackageDeprecationServiceFacts.cs\" />\n+ <Compile Include=\"Services\\SearchSideBySideServiceFacts.cs\" />\n<Compile Include=\"Services\\StatusServiceFacts.cs\" />\n<Compile Include=\"TestData\\TestDataResourceUtility.cs\" />\n<Compile Include=\"UsernameValidationRegex.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add SearchSideBySideService to do the two searches (#7176)
Progress on https://github.com/NuGet/NuGetGallery/issues/7152 |
455,736 | 21.05.2019 11:36:06 | 25,200 | d445aa7aa534c22f6bc51f9ca8dc414381c4242e | Add search side-by-side web page
Address | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/Gruntfile.js",
"new_path": "src/Bootstrap/Gruntfile.js",
"diff": "@@ -165,6 +165,23 @@ module.exports = function (grunt) {\nexpand: true,\nsrc: 'fonts/**',\ndest: 'dist/'\n+ },\n+ gallerycss: {\n+ expand: true,\n+ cwd: 'dist/css/',\n+ src: [\n+ 'bootstrap.css',\n+ 'bootstrap-theme.css'\n+ ],\n+ dest: '../NuGetGallery/Content/gallery/css/'\n+ },\n+ galleryjs: {\n+ expand: true,\n+ cwd: 'dist/js/',\n+ src: [\n+ 'bootstrap.js'\n+ ],\n+ dest: '../NuGetGallery/Scripts/gallery/'\n}\n},\n@@ -187,10 +204,10 @@ module.exports = function (grunt) {\ngrunt.registerTask('dist-css', ['less:core', 'less:theme', 'postcss:core', 'postcss:theme', 'cssmin:core', 'cssmin:theme']);\n// Full distribution task.\n- grunt.registerTask('dist', ['clean:dist', 'dist-css', 'copy:fonts', 'dist-js']);\n+ grunt.registerTask('dist', ['clean:dist', 'dist-css', 'copy:fonts', 'dist-js', 'copy:gallerycss', 'copy:galleryjs']);\n// Default task.\n- grunt.registerTask('default', ['clean:dist', 'copy:fonts', 'dist-css', 'dist-js']);\n+ grunt.registerTask('default', ['clean:dist', 'copy:fonts', 'dist-css', 'dist-js', 'copy:gallerycss', 'copy:galleryjs']);\ngrunt.registerTask('build-glyphicons-data', function () {\ngenerateGlyphiconsData.call(this, grunt);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1399,6 +1399,62 @@ img.reserved-indicator-icon {\n.page-reset-password .reset-form {\nmargin-top: 80px;\n}\n+.page-search-sxs h1 {\n+ font-size: 34px;\n+ border-bottom: 1px solid lightgray;\n+}\n+.page-search-sxs h2 {\n+ font-size: 28px;\n+ margin-top: 0;\n+}\n+.page-search-sxs .list-packages .package {\n+ padding-top: 0;\n+}\n+.page-search-sxs .list-packages .package .package-details,\n+.page-search-sxs .list-packages .package .package-list,\n+.page-search-sxs .list-packages .package .package-by {\n+ line-height: 16px;\n+ font-size: 13px;\n+}\n+.page-search-sxs .list-packages .package .package-details,\n+.page-search-sxs .list-packages .package .package-list {\n+ white-space: nowrap;\n+ overflow: hidden;\n+ text-overflow: ellipsis;\n+}\n+.page-search-sxs .list-packages .package .package-details li,\n+.page-search-sxs .list-packages .package .package-list li {\n+ display: inline;\n+}\n+.page-search-sxs .list-packages .package .package-list {\n+ margin-top: 4px;\n+ margin-bottom: 4px;\n+}\n+.page-search-sxs .list-packages .package .package-list li + li {\n+ margin-left: 10px;\n+ padding-left: 10px;\n+ border-left-style: solid;\n+ border-width: 1px;\n+ border-color: #dbdbdb;\n+}\n+.page-search-sxs .list-packages .package .package-header .reserved-indicator {\n+ width: 15px;\n+}\n+.page-search-sxs .radio label {\n+ margin-right: 30px;\n+}\n+.page-search-sxs .list-packages .package .package-header .package-title {\n+ font-size: 20px;\n+}\n+.page-search-sxs .col-package-icon {\n+ padding-right: 0;\n+}\n+.page-search-sxs .package .package-legacy-title {\n+ display: none;\n+}\n+.page-search-sxs .panel-body p:last-child {\n+ margin-bottom: 0;\n+}\n.page-sign-in .deprecate-alert {\nmargin-top: -15px;\npadding: 0px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/all.less",
"new_path": "src/Bootstrap/less/theme/all.less",
"diff": "@import \"page-profile.less\";\n@import \"page-report-abuse.less\";\n@import \"page-reset-password.less\";\n+@import \"page-search-sxs.less\";\n@import \"page-sign-in.less\";\n@import \"page-statistics-most-downloaded.less\";\n@import \"page-statistics-overview.less\";\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Bootstrap/less/theme/page-search-sxs.less",
"diff": "+.page-search-sxs {\n+ h1 {\n+ font-size: @font-size-h2;\n+ border-bottom: 1px solid lightgray;\n+ }\n+\n+ h2 {\n+ font-size: @font-size-h3;\n+ margin-top: 0;\n+ }\n+\n+ .list-packages .package {\n+ padding-top: 0;\n+ }\n+\n+ .list-packages .package .package-details,\n+ .list-packages .package .package-list,\n+ .list-packages .package .package-by {\n+ line-height: 16px;\n+ font-size: 13px;\n+ }\n+\n+ .list-packages .package .package-details,\n+ .list-packages .package .package-list {\n+ white-space: nowrap;\n+ overflow: hidden;\n+ text-overflow: ellipsis;\n+\n+ li {\n+ display: inline;\n+ }\n+ }\n+\n+ .list-packages .package .package-list {\n+ margin-top: 4px;\n+ margin-bottom: 4px;\n+\n+ li + li {\n+ margin-left: @padding-small-horizontal;\n+ padding-left: @padding-small-horizontal;\n+ border-left-style: solid;\n+ border-width: 1px;\n+ border-color: @gray-lighter;\n+ }\n+ }\n+\n+ .list-packages .package .package-header .reserved-indicator {\n+ width: 15px;\n+ }\n+\n+ .radio label {\n+ margin-right: 30px;\n+ }\n+\n+ .list-packages .package .package-header .package-title {\n+ font-size: 20px;\n+ }\n+\n+ .col-package-icon {\n+ padding-right: 0;\n+ }\n+\n+ .package .package-legacy-title {\n+ display: none;\n+ }\n+\n+ .panel-body p:last-child {\n+ margin-bottom: 0;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/Routes.cs",
"new_path": "src/NuGetGallery/App_Start/Routes.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System.Web.Mvc;\nusing System.Web.Routing;\n+using NuGetGallery.Controllers;\nusing RouteMagic;\nnamespace NuGetGallery\n@@ -562,6 +563,11 @@ public static void RegisterUIRoutes(RouteCollection routes)\n\"downloads\",\nnew { controller = \"Pages\", action = \"Downloads\" });\n+ routes.MapRoute(\n+ RouteName.ExperimentsSearchSideBySide,\n+ \"experiments/search-sxs\",\n+ new { controller = \"Experiments\", action = nameof(ExperimentsController.SearchSideBySide) });\n+\n// TODO : Most of the routes are essentially of the format api/v{x}/*. We should refactor the code to vary them by the version.\n// V1 Routes\n// If the push url is /api/v1 then NuGet.Core would ping the path to resolve redirection.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Authentication\\Providers\\AzureActiveDirectoryV2\\AzureActiveDirectoryV2AuthenticatorConfiguration.cs\" />\n<Compile Include=\"Authentication\\Providers\\AzureActiveDirectory\\AzureActiveDirectoryAuthenticator.cs\" />\n<Compile Include=\"Authentication\\Providers\\AzureActiveDirectory\\AzureActiveDirectoryAuthenticatorConfiguration.cs\" />\n+ <Compile Include=\"Controllers\\ExperimentsController.cs\" />\n<Compile Include=\"Controllers\\ManageDeprecationJsonApiController.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\Correlation\\CorrelatingHttpClientHandler.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\Correlation\\WebApiCorrelationHandler.cs\" />\n<Content Include=\"Views\\Packages\\_ManageDeprecation.cshtml\" />\n<Content Include=\"Views\\Shared\\_MultiSelectDropdown.cshtml\" />\n<Content Include=\"Views\\Packages\\_DisplayPackageDeprecation.cshtml\" />\n+ <Content Include=\"Views\\Experiments\\SearchSideBySide.cshtml\" />\n</ItemGroup>\n<ItemGroup>\n<Service Include=\"{508349B6-6B84-4DF5-91F0-309BEEBAD82D}\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/RouteName.cs",
"new_path": "src/NuGetGallery/RouteName.cs",
"diff": "@@ -105,5 +105,6 @@ public static class RouteName\npublic const string ApiV2CuratedSimulateError = \"api-v2curated-simulate-error\";\npublic const string PagesSimulateError = \"PagesSimulateError\";\npublic const string ApiSimulateError = \"ApiSimulateError\";\n+ public const string ExperimentsSearchSideBySide = \"ExperimentsSearchSideBySide\";\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlHelperExtensions.cs",
"new_path": "src/NuGetGallery/UrlHelperExtensions.cs",
"diff": "@@ -465,6 +465,21 @@ public static string Search(this UrlHelper url, string searchTerm, bool relative\n});\n}\n+ public static string SearchSideBySide(\n+ this UrlHelper url,\n+ string searchTerm = null,\n+ bool relativeUrl = true)\n+ {\n+ return GetRouteLink(\n+ url,\n+ RouteName.ExperimentsSearchSideBySide,\n+ relativeUrl,\n+ routeValues: new RouteValueDictionary\n+ {\n+ { \"q\", searchTerm }\n+ });\n+ }\n+\npublic static string UploadPackage(this UrlHelper url, bool relativeUrl = true)\n{\nreturn GetRouteLink(url, RouteName.UploadPackage, relativeUrl);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/SearchSideBySideViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/SearchSideBySideViewModel.cs",
"diff": "using System.Collections.Generic;\nusing System.ComponentModel.DataAnnotations;\n+using System.Web.Mvc;\nnamespace NuGetGallery\n{\n@@ -34,6 +35,7 @@ public class SearchSideBySideViewModel\npublic string ExpectedPackages { get; set; }\n[Display(Name = CommentsLabel)]\n+ [AllowHtml]\npublic string Comments { get; set; }\n[Display(Name = EmailLabel)]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Authentication\\Providers\\CommonAuth\\AzureActiveDirectoryV2AuthenticatorFacts.cs\" />\n<Compile Include=\"Authentication\\TestCredentialHelper.cs\" />\n<Compile Include=\"AutocompleteServiceQueryFacts.cs\" />\n+ <Compile Include=\"Controllers\\ExperimentsControllerFacts.cs\" />\n<Compile Include=\"Controllers\\FeaturesControllerFacts.cs\" />\n<Compile Include=\"Controllers\\ManageDeprecationJsonApiControllerFacts.cs\" />\n<Compile Include=\"Configuration\\ConfigurationServiceFacts.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add search side-by-side web page (#7177)
Address https://github.com/NuGet/NuGetGallery/issues/7152 |
455,736 | 23.05.2019 09:41:48 | 25,200 | b7bbc90607a1b0fdf317821a1fd1d2fc69320207 | Work around Chromium bug that gives false positives during accessibility pass
Related to
Related to | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -60,6 +60,7 @@ body h3 {\n.footer .container {\nmargin-top: 50px;\nmargin-bottom: 50px;\n+ background-color: #002440;\n}\n.footer a {\ncolor: #e3ebf1;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/base.less",
"new_path": "src/Bootstrap/less/theme/base.less",
"diff": "@@ -70,6 +70,10 @@ body {\n.container {\nmargin-top: 50px;\nmargin-bottom: 50px;\n+\n+ // This is a workaround for the following bug:\n+ // https://github.com/microsoft/accessibility-insights-web/issues/692\n+ background-color: @panel-footer-bg;\n}\na {\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Work around Chromium bug that gives false positives during accessibility pass (#7183)
Related to https://github.com/microsoft/accessibility-insights-web/issues/692
Related to https://bugs.chromium.org/p/chromium/issues/detail?id=647594 |
455,739 | 29.05.2019 10:38:12 | 25,200 | 4a5a48887da6eeefdf801fc08dd9439c4445d00d | Changed the RepositoryInformation struct to match the serialized Json format | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"new_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"diff": "@@ -74,11 +74,12 @@ public struct RepositoryInformation : IEquatable<RepositoryInformation>, ICompar\npublic string Name { get; set; }\npublic string Owner { get; set; }\npublic string CloneUrl { get; set; }\n- public int StarCount { get; set; }\n+ public int Stars { get; set; }\npublic string FullName\n{\n- get => Owner + \"/\" + Name; set\n+ get => Owner + \"/\" + Name;\n+ set\n{\nvar split = value.Split('/');\nif (split.Length == 2)\n@@ -94,7 +95,7 @@ public RepositoryInformation(string owner, string repoName, string cloneUrl, int\nOwner = owner;\nName = repoName;\nCloneUrl = cloneUrl;\n- StarCount = starCount;\n+ Stars = starCount;\n}\npublic override bool Equals(object obj)\n@@ -104,30 +105,18 @@ public override bool Equals(object obj)\npublic bool Equals(RepositoryInformation other)\n{\n- return Owner.Equals(other.Owner, StringComparison.InvariantCultureIgnoreCase) &&\n- Name.Equals(other.Name, StringComparison.InvariantCultureIgnoreCase) &&\n- CloneUrl.Equals(other.CloneUrl, StringComparison.InvariantCultureIgnoreCase);\n+ return CloneUrl.Equals(other.CloneUrl, StringComparison.InvariantCultureIgnoreCase);\n}\npublic override int GetHashCode()\n{\n// Using toLower() to make the hash case insensitive\n- // Using toLower() to make the hash case insensitive\n- var hc1 = (uint)(Owner.ToLower().GetHashCode());\n- var hc2 = (uint)(Name.ToLower().GetHashCode());\n- var hc3 = (uint)(CloneUrl.ToLower().GetHashCode());\n-\n- uint hash = 17;\n- hash = hash * 31 + hc1;\n- hash = hash * 31 + hc2;\n- hash = hash * 31 + hc3;\n-\n- return (int)hash;\n+ return CloneUrl.ToLower().GetHashCode();\n}\npublic int CompareTo(RepositoryInformation other)\n{\n// It is inverted here so the Repos would always be sorted from high starCount to low starCount\n- return other.StarCount.CompareTo(StarCount);\n+ return other.Stars.CompareTo(Stars);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "@dep.FullName\n</span>\n<span class=\"badge pull-right\" style=\"background-color: #004880\">\n- @dep.StarCount <i class=\"ms-Icon ms-Icon--FavoriteStarFill\" aria-hidden=\"true\" style=\"color:#ffac0e\"></i>\n+ @dep.Stars <i class=\"ms-Icon ms-Icon--FavoriteStarFill\" aria-hidden=\"true\" style=\"color:#ffac0e\"></i>\n</span>\n</button>\n</div>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Changed the RepositoryInformation struct to match the serialized Json format |
455,739 | 29.05.2019 12:36:46 | 25,200 | 35f4d22ff27a5b288fdeb091be9e6687c397ca16 | Clicking on the GitHub collapsed section title now don't make the page jump to the top | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "}\n<h2>\n- <a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#githubdependency-groups\"\n+ <a role=\"button\" data-toggle=\"collapse\" data-target=\"#githubdependency-groups\"\naria-expanded=\"true\" aria-controls=\"githubdependency-groups\" id=\"show-githubdependency-groups\">\n<i class=\"ms-Icon ms-Icon--ChevronDown\" aria-hidden=\"true\"></i>\n<span>GitHub Repos Usage</span>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Clicking on the GitHub collapsed section title now don't make the page jump to the top |
455,744 | 29.05.2019 13:50:16 | 25,200 | efcfb6b14ec8db9fe24d4cbd0a3ec8717f3cf418 | aligning ServerCommon versions with NuGet.Jobs | [
{
"change_type": "MODIFY",
"old_path": "src/DatabaseMigrationTools/DatabaseMigrationTools.csproj",
"new_path": "src/DatabaseMigrationTools/DatabaseMigrationTools.csproj",
"diff": "<Version>4.1.0-master-2602271</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Configuration\">\n- <Version>2.46.0</Version>\n+ <Version>2.48.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.47.0-master-2652814</Version>\n+ <Version>2.48.0</Version>\n</PackageReference>\n</ItemGroup>\n<ItemGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj",
"new_path": "src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj",
"diff": "<Version>4.1.0-master-2602271</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Configuration\">\n- <Version>2.46.0</Version>\n+ <Version>2.48.0</Version>\n</PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<PackageReference Include=\"NuGet.Services.Entities\">\n- <Version>2.46.0</Version>\n+ <Version>2.48.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.FeatureFlags\">\n- <Version>2.46.0</Version>\n+ <Version>2.48.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging.Email\">\n- <Version>2.46.0</Version>\n+ <Version>2.48.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.46.0</Version>\n+ <Version>2.48.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Issues\">\n- <Version>2.46.0</Version>\n+ <Version>2.48.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Version>2.2.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Licenses\">\n- <Version>2.46.0</Version>\n+ <Version>2.48.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n<Version>5.0.0-preview1.5665</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>2.46.0</Version>\n+ <Version>2.48.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n- <Version>2.46.0</Version>\n+ <Version>2.48.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Owin\">\n- <Version>2.46.0</Version>\n+ <Version>2.48.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Sql\">\n- <Version>2.46.0</Version>\n+ <Version>2.48.0</Version>\n</PackageReference>\n<PackageReference Include=\"Owin\">\n<Version>1.0.0</Version>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | aligning ServerCommon versions with NuGet.Jobs (#7193) |
455,739 | 29.05.2019 16:01:46 | 25,200 | b05d22c3dcc31e4c29b1d30326dc573feb92cf23 | Added Github repos count and polished GitHub Usage section | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -751,8 +751,8 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\nmodel.IsPackageDeprecationEnabled = _featureFlagService.IsManageDeprecationEnabled(currentUser);\nvar nupkgGitHubDependencies = _contentObjectService.NuGetPackagesGitHubDependencies;\n- model.GitHubDependencies = nupkgGitHubDependencies.ContainsKey(id) ?\n- nupkgGitHubDependencies[id] : new SortedSet<ContentObjectService.RepositoryInformation>();\n+ model.GitHubDependenciesInformation = nupkgGitHubDependencies.ContainsKey(id) ?\n+ nupkgGitHubDependencies[id] : new ContentObjectService.NuGetPackageInformation();\nmodel.ReadMeHtml = await _readMeService.GetReadMeHtmlAsync(package);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"diff": "@@ -54,6 +54,7 @@ $(function () {\n// Configure expanders\nwindow.nuget.configureExpanderHeading(\"dependency-groups\");\n+ window.nuget.configureExpanderHeading(\"github-usage\");\nwindow.nuget.configureExpanderHeading(\"version-history\");\nwindow.nuget.configureExpander(\n\"hidden-versions\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"new_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"diff": "@@ -30,7 +30,7 @@ public ContentObjectService(IContentService contentService)\npublic ICertificatesConfiguration CertificatesConfiguration { get; set; }\npublic ISymbolsConfiguration SymbolsConfiguration { get; set; }\npublic ITyposquattingConfiguration TyposquattingConfiguration { get; set; }\n- public Dictionary<string, SortedSet<RepositoryInformation>> NuGetPackagesGitHubDependencies { get; set; }\n+ public Dictionary<string, NuGetPackageInformation> NuGetPackagesGitHubDependencies { get; set; }\npublic async Task Refresh()\n{\n@@ -51,9 +51,9 @@ public async Task Refresh()\nnew TyposquattingConfiguration();\nNuGetPackagesGitHubDependencies =\n- await Refresh<Dictionary<string, SortedSet<RepositoryInformation>>>(\n+ await Refresh<Dictionary<string, NuGetPackageInformation>>(\nGalleryConstants.ContentNames.NuGetPackagesGitHubDependencies) ??\n- new Dictionary<string, SortedSet<RepositoryInformation>>();\n+ new Dictionary<string, NuGetPackageInformation>();\n}\nprivate async Task<T> Refresh<T>(string contentName)\n@@ -68,6 +68,17 @@ private async Task<T> Refresh<T>(string contentName)\nreturn JsonConvert.DeserializeObject<T>(configString);\n}\n+ public class NuGetPackageInformation\n+ {\n+ public int TotalRepos { get; set; }\n+ public SortedSet<RepositoryInformation> Repos { get; set; }\n+\n+ public NuGetPackageInformation()\n+ {\n+ TotalRepos = 0;\n+ Repos = null;\n+ }\n+ }\npublic struct RepositoryInformation : IEquatable<RepositoryInformation>, IComparable<RepositoryInformation>\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IContentObjectService.cs",
"new_path": "src/NuGetGallery/Services/IContentObjectService.cs",
"diff": "@@ -13,7 +13,7 @@ public interface IContentObjectService\nICertificatesConfiguration CertificatesConfiguration { get; }\nISymbolsConfiguration SymbolsConfiguration { get; }\nITyposquattingConfiguration TyposquattingConfiguration { get; }\n- Dictionary<string, SortedSet<ContentObjectService.RepositoryInformation>> NuGetPackagesGitHubDependencies { get; }\n+ Dictionary<string, ContentObjectService.NuGetPackageInformation> NuGetPackagesGitHubDependencies { get; }\nTask Refresh();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -120,7 +120,7 @@ private DisplayPackageViewModel(Package package, User currentUser, string pushed\npublic bool IsDotnetToolPackageType { get; set; }\npublic bool IsAtomFeedEnabled { get; set; }\npublic bool IsPackageDeprecationEnabled { get; set; }\n- public SortedSet<ContentObjectService.RepositoryInformation> GitHubDependencies { get; set; }\n+ public ContentObjectService.NuGetPackageInformation GitHubDependenciesInformation { get; set; }\npublic bool HasNewerPrerelease\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "}\n<h2>\n- <a role=\"button\" data-toggle=\"collapse\" data-target=\"#githubdependency-groups\"\n- aria-expanded=\"true\" aria-controls=\"githubdependency-groups\" id=\"show-githubdependency-groups\">\n+ <a role=\"button\" data-toggle=\"collapse\" data-target=\"#github-usage\"\n+ aria-expanded=\"true\" aria-controls=\"github-usage\" id=\"show-github-usage\">\n<i class=\"ms-Icon ms-Icon--ChevronDown\" aria-hidden=\"true\"></i>\n- <span>GitHub Repos Usage</span>\n+ <span>GitHub Usage</span>\n</a>\n</h2>\n- @if (Model.GitHubDependencies.Any())\n+ <style>\n+ .btn-gh-repo {\n+ background-color: white;\n+ }\n+\n+ .btn-gh-repo:hover {\n+ background-color: #d9edf7;\n+ }\n+ </style>\n+\n+ @if (Model.GitHubDependenciesInformation.Repos.Any())\n{\n- <div class=\"row panel-collapse collapse githubdependency-groups in\" aria-expanded=\"true\" id=\"githubdependency-groups\">\n- @foreach (var dep in Model.GitHubDependencies.Where((x, i) => i < 10))\n+ <div class=\"github-usage panel-collapse collapse in\" aria-expanded=\"true\" id=\"github-usage\">\n+ <p>\n+ About @(Model.GitHubDependenciesInformation.TotalRepos) popular GitHub repositories depend on\n+ @(Model.Title), including the following:\n+ </p>\n+\n+ @foreach (var dep in Model.GitHubDependenciesInformation.Repos.Take(10))\n{\n- <div class=\"col-xs-8\">\n<div class=\"row top-buffer\">\n- <div class=\"col-xs-8\">\n- <button class=\"btn btn-default text-left btn-block\"\n+ <div class=\"col-xs-12\">\n+ <button class=\"btn btn-gh-repo text-left btn-block\"\nonclick=\"window.open('@dep.CloneUrl');\">\n<span class=\"pull-left\">\n- @dep.FullName\n+ @(dep.FullName)\n</span>\n<span class=\"badge pull-right\" style=\"background-color: #004880\">\n- @dep.Stars <i class=\"ms-Icon ms-Icon--FavoriteStarFill\" aria-hidden=\"true\" style=\"color:#ffac0e\"></i>\n+ @(dep.Stars) <i class=\"ms-Icon ms-Icon--FavoriteStarFill\" aria-hidden=\"true\" style=\"color:#ffac0e\"></i>\n</span>\n</button>\n</div>\n</div>\n- </div>\n+\n}\n</div>\n}\nelse\n{\n- @:This package is not used by any major GitHub repository =(\n+ @:This package is not used by any popular GitHub repository.\n}\n<h2>\[email protected] @(Model.DownloadsPerDayLabel == \"1\" || Model.DownloadsPerDayLabel == \"<1\" ? \"download\" : \"downloads\")\nper day (avg)\n</li>\n+\n+ @if (Model.GitHubDependenciesInformation.TotalRepos > 0)\n+ {\n+ <li>\n+ <img class=\"icon\" aria-hidden=\"true\" alt=\"GitHub logo\"\n+ src=\"@Url.Absolute(\"~/Content/gallery/img/github.svg\")\"\n+ @ViewHelpers.ImageFallback(Url.Absolute(\"~/Content/gallery/img/github-32x32.png\")) />\n+ @(Model.GitHubDependenciesInformation.TotalRepos) popular dependant GitHub repos\n+ </li>\n+ }\n</ul>\n@if (StatisticsHelper.IsStatisticsPageAvailable)\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Added Github repos count and polished GitHub Usage section |
455,739 | 29.05.2019 16:30:44 | 25,200 | 0d44110fd6e033fb914aa6032d69a232954a5eb8 | GitHub repos are now loaded as a IReadOnlyList instead of SortedSet | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"new_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"diff": "@@ -71,7 +71,7 @@ private async Task<T> Refresh<T>(string contentName)\npublic class NuGetPackageInformation\n{\npublic int TotalRepos { get; set; }\n- public SortedSet<RepositoryInformation> Repos { get; set; }\n+ public IReadOnlyList<RepositoryInformation> Repos { get; set; }\npublic NuGetPackageInformation()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | GitHub repos are now loaded as a IReadOnlyList instead of SortedSet |
455,739 | 30.05.2019 15:21:31 | 25,200 | 254cb59be9b9d7b7a37a8f3d0629e0a46a719dc6 | The star count in GitHub Usage section is now formatted | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"new_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"diff": "namespace NuGetGallery\n{\n+ public static class Extensions\n+ {\n+ public static string KiloFormat(this int number)\n+ {\n+ if (number >= 1_000_000_000)\n+ return new System.Text.StringBuilder((number / 1_000_000_000.0f).ToString(\"F3\")) { [4] = 'G' }.ToString();\n+ if (number >= 100_000_000)\n+ return (number / 1000) + \"M\";\n+ if (number >= 10_000_000)\n+ return new System.Text.StringBuilder((number / 1000000.0f).ToString(\"F2\")) { [4] = 'M' }.ToString();\n+ if (number >= 1_000_000)\n+ return new System.Text.StringBuilder((number / 1000000.0f).ToString(\"F3\")) { [4] = 'M' }.ToString();\n+ if (number >= 100_000)\n+ return (number / 1000) + \"K\";\n+ if (number >= 10_000)\n+ return new System.Text.StringBuilder((number / 1000.0f).ToString(\"F2\")) { [4] = 'K' }.ToString();\n+ if (number >= 1000)\n+ return new System.Text.StringBuilder((number / 1000.0f).ToString(\"F3\")) { [4] = 'K' }.ToString();\n+\n+ return number.ToString(\"#,0\");\n+ }\n+ }\n+\npublic class ContentObjectService : IContentObjectService\n{\npublic static TimeSpan RefreshInterval = TimeSpan.FromMinutes(5);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "@(dep.FullName)\n</span>\n<span class=\"badge pull-right\" style=\"background-color: #004880\">\n- @(dep.Stars) <i class=\"ms-Icon ms-Icon--FavoriteStarFill\" aria-hidden=\"true\" style=\"color:#ffac0e\"></i>\n+ @(dep.Stars.KiloFormat()) <i class=\"ms-Icon ms-Icon--FavoriteStarFill\" aria-hidden=\"true\" style=\"color:#ffac0e\"></i>\n</span>\n</button>\n</div>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | The star count in GitHub Usage section is now formatted |
455,739 | 30.05.2019 16:26:22 | 25,200 | f5ecc555d86db80b51796c13c70fea8974f626c0 | The repo names are now links in GitHub Usage section | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "<button class=\"btn btn-gh-repo text-left btn-block\"\nonclick=\"window.open('@dep.CloneUrl');\">\n<span class=\"pull-left\">\n- @(dep.FullName)\n+ <a>@(dep.FullName)</a>\n</span>\n<span class=\"badge pull-right\" style=\"background-color: #004880\">\n@(dep.Stars.KiloFormat()) <i class=\"ms-Icon ms-Icon--FavoriteStarFill\" aria-hidden=\"true\" style=\"color:#ffac0e\"></i>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | The repo names are now links in GitHub Usage section |
455,736 | 02.06.2019 17:22:43 | 25,200 | 84d291495d7dd0302fc765ee7e8f8e9fe70e5908 | Update ServerCommon version to pull in latest validation DB migration
The new DB migration in validation DB adds a status column to validation sets
Polish the validation admin page a little bit
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/DatabaseMigrationTools/DatabaseMigrationTools.csproj",
"new_path": "src/DatabaseMigrationTools/DatabaseMigrationTools.csproj",
"diff": "<Version>4.1.0-master-2602271</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Configuration\">\n- <Version>2.48.0</Version>\n+ <Version>2.49.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.48.0</Version>\n+ <Version>2.49.0</Version>\n</PackageReference>\n</ItemGroup>\n<ItemGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj",
"new_path": "src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj",
"diff": "<Version>4.1.0-master-2602271</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Configuration\">\n- <Version>2.48.0</Version>\n+ <Version>2.49.0</Version>\n</PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<PackageReference Include=\"NuGet.Services.Entities\">\n- <Version>2.48.0</Version>\n+ <Version>2.49.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.FeatureFlags\">\n- <Version>2.48.0</Version>\n+ <Version>2.49.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging.Email\">\n- <Version>2.48.0</Version>\n+ <Version>2.49.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.48.0</Version>\n+ <Version>2.49.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Issues\">\n- <Version>2.48.0</Version>\n+ <Version>2.49.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"new_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"diff": "<Version>5.0.0-preview1.5665</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n- <Version>2.46.0</Version>\n+ <Version>2.49.0</Version>\n</PackageReference>\n<PackageReference Include=\"System.Runtime\">\n<Version>4.3.1</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Controllers/ValidationController.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Controllers/ValidationController.cs",
"diff": "@@ -42,7 +42,7 @@ private void AppendValidatedPackages(List<ValidatedPackageViewModel> validatedPa\n{\nvar groups = validationSets\n.Where(x => x.ValidatingType == validatingType)\n- .OrderBy(x => x.PackageId)\n+ .OrderBy(x => x.PackageId, StringComparer.OrdinalIgnoreCase)\n.ThenByDescending(x => NuGetVersion.Parse(x.PackageNormalizedVersion))\n.ThenByDescending(x => x.PackageKey)\n.ThenByDescending(x => x.Created)\n@@ -53,10 +53,8 @@ private void AppendValidatedPackages(List<ValidatedPackageViewModel> validatedPa\n{\nforeach (var set in group)\n{\n- // Put completed validations first then put new validations on top.\nset.PackageValidations = set.PackageValidations\n- .OrderByDescending(x => x.ValidationStatus)\n- .ThenByDescending(x => x.ValidationStatusTimestamp)\n+ .OrderBy(x => x.Started)\n.ToList();\n}\nvar deletedStatus = _validationAdminService.GetDeletedStatus(group.Key, validatingType);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Views/Validation/Index.cshtml",
"new_path": "src/NuGetGallery/Areas/Admin/Views/Validation/Index.cshtml",
"diff": "<b>Created:</b> @ShowTimestamp(set.Created)<br />\n@if (set.Created != set.Updated)\n{\n- <b>Updated:</b> @ShowTimestamp(set.Updated)\n+ <b>Updated:</b> @ShowTimestamp(set.Updated)<br />\n+ }\n+ <b>Status:</b>\n+ @switch (set.ValidationSetStatus)\n+ {\n+ case ValidationSetStatus.Unknown:\n+ @:Unknown\n+ break;\n+ case ValidationSetStatus.InProgress:\n+ @:In progress\n+ break;\n+ case ValidationSetStatus.Completed:\n+ @:Complete\n+ break;\n+ default:\n+ @(set.ValidationSetStatus)\n+ break;\n}\n</p>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Version>2.2.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Licenses\">\n- <Version>2.48.0</Version>\n+ <Version>2.49.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n<Version>5.0.0-preview1.5665</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>2.48.0</Version>\n+ <Version>2.49.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n- <Version>2.48.0</Version>\n+ <Version>2.49.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Owin\">\n- <Version>2.48.0</Version>\n+ <Version>2.49.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Sql\">\n- <Version>2.48.0</Version>\n+ <Version>2.49.0</Version>\n</PackageReference>\n<PackageReference Include=\"Owin\">\n<Version>1.0.0</Version>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Update ServerCommon version to pull in latest validation DB migration (#7219)
The new DB migration in validation DB adds a status column to validation sets
Polish the validation admin page a little bit
Progress on https://github.com/NuGet/NuGetGallery/issues/7185 |
455,776 | 03.06.2019 11:33:27 | 25,200 | 895a03ee26e4499b2c9f8d24ea506490e68bc6b0 | Wrap HealthProbe endpoint in a Razor view | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -280,7 +280,7 @@ public virtual async Task<ActionResult> Status()\n[ActionName(\"HealthProbeApi\")]\npublic ActionResult HealthProbe()\n{\n- return new HttpStatusCodeWithBodyResult(HttpStatusCode.OK, \"Gallery is Available\");\n+ return View();\n}\n[HttpGet]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Content Include=\"Views\\Packages\\_ManageDeprecation.cshtml\" />\n<Content Include=\"Views\\Shared\\_MultiSelectDropdown.cshtml\" />\n<Content Include=\"Views\\Packages\\_DisplayPackageDeprecation.cshtml\" />\n+ <Content Include=\"Views\\Api\\HealthProbeApi.cshtml\" />\n</ItemGroup>\n<ItemGroup>\n<Service Include=\"{508349B6-6B84-4DF5-91F0-309BEEBAD82D}\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Wrap HealthProbe endpoint in a Razor view (#7199) |
455,739 | 04.06.2019 13:55:19 | 25,200 | 9e458580c47736daa5ba6b1a38d497667775b912 | GitHub Usage section is collapsed by default | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "<h2>\n<a role=\"button\" data-toggle=\"collapse\" data-target=\"#github-usage\"\n- aria-expanded=\"true\" aria-controls=\"github-usage\" id=\"show-github-usage\">\n- <i class=\"ms-Icon ms-Icon--ChevronDown\" aria-hidden=\"true\"></i>\n+ aria-expanded=\"false\" aria-controls=\"github-usage\" id=\"show-github-usage\">\n+ <i class=\"ms-Icon ms-Icon--ChevronRight\" aria-hidden=\"true\"></i>\n<span>GitHub Usage</span>\n</a>\n</h2>\n@if (Model.GitHubDependenciesInformation.Repos.Any())\n{\n- <div class=\"github-usage panel-collapse collapse in\" aria-expanded=\"true\" id=\"github-usage\">\n+ <div class=\"github-usage panel-collapse collapse\" aria-expanded=\"true\" id=\"github-usage\">\n<p>\nAbout @(Model.GitHubDependenciesInformation.TotalRepos) popular GitHub repositories depend on\n- @(Model.Title), including the following:\n+ @(Model.Id), including the following:\n</p>\n@foreach (var dep in Model.GitHubDependenciesInformation.Repos.Take(10))\n<div class=\"row top-buffer\">\n<div class=\"col-xs-12\">\n<button class=\"btn btn-gh-repo text-left btn-block\"\n- onclick=\"window.open('@dep.CloneUrl');\">\n+ onclick=\"window.open('@dep.Url');\">\n<span class=\"pull-left\">\n- <a>@(dep.FullName)</a>\n+ <a>@(dep.Id)</a>\n</span>\n<span class=\"badge pull-right\" style=\"background-color: #004880\">\n@(dep.Stars.KiloFormat()) <i class=\"ms-Icon ms-Icon--FavoriteStarFill\" aria-hidden=\"true\" style=\"color:#ffac0e\"></i>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | GitHub Usage section is collapsed by default |
455,739 | 04.06.2019 14:54:13 | 25,200 | 01e8c9eaeb2aa8a17048dcd964111f87f02fc2b1 | Added feature flag to the GitHub Usage section | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -749,6 +749,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\nmodel.IsCertificatesUIEnabled = _contentObjectService.CertificatesConfiguration?.IsUIEnabledForUser(currentUser) ?? false;\nmodel.IsAtomFeedEnabled = _featureFlagService.IsPackagesAtomFeedEnabled();\nmodel.IsPackageDeprecationEnabled = _featureFlagService.IsManageDeprecationEnabled(currentUser);\n+ model.IsGitHubUsageEnabled = _featureFlagService.IsGitHubUsageEnabled(currentUser);\nvar nupkgGitHubDependencies = _contentObjectService.NuGetPackagesGitHubDependencies;\nmodel.GitHubDependenciesInformation = nupkgGitHubDependencies.ContainsKey(id) ?\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/FeatureFlagService.cs",
"new_path": "src/NuGetGallery/Services/FeatureFlagService.cs",
"diff": "@@ -17,6 +17,7 @@ public class FeatureFlagService : IFeatureFlagService\nprivate const string TyposquattingFlightName = GalleryPrefix + \"TyposquattingFlight\";\nprivate const string EmbeddedIconFlightName = GalleryPrefix + \"EmbeddedIcons\";\nprivate const string SearchSideBySideFlightName = GalleryPrefix + \"SearchSideBySide\";\n+ private const string GitHubUsageFlightName = GalleryPrefix + \"GitHubUsage\";\nprivate const string PackagesAtomFeedFeatureName = GalleryPrefix + \"PackagesAtomFeed\";\n@@ -69,5 +70,9 @@ public bool IsSearchSideBySideEnabled(User user)\n{\nreturn _client.IsEnabled(SearchSideBySideFlightName, user, defaultValue: false);\n}\n+ public bool IsGitHubUsageEnabled(User user)\n+ {\n+ return _client.IsEnabled(GitHubUsageFlightName, user, defaultValue: false);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IFeatureFlagService.cs",
"new_path": "src/NuGetGallery/Services/IFeatureFlagService.cs",
"diff": "@@ -52,5 +52,13 @@ public interface IFeatureFlagService\n/// Whether the user is able to access the search side-by-side experiment.\n/// </summary>\nbool IsSearchSideBySideEnabled(User user);\n+\n+ /// <summary>\n+ /// Whether a user can see the \"GitHub Usage\" section in a package's display page as well as\n+ /// well as the added \"GitHub Usage count\" in the \"Statistics\" section\n+ /// </summary>\n+ /// <param name=\"user\"></param>\n+ /// <returns></returns>\n+ bool IsGitHubUsageEnabled(User user);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -120,6 +120,7 @@ private DisplayPackageViewModel(Package package, User currentUser, string pushed\npublic bool IsDotnetToolPackageType { get; set; }\npublic bool IsAtomFeedEnabled { get; set; }\npublic bool IsPackageDeprecationEnabled { get; set; }\n+ public bool IsGitHubUsageEnabled { get; set; }\npublic ContentObjectService.NuGetPackageInformation GitHubDependenciesInformation { get; set; }\npublic bool HasNewerPrerelease\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "}\n}\n+ @if(Model.IsGitHubUsageEnabled)\n+ {\n<h2>\n<a role=\"button\" data-toggle=\"collapse\" data-target=\"#github-usage\"\naria-expanded=\"false\" aria-controls=\"github-usage\" id=\"show-github-usage\">\n}\n</style>\n- @if (Model.GitHubDependenciesInformation.Repos.Any())\n+ if (Model.GitHubDependenciesInformation.Repos.Any())\n{\n<div class=\"github-usage panel-collapse collapse\" aria-expanded=\"true\" id=\"github-usage\">\n<p>\n{\n@:This package is not used by any popular GitHub repository.\n}\n+ }\n<h2>\n<a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#version-history\"\nper day (avg)\n</li>\n- @if (Model.GitHubDependenciesInformation.TotalRepos > 0)\n+ @if (Model.IsGitHubUsageEnabled && Model.GitHubDependenciesInformation.TotalRepos > 0)\n{\n<li>\n<img class=\"icon\" aria-hidden=\"true\" alt=\"GitHub logo\"\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Added feature flag to the GitHub Usage section |
455,739 | 05.06.2019 12:21:24 | 25,200 | e19831c37d938331c55778cfb98d3cb0e1835ab0 | Extracted GitHub Usage code to multiple files | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Features\\FeatureFlagReference.cs\" />\n<Compile Include=\"Features\\FeatureFlagSaveResult.cs\" />\n<Compile Include=\"Features\\IEditableFeatureFlagStorageService.cs\" />\n+ <Compile Include=\"GitHub\\GitHubCacheTransformer.cs\" />\n+ <Compile Include=\"GitHub\\KiloFormatExtension.cs\" />\n+ <Compile Include=\"GitHub\\NuGetPackageGitHubInformation.cs\" />\n+ <Compile Include=\"GitHub\\RepositoryInformation.cs\" />\n<Compile Include=\"ICloudStorageStatusDependency.cs\" />\n<Compile Include=\"Infrastructure\\AzureEntityList.cs\" />\n<Compile Include=\"Infrastructure\\ElmahException.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "using NuGetGallery.Configuration;\nusing NuGetGallery.Diagnostics;\nusing NuGetGallery.Filters;\n+using NuGetGallery.GitHub;\nusing NuGetGallery.Helpers;\nusing NuGetGallery.Infrastructure;\nusing NuGetGallery.Infrastructure.Mail.Messages;\n@@ -753,7 +754,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\nvar nupkgGitHubDependencies = _contentObjectService.NuGetPackagesGitHubDependencies;\nmodel.GitHubDependenciesInformation = nupkgGitHubDependencies.ContainsKey(id) ?\n- nupkgGitHubDependencies[id] : new ContentObjectService.NuGetPackageInformation();\n+ nupkgGitHubDependencies[id] : new NuGetPackageGitHubInformation();\nmodel.ReadMeHtml = await _readMeService.GetReadMeHtmlAsync(package);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"new_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"diff": "using System.Web.UI.WebControls;\nusing System.Collections;\nusing System.Diagnostics;\n+using NuGetGallery.GitHub;\nnamespace NuGetGallery\n{\n- public static class Extensions\n- {\n- public static string KiloFormat(this int number)\n- {\n- if (number >= 1_000_000_000)\n- return new System.Text.StringBuilder((number / 1_000_000_000.0f).ToString(\"F3\")) { [4] = 'G' }.ToString();\n- if (number >= 100_000_000)\n- return (number / 1000) + \"M\";\n- if (number >= 10_000_000)\n- return new System.Text.StringBuilder((number / 1000000.0f).ToString(\"F2\")) { [4] = 'M' }.ToString();\n- if (number >= 1_000_000)\n- return new System.Text.StringBuilder((number / 1000000.0f).ToString(\"F3\")) { [4] = 'M' }.ToString();\n- if (number >= 100_000)\n- return (number / 1000) + \"K\";\n- if (number >= 10_000)\n- return new System.Text.StringBuilder((number / 1000.0f).ToString(\"F2\")) { [4] = 'K' }.ToString();\n- if (number >= 1000)\n- return new System.Text.StringBuilder((number / 1000.0f).ToString(\"F3\")) { [4] = 'K' }.ToString();\n-\n- return number.ToString(\"#,0\");\n- }\n- }\n-\npublic class ContentObjectService : IContentObjectService\n{\npublic static TimeSpan RefreshInterval = TimeSpan.FromMinutes(5);\n@@ -59,7 +37,7 @@ public ContentObjectService(IContentService contentService)\npublic ICertificatesConfiguration CertificatesConfiguration { get; set; }\npublic ISymbolsConfiguration SymbolsConfiguration { get; set; }\npublic ITyposquattingConfiguration TyposquattingConfiguration { get; set; }\n- public Dictionary<string, NuGetPackageInformation> NuGetPackagesGitHubDependencies { get; set; }\n+ public Dictionary<string, NuGetPackageGitHubInformation> NuGetPackagesGitHubDependencies { get; set; }\npublic async Task Refresh()\n{\n@@ -83,48 +61,10 @@ public async Task Refresh()\nGalleryConstants.ContentNames.NuGetPackagesGitHubDependencies) ??\nArray.Empty<RepositoryInformation>();\n- var tempDict = new Dictionary<string, List<RepositoryInformation>>(StringComparer.InvariantCultureIgnoreCase);\n- foreach (var repo in reposCache)\n- {\n- foreach (var dependency in repo.Dependencies)\n- {\n- List<RepositoryInformation> nuGetPackageInformation = null;\n- if (tempDict.ContainsKey(dependency))\n- {\n- nuGetPackageInformation = tempDict[dependency];\n- }\n- else\n- {\n- nuGetPackageInformation = new List<RepositoryInformation>();\n- }\n- nuGetPackageInformation.Add(repo);\n- tempDict[dependency] = nuGetPackageInformation;\n- }\n- }\n-\n- var tempSwapDict = new Dictionary<string, NuGetPackageInformation>(StringComparer.InvariantCultureIgnoreCase);\n- foreach (var entry in tempDict)\n- {\n- entry.Value.Sort(Comparer<RepositoryInformation>.Create((x, y) =>\n- {\n- var result = y.CompareTo(x); // Inverted for descending sort order\n- if (result != 0)\n+ if(reposCache.Any())\n{\n- return result;\n+ NuGetPackagesGitHubDependencies = GitHubCacheTransformer.GetNuGetPackagesDependents(reposCache);\n}\n-\n- // Results have the same star count, compare their ids (not inverted) to sort in alphabetical order\n- return string.Compare(x.Id, y.Id, true);\n- }));\n-\n- var nuGetPackageInformation = new NuGetPackageInformation();\n- nuGetPackageInformation.TotalRepos = entry.Value.Count;\n- nuGetPackageInformation.Repos = entry.Value.Take(10).ToList().AsReadOnly();\n- tempSwapDict[entry.Key] = nuGetPackageInformation;\n- }\n-\n- // This is done to avoid the Concurent read & modification of the dictionary\n- NuGetPackagesGitHubDependencies = tempSwapDict;\n}\nprivate async Task<T> Refresh<T>(string contentName)\n@@ -138,73 +78,5 @@ private async Task<T> Refresh<T>(string contentName)\nreturn JsonConvert.DeserializeObject<T>(configString);\n}\n-\n- public class NuGetPackageInformation\n- {\n- public int TotalRepos { get; set; }\n- public IReadOnlyList<RepositoryInformation> Repos { get; set; }\n-\n- public NuGetPackageInformation()\n- {\n- TotalRepos = 0;\n- Repos = null;\n- }\n- }\n-\n- public class RepositoryInformation : IEquatable<RepositoryInformation>, IComparable<RepositoryInformation>\n- {\n- [JsonIgnore]\n- public string Name { get; set; }\n- [JsonIgnore]\n- public string Owner { get; set; }\n- public string Url { get; set; }\n- public int Stars { get; set; }\n- public string Id\n- {\n- get => Owner + \"/\" + Name; set\n- {\n- var split = value.Split('/');\n- if (split.Length == 2)\n- {\n- Owner = split[0];\n- Name = split[1];\n- }\n- }\n- }\n-\n- public List<string> Dependencies { get; set; } = null;\n-\n- public RepositoryInformation()\n- { }\n-\n- public RepositoryInformation(string owner, string repoName, string cloneUrl, int starCount, List<string> dependencies)\n- {\n- Owner = owner;\n- Name = repoName;\n- Url = cloneUrl;\n- Stars = starCount;\n- Dependencies = dependencies;\n- }\n-\n- public override bool Equals(object obj)\n- {\n- return obj is RepositoryInformation information && Equals(information);\n- }\n-\n- public bool Equals(RepositoryInformation other)\n- {\n- return Url.Equals(other.Url, StringComparison.InvariantCultureIgnoreCase);\n- }\n- public override int GetHashCode()\n- {\n- // Using toLower() to make the hash case insensitive\n- return Url.ToLower().GetHashCode();\n- }\n-\n- public int CompareTo(RepositoryInformation other)\n- {\n- return Stars.CompareTo(other.Stars);\n- }\n- }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IContentObjectService.cs",
"new_path": "src/NuGetGallery/Services/IContentObjectService.cs",
"diff": "using System.Collections.Generic;\nusing System.Threading.Tasks;\n+using NuGetGallery.GitHub;\nusing NuGetGallery.Services;\nnamespace NuGetGallery\n@@ -13,7 +14,7 @@ public interface IContentObjectService\nICertificatesConfiguration CertificatesConfiguration { get; }\nISymbolsConfiguration SymbolsConfiguration { get; }\nITyposquattingConfiguration TyposquattingConfiguration { get; }\n- Dictionary<string, ContentObjectService.NuGetPackageInformation> NuGetPackagesGitHubDependencies { get; }\n+ Dictionary<string, NuGetPackageGitHubInformation> NuGetPackagesGitHubDependencies { get; }\nTask Refresh();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "using NuGet.Services.Licenses;\nusing NuGet.Services.Validation.Issues;\nusing NuGet.Versioning;\n+using NuGetGallery.GitHub;\nnamespace NuGetGallery\n{\n@@ -121,7 +122,7 @@ private DisplayPackageViewModel(Package package, User currentUser, string pushed\npublic bool IsAtomFeedEnabled { get; set; }\npublic bool IsPackageDeprecationEnabled { get; set; }\npublic bool IsGitHubUsageEnabled { get; set; }\n- public ContentObjectService.NuGetPackageInformation GitHubDependenciesInformation { get; set; }\n+ public NuGetPackageGitHubInformation GitHubDependenciesInformation { get; set; }\npublic bool HasNewerPrerelease\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "{\n<div class=\"github-usage panel-collapse collapse\" aria-expanded=\"true\" id=\"github-usage\">\n<p>\n- About @(Model.GitHubDependenciesInformation.TotalRepos) popular GitHub repositories depend on\n+ About @(NuGetGallery.GitHub.KiloFormatExtension.ToKiloFormat(Model.GitHubDependenciesInformation.TotalRepos)) popular GitHub repositories depend on\n@(Model.Id), including the following:\n</p>\n<a>@(dep.Id)</a>\n</span>\n<span class=\"badge pull-right\" style=\"background-color: #004880\">\n- @(dep.Stars.KiloFormat()) <i class=\"ms-Icon ms-Icon--FavoriteStarFill\" aria-hidden=\"true\" style=\"color:#ffac0e\"></i>\n+ @(NuGetGallery.GitHub.KiloFormatExtension.ToKiloFormat(dep.Stars)) <i class=\"ms-Icon ms-Icon--FavoriteStarFill\" aria-hidden=\"true\" style=\"color:#ffac0e\"></i>\n</span>\n</button>\n</div>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Extracted GitHub Usage code to multiple files |
455,739 | 05.06.2019 16:01:29 | 25,200 | 6e3d25b0eaa1827c48e141b37691b5cb49125351 | Fixed failing tests
Tests were failing because of GitHub usage section addition | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -501,11 +501,17 @@ public async Task GivenAValidatingPackageThatTheCurrentUserDoesNotOwnThenHideIt(\nvar deprecationService = new Mock<IPackageDeprecationService>();\nvar httpContext = new Mock<HttpContextBase>();\nvar httpCachePolicy = new Mock<HttpCachePolicyBase>();\n+ var contentObjectService = new Mock<IContentObjectService>();\n+ contentObjectService\n+ .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n+ .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nhttpContext: httpContext,\n- deprecationService: deprecationService);\n+ deprecationService: deprecationService,\n+ contentObjectService: contentObjectService);\ncontroller.SetCurrentUser(currentUser);\nhttpContext.Setup(c => c.Response.Cache).Returns(httpCachePolicy.Object);\n@@ -628,12 +634,18 @@ private async Task CheckValidPackage(User currentUser, User owner)\nvar indexingService = new Mock<IIndexingService>();\nvar httpContext = new Mock<HttpContextBase>();\nvar httpCachePolicy = new Mock<HttpCachePolicyBase>();\n+ var contentObjectService = new Mock<IContentObjectService>();\n+ contentObjectService\n+ .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n+ .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nindexingService: indexingService,\nhttpContext: httpContext,\n- deprecationService: deprecationService);\n+ deprecationService: deprecationService,\n+ contentObjectService: contentObjectService);\ncontroller.SetCurrentUser(currentUser);\nhttpContext.Setup(c => c.Response.Cache).Returns(httpCachePolicy.Object);\nvar title = \"A test package!\";\n@@ -685,11 +697,17 @@ public async Task GivenAnAbsoluteLatestVersionItReturnsTheFirstLatestSemVer2()\nvar packageService = new Mock<IPackageService>();\nvar indexingService = new Mock<IIndexingService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n+ var contentObjectService = new Mock<IContentObjectService>();\n+ contentObjectService\n+ .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n+ .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nindexingService: indexingService,\n- deprecationService: deprecationService);\n+ deprecationService: deprecationService,\n+ contentObjectService: contentObjectService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\nvar id = \"Foo\";\n@@ -764,11 +782,17 @@ public async Task GivenAnAbsoluteLatestVersionAndNoLatestSemVer2ItFiltersTheList\nvar packageService = new Mock<IPackageService>();\nvar indexingService = new Mock<IIndexingService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n+ var contentObjectService = new Mock<IContentObjectService>();\n+ contentObjectService\n+ .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n+ .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nindexingService: indexingService,\n- deprecationService: deprecationService);\n+ deprecationService: deprecationService,\n+ contentObjectService: contentObjectService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\nvar id = \"Foo\";\n@@ -820,13 +844,20 @@ public async Task GivenAValidPackageWithNoVersionThatTheCurrentUserDoesNotOwnItD\nvar packageService = new Mock<IPackageService>();\nvar indexingService = new Mock<IIndexingService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n+ var contentObjectService = new Mock<IContentObjectService>();\n+ contentObjectService\n+ .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n+ .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nindexingService: indexingService,\n- deprecationService: deprecationService);\n+ deprecationService: deprecationService,\n+ contentObjectService: contentObjectService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\n+\nvar package = new Package()\n{\nPackageRegistration = new PackageRegistration()\n@@ -925,12 +956,18 @@ private async Task<ActionResult> GetResultWithReadMe(string readMeHtml, bool has\nvar indexingService = new Mock<IIndexingService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\nvar fileService = new Mock<IPackageFileService>();\n+ var contentObjectService = new Mock<IContentObjectService>();\n+ contentObjectService\n+ .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n+ .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nindexingService: indexingService,\npackageFileService: fileService,\n- deprecationService: deprecationService);\n+ deprecationService: deprecationService,\n+ contentObjectService: contentObjectService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\nvar id = \"Foo\";\n@@ -983,6 +1020,10 @@ public async Task GetsValidationIssues()\nvar indexingService = new Mock<IIndexingService>();\nvar fileService = new Mock<IPackageFileService>();\nvar validationService = new Mock<IValidationService>();\n+ var contentObjectService = new Mock<IContentObjectService>();\n+ contentObjectService\n+ .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n+ .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\nvar controller = CreateController(\nGetConfigurationService(),\n@@ -990,7 +1031,8 @@ public async Task GetsValidationIssues()\nindexingService: indexingService,\npackageFileService: fileService,\nvalidationService: validationService,\n- deprecationService: deprecationService);\n+ deprecationService: deprecationService,\n+ contentObjectService: contentObjectService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\nvar package = new Package()\n@@ -1046,11 +1088,17 @@ public async Task ShowsAtomFeedIfEnabled(bool isAtomFeedEnabled)\nvar featureFlagService = new Mock<IFeatureFlagService>();\nvar packageService = new Mock<IPackageService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n+ var contentObjectService = new Mock<IContentObjectService>();\n+ contentObjectService\n+ .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n+ .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nfeatureFlagService: featureFlagService,\n- deprecationService: deprecationService);\n+ deprecationService: deprecationService,\n+ contentObjectService: contentObjectService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\nvar id = \"Foo\";\n@@ -1101,11 +1149,18 @@ public async Task DoesNotShowDeprecationToLoggedOutUsers(bool isDeprecationEnabl\nvar featureFlagService = new Mock<IFeatureFlagService>();\nvar packageService = new Mock<IPackageService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n+ var contentObjectService = new Mock<IContentObjectService>();\n+ contentObjectService\n+ .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n+ .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nfeatureFlagService: featureFlagService,\n- deprecationService: deprecationService);\n+ deprecationService: deprecationService,\n+ contentObjectService: contentObjectService\n+ );\nvar id = \"Foo\";\nvar package = new Package()\n@@ -1155,11 +1210,17 @@ public async Task ShowsDeprecationIfEnabled(bool isDeprecationEnabled)\nvar featureFlagService = new Mock<IFeatureFlagService>();\nvar packageService = new Mock<IPackageService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n+ var contentObjectService = new Mock<IContentObjectService>();\n+ contentObjectService\n+ .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n+ .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nfeatureFlagService: featureFlagService,\n- deprecationService: deprecationService);\n+ deprecationService: deprecationService,\n+ contentObjectService: contentObjectService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\nvar id = \"Foo\";\n@@ -1245,12 +1306,18 @@ public async Task SplitsLicenseExpressionWhenProvided()\nindexingService.Setup(i => i.GetLastWriteTime()).Returns(Task.FromResult((DateTime?)DateTime.UtcNow));\n+ var contentObjectService = new Mock<IContentObjectService>();\n+ contentObjectService\n+ .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n+ .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nindexingService: indexingService,\nlicenseExpressionSplitter: splitterMock,\n- deprecationService: deprecationService);\n+ deprecationService: deprecationService,\n+ contentObjectService: contentObjectService);\nvar result = await controller.DisplayPackage(id, version: null);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fixed failing tests
Tests were failing because of GitHub usage section addition |
455,739 | 05.06.2019 16:58:13 | 25,200 | 639072ffd7fe7f36e57d7bd40bba76eca8f332e4 | Fixed PR comments for GitHub Usage
Refactored the code a bit to follow the same style as existing code | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/GitHubCacheTransformer.cs",
"new_path": "src/NuGetGallery.Core/GitHub/GitHubCacheTransformer.cs",
"diff": "@@ -15,17 +15,13 @@ public class GitHubCacheTransformer\n{\nforeach (var dependency in repo.Dependencies)\n{\n- List<RepositoryInformation> packageDependents = null;\n- if (dependentsPerPackage.ContainsKey(dependency))\n- {\n- packageDependents = dependentsPerPackage[dependency];\n- }\n- else\n+ if (!dependentsPerPackage.TryGetValue(dependency, out var packageDependents))\n{\npackageDependents = new List<RepositoryInformation>();\n+ dependentsPerPackage[dependency] = packageDependents;\n}\n+\npackageDependents.Add(repo);\n- dependentsPerPackage[dependency] = packageDependents;\n}\n}\n@@ -34,7 +30,7 @@ public class GitHubCacheTransformer\n{\nentry.Value.Sort(Comparer<RepositoryInformation>.Create((x, y) =>\n{\n- var result = y.CompareTo(x); // Inverted for descending sort order\n+ var result = y.Stars.CompareTo(x.Stars); // Inverted for descending sort order\nif (result != 0)\n{\nreturn result;\n@@ -44,9 +40,7 @@ public class GitHubCacheTransformer\nreturn string.Compare(x.Id, y.Id, true);\n}));\n- var nuGetPackageInformation = new NuGetPackageGitHubInformation();\n- nuGetPackageInformation.TotalRepos = entry.Value.Count;\n- nuGetPackageInformation.Repos = entry.Value.Take(10).ToList().AsReadOnly();\n+ var nuGetPackageInformation = new NuGetPackageGitHubInformation(entry.Value.Count, entry.Value.Take(10).ToList().AsReadOnly());\ngitHubUsageMap[entry.Key] = nuGetPackageInformation;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/NuGetPackageGitHubInformation.cs",
"new_path": "src/NuGetGallery.Core/GitHub/NuGetPackageGitHubInformation.cs",
"diff": "@@ -4,13 +4,16 @@ namespace NuGetGallery.GitHub\n{\npublic class NuGetPackageGitHubInformation\n{\n- public int TotalRepos { get; set; }\n- public IReadOnlyList<RepositoryInformation> Repos { get; set; }\n+ public NuGetPackageGitHubInformation() : this(0, null)\n+ { }\n- public NuGetPackageGitHubInformation()\n+ public NuGetPackageGitHubInformation(int totalRepos, IReadOnlyList<RepositoryInformation> repos)\n{\n- TotalRepos = 0;\n- Repos = null;\n+ TotalRepos = totalRepos;\n+ Repos = repos;\n}\n+\n+ public int TotalRepos { get; }\n+ public IReadOnlyList<RepositoryInformation> Repos { get; }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/RepositoryInformation.cs",
"new_path": "src/NuGetGallery.Core/GitHub/RepositoryInformation.cs",
"diff": "namespace NuGetGallery.GitHub\n{\n- public class RepositoryInformation : IEquatable<RepositoryInformation>, IComparable<RepositoryInformation>\n+ public class RepositoryInformation\n{\n[JsonIgnore]\npublic string Name { get; set; }\n@@ -38,25 +38,5 @@ public RepositoryInformation(string owner, string repoName, string cloneUrl, int\nStars = starCount;\nDependencies = dependencies;\n}\n-\n- public override bool Equals(object obj)\n- {\n- return obj is RepositoryInformation information && Equals(information);\n- }\n-\n- public bool Equals(RepositoryInformation other)\n- {\n- return Url.Equals(other.Url, StringComparison.InvariantCultureIgnoreCase);\n- }\n- public override int GetHashCode()\n- {\n- // Using toLower() to make the hash case insensitive\n- return Url.ToLower().GetHashCode();\n- }\n-\n- public int CompareTo(RepositoryInformation other)\n- {\n- return Stars.CompareTo(other.Stars);\n- }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Features\\FeatureFlagSaveResult.cs\" />\n<Compile Include=\"Features\\IEditableFeatureFlagStorageService.cs\" />\n<Compile Include=\"GitHub\\GitHubCacheTransformer.cs\" />\n+ <Compile Include=\"GitHub\\GitHubUsageConfiguration.cs\" />\n+ <Compile Include=\"GitHub\\IGitHubUsageConfiguration.cs\" />\n<Compile Include=\"GitHub\\KiloFormatExtension.cs\" />\n<Compile Include=\"GitHub\\NuGetPackageGitHubInformation.cs\" />\n<Compile Include=\"GitHub\\RepositoryInformation.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -752,9 +752,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\nmodel.IsPackageDeprecationEnabled = _featureFlagService.IsManageDeprecationEnabled(currentUser);\nmodel.IsGitHubUsageEnabled = _featureFlagService.IsGitHubUsageEnabled(currentUser);\n- var nupkgGitHubDependencies = _contentObjectService.NuGetPackagesGitHubDependencies;\n- model.GitHubDependenciesInformation = nupkgGitHubDependencies.ContainsKey(id) ?\n- nupkgGitHubDependencies[id] : new NuGetPackageGitHubInformation();\n+ model.GitHubDependenciesInformation = _contentObjectService.GitHubUsageConfiguration.GetPackageInformation(id);\nmodel.ReadMeHtml = await _readMeService.GetReadMeHtmlAsync(package);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"new_path": "src/NuGetGallery/Services/ContentObjectService.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n-using System.Linq;\nusing System.Collections.Generic;\nusing System.Threading.Tasks;\nusing Newtonsoft.Json;\nusing NuGetGallery.Services;\n-using Microsoft.Web.XmlTransform;\n-using System.Collections.ObjectModel;\n-using Microsoft.Extensions.Logging.Abstractions;\n-using System.Web.UI.WebControls;\n-using System.Collections;\n-using System.Diagnostics;\nusing NuGetGallery.GitHub;\nnamespace NuGetGallery\n@@ -37,7 +30,7 @@ public ContentObjectService(IContentService contentService)\npublic ICertificatesConfiguration CertificatesConfiguration { get; set; }\npublic ISymbolsConfiguration SymbolsConfiguration { get; set; }\npublic ITyposquattingConfiguration TyposquattingConfiguration { get; set; }\n- public Dictionary<string, NuGetPackageGitHubInformation> NuGetPackagesGitHubDependencies { get; set; }\n+ public IGitHubUsageConfiguration GitHubUsageConfiguration { get; set; }\npublic async Task Refresh()\n{\n@@ -57,14 +50,13 @@ public async Task Refresh()\nawait Refresh<TyposquattingConfiguration>(GalleryConstants.ContentNames.TyposquattingConfiguration) ??\nnew TyposquattingConfiguration();\n+\n+\nIReadOnlyList<RepositoryInformation> reposCache = await Refresh<IReadOnlyList<RepositoryInformation>>(\nGalleryConstants.ContentNames.NuGetPackagesGitHubDependencies) ??\nArray.Empty<RepositoryInformation>();\n- if(reposCache.Any())\n- {\n- NuGetPackagesGitHubDependencies = GitHubCacheTransformer.GetNuGetPackagesDependents(reposCache);\n- }\n+ GitHubUsageConfiguration = new GitHubUsageConfiguration(reposCache);\n}\nprivate async Task<T> Refresh<T>(string contentName)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IContentObjectService.cs",
"new_path": "src/NuGetGallery/Services/IContentObjectService.cs",
"diff": "@@ -14,7 +14,7 @@ public interface IContentObjectService\nICertificatesConfiguration CertificatesConfiguration { get; }\nISymbolsConfiguration SymbolsConfiguration { get; }\nITyposquattingConfiguration TyposquattingConfiguration { get; }\n- Dictionary<string, NuGetPackageGitHubInformation> NuGetPackagesGitHubDependencies { get; }\n+ IGitHubUsageConfiguration GitHubUsageConfiguration { get; }\nTask Refresh();\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fixed PR comments for GitHub Usage
Refactored the code a bit to follow the same style as existing code |
455,739 | 06.06.2019 10:08:37 | 25,200 | 1a24707731d73337db4b2f51ea52cef93d6a2c48 | Moved the css for GitHub Usage section to a css file | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -950,6 +950,12 @@ img.reserved-indicator-icon {\nmargin-right: 8px;\ndisplay: inline-block;\n}\n+.page-package-details .btn-gh-repo {\n+ background-color: white;\n+}\n+.page-package-details .btn-gh-repo:hover {\n+ background-color: #d9edf7;\n+}\n.page-package-details .install-tabs {\nfont-size: 0.8em;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-display-package.less",
"new_path": "src/Bootstrap/less/theme/page-display-package.less",
"diff": "}\n}\n+ .btn-gh-repo {\n+ background-color: white;\n+ }\n+\n+ .btn-gh-repo:hover {\n+ background-color: #d9edf7;\n+ }\n+\n.install-tabs {\nfont-size: 0.8em;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "</a>\n</h2>\n- <style>\n- .btn-gh-repo {\n- background-color: white;\n- }\n-\n- .btn-gh-repo:hover {\n- background-color: #d9edf7;\n- }\n- </style>\n-\nif (Model.GitHubDependenciesInformation.Repos.Any())\n{\n<div class=\"github-usage panel-collapse collapse\" aria-expanded=\"true\" id=\"github-usage\">\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Moved the css for GitHub Usage section to a css file |
455,739 | 06.06.2019 10:08:55 | 25,200 | 807e36040bfa5246ea28d917b1d2ca0139bf89a7 | Added FeatureFlight for GitHub Usage | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"new_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"diff": "\"SiteAdmins\": false,\n\"Accounts\": [],\n\"Domains\": []\n+ },\n+ \"NuGetGallery.GitHubUsage\": {\n+ \"All\": false,\n+ \"SiteAdmins\": false,\n+ \"Accounts\": [\n+ \"test\"\n+ ],\n+ \"Domains\": []\n}\n}\n}\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Added FeatureFlight for GitHub Usage |
455,739 | 06.06.2019 10:48:49 | 25,200 | aae2646d42735b30f94da1a5e52541e4f632b5ab | [GitHub Usage] fixed tests | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -503,8 +503,8 @@ public async Task GivenAValidatingPackageThatTheCurrentUserDoesNotOwnThenHideIt(\nvar httpCachePolicy = new Mock<HttpCachePolicyBase>();\nvar contentObjectService = new Mock<IContentObjectService>();\ncontentObjectService\n- .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n- .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+ .SetupGet(c => c.GitHubUsageConfiguration)\n+ .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\n@@ -636,8 +636,8 @@ private async Task CheckValidPackage(User currentUser, User owner)\nvar httpCachePolicy = new Mock<HttpCachePolicyBase>();\nvar contentObjectService = new Mock<IContentObjectService>();\ncontentObjectService\n- .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n- .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+ .SetupGet(c => c.GitHubUsageConfiguration)\n+ .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\n@@ -699,8 +699,8 @@ public async Task GivenAnAbsoluteLatestVersionItReturnsTheFirstLatestSemVer2()\nvar deprecationService = new Mock<IPackageDeprecationService>();\nvar contentObjectService = new Mock<IContentObjectService>();\ncontentObjectService\n- .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n- .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+ .SetupGet(c => c.GitHubUsageConfiguration)\n+ .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\n@@ -784,8 +784,8 @@ public async Task GivenAnAbsoluteLatestVersionAndNoLatestSemVer2ItFiltersTheList\nvar deprecationService = new Mock<IPackageDeprecationService>();\nvar contentObjectService = new Mock<IContentObjectService>();\ncontentObjectService\n- .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n- .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+ .SetupGet(c => c.GitHubUsageConfiguration)\n+ .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\n@@ -846,8 +846,8 @@ public async Task GivenAValidPackageWithNoVersionThatTheCurrentUserDoesNotOwnItD\nvar deprecationService = new Mock<IPackageDeprecationService>();\nvar contentObjectService = new Mock<IContentObjectService>();\ncontentObjectService\n- .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n- .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+ .SetupGet(c => c.GitHubUsageConfiguration)\n+ .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\n@@ -958,8 +958,8 @@ private async Task<ActionResult> GetResultWithReadMe(string readMeHtml, bool has\nvar fileService = new Mock<IPackageFileService>();\nvar contentObjectService = new Mock<IContentObjectService>();\ncontentObjectService\n- .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n- .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+ .SetupGet(c => c.GitHubUsageConfiguration)\n+ .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\n@@ -1022,8 +1022,8 @@ public async Task GetsValidationIssues()\nvar validationService = new Mock<IValidationService>();\nvar contentObjectService = new Mock<IContentObjectService>();\ncontentObjectService\n- .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n- .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+ .SetupGet(c => c.GitHubUsageConfiguration)\n+ .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\n@@ -1090,8 +1090,8 @@ public async Task ShowsAtomFeedIfEnabled(bool isAtomFeedEnabled)\nvar deprecationService = new Mock<IPackageDeprecationService>();\nvar contentObjectService = new Mock<IContentObjectService>();\ncontentObjectService\n- .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n- .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+ .SetupGet(c => c.GitHubUsageConfiguration)\n+ .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\n@@ -1151,8 +1151,8 @@ public async Task DoesNotShowDeprecationToLoggedOutUsers(bool isDeprecationEnabl\nvar deprecationService = new Mock<IPackageDeprecationService>();\nvar contentObjectService = new Mock<IContentObjectService>();\ncontentObjectService\n- .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n- .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+ .SetupGet(c => c.GitHubUsageConfiguration)\n+ .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\n@@ -1212,8 +1212,8 @@ public async Task ShowsDeprecationIfEnabled(bool isDeprecationEnabled)\nvar deprecationService = new Mock<IPackageDeprecationService>();\nvar contentObjectService = new Mock<IContentObjectService>();\ncontentObjectService\n- .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n- .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+ .SetupGet(c => c.GitHubUsageConfiguration)\n+ .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\n@@ -1308,8 +1308,8 @@ public async Task SplitsLicenseExpressionWhenProvided()\nvar contentObjectService = new Mock<IContentObjectService>();\ncontentObjectService\n- .SetupGet(c => c.NuGetPackagesGitHubDependencies)\n- .Returns(new Dictionary<string, GitHub.NuGetPackageGitHubInformation>());\n+ .SetupGet(c => c.GitHubUsageConfiguration)\n+ .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GitHub Usage] fixed tests |
455,739 | 06.06.2019 10:51:29 | 25,200 | db1efd052d3d097911c6d802c6bcc7a41f92fa81 | [GitHub Usage] Styling | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/RepositoryInformation.cs",
"new_path": "src/NuGetGallery.Core/GitHub/RepositoryInformation.cs",
"diff": "@@ -6,6 +6,18 @@ namespace NuGetGallery.GitHub\n{\npublic class RepositoryInformation\n{\n+ public RepositoryInformation()\n+ { }\n+\n+ public RepositoryInformation(string owner, string repoName, string cloneUrl, int starCount, List<string> dependencies)\n+ {\n+ Owner = owner;\n+ Name = repoName;\n+ Url = cloneUrl;\n+ Stars = starCount;\n+ Dependencies = dependencies;\n+ }\n+\n[JsonIgnore]\npublic string Name { get; set; }\n[JsonIgnore]\n@@ -26,17 +38,5 @@ public string Id\n}\npublic List<string> Dependencies { get; set; } = null;\n-\n- public RepositoryInformation()\n- { }\n-\n- public RepositoryInformation(string owner, string repoName, string cloneUrl, int starCount, List<string> dependencies)\n- {\n- Owner = owner;\n- Name = repoName;\n- Url = cloneUrl;\n- Stars = starCount;\n- Dependencies = dependencies;\n- }\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GitHub Usage] Styling |
455,736 | 06.06.2019 10:59:33 | 25,200 | 9697b48c930d0cac65f1034a93569a23ad398136 | Add deployment ID value to Application Insights telemetry
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/OwinStartup.cs",
"new_path": "src/NuGetGallery/App_Start/OwinStartup.cs",
"diff": "@@ -82,6 +82,7 @@ public static void Configuration(IAppBuilder app)\nTelemetryConfiguration.Active.InstrumentationKey = instrumentationKey;\n// Add enrichers\n+ TelemetryConfiguration.Active.TelemetryInitializers.Add(new DeploymentIdTelemetryEnricher());\nTelemetryConfiguration.Active.TelemetryInitializers.Add(new ClientInformationTelemetryEnricher());\nvar telemetryProcessorChainBuilder = TelemetryConfiguration.Active.TelemetryProcessorChainBuilder;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Services\\ValidationService.cs\" />\n<Compile Include=\"Telemetry\\ClientInformationTelemetryEnricher.cs\" />\n<Compile Include=\"Telemetry\\ClientTelemetryPIIProcessor.cs\" />\n+ <Compile Include=\"Telemetry\\DeploymentIdTelemetryEnricher.cs\" />\n<Compile Include=\"Telemetry\\QuietExceptionLogger.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\CredentialValidator.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\ICredentialValidator.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Services\\PackageDeprecationServiceFacts.cs\" />\n<Compile Include=\"Services\\SearchSideBySideServiceFacts.cs\" />\n<Compile Include=\"Services\\StatusServiceFacts.cs\" />\n+ <Compile Include=\"Telemetry\\DeploymentIdTelemetryEnricherFacts.cs\" />\n<Compile Include=\"TestData\\TestDataResourceUtility.cs\" />\n<Compile Include=\"UsernameValidationRegex.cs\" />\n<Compile Include=\"Extensions\\NumberExtensionsFacts.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add deployment ID value to Application Insights telemetry (#7247)
Address https://github.com/NuGet/NuGetGallery/issues/7250 |
455,736 | 06.06.2019 11:46:32 | 25,200 | 32bf90881fd414a1d90f050740ec1e5d307b579d | Emit Google Analytics click event on middle-mouse click
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common.js",
"diff": "if (window.nuget.isGaAvailable()) {\nga('send', 'event', category, action, label, eventValue, options);\n}\n- }\n+ };\nwindow.nuget = nuget;\n.focus();\n// Handle Google analytics tracking event on specific links.\n- $.each($('a[data-track]'), function () {\n- $(this).click(function (e) {\n+ var emitClickEvent = function (e, emitDirectly) {\n+ if (!window.nuget.isGaAvailable()) {\n+ return;\n+ }\n+\nvar href = $(this).attr('href');\nvar category = $(this).data().track;\nvar trackValue = $(this).data().trackValue;\n- if (window.nuget.isGaAvailable() && href && category) {\n- if (e.altKey || e.ctrlKey || e.metaKey) {\n+ if (href && category) {\n+ if (emitDirectly) {\nwindow.nuget.sendAnalyticsEvent(category, 'click', href, trackValue);\n} else {\n+ // This path is used when the click will result in a page transition. Because of this we need to\n+ // emit telemetry in a special way so that the event gets out before the page transition occurs.\ne.preventDefault();\nwindow.nuget.sendAnalyticsEvent(category, 'click', href, trackValue, {\n'transport': 'beacon',\n});\n}\n}\n+ };\n+ $.each($('a[data-track]'), function () {\n+ $(this).mouseup(function (e) {\n+ if (e.which === 2) { // Middle-mouse click\n+ emitClickEvent.call(this, e, true);\n+ }\n+ });\n+ $(this).click(function (e) {\n+ emitClickEvent.call(this, e, e.altKey || e.ctrlKey || e.metaKey);\n});\n});\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Emit Google Analytics click event on middle-mouse click (#7249)
Address https://github.com/NuGet/NuGetGallery/issues/7248 |
455,739 | 06.06.2019 16:46:06 | 25,200 | dc4cecf5f82f1257e54def9860f3b342246ec50c | [GitHub Usage] Refactored the code to apply Loic's PR comments | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-display-package.less",
"new_path": "src/Bootstrap/less/theme/page-display-package.less",
"diff": "}\n.btn-gh-repo:hover {\n- background-color: #d9edf7;\n+ background-color: @state-info-bg;\n}\n.install-tabs {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/IGitHubUsageConfiguration.cs",
"new_path": "src/NuGetGallery.Core/GitHub/IGitHubUsageConfiguration.cs",
"diff": "{\npublic interface IGitHubUsageConfiguration\n{\n+ /// <summary>\n+ /// Returns a NuGetPackageGitHubInformation object that contains the information about a NuGet package.\n+ /// NOTE: If a packageId has no information, the NuGetPackageGitHubInformation's TotalRepos will be 0 and the Repos list will be null\n+ ///\n+ /// throws an ArgumentException if the packageId is null\n+ /// </summary>\n+ /// <param name=\"packageId\">NuGet package id</param>\n+ /// <returns></returns>\nNuGetPackageGitHubInformation GetPackageInformation(string packageId);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/NuGetPackageGitHubInformation.cs",
"new_path": "src/NuGetGallery.Core/GitHub/NuGetPackageGitHubInformation.cs",
"diff": "@@ -10,7 +10,7 @@ public NuGetPackageGitHubInformation() : this(0, null)\npublic NuGetPackageGitHubInformation(int totalRepos, IReadOnlyList<RepositoryInformation> repos)\n{\nTotalRepos = totalRepos;\n- Repos = repos;\n+ Repos = repos ?? throw new System.ArgumentException(string.Format(\"{0} cannot be null!\", nameof(repos)));\n}\npublic int TotalRepos { get; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Entities\\ReadOnlyModeException.cs\" />\n<Compile Include=\"Entities\\SuspendDbExecutionStrategy.cs\" />\n<Compile Include=\"Extensions\\EntitiesContextExtensions.cs\" />\n+ <Compile Include=\"Extensions\\IntFormatExtensions.cs\" />\n<Compile Include=\"Extensions\\PackageValidationSetExtensions.cs\" />\n<Compile Include=\"Extensions\\StorageExceptionExtensions.cs\" />\n<Compile Include=\"Extensions\\UserExtensionsCore.cs\" />\n<Compile Include=\"Features\\FeatureFlagReference.cs\" />\n<Compile Include=\"Features\\FeatureFlagSaveResult.cs\" />\n<Compile Include=\"Features\\IEditableFeatureFlagStorageService.cs\" />\n- <Compile Include=\"GitHub\\GitHubCacheTransformer.cs\" />\n<Compile Include=\"GitHub\\GitHubUsageConfiguration.cs\" />\n<Compile Include=\"GitHub\\IGitHubUsageConfiguration.cs\" />\n- <Compile Include=\"GitHub\\KiloFormatExtension.cs\" />\n<Compile Include=\"GitHub\\NuGetPackageGitHubInformation.cs\" />\n<Compile Include=\"GitHub\\RepositoryInformation.cs\" />\n<Compile Include=\"ICloudStorageStatusDependency.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"new_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"diff": "\"NuGetGallery.GitHubUsage\": {\n\"All\": false,\n\"SiteAdmins\": false,\n- \"Accounts\": [\n- \"test\"\n- ],\n+ \"Accounts\": [],\n\"Domains\": []\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "{\n<div class=\"github-usage panel-collapse collapse\" aria-expanded=\"true\" id=\"github-usage\">\n<p>\n- About @(NuGetGallery.GitHub.KiloFormatExtension.ToKiloFormat(Model.GitHubDependenciesInformation.TotalRepos)) popular GitHub repositories depend on\n+ About @(Model.GitHubDependenciesInformation.TotalRepos.ToKiloFormat()) popular GitHub repositories depend on\n@(Model.Id), including the following:\n</p>\n<a>@(dep.Id)</a>\n</span>\n<span class=\"badge pull-right\" style=\"background-color: #004880\">\n- @(NuGetGallery.GitHub.KiloFormatExtension.ToKiloFormat(dep.Stars)) <i class=\"ms-Icon ms-Icon--FavoriteStarFill\" aria-hidden=\"true\" style=\"color:#ffac0e\"></i>\n+ @(dep.Stars.ToKiloFormat()) <i class=\"ms-Icon ms-Icon--FavoriteStarFill\" aria-hidden=\"true\" style=\"color:#ffac0e\"></i>\n</span>\n</button>\n</div>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GitHub Usage] Refactored the code to apply Loic's PR comments |
455,739 | 07.06.2019 10:33:51 | 25,200 | 055f5c89d1edb903dd1531af0b3ac32b0ddd339e | [GitHub Usage] Moved ToKiloFormat to NumberExtensions class | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Extensions/NumberExtensions.cs",
"new_path": "src/NuGetGallery/Extensions/NumberExtensions.cs",
"diff": "using System;\nusing System.Globalization;\n+using System.Text;\nnamespace NuGetGallery\n{\n@@ -66,5 +67,40 @@ public static string ToUserFriendlyBytesLabel(this long bytes)\nreturn \"0 bytes\";\n}\n+\n+ /// <summary>\n+ /// Format the number to a 3 digit representation plus a letter to represent the scale (K for kilo, M for mega, or G for giga)\n+ /// </summary>\n+ /// <param name=\"number\"></param>\n+ /// <returns></returns>\n+ public static string ToKiloFormat(this int number)\n+ {\n+ if (number >= 1_000_000_000)\n+ {\n+ return new StringBuilder((number / 1_000_000_000.0f).ToString(\"F3\")) { [4] = 'G' }.ToString();\n+ }\n+\n+ if (number >= 100_000_000)\n+ {\n+ return (number / 1_000_000) + \"M\";\n+ }\n+\n+ if (number >= 1_000_000)\n+ {\n+ return new StringBuilder((number / 1_000_000.0f).ToString(number >= 10_000_000 ? \"F2\" : \"F3\")) { [4] = 'M' }.ToString();\n+ }\n+\n+ if (number >= 100_000)\n+ {\n+ return (number / 1_000) + \"K\";\n+ }\n+\n+ if (number >= 1000)\n+ {\n+ return new StringBuilder((number / 1_000.0f).ToString(number >= 10_000 ? \"F2\" : \"F3\")) { [4] = 'K' }.ToString();\n+ }\n+\n+ return number.ToString(\"#,0\");\n+ }\n}\n}\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GitHub Usage] Moved ToKiloFormat to NumberExtensions class |
455,739 | 07.06.2019 10:34:07 | 25,200 | 2a0e976b1f34efaf541b5d6d3cf457ae58927720 | [GitHub Usage] Added tests for ToKiloFormat | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Entities\\ReadOnlyModeException.cs\" />\n<Compile Include=\"Entities\\SuspendDbExecutionStrategy.cs\" />\n<Compile Include=\"Extensions\\EntitiesContextExtensions.cs\" />\n- <Compile Include=\"Extensions\\IntFormatExtensions.cs\" />\n<Compile Include=\"Extensions\\PackageValidationSetExtensions.cs\" />\n<Compile Include=\"Extensions\\StorageExceptionExtensions.cs\" />\n<Compile Include=\"Extensions\\UserExtensionsCore.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj",
"new_path": "tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj",
"diff": "<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n</ItemGroup>\n+ <ItemGroup>\n+ <Folder Include=\"GitHub\\\" />\n+ </ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n<PropertyGroup>\n<SignPath>..\\..\\build</SignPath>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Extensions/NumberExtensionsFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Extensions/NumberExtensionsFacts.cs",
"diff": "@@ -29,5 +29,33 @@ public void FormatsUsingExpectedUnit(long bytes, string expected)\nAssert.Equal(expected, actual);\n}\n}\n+\n+ public class TheToKiloFormatMethod\n+ {\n+ [Theory]\n+ [InlineData(1, \"1\")]\n+ [InlineData(999, \"999\")]\n+ [InlineData(1000, \"1.00K\")]\n+ [InlineData(1990, \"1.99K\")]\n+ [InlineData(1999, \"1.99K\")]\n+ [InlineData(9990, \"9.99K\")]\n+ [InlineData(9999, \"9.99K\")]\n+ [InlineData(10_000, \"10.0K\")]\n+ [InlineData(10_990, \"10.9K\")]\n+ [InlineData(99_990, \"99.9K\")]\n+ [InlineData(100_000, \"100K\")]\n+ [InlineData(100_990, \"100K\")]\n+ [InlineData(100_999, \"100K\")]\n+ [InlineData(999_000, \"999K\")]\n+ [InlineData(999_999, \"999K\")]\n+ [InlineData(1_000_000, \"1.00M\")]\n+\n+ public void FormatsUsingExpectedUnit(int number, string expected)\n+ {\n+ var actual = NumberExtensions.ToKiloFormat(number);\n+\n+ Assert.Equal(expected, actual);\n+ }\n+ }\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GitHub Usage] Added tests for ToKiloFormat |
455,739 | 07.06.2019 11:22:05 | 25,200 | 74f0c25ed682d595e5c5dacedf8ec013f6506793 | [GH Usage] Moved inline css to a class | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -956,6 +956,9 @@ img.reserved-indicator-icon {\n.page-package-details .btn-gh-repo:hover {\nbackground-color: #d9edf7;\n}\n+.page-package-details .badge-gh-repo {\n+ background-color: #004880;\n+}\n.page-package-details .install-tabs {\nfont-size: 0.8em;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-display-package.less",
"new_path": "src/Bootstrap/less/theme/page-display-package.less",
"diff": "background-color: @state-info-bg;\n}\n+ .badge-gh-repo {\n+ background-color: @navbar-inverse-bg;\n+ }\n+\n.install-tabs {\nfont-size: 0.8em;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "<span class=\"pull-left\">\n<a>@(dep.Id)</a>\n</span>\n- <span class=\"badge pull-right\" style=\"background-color: #004880\">\n+ <span class=\"badge pull-right badge-gh-repo\">\n@(dep.Stars.ToKiloFormat()) <i class=\"ms-Icon ms-Icon--FavoriteStarFill\" aria-hidden=\"true\" style=\"color:#ffac0e\"></i>\n</span>\n</button>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Moved inline css to a class |
455,739 | 07.06.2019 11:22:37 | 25,200 | 52d7ab5442a60d99b0a1f374bdb474a53ad220ea | [GH Usage] Used LinQ to simplify sorting | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"new_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"diff": "@@ -55,22 +55,11 @@ public NuGetPackageGitHubInformation GetPackageInformation(string packageId)\nreturn dependentsPerPackage\n.ToDictionary(\nentry => entry.Key,\n- entry =>\n- {\n- entry.Value.Sort(Comparer<RepositoryInformation>.Create((x, y) =>\n- {\n- var result = y.Stars.CompareTo(x.Stars); // Inverted for descending sort order\n- if (result != 0)\n- {\n- return result;\n- }\n-\n- // Results have the same star count, compare their ids (not inverted) to sort in alphabetical order\n- return string.Compare(x.Id, y.Id, true);\n- }));\n-\n- return new NuGetPackageGitHubInformation(entry.Value.Count, entry.Value.Take(10).ToList().AsReadOnly());\n- },\n+ entry => new NuGetPackageGitHubInformation(\n+ entry.Value.Count,\n+ entry.Value\n+ .OrderByDescending(x => x.Stars)\n+ .ThenBy(x => x.Id).Take(10).ToList()),\nStringComparer.InvariantCultureIgnoreCase);\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Used LinQ to simplify sorting |
455,739 | 07.06.2019 11:23:03 | 25,200 | 0d4f781adae909d788c765ac09865aae98e9e221 | [GH Usage] Fixed nitpick code formatting in the tests | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1159,8 +1159,7 @@ public async Task DoesNotShowDeprecationToLoggedOutUsers(bool isDeprecationEnabl\npackageService: packageService,\nfeatureFlagService: featureFlagService,\ndeprecationService: deprecationService,\n- contentObjectService: contentObjectService\n- );\n+ contentObjectService: contentObjectService);\nvar id = \"Foo\";\nvar package = new Package()\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Fixed nitpick code formatting in the tests |
455,739 | 07.06.2019 11:23:19 | 25,200 | bc02314702c084c9858f637b1f9a6849c26bc7e5 | [GH Usage] Newline in FeatureFlagService | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/FeatureFlagService.cs",
"new_path": "src/NuGetGallery/Services/FeatureFlagService.cs",
"diff": "@@ -70,6 +70,7 @@ public bool IsSearchSideBySideEnabled(User user)\n{\nreturn _client.IsEnabled(SearchSideBySideFlightName, user, defaultValue: false);\n}\n+\npublic bool IsGitHubUsageEnabled(User user)\n{\nreturn _client.IsEnabled(GitHubUsageFlightName, user, defaultValue: false);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Newline in FeatureFlagService |
455,739 | 07.06.2019 11:23:52 | 25,200 | 36abb3c32a86ec9e9b3fc96e1eac673b79e48417 | [GH Usage] Code styling | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/NuGetPackageGitHubInformation.cs",
"new_path": "src/NuGetGallery.Core/GitHub/NuGetPackageGitHubInformation.cs",
"diff": "@@ -20,6 +20,8 @@ public NuGetPackageGitHubInformation(int totalRepos, IReadOnlyList<RepositoryInf\npublic int TotalRepos { get; }\npublic IReadOnlyList<RepositoryInformation> Repos { get; }\n- public static NuGetPackageGitHubInformation EMPTY = new NuGetPackageGitHubInformation(0, Array.Empty<RepositoryInformation>().ToList().AsReadOnly());\n+ public static NuGetPackageGitHubInformation EMPTY = new NuGetPackageGitHubInformation(\n+ 0,\n+ Array.Empty<RepositoryInformation>().ToList().AsReadOnly());\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Code styling |
455,744 | 07.06.2019 12:59:15 | 25,200 | f7a67709780f604c3b60e51cd9c75fabd5f3077e | Enforcing thread safe implementation of `RandomNumberGenerator` for V3Hasher | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Authentication/V3Hasher.cs",
"new_path": "src/NuGetGallery.Services/Authentication/V3Hasher.cs",
"diff": "@@ -14,7 +14,7 @@ namespace NuGetGallery.Infrastructure.Authentication\n/// </summary>\npublic static class V3Hasher\n{\n- private static readonly RandomNumberGenerator DefaultRng = RandomNumberGenerator.Create(); // secure PRNG\n+ private static readonly RNGCryptoServiceProvider DefaultRng = new RNGCryptoServiceProvider();\nprivate const int IterationCount = 10000;\n@@ -86,7 +86,7 @@ public static bool VerifyHash(string hashedData, string providedInput)\nreturn VerifyHash(Convert.FromBase64String(hashedData), providedInput);\n}\n- private static byte[] GenerateHashInternal(string input, RandomNumberGenerator rng, KeyDerivationPrf prf, int iterCount, int saltSize, int numBytesRequested)\n+ private static byte[] GenerateHashInternal(string input, RNGCryptoServiceProvider rng, KeyDerivationPrf prf, int iterCount, int saltSize, int numBytesRequested)\n{\n// Produce a version 3 (see comment above) text hash.\nbyte[] salt = new byte[saltSize];\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Enforcing thread safe implementation of `RandomNumberGenerator` for V3Hasher (#7238) |
455,739 | 07.06.2019 13:26:24 | 25,200 | b2e92126cfdd747e80295d1d6754c1518d9a3aca | [GH Usagfe] _nuGetPackagesGitHubDependencies is no longer a property | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"new_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"diff": "@@ -6,6 +6,8 @@ namespace NuGetGallery.GitHub\n{\npublic class GitHubUsageConfiguration : IGitHubUsageConfiguration\n{\n+ private readonly Dictionary<string, NuGetPackageGitHubInformation> _nuGetPackagesGitHubDependencies;\n+\npublic GitHubUsageConfiguration(IReadOnlyList<RepositoryInformation> repositories)\n{\nif (repositories == null)\n@@ -13,13 +15,11 @@ public GitHubUsageConfiguration(IReadOnlyList<RepositoryInformation> repositorie\nthrow new ArgumentNullException(nameof(repositories));\n}\n- NuGetPackagesGitHubDependencies = repositories.Any()\n+ _nuGetPackagesGitHubDependencies = repositories.Any()\n? GetNuGetPackagesDependents(repositories)\n: new Dictionary<string, NuGetPackageGitHubInformation>();\n}\n- private Dictionary<string, NuGetPackageGitHubInformation> NuGetPackagesGitHubDependencies { get; }\n-\npublic NuGetPackageGitHubInformation GetPackageInformation(string packageId)\n{\nif (packageId == null)\n@@ -27,7 +27,7 @@ public NuGetPackageGitHubInformation GetPackageInformation(string packageId)\nthrow new ArgumentNullException(nameof(packageId));\n}\n- if (NuGetPackagesGitHubDependencies.TryGetValue(packageId, out var value))\n+ if (_nuGetPackagesGitHubDependencies.TryGetValue(packageId, out var value))\n{\nreturn value;\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usagfe] _nuGetPackagesGitHubDependencies is no longer a property |
455,739 | 07.06.2019 13:27:34 | 25,200 | fed2896f9f6bf9146371f7d2f5c9d47d387abe6a | [GH Usage] Updated IGitHubUsageConfiguration's doc | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/IGitHubUsageConfiguration.cs",
"new_path": "src/NuGetGallery.Core/GitHub/IGitHubUsageConfiguration.cs",
"diff": "@@ -4,7 +4,8 @@ public interface IGitHubUsageConfiguration\n{\n/// <summary>\n/// Returns a NuGetPackageGitHubInformation object that contains the information about a NuGet package.\n- /// NOTE: If a packageId has no information, the NuGetPackageGitHubInformation's TotalRepos will be 0 and the Repos list will be null\n+ /// NOTE: If a packageId has no information, the NuGetPackageGitHubInformation's TotalRepos will be 0\n+ /// and the Repos list will be empty\n///\n/// throws an ArgumentException if the packageId is null\n/// </summary>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Updated IGitHubUsageConfiguration's doc |
455,739 | 07.06.2019 13:35:02 | 25,200 | 814781d6c63cb9fcdf40aaf61bfca862791fb8f6 | [GH Usage] Static variable styling | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/NuGetPackageGitHubInformation.cs",
"new_path": "src/NuGetGallery.Core/GitHub/NuGetPackageGitHubInformation.cs",
"diff": "@@ -6,6 +6,10 @@ namespace NuGetGallery.GitHub\n{\npublic class NuGetPackageGitHubInformation\n{\n+ public readonly static NuGetPackageGitHubInformation Empty = new NuGetPackageGitHubInformation(\n+ 0,\n+ new List<RepositoryInformation>());\n+\npublic NuGetPackageGitHubInformation(int totalRepos, IReadOnlyList<RepositoryInformation> repos)\n{\nif (totalRepos < 0)\n@@ -19,9 +23,5 @@ public NuGetPackageGitHubInformation(int totalRepos, IReadOnlyList<RepositoryInf\npublic int TotalRepos { get; }\npublic IReadOnlyList<RepositoryInformation> Repos { get; }\n-\n- public static NuGetPackageGitHubInformation EMPTY = new NuGetPackageGitHubInformation(\n- 0,\n- Array.Empty<RepositoryInformation>().ToList().AsReadOnly());\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Static variable styling |
455,739 | 07.06.2019 13:37:52 | 25,200 | ebfc29f19917e62ec3dc2b57a02f15d3416b9936 | [GH Usage] Extracted Star color to css file | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -959,6 +959,9 @@ img.reserved-indicator-icon {\n.page-package-details .badge-gh-repo {\nbackground-color: #004880;\n}\n+.page-package-details .star-gh-repo {\n+ color: #ffac0e;\n+}\n.page-package-details .install-tabs {\nfont-size: 0.8em;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-display-package.less",
"new_path": "src/Bootstrap/less/theme/page-display-package.less",
"diff": "background-color: @navbar-inverse-bg;\n}\n+ .star-gh-repo {\n+ color: #ffac0e;\n+ }\n+\n.install-tabs {\nfont-size: 0.8em;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "<a>@(dep.Id)</a>\n</span>\n<span class=\"badge pull-right badge-gh-repo\">\n- @(dep.Stars.ToKiloFormat()) <i class=\"ms-Icon ms-Icon--FavoriteStarFill\" aria-hidden=\"true\" style=\"color:#ffac0e\"></i>\n+ @(dep.Stars.ToKiloFormat()) <i class=\"ms-Icon ms-Icon--FavoriteStarFill star-gh-repo\" aria-hidden=\"true\"></i>\n</span>\n</button>\n</div>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Extracted Star color to css file |
455,747 | 07.06.2019 13:48:07 | 25,200 | 9b746db8941a14dda77f2eb9933569a85651cbb8 | Allow published symbols to be downloaded after re-upload failures and Blog updates | [
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Entities/Extensions/PackageExtensions.cs",
"new_path": "src/NuGet.Services.Entities/Extensions/PackageExtensions.cs",
"diff": "@@ -14,10 +14,22 @@ public static class PackageExtensions\n/// <returns>The latest symbol package if present, null otherwise</returns>\npublic static SymbolPackage LatestSymbolPackage(this Package package)\n{\n- return package\n- .SymbolPackages?\n- .OrderByDescending(sp => sp.Created)\n- .FirstOrDefault();\n+ return package.GetSymbolsPackagesInReverseOrder()?.FirstOrDefault();\n+ }\n+\n+ /// <summary>\n+ /// Get the last successfully uploaded symbols package for the given package.\n+ /// </summary>\n+ /// <param name=\"package\"><see cref=\"Package\"/> for which latest symbol package is to be retrieved.</param>\n+ /// <returns>The last available symbol package if present, null otherwise</returns>\n+ public static SymbolPackage LatestAvailableSymbolPackage(this Package package)\n+ {\n+ return package.GetSymbolsPackagesInReverseOrder()?.FirstOrDefault(sp => sp.StatusKey == PackageStatus.Available);\n+ }\n+\n+ private static IOrderedEnumerable<SymbolPackage> GetSymbolsPackagesInReverseOrder(this Package package)\n+ {\n+ return package.SymbolPackages?.OrderByDescending(sp => sp.Created);\n}\n/// <summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -198,6 +198,11 @@ protected internal async Task<ActionResult> GetPackageInternal(string id, string\nif (isSymbolPackage)\n{\npackage = PackageService.FindPackageByIdAndVersionStrict(id, version);\n+\n+ if (package == null)\n+ {\n+ return new HttpStatusCodeWithBodyResult(HttpStatusCode.NotFound, string.Format(CultureInfo.CurrentCulture, Strings.PackageWithIdAndVersionNotFound, id, version));\n+ }\n}\n}\nelse\n@@ -235,12 +240,9 @@ protected internal async Task<ActionResult> GetPackageInternal(string id, string\nif (isSymbolPackage)\n{\n- var latestSymbolPackage = package?\n- .SymbolPackages\n- .OrderByDescending(sp => sp.Created)\n- .FirstOrDefault();\n+ var latestAvailableSymbolsPackage = package.LatestAvailableSymbolPackage();\n- if (latestSymbolPackage == null || latestSymbolPackage.StatusKey != PackageStatus.Available)\n+ if (latestAvailableSymbolsPackage == null)\n{\nreturn new HttpStatusCodeWithBodyResult(HttpStatusCode.NotFound, string.Format(CultureInfo.CurrentCulture, Strings.SymbolsPackage_PackageNotAvailable, id, version));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -35,6 +35,9 @@ public DisplayPackageViewModel(Package package, User currentUser, PackageDepreca\nPackageFileSize = package.PackageFileSize;\nLatestSymbolsPackage = package.LatestSymbolPackage();\n+ LatestAvailableSymbolsPackage = LatestSymbolsPackage != null && LatestSymbolsPackage.StatusKey == PackageStatus.Available\n+ ? LatestSymbolsPackage\n+ : package.LatestAvailableSymbolPackage();\nif (packageHistory.Any())\n{\n@@ -114,6 +117,7 @@ private DisplayPackageViewModel(Package package, User currentUser, string pushed\npublic int TotalDaysSinceCreated { get; private set; }\npublic long PackageFileSize { get; private set; }\npublic SymbolPackage LatestSymbolsPackage { get; private set; }\n+ public SymbolPackage LatestAvailableSymbolsPackage { get; private set; }\npublic bool HasSemVer2Version { get; }\npublic bool HasSemVer2Dependency { get; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "var absolutePackageUrl = Url.Absolute(Url.Package(Model.Id));\n- var hasSymbolsPackageAvailable = Model.LatestSymbolsPackage != null && Model.LatestSymbolsPackage.StatusKey == PackageStatus.Available;\n+ var hasSymbolsPackageAvailable = Model.LatestAvailableSymbolsPackage != null;\nvar showSymbolsPackageStatus = Model.LatestSymbolsPackage != null && Model.LatestSymbolsPackage.StatusKey != PackageStatus.Available;\nPackageManagerViewModel[] packageManagers;\n</div>\n}\n+@helper AppendAvailableSymbolsMessage(bool hasSymbolsPackageAvailable)\n+{\n+ if(hasSymbolsPackageAvailable)\n+ {\n+ <br /><br />\n+ <text><b>Please note:</b> The last successfully published symbols package is still available for debugging and download.</text>\n+ }\n+}\n+\n@* The following two helpers must be on a single line each so no extra whitespace is introduced in the expression when rendered. *@\n@* Helpers themselves are needed not to introduce that extra whitespce, which happens if they are inlined. *@\n@helper MakeLicenseLink(CompositeLicenseExpressionSegment segment) {<a href=\"@LicenseExpressionRedirectUrlHelper.GetLicenseExpressionRedirectUrl(segment.Value)\">@segment.Value</a>}\[email protected](Model.HasSemVer2Version, Model.HasSemVer2Dependency)\n}\n- @if (showSymbolsPackageStatus)\n+ @if (Model.CanDisplayPrivateMetadata && showSymbolsPackageStatus)\n{\nif (Model.LatestSymbolsPackage.StatusKey == PackageStatus.Validating)\n{\n<strong>The symbols for this package have not been indexed yet.</strong> They are not available\nfor download from the NuGet.org symbol server. Symbols will be available for download after both validation and indexing are complete.\nSymbols validation and indexing may take up to an hour. <a href=\"https://aka.ms/NuGetSymbolsPackageValidation\">Read more</a>.\n+\n+ @AppendAvailableSymbolsMessage(hasSymbolsPackageAvailable)\n</text>\n)\n}\n{\n<text>Please contact <a href=\"mailto:[email protected]\">[email protected]</a> to help fix your symbols package.</text>\n}\n+\n+ @AppendAvailableSymbolsMessage(hasSymbolsPackageAvailable)\n</text>)\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "}\n@DisplayNavigationItem(\"Documentation\", \"https://docs.microsoft.com/en-us/nuget/what-is-nuget\")\n@DisplayNavigationItem(\"Downloads\", Url.Downloads())\n- @DisplayNavigationItem(\"Blog\", \"https://blog.nuget.org/\")\n+ @DisplayNavigationItem(\"Blog\", \"https://devblogs.microsoft.com/nuget/\")\n</ul>\n@if (ShowAuthInHeader)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -1724,7 +1724,7 @@ public async Task GetPackageReturns404ForSymbolPackageIfPackageIsNotFound()\n[InlineData(PackageStatus.Deleted)]\n[InlineData(PackageStatus.FailedValidation)]\n[InlineData(PackageStatus.Validating)]\n- public async Task GetPackageReturns404ForNotAvailableLatestSymbolPackage(PackageStatus status)\n+ public async Task GetPackageReturnsLastAvailableSymbolPackage(PackageStatus status)\n{\n// Arrange\nconst string packageId = \"Baz\";\n@@ -1751,12 +1751,17 @@ public async Task GetPackageReturns404ForNotAvailableLatestSymbolPackage(Package\ncontroller.MockPackageService\n.Setup(x => x.FindPackageByIdAndVersionStrict(packageId, packageVersion))\n.Returns(package).Verifiable();\n+ controller.MockSymbolPackageFileService\n+ .Setup(x => x.CreateDownloadSymbolPackageActionResultAsync(It.IsAny<Uri>(), packageId, packageVersion))\n+ .Returns(Task.FromResult<ActionResult>(new HttpStatusCodeWithBodyResult(HttpStatusCode.OK, \"Test package\")))\n+ .Verifiable();\n// Act\nvar result = (HttpStatusCodeWithBodyResult)await controller.GetPackageInternal(packageId, packageVersion, isSymbolPackage: true);\n// Assert\n- Assert.Equal((int)HttpStatusCode.NotFound, result.StatusCode);\n+ Assert.Equal((int)HttpStatusCode.OK, result.StatusCode);\n+ controller.MockSymbolPackageFileService.Verify();\n}\n[Theory]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Allow published symbols to be downloaded after re-upload failures and Blog updates (#7252) |
455,739 | 07.06.2019 15:10:38 | 25,200 | b6724bc1c911f54ba089183157754a2e1599d14d | [GH Usage] Fixed compile issues
Forgot to use the new Empty static readonly | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"new_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"diff": "@@ -6,6 +6,7 @@ namespace NuGetGallery.GitHub\n{\npublic class GitHubUsageConfiguration : IGitHubUsageConfiguration\n{\n+ public const int ReposPerPackage = 10;\nprivate readonly Dictionary<string, NuGetPackageGitHubInformation> _nuGetPackagesGitHubDependencies;\npublic GitHubUsageConfiguration(IReadOnlyList<RepositoryInformation> repositories)\n@@ -32,7 +33,7 @@ public NuGetPackageGitHubInformation GetPackageInformation(string packageId)\nreturn value;\n}\n- return NuGetPackageGitHubInformation.EMPTY;\n+ return NuGetPackageGitHubInformation.Empty;\n}\nprivate static Dictionary<string, NuGetPackageGitHubInformation> GetNuGetPackagesDependents(IReadOnlyList<RepositoryInformation> repositories)\n@@ -59,7 +60,7 @@ public NuGetPackageGitHubInformation GetPackageInformation(string packageId)\nentry.Value.Count,\nentry.Value\n.OrderByDescending(x => x.Stars)\n- .ThenBy(x => x.Id).Take(10).ToList()),\n+ .ThenBy(x => x.Id).Take(ReposPerPackage).ToList()),\nStringComparer.InvariantCultureIgnoreCase);\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Fixed compile issues
Forgot to use the new Empty static readonly |
455,739 | 07.06.2019 15:11:27 | 25,200 | c44dac4b9ec521c6c36363398e3e0d429c2caced | [GH Usage] Added tests for GitHubUsageConfiguration | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj",
"new_path": "tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj",
"diff": "<Compile Include=\"Cookies\\CookieComplianceServiceBaseFacts.cs\" />\n<Compile Include=\"Features\\FeatureFlagClientExtensionsFacts.cs\" />\n<Compile Include=\"Features\\FeatureFlagFileStorageServiceFacts.cs\" />\n+ <Compile Include=\"GitHub\\GitHubUsageConfigurationFacts.cs\" />\n<Compile Include=\"Infrastructure\\ElmahExceptionFacts.cs\" />\n<Compile Include=\"Extensions\\UserExtensionsCoreFacts.cs\" />\n<Compile Include=\"Infrastructure\\Mail\\Messages\\MarkdownMessageBuilderFacts.cs\" />\n<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n</ItemGroup>\n- <ItemGroup>\n- <Folder Include=\"GitHub\\\" />\n- </ItemGroup>\n+ <ItemGroup />\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n<PropertyGroup>\n<SignPath>..\\..\\build</SignPath>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Added tests for GitHubUsageConfiguration |
455,776 | 07.06.2019 15:16:35 | 25,200 | a9171b28e05a1e33b1ebf63edf10ed22bf17965d | Add "PackageDeprecate" telemetry event | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Telemetry/ITelemetryService.cs",
"new_path": "src/NuGetGallery.Services/Telemetry/ITelemetryService.cs",
"diff": "@@ -34,6 +34,13 @@ public interface ITelemetryService\nvoid TrackPackageRevalidate(Package package);\n+ void TrackPackageDeprecate(\n+ IReadOnlyList<Package> packages,\n+ PackageDeprecationStatus status,\n+ PackageRegistration alternateRegistration,\n+ Package alternatePackage,\n+ bool hasCustomMessage);\n+\nvoid TrackPackageReadMeChangeEvent(Package package, string readMeSourceType, PackageEditReadMeState readMeState);\nvoid TrackCreatePackageVerificationKeyEvent(string packageId, string packageVersion, User user, IIdentity identity);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs",
"diff": "@@ -17,18 +17,15 @@ namespace NuGetGallery\npublic partial class ManageDeprecationJsonApiController\n: AppController\n{\n- private readonly IAuditingService _auditingService;\nprivate readonly IPackageService _packageService;\nprivate readonly IPackageDeprecationService _deprecationService;\nprivate readonly IFeatureFlagService _featureFlagService;\npublic ManageDeprecationJsonApiController(\n- IAuditingService auditingService,\nIPackageService packageService,\nIPackageDeprecationService deprecationService,\nIFeatureFlagService featureFlagService)\n{\n- _auditingService = auditingService ?? throw new ArgumentNullException(nameof(auditingService));\n_packageService = packageService ?? throw new ArgumentNullException(nameof(packageService));\n_deprecationService = deprecationService ?? throw new ArgumentNullException(nameof(deprecationService));\n_featureFlagService = featureFlagService ?? throw new ArgumentNullException(nameof(featureFlagService));\n@@ -169,16 +166,6 @@ public virtual JsonResult GetAlternatePackageVersions(string id)\ncustomMessage,\ncurrentUser);\n- foreach (var packageToUpdate in packagesToUpdate)\n- {\n- await _auditingService.SaveAuditRecordAsync(\n- new PackageAuditRecord(\n- packageToUpdate,\n- status == PackageDeprecationStatus.NotDeprecated ? AuditedPackageAction.Undeprecate : AuditedPackageAction.Deprecate,\n- status == PackageDeprecationStatus.NotDeprecated ? PackageUndeprecatedVia.Web : PackageDeprecatedVia.Web));\n-\n- }\n-\nreturn Json(HttpStatusCode.OK);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageDeprecationService.cs",
"new_path": "src/NuGetGallery/Services/PackageDeprecationService.cs",
"diff": "using System.Linq;\nusing System.Threading.Tasks;\nusing NuGet.Services.Entities;\n+using NuGetGallery.Auditing;\nnamespace NuGetGallery\n{\n@@ -14,16 +15,19 @@ public class PackageDeprecationService : IPackageDeprecationService\n{\nprivate readonly IEntitiesContext _entitiesContext;\nprivate readonly IPackageUpdateService _packageUpdateService;\n- private readonly IIndexingService _indexingService;\n+ private readonly ITelemetryService _telemetryService;\n+ private readonly IAuditingService _auditingService;\npublic PackageDeprecationService(\nIEntitiesContext entitiesContext,\nIPackageUpdateService packageUpdateService,\n- IIndexingService indexingService)\n+ ITelemetryService telemetryService,\n+ IAuditingService auditingService)\n{\n_entitiesContext = entitiesContext ?? throw new ArgumentNullException(nameof(entitiesContext));\n_packageUpdateService = packageUpdateService ?? throw new ArgumentNullException(nameof(packageUpdateService));\n- _indexingService = indexingService ?? throw new ArgumentNullException(nameof(indexingService));\n+ _telemetryService = telemetryService ?? throw new ArgumentNullException(nameof(telemetryService));\n+ _auditingService = auditingService ?? throw new ArgumentNullException(nameof(auditingService));\n}\npublic async Task UpdateDeprecation(\n@@ -103,6 +107,22 @@ public class PackageDeprecationService : IPackageDeprecationService\nawait _packageUpdateService.UpdatePackagesAsync(packages);\ntransaction.Commit();\n+\n+ _telemetryService.TrackPackageDeprecate(\n+ packages,\n+ status,\n+ alternatePackageRegistration,\n+ alternatePackage,\n+ !string.IsNullOrWhiteSpace(customMessage));\n+\n+ foreach (var package in packages)\n+ {\n+ await _auditingService.SaveAuditRecordAsync(\n+ new PackageAuditRecord(\n+ package,\n+ status == PackageDeprecationStatus.NotDeprecated ? AuditedPackageAction.Undeprecate : AuditedPackageAction.Deprecate,\n+ status == PackageDeprecationStatus.NotDeprecated ? PackageUndeprecatedVia.Web : PackageDeprecatedVia.Web));\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "using System.Net.Http;\nusing System.Security.Principal;\nusing System.Web;\n+using System.Web.Helpers;\nusing Newtonsoft.Json;\nusing NuGet.Services.Entities;\nusing NuGet.Services.FeatureFlags;\n@@ -39,6 +40,7 @@ internal class Events\npublic const string PackageUnlisted = \"PackageUnlisted\";\npublic const string PackageListed = \"PackageListed\";\npublic const string PackageDelete = \"PackageDelete\";\n+ public const string PackageDeprecate = \"PackageDeprecate\";\npublic const string PackageReupload = \"PackageReupload\";\npublic const string PackageHardDeleteReflow = \"PackageHardDeleteReflow\";\npublic const string PackageRevalidate = \"PackageRevalidate\";\n@@ -96,7 +98,7 @@ internal class Events\n// ODataCustomQuery properties\npublic const string IsCustomQuery = \"IsCustomQuery\";\n- // Package push properties\n+ // Package event properties\npublic const string AuthenticationMethod = \"AuthenticationMethod\";\npublic const string ClientVersion = \"ClientVersion\";\npublic const string ProtocolVersion = \"ProtocolVersion\";\n@@ -106,6 +108,13 @@ internal class Events\npublic const string KeyCreationDate = \"KeyCreationDate\";\npublic const string PackageId = \"PackageId\";\npublic const string PackageVersion = \"PackageVersion\";\n+ public const string PackageVersions = \"PackageVersions\";\n+\n+ // Package deprecate properties\n+ public const string DeprecationReason = \"PackageDeprecationReason\";\n+ public const string DeprecationAlternatePackageId = \"PackageDeprecationAlternatePackageId\";\n+ public const string DeprecationAlternatePackageVersion = \"PackageDeprecationAlternatePackageVersion\";\n+ public const string DeprecationCustomMessage = \"PackageDeprecationCustomMessage\";\n// User properties\npublic const string RegistrationMethod = \"RegistrationMethod\";\n@@ -392,6 +401,25 @@ public void TrackPackageRevalidate(Package package)\nTrackMetricForPackage(Events.PackageRevalidate, package);\n}\n+ public void TrackPackageDeprecate(\n+ IReadOnlyList<Package> packages,\n+ PackageDeprecationStatus status,\n+ PackageRegistration alternateRegistration,\n+ Package alternatePackage,\n+ bool hasCustomMessage)\n+ {\n+ TrackMetricForPackageVersions(\n+ Events.PackageDeprecate,\n+ packages,\n+ properties =>\n+ {\n+ properties.Add(DeprecationReason, ((int)status).ToString());\n+ properties.Add(DeprecationAlternatePackageId, alternateRegistration?.Id ?? alternatePackage?.Id);\n+ properties.Add(DeprecationAlternatePackageVersion, alternatePackage?.NormalizedVersion);\n+ properties.Add(DeprecationCustomMessage, hasCustomMessage.ToString());\n+ });\n+ }\n+\npublic void TrackPackageMetadataComplianceError(string packageId, string packageVersion, IEnumerable<string> complianceFailures)\n{\nTrackMetricForPackage(\n@@ -648,6 +676,39 @@ private static string GetApiKeyCreationDate(User user, IIdentity identity)\n});\n}\n+ private void TrackMetricForPackageVersions(\n+ string metricName,\n+ IReadOnlyList<Package> packages,\n+ Action<Dictionary<string, string>> addProperties = null)\n+ {\n+ if (packages == null || !packages.Any() || packages.Select(p => p.PackageRegistrationKey).Distinct().Count() > 1)\n+ {\n+ throw new ArgumentException(nameof(packages));\n+ }\n+\n+ TrackMetricForPackageVersions(\n+ metricName,\n+ packages.First().PackageRegistration.Id,\n+ packages.Select(p => p.NormalizedVersion).ToList(),\n+ addProperties);\n+ }\n+\n+ private void TrackMetricForPackageVersions(\n+ string metricName,\n+ string packageId,\n+ IReadOnlyList<string> packageVersions,\n+ Action<Dictionary<string, string>> addProperties = null)\n+ {\n+ TrackMetric(metricName, packageVersions.Count(), properties => {\n+ properties.Add(ClientVersion, GetClientVersion());\n+ properties.Add(ProtocolVersion, GetProtocolVersion());\n+ properties.Add(ClientInformation, GetClientInformation());\n+ properties.Add(PackageId, packageId);\n+ properties.Add(PackageVersion, BuildArrayProperty(packageVersions));\n+ addProperties?.Invoke(properties);\n+ });\n+ }\n+\npublic void TrackUserPackageDeleteChecked(UserPackageDeleteEvent details, UserPackageDeleteOutcome outcome)\n{\nif (details == null)\n@@ -727,7 +788,7 @@ public void TrackAccountDeletionCompleted(User deletedUser, User deletedBy, bool\n}\nTrackMetric(Events.AccountDeleteCompleted, 1, properties => {\n- properties.Add(AccountDeletedByRole, string.Join(\",\", deletedBy.Roles?.Select( role => role.Name) ?? new List<string>()));\n+ properties.Add(AccountDeletedByRole, BuildArrayProperty(deletedBy.Roles?.Select(role => role.Name) ?? new string[0]));\nproperties.Add(AccountIsSelfDeleted, $\"{deletedUser.Key == deletedBy.Key}\");\nproperties.Add(AccountDeletedIsOrganization, $\"{deletedUser is Organization}\");\nproperties.Add(AccountDeleteSucceeded, $\"{success}\");\n@@ -766,7 +827,7 @@ public void TrackSendEmail(string smtpUri, DateTimeOffset startTime, TimeSpan du\nTrackMetric(Events.TyposquattingCheckResultAndTotalTimeInMs, totalTime.TotalMilliseconds, properties => {\nproperties.Add(PackageId, packageId);\nproperties.Add(WasUploadBlocked, wasUploadBlocked.ToString());\n- properties.Add(CollisionPackageIds, string.Join(\",\", collisionPackageIds.Take(TyposquattingCollisionIdsMaxPropertyValue)));\n+ properties.Add(CollisionPackageIds, BuildArrayProperty(collisionPackageIds.Take(TyposquattingCollisionIdsMaxPropertyValue)));\nproperties.Add(CollisionPackageIdsCount, collisionPackageIds.Count.ToString());\nproperties.Add(CheckListLength, checkListLength.ToString());\nproperties.Add(HasExtraCollisionPackageIds, (collisionPackageIds.Count > TyposquattingCollisionIdsMaxPropertyValue).ToString());\n@@ -900,5 +961,10 @@ protected virtual void TrackMetric(string metricName, double value, Action<Dicti\n_telemetryClient.TrackMetric(metricName, value, telemetryProperties);\n}\n+\n+ private string BuildArrayProperty(IEnumerable<string> list)\n+ {\n+ return JsonConvert.SerializeObject(list);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ManageDeprecationJsonApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ManageDeprecationJsonApiControllerFacts.cs",
"diff": "@@ -831,8 +831,6 @@ public enum ReturnsSuccessful_AlternatePackage_State\n.Completes()\n.Verifiable();\n- var auditingService = GetService<IAuditingService>();\n-\nvar controller = GetController<ManageDeprecationJsonApiController>();\ncontroller.SetCurrentUser(currentUser);\n@@ -852,31 +850,6 @@ public enum ReturnsSuccessful_AlternatePackage_State\n// Assert\nAssertSuccessResponse(controller);\n- if (expectedStatus == PackageDeprecationStatus.NotDeprecated)\n- {\n- foreach (var normalizedVersion in packageNormalizedVersions)\n- {\n- auditingService.WroteRecord<PackageAuditRecord>(\n- r => r.Action == AuditedPackageAction.Undeprecate\n- && r.Reason == PackageUndeprecatedVia.Web\n- && r.DeprecationRecord == null\n- && r.Id == id\n- && r.PackageRecord.NormalizedVersion == normalizedVersion);\n- }\n- }\n- else\n- {\n- foreach (var normalizedVersion in packageNormalizedVersions)\n- {\n- auditingService.WroteRecord<PackageAuditRecord>(\n- r => r.Action == AuditedPackageAction.Deprecate\n- && r.Reason == PackageDeprecatedVia.Web\n- && r.DeprecationRecord.Status == (int)expectedStatus\n- && r.Id == id\n- && r.PackageRecord.NormalizedVersion == normalizedVersion);\n- }\n- }\n-\nfeatureFlagService.Verify();\npackageService.Verify();\ndeprecationService.Verify();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageDeprecationServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageDeprecationServiceFacts.cs",
"diff": "using System.Threading.Tasks;\nusing Moq;\nusing NuGet.Services.Entities;\n+using NuGetGallery.Auditing;\nusing NuGetGallery.Framework;\nusing Xunit;\n@@ -61,27 +62,32 @@ public async Task ThrowsIfPackagesHaveDifferentRegistrations()\npublic async Task DeletesExistingDeprecationsIfStatusNotDeprecated()\n{\n// Arrange\n- var registration = new PackageRegistration { Id = \"theId\" };\n+ var id = \"theId\";\n+ var registration = new PackageRegistration { Id = id };\nvar packageWithDeprecation1 = new Package\n{\nPackageRegistration = registration,\n+ NormalizedVersion = \"1.0.0\",\nDeprecations = new List<PackageDeprecation> { new PackageDeprecation() }\n};\nvar packageWithoutDeprecation1 = new Package\n{\n- PackageRegistration = registration\n+ PackageRegistration = registration,\n+ NormalizedVersion = \"2.0.0\"\n};\nvar packageWithDeprecation2 = new Package\n{\nPackageRegistration = registration,\n+ NormalizedVersion = \"3.0.0\",\nDeprecations = new List<PackageDeprecation> { new PackageDeprecation() }\n};\nvar packageWithoutDeprecation2 = new Package\n{\n- PackageRegistration = registration\n+ PackageRegistration = registration,\n+ NormalizedVersion = \"4.0.0\"\n};\nvar packages = new[]\n@@ -115,6 +121,13 @@ public async Task DeletesExistingDeprecationsIfStatusNotDeprecated()\n.Returns(Task.CompletedTask)\n.Verifiable();\n+ var auditingService = GetService<IAuditingService>();\n+\n+ var telemetryService = GetMock<ITelemetryService>();\n+ telemetryService\n+ .Setup(x => x.TrackPackageDeprecate(packages, PackageDeprecationStatus.NotDeprecated, null, null, false))\n+ .Verifiable();\n+\nvar user = new User { Key = 1 };\nvar service = Get<PackageDeprecationService>();\n@@ -132,10 +145,18 @@ public async Task DeletesExistingDeprecationsIfStatusNotDeprecated()\nAssert.Equal(0, context.Deprecations.Count());\npackageUpdateService.Verify();\ntransactionMock.Verify();\n+ telemetryService.Verify();\nforeach (var package in packages)\n{\nAssert.Empty(package.Deprecations);\n+\n+ auditingService.WroteRecord<PackageAuditRecord>(\n+ r => r.Action == AuditedPackageAction.Undeprecate\n+ && r.Reason == PackageUndeprecatedVia.Web\n+ && r.DeprecationRecord == null\n+ && r.Id == id\n+ && r.PackageRecord.NormalizedVersion == package.NormalizedVersion);\n}\n}\n@@ -143,23 +164,30 @@ public async Task DeletesExistingDeprecationsIfStatusNotDeprecated()\npublic async Task ReplacesExistingDeprecations()\n{\n// Arrange\n- var registration = new PackageRegistration { Id = \"theId\" };\nvar lastTimestamp = new DateTime(2019, 3, 4);\n+ var id = \"theId\";\n+ var registration = new PackageRegistration { Id = id };\nvar packageWithDeprecation1 = new Package\n{\nPackageRegistration = registration,\n- Deprecations = new List<PackageDeprecation> { new PackageDeprecation() }\n+ NormalizedVersion = \"1.0.0\",\n+ Deprecations = new List<PackageDeprecation> { new PackageDeprecation() },\n+ LastEdited = lastTimestamp\n};\nvar packageWithoutDeprecation1 = new Package\n{\n- PackageRegistration = registration\n+ PackageRegistration = registration,\n+ NormalizedVersion = \"2.0.0\",\n+ LastEdited = lastTimestamp\n};\nvar packageWithDeprecation2 = new Package\n{\nPackageRegistration = registration,\n+ NormalizedVersion = \"3.0.0\",\n+ LastEdited = lastTimestamp,\nDeprecations = new List<PackageDeprecation>\n{\nnew PackageDeprecation\n@@ -170,12 +198,16 @@ public async Task ReplacesExistingDeprecations()\nvar packageWithoutDeprecation2 = new Package\n{\n- PackageRegistration = registration\n+ PackageRegistration = registration,\n+ NormalizedVersion = \"4.0.0\",\n+ LastEdited = lastTimestamp\n};\nvar packageWithDeprecation3 = new Package\n{\nPackageRegistration = registration,\n+ NormalizedVersion = \"5.0.0\",\n+ LastEdited = lastTimestamp,\nDeprecations = new List<PackageDeprecation>\n{\nnew PackageDeprecation\n@@ -216,13 +248,20 @@ public async Task ReplacesExistingDeprecations()\n.Returns(Task.CompletedTask)\n.Verifiable();\n- var service = Get<PackageDeprecationService>();\n+ var auditingService = GetService<IAuditingService>();\nvar status = (PackageDeprecationStatus)99;\nvar alternatePackageRegistration = new PackageRegistration();\nvar alternatePackage = new Package();\n+ var telemetryService = GetMock<ITelemetryService>();\n+ telemetryService\n+ .Setup(x => x.TrackPackageDeprecate(packages, status, alternatePackageRegistration, alternatePackage, true))\n+ .Verifiable();\n+\n+ var service = Get<PackageDeprecationService>();\n+\nvar customMessage = \"message\";\nvar user = new User { Key = 1 };\n@@ -240,6 +279,7 @@ public async Task ReplacesExistingDeprecations()\ndatabaseMock.Verify();\ntransactionMock.Verify();\npackageUpdateService.Verify();\n+ telemetryService.Verify();\nAssert.Equal(packages.Count(), context.Deprecations.Count());\nforeach (var package in packages)\n@@ -250,6 +290,13 @@ public async Task ReplacesExistingDeprecations()\nAssert.Equal(alternatePackageRegistration, deprecation.AlternatePackageRegistration);\nAssert.Equal(alternatePackage, deprecation.AlternatePackage);\nAssert.Equal(customMessage, deprecation.CustomMessage);\n+\n+ auditingService.WroteRecord<PackageAuditRecord>(\n+ r => r.Action == (status == PackageDeprecationStatus.NotDeprecated ? AuditedPackageAction.Undeprecate : AuditedPackageAction.Deprecate)\n+ && r.Reason == (status == PackageDeprecationStatus.NotDeprecated ? PackageUndeprecatedVia.Web : PackageDeprecatedVia.Web)\n+ && r.DeprecationRecord == null\n+ && r.Id == id\n+ && r.PackageRecord.NormalizedVersion == package.NormalizedVersion);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n+using System.Collections;\nusing System.Collections.Generic;\nusing System.Diagnostics;\nusing System.Linq;\n+using CommonMark.Syntax;\n+using Microsoft.Ajax.Utilities;\nusing Moq;\nusing NuGet.Services.Entities;\nusing NuGet.Versioning;\n@@ -35,7 +38,8 @@ public static IEnumerable<object[]> TrackMetricNames_Data\n{\nget\n{\n- var package = fakes.Package.Packages.First();\n+ var packages = fakes.Package.Packages.ToList();\n+ var package = packages.First();\nvar identity = Fakes.ToIdentity(fakes.User);\nyield return new object[] { \"CertificateActivated\",\n(TrackAction)(s => s.TrackCertificateActivated(\"thumbprint\"))\n@@ -97,6 +101,14 @@ public static IEnumerable<object[]> TrackMetricNames_Data\n(TrackAction)(s => s.TrackPackageRevalidate(package))\n};\n+ yield return new object[] { \"PackageDeprecate\",\n+ (TrackAction)(s => s.TrackPackageDeprecate(\n+ packages,\n+ PackageDeprecationStatus.Legacy,\n+ new PackageRegistration { Id = \"alt\" },\n+ new Package { PackageRegistration = new PackageRegistration { Id = \"alt-2\" }, NormalizedVersion = \"1.2.3\" }, true))\n+ };\n+\nyield return new object[] { \"CreatePackageVerificationKey\",\n(TrackAction)(s => s.TrackCreatePackageVerificationKeyEvent(fakes.Package.Id, package.Version, fakes.User, identity))\n};\n@@ -637,7 +649,7 @@ public void TrackAccountDeletedCompletedAddsCorrectData()\nIt.Is<double>(value => value == 1),\nIt.Is<IDictionary<string, string>>(\nproperties => properties.Count == 4 &&\n- properties[\"AccountDeletedByRole\"] == \"Admins\" &&\n+ properties[\"AccountDeletedByRole\"] == \"[\\\"Admins\\\"]\" &&\nproperties[\"AccountIsSelfDeleted\"] == \"False\" &&\nproperties[\"AccountDeletedIsOrganization\"] == \"True\" &&\nproperties[\"AccountDeleteSucceeded\"] == \"True\")\n@@ -700,6 +712,125 @@ public void TrackODataCustomQueryAddsCorrectData(bool customQuery)\nAssert.Equal(customQuery.ToString(), properties[\"IsCustomQuery\"]);\n}\n+ public static IEnumerable<object[]> TrackPackageDeprecateThrowsIfPackageListInvalid_Data =>\n+ new[]\n+ {\n+ new object[]\n+ {\n+ null\n+ },\n+ new object[]\n+ {\n+ new Package[0]\n+ },\n+ new object[]\n+ {\n+ new []\n+ {\n+ new Package { PackageRegistrationKey = 1 },\n+ new Package { PackageRegistrationKey = 2 }\n+ }\n+ }\n+ };\n+\n+ [Theory]\n+ [MemberData(nameof(TrackPackageDeprecateThrowsIfPackageListInvalid_Data))]\n+ public void TrackPackageDeprecateThrowsIfPackageListInvalid(IReadOnlyList<Package> packages)\n+ {\n+ var service = CreateService();\n+ Assert.Throws<ArgumentException>(() => service.TrackPackageDeprecate(packages, PackageDeprecationStatus.CriticalBugs, null, null, false));\n+ }\n+\n+ public static IEnumerable<object[]> TrackPackageDeprecateSucceedsWithoutAlternate_Data =>\n+ MemberDataHelper.Combine(\n+ MemberDataHelper.EnumDataSet<PackageDeprecationStatus>(),\n+ MemberDataHelper.BooleanDataSet());\n+\n+ [Theory]\n+ [MemberData(nameof(TrackPackageDeprecateSucceedsWithoutAlternate_Data))]\n+ public void TrackPackageDeprecateSucceedsWithoutAlternate(PackageDeprecationStatus status, bool hasCustomMessage)\n+ {\n+ var service = CreateService();\n+ var packages = fakes.Package.Packages.ToList();\n+ var allProperties = new List<IDictionary<string, string>>();\n+ service.TelemetryClient\n+ .Setup(x => x.TrackMetric(It.IsAny<string>(), It.IsAny<double>(), It.IsAny<IDictionary<string, string>>()))\n+ .Callback<string, double, IDictionary<string, string>>((_, __, p) => allProperties.Add(p));\n+\n+ service.TrackPackageDeprecate(packages, status, null, null, hasCustomMessage);\n+\n+ service.TelemetryClient.Verify(\n+ x => x.TrackMetric(\"PackageDeprecate\", packages.Count(), It.IsAny<IDictionary<string, string>>()),\n+ Times.Once);\n+\n+ var properties = Assert.Single(allProperties);\n+ Assert.Contains(\n+ new KeyValuePair<string, string>(\"PackageDeprecationReason\", ((int)status).ToString()),\n+ properties);\n+\n+ Assert.Contains(\n+ new KeyValuePair<string, string>(\"PackageDeprecationAlternatePackageId\", null),\n+ properties);\n+\n+ Assert.Contains(\n+ new KeyValuePair<string, string>(\"PackageDeprecationAlternatePackageVersion\", null),\n+ properties);\n+\n+ Assert.Contains(\n+ new KeyValuePair<string, string>(\"PackageDeprecationCustomMessage\", hasCustomMessage.ToString()),\n+ properties);\n+ }\n+\n+ public static IEnumerable<object[]> TrackPackageDeprecateSucceedsWithAlternate_Data =>\n+ MemberDataHelper.Combine(\n+ MemberDataHelper.BooleanDataSet(),\n+ MemberDataHelper.BooleanDataSet());\n+\n+ [Theory]\n+ [MemberData(nameof(TrackPackageDeprecateSucceedsWithAlternate_Data))]\n+ public void TrackPackageDeprecateSucceedsWithAlternate(bool hasRegistration, bool hasPackage)\n+ {\n+ var service = CreateService();\n+ var allProperties = new List<IDictionary<string, string>>();\n+ service.TelemetryClient\n+ .Setup(x => x.TrackMetric(It.IsAny<string>(), It.IsAny<double>(), It.IsAny<IDictionary<string, string>>()))\n+ .Callback<string, double, IDictionary<string, string>>((_, __, p) => allProperties.Add(p));\n+\n+ var packages = fakes.Package.Packages.ToList();\n+ var alternateRegistration = hasRegistration ? new PackageRegistration { Id = \"alt-R\" } : null;\n+ var alternatePackage = hasPackage ? new Package { PackageRegistration = new PackageRegistration { Id = \"alt-P\" }, NormalizedVersion = \"4.3.2\" } : null;\n+\n+ var status = PackageDeprecationStatus.NotDeprecated;\n+ service.TrackPackageDeprecate(packages, status, alternateRegistration, alternatePackage, false);\n+\n+ service.TelemetryClient.Verify(\n+ x => x.TrackMetric(\"PackageDeprecate\", packages.Count(), It.IsAny<IDictionary<string, string>>()),\n+ Times.Once);\n+\n+ var properties = Assert.Single(allProperties);\n+ Assert.Contains(\n+ new KeyValuePair<string, string>(\"PackageDeprecationReason\", ((int)PackageDeprecationStatus.NotDeprecated).ToString()),\n+ properties);\n+\n+ var expectedAlternateId = hasRegistration\n+ ? alternateRegistration.Id\n+ : (hasPackage ? alternatePackage.Id : null);\n+\n+ Assert.Contains(\n+ new KeyValuePair<string, string>(\"PackageDeprecationAlternatePackageId\", expectedAlternateId),\n+ properties);\n+\n+ var expectedAlternateVersion = hasPackage ? alternatePackage.NormalizedVersion : null;\n+\n+ Assert.Contains(\n+ new KeyValuePair<string, string>(\"PackageDeprecationAlternatePackageVersion\", expectedAlternateVersion),\n+ properties);\n+\n+ Assert.Contains(\n+ new KeyValuePair<string, string>(\"PackageDeprecationCustomMessage\", false.ToString()),\n+ properties);\n+ }\n+\nprivate TelemetryServiceWrapper CreateServiceForCertificateTelemetry(string metricName, string thumbprint)\n{\nvar service = CreateService();\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add "PackageDeprecate" telemetry event (#7245) |
455,739 | 07.06.2019 18:02:43 | 25,200 | 03d3bb430ca6908353e0d881420f6cc7e4c4e344 | [GH Usage] Removed unnecessary check | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"new_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"diff": "@@ -16,9 +16,7 @@ public GitHubUsageConfiguration(IReadOnlyList<RepositoryInformation> repositorie\nthrow new ArgumentNullException(nameof(repositories));\n}\n- _nuGetPackagesGitHubDependencies = repositories.Any()\n- ? GetNuGetPackagesDependents(repositories)\n- : new Dictionary<string, NuGetPackageGitHubInformation>();\n+ _nuGetPackagesGitHubDependencies = GetNuGetPackagesDependents(repositories);\n}\npublic NuGetPackageGitHubInformation GetPackageInformation(string packageId)\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Removed unnecessary check |
455,739 | 07.06.2019 18:10:36 | 25,200 | ba50cd94a9ed5e0ba80724c90d90d8eb9e610780 | [GH Usage] Fixed doc typo | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/IGitHubUsageConfiguration.cs",
"new_path": "src/NuGetGallery.Core/GitHub/IGitHubUsageConfiguration.cs",
"diff": "@@ -9,7 +9,7 @@ public interface IGitHubUsageConfiguration\n///\n/// throws an ArgumentException if the packageId is null\n/// </summary>\n- /// <param name=\"packageId\">NuGet package id</param>\n+ /// <param name=\"packageId\">NuGet package id, cannot be null</param>\n/// <returns></returns>\nNuGetPackageGitHubInformation GetPackageInformation(string packageId);\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Fixed doc typo |
455,739 | 07.06.2019 18:11:07 | 25,200 | 0a358cdeed14e37459963e79092530e45ccb7e4f | [GH Usage] Added testcases for ToKiloFormat method | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Extensions/NumberExtensionsFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Extensions/NumberExtensionsFacts.cs",
"diff": "@@ -49,7 +49,12 @@ public class TheToKiloFormatMethod\n[InlineData(999_000, \"999K\")]\n[InlineData(999_999, \"999K\")]\n[InlineData(1_000_000, \"1.00M\")]\n-\n+ [InlineData(1_999_000, \"1.99M\")]\n+ [InlineData(99_990_000, \"99.9M\")]\n+ [InlineData(100_990_000, \"100M\")]\n+ [InlineData(999_990_000, \"999M\")]\n+ [InlineData(1_000_000_000, \"1.00G\")]\n+ [InlineData(1_999_000_000, \"1.99G\")]\npublic void FormatsUsingExpectedUnit(int number, string expected)\n{\nvar actual = NumberExtensions.ToKiloFormat(number);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Added testcases for ToKiloFormat method |
455,747 | 10.06.2019 11:26:46 | 25,200 | c848d1666d6ced01033456c2b383c7b738c17fdd | set blog link | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "}\n@DisplayNavigationItem(\"Documentation\", \"https://docs.microsoft.com/en-us/nuget/what-is-nuget\")\n@DisplayNavigationItem(\"Downloads\", Url.Downloads())\n- @DisplayNavigationItem(\"Blog\", \"https://devblogs.microsoft.com/nuget/\")\n+ @DisplayNavigationItem(\"Blog\", \"https://blog.nuget.org/\")\n</ul>\n@if (ShowAuthInHeader)\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | set blog link (#7255) |
455,739 | 10.06.2019 16:03:07 | 25,200 | 8e31c67bee82671011761bc4ee28c4193a0e87eb | [GH Usage] Moved sorting logic to NuGetPackage info class | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"new_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"diff": "@@ -6,7 +6,6 @@ namespace NuGetGallery.GitHub\n{\npublic class GitHubUsageConfiguration : IGitHubUsageConfiguration\n{\n- public const int ReposPerPackage = 10;\nprivate readonly Dictionary<string, NuGetPackageGitHubInformation> _nuGetPackagesGitHubDependencies;\npublic GitHubUsageConfiguration(IReadOnlyList<RepositoryInformation> repositories)\n@@ -56,9 +55,7 @@ public NuGetPackageGitHubInformation GetPackageInformation(string packageId)\nentry => entry.Key,\nentry => new NuGetPackageGitHubInformation(\nentry.Value.Count,\n- entry.Value\n- .OrderByDescending(x => x.Stars)\n- .ThenBy(x => x.Id).Take(ReposPerPackage).ToList()),\n+ entry.Value),\nStringComparer.InvariantCultureIgnoreCase);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/NuGetPackageGitHubInformation.cs",
"new_path": "src/NuGetGallery.Core/GitHub/NuGetPackageGitHubInformation.cs",
"diff": "@@ -6,6 +6,8 @@ namespace NuGetGallery.GitHub\n{\npublic class NuGetPackageGitHubInformation\n{\n+ public const int ReposPerPackage = 10;\n+\npublic readonly static NuGetPackageGitHubInformation Empty = new NuGetPackageGitHubInformation(\n0,\nnew List<RepositoryInformation>());\n@@ -17,8 +19,17 @@ public NuGetPackageGitHubInformation(int totalRepos, IReadOnlyList<RepositoryInf\nthrow new IndexOutOfRangeException(string.Format(\"{0} cannot have a negative value!\", nameof(totalRepos)));\n}\n+ if( repos == null)\n+ {\n+ throw new ArgumentNullException(nameof(repos));\n+ }\n+\nTotalRepos = totalRepos;\n- Repos = repos ?? throw new ArgumentNullException(nameof(repos));\n+ Repos = repos\n+ .OrderByDescending(x => x.Stars)\n+ .ThenBy(x => x.Id)\n+ .Take(ReposPerPackage)\n+ .ToList();\n}\npublic int TotalRepos { get; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/RepositoryInformation.cs",
"new_path": "src/NuGetGallery.Core/GitHub/RepositoryInformation.cs",
"diff": "@@ -26,7 +26,7 @@ public class RepositoryInformation\n}\nelse\n{\n- throw new ArgumentException(string.Format(\"{0} has an invalid format! It should be \\\"owner/repositoryName\\\", instead it is: {1}\", nameof(Id), Id));\n+ throw new ArgumentException(string.Format(\"{0} has an invalid format! It should be \\\"owner/repositoryName\\\"!\", nameof(Id)));\n}\nUrl = url ?? throw new ArgumentNullException(nameof(url));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "@(Model.Id), including the following:\n</p>\n- @foreach (var dep in Model.GitHubDependenciesInformation.Repos.Take(10))\n+ @foreach (var dep in Model.GitHubDependenciesInformation.Repos)\n{\n<div class=\"row top-buffer\">\n<div class=\"col-xs-12\">\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/GitHub/GitHubUsageConfigurationFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/GitHub/GitHubUsageConfigurationFacts.cs",
"diff": "@@ -20,6 +20,7 @@ private static GitHubUsageConfiguration GenConfig(params RepositoryInformation[]\n{\nreturn new GitHubUsageConfiguration(repos);\n}\n+\npublic class TheConstructor\n{\n[Fact]\n@@ -31,7 +32,6 @@ public void InvalidRepoCache()\npublic class TheGetPackageInformationMethod\n{\n-\n[Fact]\npublic void EmptyRepoCache()\n{\n@@ -106,7 +106,7 @@ public void MultiReposSameDependencyOrderedByStarCount()\nvar gh = GenConfig(expectedRepos);\nvar nupkgInformation = gh.GetPackageInformation(\"nupkg1\");\n- Assert.Equal(Math.Min(expectedRepos.Length, GitHubUsageConfiguration.ReposPerPackage), nupkgInformation.Repos.Count);\n+ Assert.Equal(Math.Min(expectedRepos.Length, NuGetPackageGitHubInformation.ReposPerPackage), nupkgInformation.Repos.Count);\nAssert.Equal(expectedRepos.Length, nupkgInformation.TotalRepos);\n// Make sure they're ordered by descending order of stars\n@@ -140,7 +140,7 @@ public void OrderedByStarCountThenByIdThenTrimmed()\nvar gh = GenConfig(expectedRepos);\nvar nupkgInformation = gh.GetPackageInformation(\"nupkg1\");\n- Assert.Equal(Math.Min(expectedRepos.Length, GitHubUsageConfiguration.ReposPerPackage), nupkgInformation.Repos.Count);\n+ Assert.Equal(Math.Min(expectedRepos.Length, NuGetPackageGitHubInformation.ReposPerPackage), nupkgInformation.Repos.Count);\nAssert.Equal(expectedRepos.Length, nupkgInformation.TotalRepos);\nAssert.Equal(\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Moved sorting logic to NuGetPackage info class |
455,739 | 11.06.2019 11:09:41 | 25,200 | c9486cb1ff7605b930e59564f1e5b7de5500768f | [GH Usage] Updated GH Usage Config class documentation | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/IGitHubUsageConfiguration.cs",
"new_path": "src/NuGetGallery.Core/GitHub/IGitHubUsageConfiguration.cs",
"diff": "@@ -4,11 +4,11 @@ public interface IGitHubUsageConfiguration\n{\n/// <summary>\n/// Returns a NuGetPackageGitHubInformation object that contains the information about a NuGet package.\n- /// NOTE: If a packageId has no information, the NuGetPackageGitHubInformation's TotalRepos will be 0\n+ /// If a packageId has no information, the NuGetPackageGitHubInformation's TotalRepos will be 0\n/// and the Repos list will be empty\n///\n- /// throws an ArgumentException if the packageId is null\n/// </summary>\n+ /// <exception cref=\"System.ArgumentNullException\">Thrown when packageId is null</exception>\n/// <param name=\"packageId\">NuGet package id, cannot be null</param>\n/// <returns></returns>\nNuGetPackageGitHubInformation GetPackageInformation(string packageId);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Updated GH Usage Config class documentation |
455,739 | 11.06.2019 13:27:18 | 25,200 | 04773e341f8efc3a5c652ea05edfa87b9247b74a | [GH Usage] Added null check | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/RepositoryInformation.cs",
"new_path": "src/NuGetGallery.Core/GitHub/RepositoryInformation.cs",
"diff": "@@ -20,7 +20,7 @@ public class RepositoryInformation\nthrow new IndexOutOfRangeException(string.Format(\"{0} cannot have a negative value!\", nameof(stars)));\n}\n- Id = id;\n+ Id = id ?? throw new ArgumentNullException(nameof(id));\nvar idSplit = Id.Split('/');\nif (idSplit.Length == 2)\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Added null check |
455,739 | 11.06.2019 13:27:35 | 25,200 | 53a20a988637723a7cfc06093c46b9e5c851e31f | [GH Usage] Updated Feature flag doc | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IFeatureFlagService.cs",
"new_path": "src/NuGetGallery/Services/IFeatureFlagService.cs",
"diff": "@@ -54,11 +54,11 @@ public interface IFeatureFlagService\nbool IsSearchSideBySideEnabled(User user);\n/// <summary>\n- /// Whether a user can see the \"GitHub Usage\" section in a package's display page as well as\n- /// well as the added \"GitHub Usage count\" in the \"Statistics\" section\n+ /// Whether a user can see the \"GitHub Usage\" section in a package's display page as well\n+ /// as the added \"GitHub Usage count\" in the \"Statistics\" section\n/// </summary>\n- /// <param name=\"user\"></param>\n- /// <returns></returns>\n+ /// <param name=\"user\">The user to test fot the Flight</param>\n+ /// <returns>Whether or not the Flight is enabled for the user</returns>\nbool IsGitHubUsageEnabled(User user);\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Updated Feature flag doc |
455,739 | 11.06.2019 13:52:40 | 25,200 | 9b6c98a3909b03bd5cc344ab12f66399d526b9eb | [GH Usage] Switched a button for an anchor | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -951,6 +951,8 @@ img.reserved-indicator-icon {\ndisplay: inline-block;\n}\n.page-package-details .btn-gh-repo {\n+ display: inline-block;\n+ width: 100%;\nbackground-color: white;\n}\n.page-package-details .btn-gh-repo:hover {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-display-package.less",
"new_path": "src/Bootstrap/less/theme/page-display-package.less",
"diff": "}\n.btn-gh-repo {\n+ display: inline-block;\n+ width: 100%;\nbackground-color: white;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "{\n<div class=\"row top-buffer\">\n<div class=\"col-xs-12\">\n- <button class=\"btn btn-gh-repo text-left btn-block\"\n- onclick=\"window.open('@dep.Url');\">\n+ <a class=\"btn btn-gh-repo text-left\" href=\"@dep.Url\" target=\"_blank\">\n<span class=\"pull-left\">\n- <a>@(dep.Id)</a>\n+ @(dep.Id)\n</span>\n<span class=\"badge pull-right badge-gh-repo\">\n@(dep.Stars.ToKiloFormat()) <i class=\"ms-Icon ms-Icon--FavoriteStarFill star-gh-repo\" aria-hidden=\"true\"></i>\n</span>\n- </button>\n+ </a>\n</div>\n</div>\n}\nelse\n{\n- @:This package is not used by any popular GitHub repository.\n+ <p class=\"github-usage panel-collapse collapse\" aria-expanded=\"true\" id=\"github-usage\">\n+ This package is not used by any popular GitHub repository.\n+ </p>\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Switched a button for an anchor |
455,739 | 11.06.2019 13:57:52 | 25,200 | 714c0cd43d038c3f7cd06551d57c6267e547a57b | [GH Usage] Switched from the NuGetGallery.GitHub namesoace to NuGetGallery | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"new_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"diff": "using System.Collections.Generic;\nusing System.Linq;\n-namespace NuGetGallery.GitHub\n+namespace NuGetGallery\n{\npublic class GitHubUsageConfiguration : IGitHubUsageConfiguration\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/NuGetPackageGitHubInformation.cs",
"new_path": "src/NuGetGallery.Core/GitHub/NuGetPackageGitHubInformation.cs",
"diff": "using System.Collections.Generic;\nusing System.Linq;\n-namespace NuGetGallery.GitHub\n+namespace NuGetGallery\n{\npublic class NuGetPackageGitHubInformation\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/RepositoryInformation.cs",
"new_path": "src/NuGetGallery.Core/GitHub/RepositoryInformation.cs",
"diff": "using System;\nusing System.Collections.Generic;\n-namespace NuGetGallery.GitHub\n+namespace NuGetGallery\n{\npublic class RepositoryInformation\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Storage/ContentObjectService.cs",
"new_path": "src/NuGetGallery.Services/Storage/ContentObjectService.cs",
"diff": "using System.Collections.Generic;\nusing System.Threading.Tasks;\nusing Newtonsoft.Json;\n-using NuGetGallery.GitHub;\nusing NuGetGallery.Services;\nnamespace NuGetGallery\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Storage/IContentObjectService.cs",
"new_path": "src/NuGetGallery.Services/Storage/IContentObjectService.cs",
"diff": "using System.Collections.Generic;\nusing System.Threading.Tasks;\n-using NuGetGallery.GitHub;\nusing NuGetGallery.Services;\nnamespace NuGetGallery\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "using NuGetGallery.Configuration;\nusing NuGetGallery.Diagnostics;\nusing NuGetGallery.Filters;\n-using NuGetGallery.GitHub;\nusing NuGetGallery.Helpers;\nusing NuGetGallery.Infrastructure;\nusing NuGetGallery.Infrastructure.Mail.Messages;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "using NuGet.Services.Licenses;\nusing NuGet.Services.Validation.Issues;\nusing NuGet.Versioning;\n-using NuGetGallery.GitHub;\nnamespace NuGetGallery\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/GitHub/GitHubUsageConfigurationFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/GitHub/GitHubUsageConfigurationFacts.cs",
"diff": "using System.Linq;\nusing Xunit;\n-namespace NuGetGallery.GitHub\n+namespace NuGetGallery\n{\npublic class GitHubUsageConfigurationFacts\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Switched from the NuGetGallery.GitHub namesoace to NuGetGallery |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.