Add configuration value to redirect specific curated feeds to main feed (#6489)

joelverhagen · joelverhagen · commit 0c7b21ae56bd · 2018-09-28T14:15:52.000-07:00
Address #6472
diff --git a/src/NuGetGallery/Configuration/AppConfiguration.cs b/src/NuGetGallery/Configuration/AppConfiguration.cs
@@ -348,5 +348,9 @@ public string ExternalBrandingMessage
         [DefaultValue(null)]
         [TypeConverter(typeof(StringArrayConverter))]
         public string[] DisabledCuratedFeeds { get; set; }
+
+        [DefaultValue(null)]
+        [TypeConverter(typeof(StringArrayConverter))]
+        public string[] RedirectedCuratedFeeds { get; set; }
     }
 }
diff --git a/src/NuGetGallery/Configuration/IAppConfiguration.cs b/src/NuGetGallery/Configuration/IAppConfiguration.cs
@@ -355,5 +355,10 @@ public interface IAppConfiguration : ICoreMessageServiceConfiguration
         /// it doesn't exist.
         /// </summary>
         string[] DisabledCuratedFeeds { get; set; }
+
+        /// <summary>
+        /// The name of zero or more curated feeds that are redirected to the main feed.
+        /// </summary>
+        string[] RedirectedCuratedFeeds { get; set; }
     }
 }
diff --git a/src/NuGetGallery/Controllers/ODataV2CuratedFeedController.cs b/src/NuGetGallery/Controllers/ODataV2CuratedFeedController.cs
@@ -25,16 +25,19 @@ public class ODataV2CuratedFeedController
         private readonly IGalleryConfigurationService _configurationService;
         private readonly ISearchService _searchService;
         private readonly ICuratedFeedService _curatedFeedService;
+        private readonly IEntityRepository<Package> _packagesRepository;
 
         public ODataV2CuratedFeedController(
             IGalleryConfigurationService configurationService,
             ISearchService searchService,
-            ICuratedFeedService curatedFeedService)
+            ICuratedFeedService curatedFeedService,
+            IEntityRepository<Package> packagesRepository)
             : base(configurationService)
         {
             _configurationService = configurationService;
             _searchService = searchService;
             _curatedFeedService = curatedFeedService;
+            _packagesRepository = packagesRepository;
         }
 
         // /api/v2/curated-feed/curatedFeedName/Packages?semVerLevel=
