fix: Opaque to Exception conversion (#710)

* fix: Opaque to Exception conversion
smithy-lang · Nov 11, 2024 · cb301b9 · cb301b9
1 parent fe48098
commit cb301b9
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 8 deletions.
diff --git a/...src/main/java/software/amazon/polymorph/smithyjava/generator/awssdk/v2/ToNativeAwsV2.java b/...src/main/java/software/amazon/polymorph/smithyjava/generator/awssdk/v2/ToNativeAwsV2.java
@@ -554,19 +554,32 @@ protected MethodSpec errorOpaque() {
         VAR_INPUT,
         Dafny.datatypeDeconstructor("obj")
       )
-      // If obj is ANY Exception
+      // If obj is A RuntimeException
       .nextControlFlow(
         "else if ($L.$L instanceof $T)",
         VAR_INPUT,
         Dafny.datatypeDeconstructor("obj"),
-        Exception.class
+        RuntimeException.class
       )
       .addStatement(
         "return ($T) $L.$L",
         RuntimeException.class,
         VAR_INPUT,
         Dafny.datatypeDeconstructor("obj")
       )
+      // If obj is A Throwable
+      .nextControlFlow(
+        "else if ($L.$L instanceof $T)",
+        VAR_INPUT,
+        Dafny.datatypeDeconstructor("obj"),
+        Throwable.class
+      )
+      .addStatement(
+        "return new RuntimeException(String.format($S, (Throwable) dafnyValue.dtor_obj()))",
+        "Unknown error thrown while calling " +
+        AwsSdkNativeV2.titleForService(subject.serviceShape) +
+        ". %s"
+      )
       .endControlFlow()
       // If obj is not ANY exception and String is not set, Give Up with IllegalStateException
       .addStatement(
@@ -608,19 +621,32 @@ protected MethodSpec errorOpaqueWithText() {
         VAR_INPUT,
         Dafny.datatypeDeconstructor("obj")
       )
-      // If obj is ANY Exception
+      // If obj is A RuntimeException
       .nextControlFlow(
         "else if ($L.$L instanceof $T)",
         VAR_INPUT,
         Dafny.datatypeDeconstructor("obj"),
-        Exception.class
+        RuntimeException.class
       )
       .addStatement(
         "return ($T) $L.$L",
         RuntimeException.class,
         VAR_INPUT,
         Dafny.datatypeDeconstructor("obj")
       )
+      // If obj is A Throwable
+      .nextControlFlow(
+        "else if ($L.$L instanceof $T)",
+        VAR_INPUT,
+        Dafny.datatypeDeconstructor("obj"),
+        Throwable.class
+      )
+      .addStatement(
+        "return new RuntimeException(String.format($S, (Throwable) dafnyValue.dtor_obj()))",
+        "Unknown error thrown while calling " +
+        AwsSdkNativeV2.titleForService(subject.serviceShape) +
+        ". %s"
+      )
       .endControlFlow()
       // If obj is not ANY exception and String is not set, Give Up with IllegalStateException
       .addStatement(

diff --git a/...test/java/software/amazon/polymorph/smithyjava/generator/awssdk/v2/ToNativeConstants.java b/...test/java/software/amazon/polymorph/smithyjava/generator/awssdk/v2/ToNativeConstants.java
@@ -97,9 +97,9 @@ public static software.amazon.awssdk.services.kms.model.RequiredListEnum Require
     """
     package software.amazon.cryptography.services.kms.internaldafny;
 
-     import java.lang.Exception;
      import java.lang.IllegalStateException;
      import java.lang.RuntimeException;
+     import java.lang.Throwable;
      import software.amazon.awssdk.services.kms.KmsClient;
      import software.amazon.awssdk.services.kms.model.DependencyTimeoutException;
      import software.amazon.awssdk.services.kms.model.DoSomethingRequest;
@@ -148,10 +148,12 @@ public static RuntimeException Error(Error_Opaque dafnyValue) {
         // Which would allow Dafny developers to treat the two differently.
         if (dafnyValue.dtor_obj() instanceof KmsException) {
           return (KmsException) dafnyValue.dtor_obj();
-        } else if (dafnyValue.dtor_obj() instanceof Exception) {
+        } else if (dafnyValue.dtor_obj() instanceof RuntimeException) {
           return (RuntimeException) dafnyValue.dtor_obj();
+        } else if (dafnyValue.dtor_obj() instanceof Throwable) {
+          return new RuntimeException(String.format("Unknown error thrown while calling AWS. %%s", (Throwable) dafnyValue.dtor_obj()));
         }
-         return new IllegalStateException(String.format(%s, dafnyValue));
+        return new IllegalStateException(String.format(%s, dafnyValue));
       }
 
        public static RuntimeException Error(Error_OpaqueWithText dafnyValue) {
@@ -162,8 +164,10 @@ public static RuntimeException Error(Error_OpaqueWithText dafnyValue) {
          // Which would allow Dafny developers to treat the two differently.
          if (dafnyValue.dtor_obj() instanceof KmsException) {
            return (KmsException) dafnyValue.dtor_obj();
-         } else if (dafnyValue.dtor_obj() instanceof Exception) {
+         } else if (dafnyValue.dtor_obj() instanceof RuntimeException) {
            return (RuntimeException) dafnyValue.dtor_obj();
+         } else if (dafnyValue.dtor_obj() instanceof Throwable) {
+           return new RuntimeException(String.format("Unknown error thrown while calling AWS. %%s", (Throwable) dafnyValue.dtor_obj()));
          }
          return new IllegalStateException(String.format(%s, dafnyValue));
        }