Importer Rework - Fix Warnings

roles/lib/files/FWO.Api.Client/Queries/ModellingQueries.cs

@@ -180,6 +180,7 @@ static ModellingQueries()
                 removeAllServiceGroupsFromConnection = GetQueryText("modelling/removeAllServiceGroupsFromConnection.graphql");
                 getConnectionIdsForService = GetQueryText("modelling/getConnectionIdsForService.graphql");
                 getConnectionIdsForServiceGroup = GetQueryText("modelling/getConnectionIdsForServiceGroup.graphql");
+                updateConnectionDecommission = GetQueryText("modelling/updateConnectionDecommission.graphql");
 
                 getSelectedConnections = connectionDetailsFragment + GetQueryText("modelling/getSelectedConnections.graphql");
                 addSelectedConnection = GetQueryText("modelling/addSelectedConnection.graphql");

roles/lib/files/FWO.Data/Device.cs

@@ -1,7 +1,6 @@
 using System.Text.Json.Serialization;
 using FWO.Basics;
 using Newtonsoft.Json;
-using FWO.Basics;
 
 namespace FWO.Data
 {

roles/lib/files/FWO.Data/NetworkLocation.cs

@@ -13,7 +13,7 @@ public class NetworkLocation : IComparable
 
         public NetworkLocation(NetworkUser user, NetworkObject? networkObject)
         {
-            Object = networkObject;
+            Object = networkObject ?? new();
             User = user;
         }
 

roles/lib/files/FWO.Data/Report/DeviceReport.cs

@@ -33,10 +33,13 @@ public List<Rule> GetRuleList()
         }
 
         public DeviceReport()
-        { }
+        {
+            RulebaseLinks = [];
+        }
 
         public DeviceReport(DeviceReport device)
         {
+            RulebaseLinks = [];
             // TODO: implement this method to return a list of rules associated with the device
         }
 

roles/lib/files/FWO.Data/Report/ManagementReport.cs

@@ -88,7 +88,9 @@ public class ManagementReport
         public bool[] Detailed = [false, false, false]; // nobj, nsrv, user
 
         public ManagementReport()
-        { }
+        {
+            Uid = string.Empty;
+        }
 
 
         public string NameAndDeviceNames(string separator = ", ")

roles/lib/files/FWO.DeviceAutoDiscovery/AutoDiscoveryFortiManager.cs

@@ -101,7 +101,7 @@ public async Task BuildAdomDeviceVdomStructure(string sessionId, List<Adom> cust
                 RestResponse<FmApiTopLevelHelperDev> deviceResponse = await restClientFM.GetDevicesPerAdom(sessionId, adom.Name);
                 if (deviceResponse != null && deviceResponse.StatusCode == HttpStatusCode.OK && deviceResponse.IsSuccessful)
                 {
-                    adom.DeviceList = deviceResponse.Data?.Result[0].FortiGates;
+                    adom.DeviceList = deviceResponse.Data?.Result[0].FortiGates ?? [];
                 }
             }
             // now get vdoms per device

roles/lib/files/FWO.Mail/MailerMailKit.cs

@@ -94,7 +94,7 @@ await smtp.ConnectAsync(
 
                 return true;
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return false;
             }

roles/lib/files/FWO.Report.Filter/DynGraphqlQuery.cs