@@ -46,15 +49,16 @@ public IHttpActionResult Get(
             string curatedFeedName,
             [FromUri] string semVerLevel = null)
         {
-            if (_curatedFeedService.GetFeedByName(curatedFeedName) == null)
+            var result = GetCuratedFeedResult(curatedFeedName);
+            if (result.ActionResult != null)
             {
-                return NotFound();
+                return result.ActionResult;
             }
 
             var semVerLevelKey = SemVerLevelKey.ForSemVerLevel(semVerLevel);
 
-            var queryable = _curatedFeedService
-                .GetPackages(curatedFeedName)
+            var queryable = result
+                .Packages
                 .Where(p => p.PackageStatusKey == PackageStatus.Available)
                 .Where(SemVerLevelKey.IsPackageCompliantWithSemVerLevelPredicate(semVerLevel))
                 .ToV2FeedPackageQuery(
@@ -130,14 +134,14 @@ private async Task<IHttpActionResult> GetCore(
             bool return404NotFoundWhenNoResults,
             string semVerLevel)
         {
-            var curatedFeed = _curatedFeedService.GetFeedByName(curatedFeedName);
-            if (curatedFeed == null)
+            var result = GetCuratedFeedResult(curatedFeedName);
+            if (result.ActionResult != null)
             {
-                return NotFound();
+                return result.ActionResult;
             }
 
-            var packages = _curatedFeedService
-                .GetPackages(curatedFeedName)
+            var packages = result
+                .Packages
                 .Where(p => p.PackageStatusKey == PackageStatus.Available)
                 .Where(SemVerLevelKey.IsPackageCompliantWithSemVerLevelPredicate(semVerLevel))
                 .Where(p => p.PackageRegistration.Id.Equals(id, StringComparison.OrdinalIgnoreCase));
@@ -158,7 +162,7 @@ private async Task<IHttpActionResult> GetCore(
                     packages,
                     id,
                     normalizedVersion,
-                    curatedFeed: curatedFeed,
+                    curatedFeed: result.CuratedFeed,
                     semVerLevel: semVerLevel);
 
                 // If intercepted, create a paged queryresult
@@ -228,9 +232,10 @@ public async Task<IHttpActionResult> Search(
             [FromODataUri]bool includePrerelease = false,
             [FromUri]string semVerLevel = null)
         {
-            if (_curatedFeedService.GetFeedByName(curatedFeedName) == null)
+            var result = GetCuratedFeedResult(curatedFeedName);
+            if (result.ActionResult != null)
             {
-                return NotFound();
+                return result.ActionResult;
             }
 
             // Handle OData-style |-separated list of frameworks.
@@ -251,8 +256,8 @@ public async Task<IHttpActionResult> Search(
             }
 
             // Perform actual search
-            var curatedFeed = _curatedFeedService.GetFeedByName(curatedFeedName);
-            var packages = _curatedFeedService.GetPackages(curatedFeedName)
+            var packages = result
+                .Packages
                 .Where(p => p.PackageStatusKey == PackageStatus.Available)
                 .Where(SemVerLevelKey.IsPackageCompliantWithSemVerLevelPredicate(semVerLevel))
                 .OrderBy(p => p.PackageRegistration.Id).ThenBy(p => p.Version);
@@ -265,7 +270,7 @@ public async Task<IHttpActionResult> Search(
                 searchTerm,
                 targetFramework,
                 includePrerelease,
-                curatedFeed: curatedFeed,
+                curatedFeed: result.CuratedFeed,
                 semVerLevel: semVerLevel);
 
             // Packages provided by search service (even when not hijacked)
@@ -326,5 +331,59 @@ public async Task<IHttpActionResult> SearchCount(
             var searchResults = await Search(options, curatedFeedName, searchTerm, targetFramework, includePrerelease, semVerLevel);
             return searchResults.FormattedAsCountResult<V2FeedPackage>();
         }
+
+        private bool IsCuratedFeedRedirected(string name)
+        {
+            if (_configurationService.Current.RedirectedCuratedFeeds == null)
+            {
+                return false;
+            }
+
+            return _configurationService
+                .Current
+                .RedirectedCuratedFeeds
+                .Contains(name, StringComparer.OrdinalIgnoreCase);
+        }
+
+        private CuratedFeedResult GetCuratedFeedResult(string curatedFeedName)
+        {
+            IQueryable<Package> packages;
+            CuratedFeed curatedFeed;
+            if (IsCuratedFeedRedirected(curatedFeedName))
+            {
+                curatedFeed = null;
+                packages = _packagesRepository.GetAll();
+            }
+            else
+            {
+                curatedFeed = _curatedFeedService.GetFeedByName(curatedFeedName);
+                if (curatedFeed == null)
+                {
+                    return new CuratedFeedResult(NotFound());
+                }
+
+                packages = _curatedFeedService.GetPackages(curatedFeedName);
+            }
+
+            return new CuratedFeedResult(packages, curatedFeed);
+        }
+
+        private class CuratedFeedResult
+        {
+            public CuratedFeedResult(IHttpActionResult actionResult)
+            {
+                ActionResult = actionResult ?? throw new ArgumentNullException(nameof(actionResult));
+            }
+
+            public CuratedFeedResult(IQueryable<Package> packages, CuratedFeed curatedFeed)
+            {
+                Packages = packages ?? throw new ArgumentNullException(nameof(packages));
+                CuratedFeed = curatedFeed;
+            }
+
+            public IQueryable<Package> Packages { get; }
+            public CuratedFeed CuratedFeed { get; }
+            public IHttpActionResult ActionResult { get; }
+        }
     }
 }
diff --git a/tests/NuGetGallery.Facts/Controllers/ODataFeedControllerFactsBase.cs b/tests/NuGetGallery.Facts/Controllers/ODataFeedControllerFactsBase.cs
@@ -24,7 +24,7 @@ namespace NuGetGallery.Controllers
     public abstract class ODataFeedControllerFactsBase<TController>
         where TController : NuGetODataController
     {
-        private const string _siteRoot = "https://nuget.localtest.me";
+        protected const string _siteRoot = "https://nuget.localtest.me";
         protected const string TestPackageId = "Some.Awesome.Package";
 
         protected readonly IReadOnlyCollection<Package> AvailablePackages;
@@ -60,7 +60,14 @@ protected TController CreateTestableODataFeedController(HttpRequestMessage reque
             configurationService.Current.SiteRoot = _siteRoot;
 
             var controller = CreateController(PackagesRepository, configurationService, searchService);
-            
+
+            AddRequestToController(request, controller);
+
+            return controller;
+        }
+
+        protected static void AddRequestToController(HttpRequestMessage request, TController controller)
+        {
             var httpRequest = new HttpRequest(string.Empty, request.RequestUri.AbsoluteUri, request.RequestUri.Query);
             var httpResponse = new HttpResponse(new StringWriter());
             var httpContext = new HttpContext(httpRequest, httpResponse);
@@ -72,8 +79,6 @@ protected TController CreateTestableODataFeedController(HttpRequestMessage reque
 
             controller.ControllerContext.Controller = controller;
             controller.ControllerContext.Configuration = new HttpConfiguration();
-
-            return controller;
         }
 
         protected async Task<IReadOnlyCollection<TFeedPackage>> GetCollection<TFeedPackage>(
@@ -208,7 +213,7 @@ private static IQueryable<Package> CreatePackagesQueryable()
             return list.AsQueryable();
         }
 
-        private static ODataQueryContext CreateODataQueryContext<TFeedPackage>()
+        protected static ODataQueryContext CreateODataQueryContext<TFeedPackage>()
             where TFeedPackage : class
         {
             var oDataModelBuilder = new ODataConventionModelBuilder();
diff --git a/tests/NuGetGallery.Facts/Controllers/ODataV2CuratedFeedControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/ODataV2CuratedFeedControllerFacts.cs

Original file line number	Diff line number	Diff line change
`@@ -348,5 +348,9 @@ public string ExternalBrandingMessage`
`348`	`348`	`[DefaultValue(null)]`
`349`	`349`	`[TypeConverter(typeof(StringArrayConverter))]`
`350`	`350`	`public string[] DisabledCuratedFeeds { get; set; }`
	`351`	`+`
	`352`	`+ [DefaultValue(null)]`
	`353`	`+ [TypeConverter(typeof(StringArrayConverter))]`
	`354`	`+ public string[] RedirectedCuratedFeeds { get; set; }`
`351`	`355`	`}`
`352`	`356`	`}`
Original file line number	Diff line number	Diff line change
`@@ -355,5 +355,10 @@ public interface IAppConfiguration : ICoreMessageServiceConfiguration`
`355`	`355`	`/// it doesn't exist.`
`356`	`356`	`/// </summary>`
`357`	`357`	`string[] DisabledCuratedFeeds { get; set; }`
	`358`	`+`
	`359`	`+ /// <summary>`
	`360`	`+ /// The name of zero or more curated feeds that are redirected to the main feed.`
	`361`	`+ /// </summary>`
	`362`	`+ string[] RedirectedCuratedFeeds { get; set; }`
`358`	`363`	`}`
`359`	`364`	`}`