Add CLI output to indicate where output went (#141)

Author: gfs

Cli/AttackSurfaceAnalyzerCli.csproj

@@ -49,6 +49,13 @@
   <ItemGroup>
     <None Remove="asa.sqlite" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>

Cli/Program.cs

@@ -366,15 +366,16 @@ private static int RunExportCollectCommand(ExportCollectCommandOptions opts)
             };
             serializer.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
             Log.Debug("{0} RunExportCollectCommand", Strings.Get("End"));
+            string path = Path.Combine(opts.OutputPath, Helpers.MakeValidFileName(opts.FirstRunId + "_vs_" + opts.SecondRunId + "_summary.json.txt"));
 
-            using (StreamWriter sw = new StreamWriter(Path.Combine(opts.OutputPath, Helpers.MakeValidFileName(opts.FirstRunId + "_vs_" + opts.SecondRunId + "_summary.json.txt")))) //lgtm[cs/path-injection]
+            using (StreamWriter sw = new StreamWriter(path)) //lgtm[cs/path-injection]
             {
                 using (JsonWriter writer = new JsonTextWriter(sw))
                 {
                     serializer.Serialize(writer, results);
                 }
             }
-            Log.Information(Strings.Get("DoneWriting"));
+            Log.Information(Strings.Get("OutputWrittenTo"), path);
             return 0;
 
         }
@@ -567,6 +568,7 @@ private static int RunExportMonitorCommand(ExportMonitorCommandOptions opts)
             Telemetry.TrackEvent("Begin Export Monitor", StartEvent);
 
             WriteMonitorJson(opts.RunId, (int)RESULT_TYPE.FILE, opts.OutputPath);
+
             return 0;
         }
 
@@ -596,13 +598,17 @@ public static void WriteMonitorJson(string RunId, int ResultType, string OutputP
             JsonSerializer serializer = JsonSerializer.Create(settings);
             serializer.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
 
-            using (StreamWriter sw = new StreamWriter(Path.Combine(OutputPath, Helpers.MakeValidFileName(RunId + "_Monitoring_" + ((RESULT_TYPE)ResultType).ToString() + ".json.txt")))) //lgtm[cs/path-injection]
+            string path = Path.Combine(OutputPath, Helpers.MakeValidFileName(RunId + "_Monitoring_" + ((RESULT_TYPE)ResultType).ToString() + ".json.txt"));
+
+            using (StreamWriter sw = new StreamWriter(path)) //lgtm[cs/path-injection]
             {
                 using (JsonWriter writer = new JsonTextWriter(sw))
                 {
                     serializer.Serialize(writer, records);
                 }
             }
+            Log.Information(Strings.Get("OutputWrittenTo"), path);
+
         }
 
         private static int RunMonitorCommand(MonitorCommandOptions opts)
@@ -1314,6 +1320,7 @@ private static int RunCompareCommand(CompareCommandOptions opts)
 
             var result = engine.CompileRenderAsync("Output" + Path.DirectorySeparatorChar + "Output.cshtml", results).Result;
             File.WriteAllText($"{opts.OutputBaseFilename}.html", result);
+            Log.Information(Strings.Get("OutputWrittenTo"), opts.OutputBaseFilename + ".html");
 
             return 0;
         }

Cli/Properties/Resources.Designer.cs

@@ -393,4 +393,7 @@
   <data name="ExcludingHive" xml:space="preserve">
     <value>Excluding Hive</value>
   </data>
+  <data name="OutputWrittenTo" xml:space="preserve">
+    <value>Output written to: {0}</value>
+  </data>
 </root>