fix(.NET): Improve Collection of Errors string

aws · Dec 23, 2024 · 5141708 · 5141708
1 parent 1915a11
commit 5141708
Show file tree

Hide file tree

Showing 6 changed files with 141 additions and 3 deletions.
diff --git a/...erialProviders/codegen-patches/AwsCryptographicMaterialProviders/dotnet/dafny-4.9.0.patch b/...erialProviders/codegen-patches/AwsCryptographicMaterialProviders/dotnet/dafny-4.9.0.patch
@@ -0,0 +1,39 @@
+diff --git b/AwsCryptographicMaterialProviders/runtimes/net/Generated/AwsCryptographicMaterialProviders/CollectionOfErrors.cs a/AwsCryptographicMaterialProviders/runtimes/net/Generated/AwsCryptographicMaterialProviders/CollectionOfErrors.cs
+index 8f7200422..39f044046 100644
+--- b/AwsCryptographicMaterialProviders/runtimes/net/Generated/AwsCryptographicMaterialProviders/CollectionOfErrors.cs
++++ a/AwsCryptographicMaterialProviders/runtimes/net/Generated/AwsCryptographicMaterialProviders/CollectionOfErrors.cs
+@@ -8,9 +8,18 @@ namespace AWS.Cryptography.MaterialProviders
+   public class CollectionOfErrors : Exception
+   {
+     public readonly System.Collections.Generic.List<Exception> list;
+-    public CollectionOfErrors(System.Collections.Generic.List<Exception> list, string message) : base(message) { this.list = list; }
++    public CollectionOfErrors(System.Collections.Generic.List<Exception> list, string message) : base(message + $"\n List: \n{ListAsString(list)}") { this.list = list; }
+     public CollectionOfErrors(string message) : base(message) { this.list = new System.Collections.Generic.List<Exception>(); }
+     public CollectionOfErrors() : base("CollectionOfErrors") { this.list = new System.Collections.Generic.List<Exception>(); }
++
++    private static string ListAsString(List<Exception> list)
++    {
++      if (list.Count < 1) return "";
++      string[] msgArr = new string[list.Count];
++      for (int i = 0; i < list.Count; i++)
++        msgArr[i] = $"{list[i].GetType().Name} :: {list[i].Message}";
++      return String.Join("\n\t", msgArr);
++    }
+   }
+
+ }
+diff --git b/AwsCryptographicMaterialProviders/runtimes/net/Generated/AwsCryptographicMaterialProviders/TypeConversion.cs a/AwsCryptographicMaterialProviders/runtimes/net/Generated/AwsCryptographicMaterialProviders/TypeConversion.cs
+index d5ab49915..446365249 100644
+--- b/AwsCryptographicMaterialProviders/runtimes/net/Generated/AwsCryptographicMaterialProviders/TypeConversion.cs
++++ a/AwsCryptographicMaterialProviders/runtimes/net/Generated/AwsCryptographicMaterialProviders/TypeConversion.cs
+@@ -3946,7 +3946,9 @@ namespace AWS.Cryptography.MaterialProviders
+             dafnyVal._ComAmazonawsDynamodb
+           );
+         case software.amazon.cryptography.materialproviders.internaldafny.types.Error_ComAmazonawsKms dafnyVal:
+-          return Com.Amazonaws.KMS.TypeConversion.FromDafny_CommonError(
++          // BEGIN MANUAL EDIT
++          return Com.Amazonaws.Kms.TypeConversion.FromDafny_CommonError(
++            // END MANUAL EDIT
+             dafnyVal._ComAmazonawsKms
+           );
+         case software.amazon.cryptography.materialproviders.internaldafny.types.Error_AwsCryptographicMaterialProvidersException dafnyVal:
diff --git a/...graphicMaterialProviders/codegen-patches/AwsCryptographyKeyStore/dotnet/dafny-4.9.0.patch b/...graphicMaterialProviders/codegen-patches/AwsCryptographyKeyStore/dotnet/dafny-4.9.0.patch
@@ -0,0 +1,49 @@
+diff --git b/AwsCryptographicMaterialProviders/runtimes/net/Generated/AwsCryptographyKeyStore/CollectionOfErrors.cs a/AwsCryptographicMaterialProviders/runtimes/net/Generated/AwsCryptographyKeyStore/CollectionOfErrors.cs
+index e752a715a..0278e8a9a 100644
+--- b/AwsCryptographicMaterialProviders/runtimes/net/Generated/AwsCryptographyKeyStore/CollectionOfErrors.cs
++++ a/AwsCryptographicMaterialProviders/runtimes/net/Generated/AwsCryptographyKeyStore/CollectionOfErrors.cs
+@@ -8,9 +8,17 @@ namespace AWS.Cryptography.KeyStore
+   public class CollectionOfErrors : Exception
+   {
+     public readonly System.Collections.Generic.List<Exception> list;
+-    public CollectionOfErrors(System.Collections.Generic.List<Exception> list, string message) : base(message) { this.list = list; }
++    public CollectionOfErrors(System.Collections.Generic.List<Exception> list, string message) : base(message + $"\n List: \n{ListAsString(list)}") { this.list = list; }
+     public CollectionOfErrors(string message) : base(message) { this.list = new System.Collections.Generic.List<Exception>(); }
+     public CollectionOfErrors() : base("CollectionOfErrors") { this.list = new System.Collections.Generic.List<Exception>(); }
+   }
+
++  private static string ListAsString(List<Exception> list)
++  {
++    if (list.Count < 1) return "";
++    string[] msgArr = new string[list.Count];
++    for (int i = 0; i < list.Count; i++)
++      msgArr[i] = $"{list[i].GetType().Name} :: {list[i].Message}";
++    return String.Join("\n\t", msgArr);
++  }
+ }
+diff --git b/AwsCryptographicMaterialProviders/runtimes/net/Generated/AwsCryptographyKeyStore/TypeConversion.cs a/AwsCryptographicMaterialProviders/runtimes/net/Generated/AwsCryptographyKeyStore/TypeConversion.cs
+index b7ee7eb89..9c9b351d5 100644
+--- b/AwsCryptographicMaterialProviders/runtimes/net/Generated/AwsCryptographyKeyStore/TypeConversion.cs
++++ a/AwsCryptographicMaterialProviders/runtimes/net/Generated/AwsCryptographyKeyStore/TypeConversion.cs
+@@ -736,7 +736,9 @@ namespace AWS.Cryptography.KeyStore
+             dafnyVal._ComAmazonawsDynamodb
+           );
+         case software.amazon.cryptography.keystore.internaldafny.types.Error_ComAmazonawsKms dafnyVal:
+-          return Com.Amazonaws.KMS.TypeConversion.FromDafny_CommonError(
++          // BEGIN MANUAL EDIT
++          return Com.Amazonaws.Kms.TypeConversion.FromDafny_CommonError(
++          // END MANUAL EDIT
+             dafnyVal._ComAmazonawsKms
+           );
+         case software.amazon.cryptography.keystore.internaldafny.types.Error_KeyStoreException dafnyVal:
+@@ -761,7 +763,9 @@ namespace AWS.Cryptography.KeyStore
+       {
+         case "Com.Amazonaws.KMS":
+           return software.amazon.cryptography.keystore.internaldafny.types.Error.create_ComAmazonawsKms(
+-            Com.Amazonaws.KMS.TypeConversion.ToDafny_CommonError(value)
++          // BEGIN MANUAL EDIT
++            Com.Amazonaws.Kms.TypeConversion.ToDafny_CommonError(value)
++          // END MANUAL EDIT
+           );
+         case "Com.Amazonaws.Dynamodb":
+           return software.amazon.cryptography.keystore.internaldafny.types.Error.create_ComAmazonawsDynamodb(
diff --git a/...lProviders/runtimes/net/Generated/AwsCryptographicMaterialProviders/CollectionOfErrors.cs b/...lProviders/runtimes/net/Generated/AwsCryptographicMaterialProviders/CollectionOfErrors.cs
@@ -8,9 +8,18 @@ namespace AWS.Cryptography.MaterialProviders
   public class CollectionOfErrors : Exception
   {
     public readonly System.Collections.Generic.List<Exception> list;
-    public CollectionOfErrors(System.Collections.Generic.List<Exception> list, string message) : base(message) { this.list = list; }
+    public CollectionOfErrors(System.Collections.Generic.List<Exception> list, string message) : base(message + $"\n List: \n{ListAsString(list)}") { this.list = list; }
     public CollectionOfErrors(string message) : base(message) { this.list = new System.Collections.Generic.List<Exception>(); }
     public CollectionOfErrors() : base("CollectionOfErrors") { this.list = new System.Collections.Generic.List<Exception>(); }
+
+    private static string ListAsString(List<Exception> list)
+    {
+      if (list.Count < 1) return "";
+      string[] msgArr = new string[list.Count];
+      for (int i = 0; i < list.Count; i++)
+        msgArr[i] = $"{list[i].GetType().Name} :: {list[i].Message}";
+      return String.Join("\n\t", msgArr);
+    }
   }
 
 }
diff --git a/...hicMaterialProviders/runtimes/net/Generated/AwsCryptographyKeyStore/CollectionOfErrors.cs b/...hicMaterialProviders/runtimes/net/Generated/AwsCryptographyKeyStore/CollectionOfErrors.cs
@@ -8,9 +8,17 @@ namespace AWS.Cryptography.KeyStore
   public class CollectionOfErrors : Exception
   {
     public readonly System.Collections.Generic.List<Exception> list;
-    public CollectionOfErrors(System.Collections.Generic.List<Exception> list, string message) : base(message) { this.list = list; }
+    public CollectionOfErrors(System.Collections.Generic.List<Exception> list, string message) : base(message + $"\n List: \n{ListAsString(list)}") { this.list = list; }
     public CollectionOfErrors(string message) : base(message) { this.list = new System.Collections.Generic.List<Exception>(); }
     public CollectionOfErrors() : base("CollectionOfErrors") { this.list = new System.Collections.Generic.List<Exception>(); }
   }
 
+  private static string ListAsString(List<Exception> list)
+  {
+    if (list.Count < 1) return "";
+    string[] msgArr = new string[list.Count];
+    for (int i = 0; i < list.Count; i++)
+      msgArr[i] = $"{list[i].GetType().Name} :: {list[i].Message}";
+    return String.Join("\n\t", msgArr);
+  }
 }
diff --git a/AwsCryptographyPrimitives/codegen-patches/dotnet/dafny-4.9.0.patch b/AwsCryptographyPrimitives/codegen-patches/dotnet/dafny-4.9.0.patch
@@ -0,0 +1,24 @@
+diff --git b/AwsCryptographyPrimitives/runtimes/net/Generated/CollectionOfErrors.cs a/AwsCryptographyPrimitives/runtimes/net/Generated/CollectionOfErrors.cs
+index ed41bb43b..1df996dd0 100644
+--- b/AwsCryptographyPrimitives/runtimes/net/Generated/CollectionOfErrors.cs
++++ a/AwsCryptographyPrimitives/runtimes/net/Generated/CollectionOfErrors.cs
+@@ -8,9 +8,18 @@ namespace AWS.Cryptography.Primitives
+     public class CollectionOfErrors : Exception
+     {
+         public readonly System.Collections.Generic.List<Exception> list;
+-        public CollectionOfErrors(System.Collections.Generic.List<Exception> list, string message) : base(message) { this.list = list; }
++        public CollectionOfErrors(System.Collections.Generic.List<Exception> list, string message) : base(message + $"\n List: \n{ListAsString(list)}") { this.list = list; }
+         public CollectionOfErrors(string message) : base(message) { this.list = new System.Collections.Generic.List<Exception>(); }
+         public CollectionOfErrors() : base("CollectionOfErrors") { this.list = new System.Collections.Generic.List<Exception>(); }
++
++        private static string ListAsString(List<Exception> list)
++        {
++            if (list.Count < 1) return "";
++            string[] msgArr = new string[list.Count];
++            for (int i = 0; i < list.Count; i++)
++                msgArr[i] = $"{list[i].GetType().Name} :: {list[i].Message}";
++            return String.Join("\n\t", msgArr);
++        }
+     }
+
+ }
diff --git a/AwsCryptographyPrimitives/runtimes/net/Generated/CollectionOfErrors.cs b/AwsCryptographyPrimitives/runtimes/net/Generated/CollectionOfErrors.cs
@@ -8,9 +8,18 @@ namespace AWS.Cryptography.Primitives
     public class CollectionOfErrors : Exception
     {
         public readonly System.Collections.Generic.List<Exception> list;
-        public CollectionOfErrors(System.Collections.Generic.List<Exception> list, string message) : base(message) { this.list = list; }
+        public CollectionOfErrors(System.Collections.Generic.List<Exception> list, string message) : base(message + $"\n List: \n{ListAsString(list)}") { this.list = list; }
         public CollectionOfErrors(string message) : base(message) { this.list = new System.Collections.Generic.List<Exception>(); }
         public CollectionOfErrors() : base("CollectionOfErrors") { this.list = new System.Collections.Generic.List<Exception>(); }
+
+        private static string ListAsString(List<Exception> list)
+        {
+            if (list.Count < 1) return "";
+            string[] msgArr = new string[list.Count];
+            for (int i = 0; i < list.Count; i++)
+                msgArr[i] = $"{list[i].GetType().Name} :: {list[i].Message}";
+            return String.Join("\n\t", msgArr);
+        }
     }
 
 }