Merged PR 732265: Remove IcmClient from cache monitor

We no longer creating icm from the cache monitor and not going to. Removing the code that was doing it.

Author: SergeyTeplyakov

Public/Src/Cache/Monitor/Library/Constants.cs

@@ -72,10 +72,6 @@ public enum ResultCode
 
         public static string DefaultKeyVaultUrl { get; } = "https://cbsecrets.vault.azure.net/";
 
-        public static string DefaultIcmUrl { get; } = "https://prod.microsofticm.com/connector2/ConnectorIncidentManager.svc";
-
-        public static string DefaultIcmCertificateName { get; } = "CacheICMConnector";
-
         public static Guid DefaultIcmConnectorId { get; } = new Guid("0ec5df2e-e61a-4b79-83cb-51f7adce5a9f");
 
         public static TimeSpan IcmCertificateCacheTimeToLive { get; } = TimeSpan.FromDays(1);

Public/Src/Cache/Monitor/Library/IcM/IcmClient.cs

@@ -16,7 +16,6 @@
 using BuildXL.Cache.Monitor.App.Rules;
 using BuildXL.Cache.Monitor.App.Rules.Kusto;
 using BuildXL.Cache.Monitor.App.Scheduling;
-using BuildXL.Cache.Monitor.Library.IcM;
 using BuildXL.Cache.Monitor.Library.Notifications;
 using BuildXL.Cache.Monitor.Library.Rules.Kusto;
 using BuildXL.Cache.Monitor.Library.Scheduling;
@@ -31,16 +30,6 @@ public class Configuration
         {
             public KustoCredentials KustoIngestionCredentials { get; set; } = Constants.CloudBuildProdKustoCredentials;
 
-            public string KeyVaultUrl { get; set; } = Constants.DefaultKeyVaultUrl;
-
-            public AzureActiveDirectoryCredentials KeyVaultCredentials { get; set; } = Constants.PMETenantCredentials;
-
-            public string IcmUrl { get; set; } = Constants.DefaultIcmUrl;
-
-            public Guid IcmConnectorId { get; set; } = Constants.DefaultIcmConnectorId;
-
-            public string IcmCertificateName { get; set; } = Constants.DefaultIcmCertificateName;
-
             public bool ReadOnly { get; set; } = true;
 
             /// <summary>
@@ -92,7 +81,6 @@ public class Configuration
         private readonly IReadOnlyDictionary<MonitorEnvironment, EnvironmentResources> _environmentResources;
 
         private readonly IKustoIngestClient _kustoIngestClient;
-        private readonly IIcmClient _icmClient;
 
         private static Tracer Tracer { get; } = new Tracer(nameof(Monitor));
 
@@ -102,39 +90,12 @@ public static async Task<Result<Monitor>> CreateAsync(OperationContext context,
             Tracer.Info(context, "Creating Kusto ingest client");
             var kustoIngestClient = ExternalDependenciesFactory.CreateKustoIngestClient(configuration.KustoIngestionCredentials).ThrowIfFailure();
 
-            IIcmClient icmClient;
-            if (!configuration.ReadOnly)
-            {
-                Tracer.Info(context, "Creating KeyVault client");
-                var keyVaultClient = new KeyVaultClient(
-                    configuration.KeyVaultUrl,
-                    configuration.KeyVaultCredentials.TenantId,
-                    configuration.KeyVaultCredentials.AppId,
-                    configuration.KeyVaultCredentials.AppKey,
-                    SystemClock.Instance,
-                    Constants.IcmCertificateCacheTimeToLive);
-
-                Tracer.Info(context, "Creating IcM client");
-                icmClient = new IcmClient(
-                    keyVaultClient,
-                    configuration.IcmUrl,
-                    configuration.IcmConnectorId,
-                    configuration.IcmCertificateName,
-                    SystemClock.Instance);
-            }
-            else
-            {
-                Tracer.Info(context, "Using mock ICM client");
-                icmClient = new MockIcmClient();
-            }
-
             var environmentResources = await CreateEnvironmentResourcesAsync(context, configuration.Environments);
 
             context.Token.ThrowIfCancellationRequested();
             return new Monitor(
                 configuration,
                 kustoIngestClient,
-                icmClient,
                 SystemClock.Instance,
                 environmentResources,
                 context.TracingContext.Logger);
@@ -171,14 +132,13 @@ private static Task<EnvironmentResources> CreateEnvironmentResourcesAsync(Operat
             return Task.FromResult(new EnvironmentResources(kustoClient));
         }
 
-        private Monitor(Configuration configuration, IKustoIngestClient kustoIngestClient, IIcmClient icmClient, IClock clock, IReadOnlyDictionary<MonitorEnvironment, EnvironmentResources> environmentResources, ILogger logger)
+        private Monitor(Configuration configuration, IKustoIngestClient kustoIngestClient, IClock clock, IReadOnlyDictionary<MonitorEnvironment, EnvironmentResources> environmentResources, ILogger logger)
         {
             _configuration = configuration;
 
             _clock = clock;
             _logger = logger;
             _kustoIngestClient = kustoIngestClient;
-            _icmClient = icmClient;
             _environmentResources = environmentResources;
 
             if (configuration.ReadOnly)
@@ -412,7 +372,6 @@ private void OncePerStamp(Func<SingleStampRuleArguments, IEnumerable<Instantiati
                     _logger,
                     _alertNotifier,
                     resources.KustoQueryClient,
-                    _icmClient,
                     environmentConfiguration.KustoDatabaseName,
                     stampId);
 
@@ -446,7 +405,6 @@ private void OncePerEnvironment(Func<MultiStampRuleArguments, IEnumerable<Instan
                     _logger,
                     _alertNotifier,
                     resources.KustoQueryClient,
-                    _icmClient,
                     _configuration.Environments[environment].KustoDatabaseName,
                     environment,
                     watchlist);