@@ -424,7 +424,7 @@ private static string GetDevWhereFilter(ref DynGraphqlQuery query, DeviceFilter?
 
             devWhereStatement += "_or: [{";
 
-            foreach (ManagementSelect mgmt in deviceFilter.Managements)
+            foreach (ManagementSelect mgmt in deviceFilter?.Managements ?? [])
             {
                 foreach (DeviceSelect dev in mgmt.Devices)
                 {

roles/lib/files/FWO.Report/Data/DeviceReportController.cs

@@ -56,7 +56,7 @@ public void AssignRuleNumbers(RulebaseLink? rbLinkIn = null, int ruleNumber = 1)
             // }
         }
 
-        public bool ContainsRules()
+        public new bool ContainsRules()
         {
             return true;
             // if (RbLink?.NextRulebase.Rules.Length>0)

roles/lib/files/FWO.Report/Data/RulebaseReportController.cs

@@ -65,7 +65,7 @@ public static bool Merge(this RulebaseReport[] rulebases, RulebaseReport[] ruleb
                         {
                             if (rulebases[i].Rules != null && rulebasesToMerge[i].Rules != null && rulebasesToMerge[i].Rules.Length > 0)
                             {
-                                rulebases[i].Rules = rulebases[i].Rules?.Concat(rulebasesToMerge[i].Rules!).ToArray();
+                                rulebases[i].Rules = rulebases[i].Rules.Concat(rulebasesToMerge[i].Rules!).ToArray();
                                 newObjects = true;
                             }
                         }

roles/lib/files/FWO.Report/Display/RuleDisplayHtml.cs

@@ -126,7 +126,7 @@ protected static string EnforcingGatewayToHtml(Device gateway, int mgmtId, int c
             string gwLink = ReportDevicesBase.GetReportDevicesLinkAddress(location, mgmtId, ObjCatString.NwObj, chapterNumber, gateway.Id, reportType);
 
             return DisplayGateway(gateway, reportType, reportType.IsResolvedReport() ? null :
-                ReportBase.ConstructLink(ReportBase.GetIconClass(ObjCategory.nsrv, "Gateway"), gateway.Name, style, gwLink)).ToString();
+                ReportBase.ConstructLink(ReportBase.GetIconClass(ObjCategory.nsrv, "Gateway"), gateway.Name ?? string.Empty, style, gwLink)).ToString();
         }
 
         private string DisplaySourceOrDestination(Rule rule, int chapterNumber, OutputLocation location, ReportType reportType, string style, bool isSource, bool overwriteIsResolvedReport = false)

roles/lib/files/FWO.Report/ReportCompliance.cs

@@ -36,7 +36,7 @@ public class ReportCompliance : ReportBase
         private readonly int _maxDegreeOfParallelism;
         private readonly SemaphoreSlim _semaphore;
         private readonly NatRuleDisplayHtml _natRuleDisplayHtml;
-        private List<string> _columnsToExport;
+        private List<string> _columnsToExport = [];
         private bool _includeHeaderInExport;
         private char _separator;
         private int _maxCellSize;
@@ -378,6 +378,10 @@ private Task GatherEmptyGroups(NetworkLocation[] networkLocations, List<NetworkL
 
         private Task<List<Rule>> GatherReportData((List<Rule> processed, List<RuleViewData> viewData)[]? results)
         {
+            if (results == null)
+            {
+                results = [];   
+            }
             RuleViewData.Capacity = results.Sum(r => r.viewData.Count);
             List<Rule> processedRulesFlat = new(results.Sum(r => r.processed.Count));
 
@@ -422,6 +426,7 @@ protected virtual Dictionary<string, object> CreateQueryVariables(int offset, in
             return queryVariables;
         }
 
+        //TODO: Does this need to be async?
         protected virtual async Task SetComplianceDataForRule(Rule rule, ApiConnection apiConnection, Func<ComplianceViolation, string>? formatter = null)
         {
             try

roles/lib/files/FWO.Report/ReportDevicesBase.cs

@@ -111,14 +111,16 @@ public async Task<List<ManagementReport>> GetImportIdsInTimeRange(ApiConnection
             return (unsupportedList, reducedDeviceFilter);
         }
 
+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
         private static async Task<bool> UsageDataAvailable(ApiConnection apiConnection, int devId)
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
         {
             try
             {
                 // TODO: the following only deals with first rulebase of a gateway:
                 // return (await apiConnection.SendQueryAsync<List<AggregateCountLastHit>>(ReportQueries.getUsageDataCount, new { devId })
                 //     )[0].RulebasesOnGateway[0].Rulebase.RulesWithHits.Aggregate.Count > 0;
-                return false;   // TODO: implement
+                return false;   // TODO: implement and remove pragma warning disable once done
             }
             catch (Exception)
             {

roles/lib/files/FWO.Report/ReportNatRules.cs

@@ -32,7 +32,7 @@ public override string ExportToHtml()
                         RulebaseLink? initialRulebaseLink = device.RulebaseLinks.FirstOrDefault(_ => _.IsInitialRulebase());
                         if (initialRulebaseLink != null) 
                         {
-                            foreach (var rule in managementReport.Rulebases.FirstOrDefault(rb => rb.Id == initialRulebaseLink.NextRulebaseId)?.Rules)
+                            foreach (var rule in managementReport.Rulebases.FirstOrDefault(rb => rb.Id == initialRulebaseLink.NextRulebaseId)?.Rules ?? [])
                             {
 								AppendNatRuleHeadlineHtml(ref report, device.Name);
 

roles/lib/files/FWO.Report/ReportRules.cs

@@ -33,7 +33,6 @@ public class ReportRules(DynGraphqlQuery query, UserConfig userConfig, ReportTyp
     {
         private const int ColumnCount = 12;
         protected bool UseAdditionalFilter = false;
-        private bool VarianceMode = false;
 
         private static Dictionary<(int deviceId, int managementId), Rule[]> _rulesCache = new();
 

roles/lib/files/FWO.Services/ModellingAppRoleHandler.cs

@@ -4,10 +4,6 @@
 using FWO.Data.Modelling;
 using FWO.Basics;
 using FWO.Config.Api;
-using FWO.Basics;
-using FWO.Data;
-using FWO.Api.Client;
-using FWO.Api.Client.Queries;
 using NetTools;
 using System.Net;
 using System.Text.Json;

roles/lib/files/FWO.Services/ModellingVarianceAnalysisGetProd.cs

@@ -74,7 +74,7 @@ private async Task<bool> GetModelledRulesProductionState(ModellingFilter modelli
         private void IdentifyModelledRules(Management mgt, List<Rule> rulesByMgt)
         {
             // get all rulebase links for this management
-            List<RulebaseLink> rulebaseLinks = mgt.Devices.Cast<DeviceReport>().SelectMany(d => d.RulebaseLinks.Where(rl => rl.Removed != null)).ToList();
+            List<RulebaseLink> rulebaseLinks = mgt.Devices.SelectMany(d => d.RulebaseLinks.Where(rl => rl.Removed != null)).ToList();
             allModelledRules.Add(mgt.Id, []);
             foreach (var rule in rulesByMgt)
             {

roles/lib/files/FWO.Services/ModellingVarianceAnalysisObjectsForRequest.cs

@@ -161,7 +161,7 @@ private WfReqTask ConstructRuleTask(Management mgt, Rule rule, ModellingConnecti
                 {
                     Field = ElemFieldType.rule.ToString(),
                     RuleUid = rule.Uid,
-                    DeviceId = rule.EnforcingGateways.FirstOrDefault().Content?.Id,
+                    DeviceId = rule.EnforcingGateways.FirstOrDefault()?.Content?.Id,
                     Name = rule.Name
                 }
             ];