fixing from code-analysis and mono build

Author: dtylman

Retriever/Configuration.cs

@@ -75,36 +75,52 @@ public static string DefaultFileName
         public string ConfigFileName { get => configFileName; set => configFileName = value; }
 
         private static Configuration instance;
-
+        
         public void Save()
         {
+            if (string.IsNullOrEmpty(ConfigFileName))
+            {
+                ConfigFileName = DefaultFileName;
+            }
             string dirName = Path.GetDirectoryName(ConfigFileName);
-            if (!Directory.Exists(dirName))
+            if ((!string.IsNullOrEmpty(dirName)) && (!Directory.Exists(dirName)))
             {
                 Directory.CreateDirectory(dirName);
             }
             JsonSerializer serializer = new JsonSerializer();
-            using (StreamWriter sw = new StreamWriter(ConfigFileName))
-            using (JsonWriter writer = new JsonTextWriter(sw))
+            StreamWriter sw = new StreamWriter(ConfigFileName);
+            try
             {
-                writer.Formatting = Formatting.Indented;
-                serializer.Serialize(writer, this);
+                using (JsonWriter writer = new JsonTextWriter(sw))
+                {
+                    writer.Formatting = Formatting.Indented;
+                    serializer.Serialize(writer, this);
+                }
+            }
+            finally
+            {
+                sw.Close();
             }
         }
