Skip to content

Commit

Permalink
remove duplicate masker, changes related to tests
Browse files Browse the repository at this point in the history
  • Loading branch information
v-kivlev committed Oct 12, 2023
1 parent 47346b2 commit deb6eeb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ public static partial class AdditionalMaskingRegexes
+ @"npm_[0-9A-Za-z]{36}" // match
+ @"\b", // post-match

// NPM author keys.
@"\b" // pre-match
+ @"npm_[0-9A-Za-z]{36}" // match
+ @"\b", // post-match
};
}
}
1 change: 1 addition & 0 deletions src/Microsoft.VisualStudio.Services.Agent/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@ public static class Task
Agent.Version,
Agent.WorkFolder,
Agent.WorkingDirectory,
Agent.EnableAdditionalMaskingRegexes,
// Build variables
Build.ArtifactStagingDirectory,
Build.BinariesDirectory,
Expand Down
4 changes: 4 additions & 0 deletions src/Test/L0/Listener/JobDispatcherL0.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using Agent.Listener.Configuration;
using Microsoft.TeamFoundation.DistributedTask.WebApi;
using Microsoft.VisualStudio.Services.Agent.Listener;
using Microsoft.VisualStudio.Services.WebApi;
Expand All @@ -22,13 +23,15 @@ public sealed class JobDispatcherL0
private Mock<IProcessInvoker> _processInvoker;
private Mock<IAgentServer> _agentServer;
private Mock<IConfigurationStore> _configurationStore;
private Mock<IFeatureFlagProvider> _featureFlagProvider;

public JobDispatcherL0()
{
_processChannel = new Mock<IProcessChannel>();
_processInvoker = new Mock<IProcessInvoker>();
_agentServer = new Mock<IAgentServer>();
_configurationStore = new Mock<IConfigurationStore>();
_featureFlagProvider = new Mock<IFeatureFlagProvider>();
}

private Pipelines.AgentJobRequestMessage CreateJobRequestMessage()
Expand All @@ -53,6 +56,7 @@ public async void DispatchesJobRequest()
var jobDispatcher = new JobDispatcher();
hc.SetSingleton<IConfigurationStore>(_configurationStore.Object);
hc.SetSingleton<IAgentServer>(_agentServer.Object);
hc.SetSingleton<IFeatureFlagProvider>(_featureFlagProvider.Object);

hc.EnqueueInstance<IProcessChannel>(_processChannel.Object);
hc.EnqueueInstance<IProcessInvoker>(_processInvoker.Object);
Expand Down

0 comments on commit deb6eeb

Please sign in to comment.