Fixing Issue #15 (#16)

* Fixing ArgumentOutOfRangeException issue when no key exists. * Bumping patch number on VersionPrefix.
Narochno · Dec 8, 2017 · 53f936a · 53f936a
1 parent c893cc2
commit 53f936a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/misc/CredstashTester/Program.cs b/misc/CredstashTester/Program.cs
@@ -1,7 +1,11 @@
 using System;
 using System.Collections.Generic;
+using Amazon;
+using Amazon.DynamoDBv2;
+using Amazon.KeyManagementService;
 using Amazon.Runtime;
 using Microsoft.Extensions.Configuration;
+using Narochno.Credstash;
 using Narochno.Credstash.Configuration;
 
 namespace CredstashTester
@@ -10,6 +14,12 @@ public class Program
     {
         public static void Main(string[] args)
         {
+            var stash = new Credstash(new CredstashOptions(), new AmazonKeyManagementServiceClient(RegionEndpoint.EUWest1),
+                   new AmazonDynamoDBClient(RegionEndpoint.EUWest1));
+
+            var noneExistingKey1 = stash.GetSecretAsync(Guid.NewGuid().ToString()).Result;
+            var noneExistingKey2 = stash.GetSecretAsync(Guid.NewGuid().ToString(), "1").Result;
+
             //var creds = new StoredProfileAWSCredentials();
             //var stash = new Credstash(new CredstashOptions(), new AmazonKeyManagementServiceClient(creds, RegionEndpoint.EUWest1),
             //    new AmazonDynamoDBClient(creds, RegionEndpoint.EUWest1));

diff --git a/src/Narochno.Credstash.Configuration/Narochno.Credstash.Configuration.csproj b/src/Narochno.Credstash.Configuration/Narochno.Credstash.Configuration.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>2.1.0</VersionPrefix>
+    <VersionPrefix>2.1.1</VersionPrefix>
     <Authors>adamhathcock</Authors>
     <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
     <AssemblyName>Narochno.Credstash.Configuration</AssemblyName>

diff --git a/src/Narochno.Credstash/Credstash.cs b/src/Narochno.Credstash/Credstash.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
@@ -58,7 +59,8 @@ public async Task<Optional<string>> GetSecretAsync(string name, string version =
                         }
                     }
                 }).ConfigureAwait(false);
-                item = CredstashItem.From(response.Items[0]);
+
+                item = CredstashItem.From(response.Items.FirstOrDefault());
             }
             else
             {
@@ -74,6 +76,11 @@ public async Task<Optional<string>> GetSecretAsync(string name, string version =
                 item = CredstashItem.From(response.Item);
             }
 
+            if (item == null)
+            {
+                return null;
+            }
+
             DecryptResponse decryptResponse;
             try
             {

diff --git a/src/Narochno.Credstash/Internal/CredstashItem.cs b/src/Narochno.Credstash/Internal/CredstashItem.cs
@@ -17,6 +17,11 @@ public class CredstashItem
 
         public static CredstashItem From(Dictionary<string, AttributeValue> item)
         {
+            if (item == null || item.Count == 0)
+            {
+                return null;
+            }
+
             return new CredstashItem
             {
                 Name = item["name"].S,

diff --git a/src/Narochno.Credstash/Narochno.Credstash.csproj b/src/Narochno.Credstash/Narochno.Credstash.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <VersionPrefix>2.1.0</VersionPrefix>
+    <VersionPrefix>2.1.1</VersionPrefix>
     <Authors>adamhathcock</Authors>
     <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
     <AssemblyName>Narochno.Credstash</AssemblyName>