Skip to content

Commit

Permalink
Delete unused downloads and status folders (#10145)
Browse files Browse the repository at this point in the history
  • Loading branch information
joelverhagen authored Aug 21, 2024
1 parent 079cff7 commit 146473e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 20 deletions.
4 changes: 1 addition & 3 deletions src/NuGetGallery.Core/CoreConstants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,13 @@ public static class Folders
{
public const string UserCertificatesFolderName = "user-certificates";
public const string ContentFolderName = "content";
public const string DownloadsFolderName = "downloads";
public const string PackageBackupsFolderName = "package-backups";
public const string PackageReadMesFolderName = "readmes";
public const string PackagesFolderName = "packages";
public const string PackagesContentFolderName = "packages-content";
public const string UploadsFolderName = "uploads";
public const string ValidationFolderName = "validation";
public const string RevalidationFolderName = "revalidation";
public const string StatusFolderName = "status";
public const string SymbolPackagesFolderName = "symbol-packages";
public const string SymbolPackageBackupsFolderName = "symbol-package-backups";
public const string FlatContainerFolderName = "v3-flatcontainer";
Expand All @@ -57,4 +55,4 @@ public static class Folders

public const string LoginDiscontinuationConfigFileName = "Login-Discontinuation-Configuration.json";
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
Expand All @@ -11,7 +11,6 @@ public class GalleryCloudBlobContainerInformationProvider : ICloudBlobContainerI
{
private static readonly HashSet<string> KnownPublicFolders = new HashSet<string> {
CoreConstants.Folders.PackagesFolderName,
CoreConstants.Folders.DownloadsFolderName,
CoreConstants.Folders.SymbolPackagesFolderName,
CoreConstants.Folders.FlatContainerFolderName,
};
Expand All @@ -23,7 +22,6 @@ public class GalleryCloudBlobContainerInformationProvider : ICloudBlobContainerI
CoreConstants.Folders.ValidationFolderName,
CoreConstants.Folders.UserCertificatesFolderName,
CoreConstants.Folders.RevalidationFolderName,
CoreConstants.Folders.StatusFolderName,
CoreConstants.Folders.PackagesContentFolderName,
CoreConstants.Folders.PackageBackupsFolderName,
CoreConstants.Folders.SymbolPackageBackupsFolderName,
Expand All @@ -41,11 +39,9 @@ public string GetCacheControl(string folderName)
case CoreConstants.Folders.PackageBackupsFolderName:
case CoreConstants.Folders.UploadsFolderName:
case CoreConstants.Folders.SymbolPackageBackupsFolderName:
case CoreConstants.Folders.DownloadsFolderName:
case CoreConstants.Folders.PackageReadMesFolderName:
case CoreConstants.Folders.ContentFolderName:
case CoreConstants.Folders.RevalidationFolderName:
case CoreConstants.Folders.StatusFolderName:
case CoreConstants.Folders.UserCertificatesFolderName:
case CoreConstants.Folders.PackagesContentFolderName:
case CoreConstants.Folders.FlatContainerFolderName:
Expand All @@ -70,15 +66,11 @@ public string GetContentType(string folderName)
case CoreConstants.Folders.FlatContainerFolderName:
return CoreConstants.PackageContentType;

case CoreConstants.Folders.DownloadsFolderName:
return CoreConstants.OctetStreamContentType;

case CoreConstants.Folders.PackageReadMesFolderName:
return CoreConstants.TextContentType;

case CoreConstants.Folders.ContentFolderName:
case CoreConstants.Folders.RevalidationFolderName:
case CoreConstants.Folders.StatusFolderName:
return CoreConstants.JsonContentType;

case CoreConstants.Folders.UserCertificatesFolderName:
Expand Down
7 changes: 2 additions & 5 deletions src/NuGetGallery/Services/FileSystemFileStorageService.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using NuGetGallery.Configuration;
Expand Down Expand Up @@ -309,13 +309,10 @@ private static string GetContentType(string folderName)
case CoreConstants.Folders.SymbolPackagesFolderName:
return CoreConstants.PackageContentType;

case CoreConstants.Folders.DownloadsFolderName:
return CoreConstants.OctetStreamContentType;

default:
throw new InvalidOperationException(
string.Format(CultureInfo.CurrentCulture, "The folder name {0} is not supported.", folderName));
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System.Collections.Generic;
Expand Down Expand Up @@ -26,7 +26,6 @@ public override IEnumerable<object[]> GetData(MethodInfo testMethod)
{
// Folder name, is public, content type
new object[] { CoreConstants.Folders.ContentFolderName, false, CoreConstants.JsonContentType, },
new object[] { CoreConstants.Folders.DownloadsFolderName, true, CoreConstants.OctetStreamContentType },
new object[] { CoreConstants.Folders.PackageBackupsFolderName, false, CoreConstants.PackageContentType },
new object[] { CoreConstants.Folders.PackageReadMesFolderName, false, CoreConstants.TextContentType },
new object[] { CoreConstants.Folders.PackagesFolderName, true, CoreConstants.PackageContentType },
Expand All @@ -37,7 +36,6 @@ public override IEnumerable<object[]> GetData(MethodInfo testMethod)
new object[] { CoreConstants.Folders.ValidationFolderName, false, CoreConstants.PackageContentType },
new object[] { CoreConstants.Folders.PackagesContentFolderName, false, CoreConstants.OctetStreamContentType },
new object[] { CoreConstants.Folders.RevalidationFolderName, false, CoreConstants.JsonContentType },
new object[] { CoreConstants.Folders.StatusFolderName, false, CoreConstants.JsonContentType },
new object[] { CoreConstants.Folders.FlatContainerFolderName, true, CoreConstants.PackageContentType },
};

Expand Down

0 comments on commit 146473e

Please sign in to comment.