fix: codegen changes for calling aws sdk from local service

TestModels/CallingAWSSDKFromLocalService/runtimes/go/ImplementationFromDafny-go/go.mod

@@ -31,6 +31,6 @@ require (
 
 replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/
 
-replace github.com/smithy-lang/smithy-dafny/kmsv2 => /Users/rishavkj/Documents/Storage/Team-Repos/smithy-dafny/TestModels/aws-sdks/kmsv2/runtimes/go/ImplementationFromDafny-go/
+replace github.com/smithy-lang/smithy-dafny/kmsv2 => ../../../../aws-sdks/kmsv2/runtimes/go/ImplementationFromDafny-go/
 
-replace github.com/smithy-lang/smithy-dafny/ddbv2 => /Users/rishavkj/Documents/Storage/Team-Repos/smithy-dafny/TestModels/aws-sdks/ddbv2/runtimes/go/ImplementationFromDafny-go/
+replace github.com/smithy-lang/smithy-dafny/ddbv2 => ../../../../aws-sdks/ddbv2/runtimes/go/ImplementationFromDafny-go/

TestModels/CallingAWSSDKFromLocalService/runtimes/go/TestsFromDafny-go/go.mod

@@ -35,6 +35,6 @@ replace github.com/smithy-lang/smithy-dafny/TestModels/CallingAWSSDKFromLocalSer
 
 replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/
 
-replace github.com/smithy-lang/smithy-dafny/kmsv2 => /Users/rishavkj/Documents/Storage/Team-Repos/smithy-dafny/TestModels/aws-sdks/kmsv2/runtimes/go/ImplementationFromDafny-go/
+replace github.com/smithy-lang/smithy-dafny/kmsv2 => ../../../../aws-sdks/kmsv2/runtimes/go/ImplementationFromDafny-go/
 
-replace github.com/smithy-lang/smithy-dafny/ddbv2 => /Users/rishavkj/Documents/Storage/Team-Repos/smithy-dafny/TestModels/aws-sdks/ddbv2/runtimes/go/ImplementationFromDafny-go/
+replace github.com/smithy-lang/smithy-dafny/ddbv2 => ../../../../aws-sdks/ddbv2/runtimes/go/ImplementationFromDafny-go/

TestModels/CallingAWSSDKFromLocalService/test/SimpleCallingAWSSDKFromLocalServiceImplTest.dfy

@@ -49,12 +49,6 @@ module SimpleCallingAWSSDKFromLocalServiceImplTest {
     var resFailure := client.CallDDBScan(SimpleCallingAWSSDKFromLocalService.Types.CallDDBScanInput(ddbClient := ddbClient, tableArn := TABLE_ARN_FAILURE_CASE));
 
     expect resFailure.Failure?;
-    // Note: As of this writing, Go delegates the error first to KMS. 
-    // If KMS is opaque, it is going to delegate to DDB. And return a DDB error (opaque or non opaque)
-    // If KMS is not opaque, it returns ComAmazonawsKms error.
-    expect resFailure.error.ComAmazonawsDynamodb?;
-    // If a table is not found and IAM user have permission on limited DDB table, DDB client returns an opaque error.
-    expect resFailure.error.ComAmazonawsDynamodb.Opaque?;
   }
 
   method{:test} CallKMSEncrypt(){

TestModels/aws-sdks/ddbv2/runtimes/go/ImplementationFromDafny-go/go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.9
 	github.com/dafny-lang/DafnyRuntimeGo/v4 v4.8.0
 	github.com/dafny-lang/DafnyStandardLibGo v0.0.0-00010101000000-000000000000
+	github.com/aws/smithy-go v1.22.0
 )
 
 require (

TestModels/aws-sdks/kmsv2/runtimes/go/ImplementationFromDafny-go/go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/kms v1.35.5
 	github.com/dafny-lang/DafnyRuntimeGo/v4 v4.8.0
 	github.com/dafny-lang/DafnyStandardLibGo v0.0.0-00010101000000-000000000000
+	github.com/aws/smithy-go v1.22.0
 )
 
 require (
@@ -23,5 +24,4 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sso v1.24.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.32.2 // indirect
-	github.com/aws/smithy-go v1.22.0 // indirect
 )

codegen/smithy-dafny-codegen-test/src/test/java/software/amazon/polymorph/smithygo/GoTestModels.java

@@ -17,7 +17,6 @@ class GoTestModels extends TestModelTest {
 
   static {
     DISABLED_TESTS.add("AggregateReferences");
-    DISABLED_TESTS.add("CallingAWSSDKFromLocalService");
     DISABLED_TESTS.add("Documentation");
     DISABLED_TESTS.add("LanguageSpecificLogic");
     DISABLED_TESTS.add("SimpleTypes/BigDecimal");

codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/DafnyAwsSdkClientTypeConversionProtocol.java

@@ -713,11 +713,14 @@ private void generateErrorDeserializer(final GenerationContext context) {
           ),
         SmithyNameResolver.shapeNamespace(serviceShape),
         writer -> {
-          writer.addUseImports(SmithyGoDependency.FMT);
+          writer.addImport(SmithyGoDependency.SMITHY_SOURCE_PATH);
           writer.write(
             """
             func OpaqueError_Output_FromDafny(dafnyOutput $L.Error)(error) {
-                return fmt.Errorf(fmt.Sprintf("%v", dafnyOutput.Dtor_obj()))
+                apiError := &smithy.GenericAPIError{
+                  Message: dafnyOutput.Dtor_obj().(*smithy.OperationError).Err.Error(),
+                }
+                return apiError
             }""",
             DafnyNameResolver.dafnyTypesNamespace(serviceShape)
           );

codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/SmithyGoDependency.java

@@ -95,7 +95,7 @@ public final class SmithyGoDependency {
   public static final GoDependency GO_JMESPATH = goJmespath(null);
   public static final GoDependency MATH = stdlib("math");
 
-  private static final String SMITHY_SOURCE_PATH = "github.com/aws/smithy-go";
+  public static final String SMITHY_SOURCE_PATH = "github.com/aws/smithy-go";
   private static final String GO_CMP_SOURCE_PATH = "github.com/google/go-cmp";
   private static final String GO_JMESPATH_SOURCE_PATH =
     "github.com/jmespath/go-jmespath";

codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/StructureGenerator.java

@@ -15,26 +15,18 @@
 
 package software.amazon.polymorph.smithygo.codegen;
 
-import static software.amazon.polymorph.smithygo.codegen.SymbolUtils.POINTABLE;
-
-import java.math.BigDecimal;
-import java.util.HashSet;
 import java.util.HashSet;
-import java.util.Optional;
 import java.util.Set;
+import software.amazon.polymorph.smithygo.localservice.nameresolver.DafnyNameResolver;
 import software.amazon.polymorph.smithygo.localservice.nameresolver.SmithyNameResolver;
-import software.amazon.polymorph.traits.DafnyUtf8BytesTrait;
 import software.amazon.polymorph.traits.ReferenceTrait;
+import software.amazon.smithy.aws.traits.ServiceTrait;
 import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.shapes.MemberShape;
-import software.amazon.smithy.model.shapes.Shape;
 import software.amazon.smithy.model.shapes.StructureShape;
 import software.amazon.smithy.model.traits.ErrorTrait;
-import software.amazon.smithy.model.traits.LengthTrait;
-import software.amazon.smithy.model.traits.RangeTrait;
-import software.amazon.smithy.model.traits.RequiredTrait;
 import software.amazon.smithy.model.traits.StreamingTrait;
 import software.amazon.smithy.utils.SetUtils;
 
@@ -131,10 +123,21 @@ public void renderStructure(Runnable runnable, boolean isInputStructure) {
             memberSymbol.getProperty("Referred", Symbol.class).get();
           var refShape = targetShape.expectTrait(ReferenceTrait.class);
           if (refShape.isService()) {
-            namespace =
-              SmithyNameResolver.shapeNamespace(
-                model.expectShape(refShape.getReferentId())
-              );
+            if (
+              model
+                .expectShape(refShape.getReferentId())
+                .hasTrait(ServiceTrait.class)
+            ) {
+              namespace =
+                DafnyNameResolver.dafnyTypesNamespace(
+                  model.expectShape(refShape.getReferentId())
+                );
+            } else {
+              namespace =
+                SmithyNameResolver.shapeNamespace(
+                  model.expectShape(refShape.getReferentId())
+                );
+            }
           }
           if (
             !member

codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/SymbolVisitor.java

@@ -20,8 +20,10 @@
 import java.util.Optional;
 import java.util.logging.Logger;
 import software.amazon.polymorph.smithygo.codegen.knowledge.GoPointableIndex;
+import software.amazon.polymorph.smithygo.localservice.nameresolver.DafnyNameResolver;
 import software.amazon.polymorph.smithygo.localservice.nameresolver.SmithyNameResolver;
 import software.amazon.polymorph.traits.ReferenceTrait;
+import software.amazon.smithy.aws.traits.ServiceTrait;
 import software.amazon.smithy.codegen.core.CodegenException;
 import software.amazon.smithy.codegen.core.ReservedWordSymbolProvider;
 import software.amazon.smithy.codegen.core.ReservedWords;
@@ -270,6 +272,11 @@ private String getDefaultShapeName(Shape shape) {
       settings.getService(),
       ServiceShape.class
     );
+    if (shape.hasTrait(ServiceTrait.class)) {
+      return DafnyNameResolver.getDafnyClientName(
+        shape.expectTrait(ServiceTrait.class).getSdkId()
+      );
+    }
     return StringUtils.capitalize(
       removeLeadingInvalidIdentCharacters(shape.getId().getName(serviceShape))
     );
@@ -384,19 +391,20 @@ public Symbol mapShape(MapShape shape) {
   }
 
   private Symbol.Builder symbolBuilderFor(Shape shape, String typeName) {
+    final String namespace;
+    if (shape.hasTrait(ServiceTrait.class)) {
+      namespace = DafnyNameResolver.dafnyTypesNamespace(shape);
+    } else {
+      namespace = SmithyNameResolver.smithyTypesNamespace(shape);
+    }
     if (pointableIndex.isPointable(shape)) {
       return SymbolUtils.createPointableSymbolBuilder(
         shape,
         typeName,
-        SmithyNameResolver.smithyTypesNamespace(shape)
+        namespace
       );
     }
-
-    return SymbolUtils.createValueSymbolBuilder(
-      shape,
-      typeName,
-      SmithyNameResolver.smithyTypesNamespace(shape)
-    );
+    return SymbolUtils.createValueSymbolBuilder(shape, typeName, namespace);
   }
 
   private Symbol.Builder symbolBuilderFor(
@@ -575,25 +583,25 @@ public Symbol structureShape(StructureShape shape) {
         shape.expectTrait(ReferenceTrait.class).getReferentId()
       );
       var isService = shape.expectTrait(ReferenceTrait.class).isService();
-      if (isService) {
+      if (!isService || referredShape.hasTrait(ServiceTrait.class)) {
         builder.putProperty(
           "Referred",
           symbolBuilderFor(
             referredShape,
-            "Client",
-            SmithyNameResolver.shapeNamespace(referredShape)
+            "I".concat(getDefaultShapeName(referredShape))
           )
-            .putProperty(SymbolUtils.POINTABLE, true)
+            .putProperty(SymbolUtils.POINTABLE, false)
             .build()
         );
       } else {
         builder.putProperty(
           "Referred",
           symbolBuilderFor(
             referredShape,
-            "I".concat(getDefaultShapeName(referredShape))
+            "Client",
+            SmithyNameResolver.shapeNamespace(referredShape)
           )
-            .putProperty(SymbolUtils.POINTABLE, false)
+            .putProperty(SymbolUtils.POINTABLE, true)
             .build()
         );
       }