dev

APIs/AWSAPI.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Amazon;
 using Amazon.Runtime;
 

APIs/AWSLambdaAPI.cs

@@ -4,7 +4,6 @@
 using Amazon.Lambda;
 using Amazon.Lambda.Model;
 using Amazon.Runtime;
-using heaven.APIs;
 
 namespace heaven.APIs
 {
@@ -55,6 +54,7 @@ public override void Read(AWSCredentials credentials, RegionEndpoint region)
                 }
             }
             while (!string.IsNullOrEmpty(resp.NextMarker));
+
         }
 
     }

AWSObject.cs → APIs/AWSObject.cs

@@ -1,7 +1,6 @@
 using System;
-using Amazon;
 
-namespace heaven
+namespace heaven.APIs
 {
     [Serializable]
     public class AWSObject

ResourceLister.cs → APIs/AWSResources.cs

@@ -4,23 +4,17 @@
 using System.IO;
 using Amazon;
 using Amazon.Runtime;
-using heaven.APIs;
 using Newtonsoft.Json;
 
-namespace heaven
+namespace heaven.APIs
 {
-    internal class ResourceLoader
+    internal class AWSResources
     {
         private readonly List<AWSAPI> apis = new List<AWSAPI>();
-        private string accessKey;
-        private string secretKey;
-        private int maxItems = 100;
         private readonly List<AWSObject> objects = new List<AWSObject>();
 
-        public string AccessKey { get => accessKey; set => accessKey = value; }
-
+        private int maxItems = 100;
 
-        public string SecretKey { get => secretKey; set => secretKey = value; }
         public int MaxItems { get => maxItems; set => maxItems = value; }
 
         public IEnumerable<AWSObject> Objects
@@ -31,20 +25,29 @@ public IEnumerable<AWSObject> Objects
             }
         }
 
-        public ResourceLoader()
+        public AWSResources()
         {
             this.apis.Add(new AWSLambdaAPI(this.objects, this.MaxItems));
             this.apis.Add(new AWSS3API(this.objects, this.maxItems));
+
             LoadFromFile();
         }
 
-
-        internal void Load(BackgroundWorker worker, DoWorkEventArgs e)
+        /// <summary>
+        /// Connects to AWS and reads all resources
+        /// </summary>
+        /// <param name="creds">Creds.</param>
+        /// <param name="worker">Worker.</param>
+        /// <param name="e">E.</param>
+        public void Scan(AWSCredentials creds, BackgroundWorker worker, DoWorkEventArgs e)
         {
+            if (creds == null)
+            {
+                throw new ApplicationException("No Credentials are provided");
+            }
             this.objects.Clear();
             try
             {
-                AWSCredentials creds = GetCredentials();
                 List<RegionEndpoint> regions = new List<RegionEndpoint>(RegionEndpoint.EnumerableAllRegions);
                 int totalItems = this.apis.Count * regions.Count;
                 int currentItem = 0;
@@ -53,15 +56,17 @@ internal void Load(BackgroundWorker worker, DoWorkEventArgs e)
                     foreach (RegionEndpoint region in regions)
                     {
                         int progress = (currentItem * 100) / totalItems;
-                        worker.ReportProgress(progress, string.Format("Fetching '{0}' from {1}", api.Name, region));
+                        worker.ReportProgress(progress, string.Format("Fetching '{0}' from {1}...", api.Name, region));
                         try
                         {
                             if (worker.CancellationPending)
                             {
                                 e.Cancel = true;
                                 return;
                             }
+                            int before = this.objects.Count;     
                             api.Read(creds, region);
+                            worker.ReportProgress(progress, string.Format("{0} items read.\n", objects.Count - before));
                         }
                         catch (Exception ex)
                         {
@@ -78,11 +83,10 @@ internal void Load(BackgroundWorker worker, DoWorkEventArgs e)
             finally
             {
                 SaveToFile(); 
-                worker.ReportProgress(100, "Done");
+                worker.ReportProgress(100, "Done\n");
             }
         }
 
-
         private void SaveToFile()
         {
             StreamWriter sw = new StreamWriter("objects.json", false);
@@ -137,16 +141,5 @@ private void LoadFromFile()
                 Console.WriteLine(ex);
             }
         }
-
-        private AWSCredentials GetCredentials()
-        {
-            if (!string.IsNullOrEmpty(this.AccessKey))
-            {
-                return new BasicAWSCredentials(this.AccessKey, this.SecretKey);
-            }
-            return FallbackCredentialsFactory.GetCredentials();
-        }
-
-
     }
-}
+}

FormCredentials.cs

