Skip to content

Commit 146473e

Browse files
authored
Delete unused downloads and status folders (#10145)
1 parent 079cff7 commit 146473e

4 files changed

Lines changed: 5 additions & 20 deletions

File tree

src/NuGetGallery.Core/CoreConstants.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,13 @@ public static class Folders
3333
{
3434
public const string UserCertificatesFolderName = "user-certificates";
3535
public const string ContentFolderName = "content";
36-
public const string DownloadsFolderName = "downloads";
3736
public const string PackageBackupsFolderName = "package-backups";
3837
public const string PackageReadMesFolderName = "readmes";
3938
public const string PackagesFolderName = "packages";
4039
public const string PackagesContentFolderName = "packages-content";
4140
public const string UploadsFolderName = "uploads";
4241
public const string ValidationFolderName = "validation";
4342
public const string RevalidationFolderName = "revalidation";
44-
public const string StatusFolderName = "status";
4543
public const string SymbolPackagesFolderName = "symbol-packages";
4644
public const string SymbolPackageBackupsFolderName = "symbol-package-backups";
4745
public const string FlatContainerFolderName = "v3-flatcontainer";
@@ -57,4 +55,4 @@ public static class Folders
5755

5856
public const string LoginDiscontinuationConfigFileName = "Login-Discontinuation-Configuration.json";
5957
}
60-
}
58+
}

src/NuGetGallery.Core/Services/GalleryCloudBlobContainerInformationProvider.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
@@ -11,7 +11,6 @@ public class GalleryCloudBlobContainerInformationProvider : ICloudBlobContainerI
1111
{
1212
private static readonly HashSet<string> KnownPublicFolders = new HashSet<string> {
1313
CoreConstants.Folders.PackagesFolderName,
14-
CoreConstants.Folders.DownloadsFolderName,
1514
CoreConstants.Folders.SymbolPackagesFolderName,
1615
CoreConstants.Folders.FlatContainerFolderName,
1716
};
@@ -23,7 +22,6 @@ public class GalleryCloudBlobContainerInformationProvider : ICloudBlobContainerI
2322
CoreConstants.Folders.ValidationFolderName,
2423
CoreConstants.Folders.UserCertificatesFolderName,
2524
CoreConstants.Folders.RevalidationFolderName,
26-
CoreConstants.Folders.StatusFolderName,
2725
CoreConstants.Folders.PackagesContentFolderName,
2826
CoreConstants.Folders.PackageBackupsFolderName,
2927
CoreConstants.Folders.SymbolPackageBackupsFolderName,
@@ -41,11 +39,9 @@ public string GetCacheControl(string folderName)
4139
case CoreConstants.Folders.PackageBackupsFolderName:
4240
case CoreConstants.Folders.UploadsFolderName:
4341
case CoreConstants.Folders.SymbolPackageBackupsFolderName:
44-
case CoreConstants.Folders.DownloadsFolderName:
4542
case CoreConstants.Folders.PackageReadMesFolderName:
4643
case CoreConstants.Folders.ContentFolderName:
4744
case CoreConstants.Folders.RevalidationFolderName:
48-
case CoreConstants.Folders.StatusFolderName:
4945
case CoreConstants.Folders.UserCertificatesFolderName:
5046
case CoreConstants.Folders.PackagesContentFolderName:
5147
case CoreConstants.Folders.FlatContainerFolderName:
@@ -70,15 +66,11 @@ public string GetContentType(string folderName)
7066
case CoreConstants.Folders.FlatContainerFolderName:
7167
return CoreConstants.PackageContentType;
7268

73-
case CoreConstants.Folders.DownloadsFolderName:
74-
return CoreConstants.OctetStreamContentType;
75-
7669
case CoreConstants.Folders.PackageReadMesFolderName:
7770
return CoreConstants.TextContentType;
7871

7972
case CoreConstants.Folders.ContentFolderName:
8073
case CoreConstants.Folders.RevalidationFolderName:
81-
case CoreConstants.Folders.StatusFolderName:
8274
return CoreConstants.JsonContentType;
8375

8476
case CoreConstants.Folders.UserCertificatesFolderName:

src/NuGetGallery/Services/FileSystemFileStorageService.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using NuGetGallery.Configuration;
@@ -309,13 +309,10 @@ private static string GetContentType(string folderName)
309309
case CoreConstants.Folders.SymbolPackagesFolderName:
310310
return CoreConstants.PackageContentType;
311311

312-
case CoreConstants.Folders.DownloadsFolderName:
313-
return CoreConstants.OctetStreamContentType;
314-
315312
default:
316313
throw new InvalidOperationException(
317314
string.Format(CultureInfo.CurrentCulture, "The folder name {0} is not supported.", folderName));
318315
}
319316
}
320317
}
321-
}
318+
}

tests/NuGetGallery.Core.Facts/Services/FolderNamesDataAttribute.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.Collections.Generic;
@@ -26,7 +26,6 @@ public override IEnumerable<object[]> GetData(MethodInfo testMethod)
2626
{
2727
// Folder name, is public, content type
2828
new object[] { CoreConstants.Folders.ContentFolderName, false, CoreConstants.JsonContentType, },
29-
new object[] { CoreConstants.Folders.DownloadsFolderName, true, CoreConstants.OctetStreamContentType },
3029
new object[] { CoreConstants.Folders.PackageBackupsFolderName, false, CoreConstants.PackageContentType },
3130
new object[] { CoreConstants.Folders.PackageReadMesFolderName, false, CoreConstants.TextContentType },
3231
new object[] { CoreConstants.Folders.PackagesFolderName, true, CoreConstants.PackageContentType },
@@ -37,7 +36,6 @@ public override IEnumerable<object[]> GetData(MethodInfo testMethod)
3736
new object[] { CoreConstants.Folders.ValidationFolderName, false, CoreConstants.PackageContentType },
3837
new object[] { CoreConstants.Folders.PackagesContentFolderName, false, CoreConstants.OctetStreamContentType },
3938
new object[] { CoreConstants.Folders.RevalidationFolderName, false, CoreConstants.JsonContentType },
40-
new object[] { CoreConstants.Folders.StatusFolderName, false, CoreConstants.JsonContentType },
4139
new object[] { CoreConstants.Folders.FlatContainerFolderName, true, CoreConstants.PackageContentType },
4240
};
4341

0 commit comments

Comments
 (0)