Skip to content

Commit f28a1eb

Browse files
authored
Removed unused localIP member of CloudAuditingService. (#8306)
1 parent ed4fa14 commit f28a1eb

3 files changed

Lines changed: 6 additions & 14 deletions

File tree

src/NuGetGallery.Core/Auditing/CloudAuditingService.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,15 @@ public class CloudAuditingService : AuditingService, ICloudStorageStatusDependen
2222
public static readonly string DefaultContainerName = "auditing";
2323

2424
private CloudBlobContainer _auditContainer;
25-
private string _instanceId;
26-
private string _localIP;
2725
private Func<Task<AuditActor>> _getOnBehalfOf;
2826

29-
public CloudAuditingService(string instanceId, string localIP, string storageConnectionString, bool readAccessGeoRedundant, Func<Task<AuditActor>> getOnBehalfOf)
30-
: this(instanceId, localIP, GetContainer(storageConnectionString, readAccessGeoRedundant), getOnBehalfOf)
27+
public CloudAuditingService(string storageConnectionString, bool readAccessGeoRedundant, Func<Task<AuditActor>> getOnBehalfOf)
28+
: this(GetContainer(storageConnectionString, readAccessGeoRedundant), getOnBehalfOf)
3129
{
3230
}
3331

34-
public CloudAuditingService(string instanceId, string localIP, CloudBlobContainer auditContainer, Func<Task<AuditActor>> getOnBehalfOf)
32+
public CloudAuditingService(CloudBlobContainer auditContainer, Func<Task<AuditActor>> getOnBehalfOf)
3533
{
36-
_instanceId = instanceId;
37-
_localIP = localIP;
3834
_auditContainer = auditContainer;
3935
_getOnBehalfOf = getOnBehalfOf;
4036
}

src/NuGetGallery/App_Start/DefaultDependenciesModule.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,11 +1404,7 @@ private static void ConfigureForAzureStorage(ContainerBuilder builder, IGalleryC
14041404

14051405
private static IAuditingService GetAuditingServiceForAzureStorage(ContainerBuilder builder, IGalleryConfigurationService configuration)
14061406
{
1407-
string instanceId = HostMachine.Name;
1408-
1409-
var localIp = AuditActor.GetLocalIpAddressAsync().Result;
1410-
1411-
var service = new CloudAuditingService(instanceId, localIp, configuration.Current.AzureStorage_Auditing_ConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant, AuditActor.GetAspNetOnBehalfOfAsync);
1407+
var service = new CloudAuditingService(configuration.Current.AzureStorage_Auditing_ConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant, AuditActor.GetAspNetOnBehalfOfAsync);
14121408

14131409
builder.RegisterInstance(service)
14141410
.As<ICloudStorageStatusDependency>()

tests/NuGetGallery.Core.Facts/Auditing/CloudAuditingServiceTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void CloudAuditServiceObfuscateAuditRecord()
1818
{
1919
// Arrange
2020
CloudBlobContainer nullBlobContainer = null;
21-
var service = new CloudAuditingService("id", "1.1.1.1", nullBlobContainer, AuditActor.GetCurrentMachineActorAsync);
21+
var service = new CloudAuditingService(nullBlobContainer, AuditActor.GetCurrentMachineActorAsync);
2222

2323
AuditActor onBehalfOf = new AuditActor("machineName", "3.3.3.3", "userName1", "NoAuthentication", "someKey", DateTime.Now, null);
2424
AuditActor auditActor = new AuditActor("machineName", "2.2.2.2", "userName1", "NoAuthentication", "someKey", DateTime.Now, onBehalfOf);
@@ -57,7 +57,7 @@ public void OnlyPackageAuditRecordsWillBeSaved(AuditRecord record, bool expected
5757
{
5858
// Arrange
5959
CloudBlobContainer nullBlobContainer = null;
60-
var service = new CloudAuditingService("id", "1.1.1.1", nullBlobContainer, AuditActor.GetCurrentMachineActorAsync);
60+
var service = new CloudAuditingService(nullBlobContainer, AuditActor.GetCurrentMachineActorAsync);
6161

6262
// Act + Assert
6363
Assert.Equal<bool>(expectedResult, service.RecordWillBePersisted(record));

0 commit comments

Comments
 (0)