-
-
-
+        
         public static void Load(string configFileName)
         {
             try
             {
 
                 JsonSerializer serializer = new JsonSerializer();
-                using (StreamReader sr = new StreamReader(configFileName))
-                using (JsonReader reader = new JsonTextReader(sr))
+                StreamReader sr = new StreamReader(configFileName);
+                try
+                {
+                    using (JsonReader reader = new JsonTextReader(sr))
+                    {
+                        instance = serializer.Deserialize<Configuration>(reader);
+                        instance.ConfigFileName = configFileName;
+                    }
+                }
+                finally
                 {
-                    instance = serializer.Deserialize<Configuration>(reader);
-                    instance.ConfigFileName = configFileName;
+                    sr.Close();                    
                 }
             }
             catch (Exception ex)

Retriever/ConsoleScanner.cs

@@ -10,13 +10,14 @@
 
 namespace Retriever
 {
-    public class ConsoleScanner
+    public class ConsoleScanner 
     {
         private Profile profile;
         private StreamWriter swout;
         private Scanner scanner;
         private AWSCredentials creds;
-        
+
+
         public void Scan(string outputFile)
         {
             Console.WriteLine(String.Format("Writing to '{0}'", outputFile));

Retriever/FormAbout.Designer.cs

@@ -18,31 +18,28 @@ public FormCredentials()
         /// Gets the credentials from the GUI
         /// </summary>
         /// <value>The credentials.</value>
-        public AWSCredentials Credentials
+        public AWSCredentials GetCredentials()
         {
-            get
+            if (!string.IsNullOrEmpty(this.AccessKeyID) && (!string.IsNullOrEmpty(this.SecretAccessKey)))
             {
-                if (!string.IsNullOrEmpty(this.AccessKeyID) && (!string.IsNullOrEmpty(this.SecretAccessKey)))
-                {
-                    return new BasicAWSCredentials(this.AccessKeyID, this.SecretAccessKey);
-                }
-                else if (!string.IsNullOrEmpty(this.ProfileName))
+                return new BasicAWSCredentials(this.AccessKeyID, this.SecretAccessKey);
+            }
+            else if (!string.IsNullOrEmpty(this.ProfileName))
+            {
+                SharedCredentialsFile credentialsFile = new SharedCredentialsFile();
+                if (!credentialsFile.TryGetProfile(ProfileName, out CredentialProfile credentialProfile))
                 {
-                    SharedCredentialsFile credentialsFile = new SharedCredentialsFile();
-                    if (!credentialsFile.TryGetProfile(ProfileName, out CredentialProfile credentialProfile))
-                    {
-                        throw new ApplicationException(string.Format("Profile '{0}' does not exists", ProfileName));
-                    }
-                    if (!AWSCredentialsFactory.TryGetAWSCredentials(credentialProfile, credentialsFile, out AWSCredentials credentials))
-                    {
-                        throw new ApplicationException(string.Format("Failed to get credentials for profile '{0}'", ProfileName));
-                    }
-                    return credentials;
+                    throw new ApplicationException(string.Format("Profile '{0}' does not exists", ProfileName));
                 }
-                else
+                if (!AWSCredentialsFactory.TryGetAWSCredentials(credentialProfile, credentialsFile, out AWSCredentials credentials))
                 {
-                    return FallbackCredentialsFactory.GetCredentials();
+                    throw new ApplicationException(string.Format("Failed to get credentials for profile '{0}'", ProfileName));
                 }
+                return credentials;
+            }
+            else
+            {
+                return FallbackCredentialsFactory.GetCredentials();
             }
         }
 

Retriever/FormCredentials.cs

@@ -2,8 +2,6 @@
 using System.ComponentModel;
 using System.Net;
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Threading;
 using System.Windows.Forms;
 using Amazon;
 using Amazon.Runtime;
@@ -31,6 +29,20 @@ public FormMain()
         {
             InitializeComponent();
 
+            try
+            {
+                ComponentResourceManager resources = new ComponentResourceManager(typeof(FormMain));
+                this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+                this.imageList.ImageStream = ((ImageListStreamer)resources.GetObject("imageList.ImageStream"));
+                this.imageList.TransparentColor = System.Drawing.Color.Transparent;
+                this.imageList.Images.SetKeyName(0, "icons8-checkmark-50.png");
+                this.imageList.Images.SetKeyName(1, "icons8-error-50.png");
+            }
+            catch (Exception ex)
+            {
+                Console.Error.WriteLine(ex);
+            }
+
             this.appBar.ToolTip = new ModernToolTip();
 
             PopulateActions();            
@@ -300,7 +312,7 @@ private void ShowCredentialsDialog()
             DialogResult dr = formCredentials.ShowDialog(this);
             if (dr == DialogResult.OK)
             {
-                this.creds = formCredentials.Credentials;
+                this.creds = formCredentials.GetCredentials(); 
             }
         }
 

Retriever/FormMain.Designer.cs

@@ -131,7 +131,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACw
-        CgAAAk1TRnQBSQFMAgEBAgEAAYgBAQGIAQEBIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CgAAAk1TRnQBSQFMAgEBAgEAAZABAQGQAQEBIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

Retriever/FormMain.cs

@@ -50,14 +50,14 @@ public FormProfileEditor(Profile profile, string selectedService, string selecte
             appBar.ToolTip = new ModernToolTip();
 
             AppAction regionAction = new AppAction();
-            regionAction.Image = Resources.Regions50;
+            regionAction.Image = Resources.Regionss50;
             regionAction.Cursor = Cursors.Hand;
             regionAction.ToolTip = "Regions Editor";
             regionAction.Click += RegionAction_Click;
             this.appBar.Actions.Add(regionAction);
 
             AppAction saveProfileAction = new AppAction();
-            saveProfileAction.Image = Resources.SaveAs50;
+            saveProfileAction.Image = Resources.Save50;
             saveProfileAction.Cursor = Cursors.Hand;
             saveProfileAction.ToolTip = "Save Profile As...";
             saveProfileAction.Click += SaveProfileAction_Click;

Retriever/FormMain.resx

@@ -4,7 +4,6 @@
 using System.Linq;
 using CloudOps;
 using Newtonsoft.Json;
-using System;
 
 namespace Retriever
 {
@@ -16,25 +15,40 @@ public void Save()
             {
                 Save("objects.json");
             }
-
+            
             public void Save(string fileName)
             {
                 JsonSerializer serializer = new JsonSerializer();
-                using (StreamWriter sw = new StreamWriter(fileName))
-                using (JsonWriter writer = new JsonTextWriter(sw))
+                StreamWriter sw = new StreamWriter(fileName);
+                try
+                {
+                    using (JsonWriter writer = new JsonTextWriter(sw))
+                    {
+                        writer.Formatting = Formatting.Indented;
+                        serializer.Serialize(writer, this);
+                    }
+                }
+                finally
                 {
-                    writer.Formatting = Formatting.Indented;
-                    serializer.Serialize(writer, this);
+                    sw.Close();
                 }
             }
 
+            
             public static CloudObjects Load()
             {
                 JsonSerializer serializer = new JsonSerializer();
-                using (StreamReader sr = new StreamReader("objects.json"))
-                using (JsonReader reader = new JsonTextReader(sr))
+                StreamReader sr = new StreamReader("objects.json");
+                try
+                {
+                    using (JsonReader reader = new JsonTextReader(sr))
+                    {
+                        return serializer.Deserialize<CloudObjects>(reader);
+                    }
+                }
+                finally
                 {
-                    return serializer.Deserialize<CloudObjects>(reader);
+                    sr.Close();
                 }
 
             }

Retriever/FormProfileEditor.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
 using CloudOps;
-using Retriever.Properties;
 using Newtonsoft.Json;
 using AWSRetriver.Controls;
 
@@ -144,23 +143,37 @@ public void Save()
             public void SaveAs(string newPath)
             {                                
                 JsonSerializer serializer = new JsonSerializer();
-                using (StreamWriter sw = new StreamWriter(newPath))
-                using (JsonWriter writer = new JsonTextWriter(sw))
+                StreamWriter sw = new StreamWriter(newPath);
+                try
                 {
-                    writer.Formatting = Formatting.Indented;
-                    serializer.Serialize(writer, this);
+                    using (JsonWriter writer = new JsonTextWriter(sw))
+                    {
+                        writer.Formatting = Formatting.Indented;
+                        serializer.Serialize(writer, this);
+                    }
+                }
+                finally
+                {
+                    sw.Close();
                 }
             }
 
             public static Profile Load(string path)
             {                
                 JsonSerializer serializer = new JsonSerializer();
-                using (StreamReader sr = new StreamReader(path))
-                using (JsonReader reader = new JsonTextReader(sr))
+                StreamReader sr = new StreamReader(path);
+                try
+                {
+                    using (JsonReader reader = new JsonTextReader(sr))
+                    {
+                        Profile p = serializer.Deserialize<Profile>(reader);
+                        p.path = path;
+                        return p;
+                    }
+                }
+                finally
                 {
-                    Profile p = serializer.Deserialize<Profile>(reader);
-                    p.path = path;
-                    return p;
+                    sr.Close();
                 }
             }
         }