@@ -7,6 +7,8 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Amazon.Runtime;
+using Amazon.Runtime.CredentialManagement;
 
 namespace heaven
 {
@@ -15,22 +17,66 @@ public partial class FormCredentials : Form
         public FormCredentials()
         {
             InitializeComponent();
+            this.txtProfile.Text = SharedCredentialsFile.DefaultProfileName;
         }
 
-        private void buttonOK_Click(object sender, EventArgs e)
+        /// <summary>
+        /// Gets the credentials from the GUI
+        /// </summary>
+        /// <value>The credentials.</value>
+        public AWSCredentials Credentials
         {
+            get
+            {
+                if (!string.IsNullOrEmpty(this.AccessKey) && (!string.IsNullOrEmpty(this.SecretKey)))
+                {
+                    return new BasicAWSCredentials(this.AccessKey, this.SecretKey);
+                }
+                else if (!string.IsNullOrEmpty(this.ProfileName))
+                {
+                    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;
+                }
+                else
+                {
+                    return FallbackCredentialsFactory.GetCredentials();
+                }
+            }
+        }
+
+        public string AccessKey { get{
+            return  this.txtAccessKey.Text;
+        } }
 
+        public string SecretKey { get {
+            return this.txtSecretKey.Text;
+        }}
+
+        public string ProfileName
+        {
+            get
+            {
+                return this.txtProfile.Text;
+            }
         }
 
         private void txtAccessKey_TextChanged(object sender, EventArgs e)
         {
             if (string.IsNullOrEmpty(txtAccessKey.Text))
             {
-                this.txtProfile.Enabled = true;
+                this.txtProfile.Text = SharedCredentialsFile.DefaultProfileName; 
             } else
             {
-                this.txtProfile.Enabled = false;
+                this.txtProfile.Text = "";
             }
         }
     }
-}
+}        

FormMain.cs

@@ -1,36 +1,29 @@
-using Amazon.CloudFormation;
-using Amazon.CloudFormation.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.CredentialManagement;
-using System;
-using System.Collections.Generic;
+using System;
 using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Windows.Forms;
+using Amazon.Runtime;
+using heaven.APIs;
 
 namespace heaven
 {
     public partial class FormMain : Form
     {
-        private ResourceLoader resourceLoader = new ResourceLoader();
+        private readonly AWSResources awsResources = new AWSResources();
+        private AWSCredentials creds;
 
         public FormMain()
         {
             InitializeComponent();
             InitializeBackgroundWorker();
             PopulateListView();
+
         }
 
         private void PopulateListView()
         {
             this.listViewObjects.Columns.Clear();
             this.listViewObjects.Items.Clear();
-            foreach (AWSObject obj in this.resourceLoader.Objects)
+            foreach (AWSObject obj in this.awsResources.Objects)
             {
                 ListViewItem item = this.listViewObjects.Items.Add(obj.Type);
                 item.SubItems.Add(obj.Region);
@@ -51,16 +44,26 @@ private void PopulateListView()
             }
         }
 
+        private AWSCredentials GetCredentials()
+        {
+            if (this.creds == null)
+            {
+                FormCredentials formCredentials = new FormCredentials();
+                DialogResult dr = formCredentials.ShowDialog(this);
+                if (dr == DialogResult.OK)
+                {
+                    this.creds = formCredentials.Credentials;
+                }
+
+            }
+            return this.creds;
+        }
+
         private void InitializeBackgroundWorker()
         {
-            backgroundWorker.DoWork +=
-                new DoWorkEventHandler(BackgroundWorker_DoWork);
-            backgroundWorker.RunWorkerCompleted +=
-                new RunWorkerCompletedEventHandler(
-            BackgroundWorker_RunWorkerCompleted);
-            backgroundWorker.ProgressChanged +=
-                new ProgressChangedEventHandler(
-            BackgroundWorker_ProgressChanged);
+            backgroundWorker.DoWork += new DoWorkEventHandler(BackgroundWorker_DoWork);
+            backgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(BackgroundWorker_RunWorkerCompleted);
+            backgroundWorker.ProgressChanged += new ProgressChangedEventHandler(BackgroundWorker_ProgressChanged);
         }
 
         private void BackgroundWorker_ProgressChanged(object sender, ProgressChangedEventArgs e)
@@ -85,7 +88,7 @@ private void BackgroundWorker_RunWorkerCompleted(object sender, RunWorkerComplet
             }
             else if (e.Cancelled)
             {
-                Print("Canceled");
+                Print("Canceled\n");
                 this.progressBar.Value = 0;
             }
             else
@@ -100,20 +103,20 @@ private void BackgroundWorker_RunWorkerCompleted(object sender, RunWorkerComplet
 
         private void Print(Exception e)
         {
-            Print("Error: " + e.Message);
+            Print("Error: " + e.Message + "\n");
         }
 
         private void Print(object message)
         {
             this.statusLabel.Text = message.ToString();
-            this.textLog.AppendText(message.ToString() + "\n");
+            this.textLog.AppendText(message.ToString());
         }
 
 
         private void BackgroundWorker_DoWork(object sender, DoWorkEventArgs e)
         {
             BackgroundWorker worker = sender as BackgroundWorker;
-            this.resourceLoader.Load(worker, e);
+            this.awsResources.Scan(this.creds, worker, e);
         }
 
         private void ExitToolStripMenuItem_Click(object sender, EventArgs e)
@@ -122,12 +125,13 @@ private void ExitToolStripMenuItem_Click(object sender, EventArgs e)
         }
 
         private void ToolStripButtonClose_Click(object sender, EventArgs e)
-        {            
+        {
             Close();
         }
 
         private void ToolStripButtonLoad_Click(object sender, EventArgs e)
         {
+            this.creds = GetCredentials();
             statusLabel.Text = String.Empty;
             this.buttonLoad.Enabled = false;
             this.buttonStop.Enabled = true;
@@ -140,10 +144,5 @@ private void ToolStripButtonStop_Click(object sender, EventArgs e)
             buttonStop.Enabled = false;
         }
 
-        private void FormMain_Load(object sender, EventArgs e)
-        {
-            FormCredentials formCredentials= new FormCredentials();
-            formCredentials.ShowDialog(this);
-        }
     }
 }