fix: correct error wrapping in auth codegen (#484)

aws · Dec 1, 2023 · 7be1336 · 7be1336
1 parent 81ebcd0
commit 7be1336
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.../src/main/java/software/amazon/smithy/go/codegen/auth/GetIdentityMiddlewareGenerator.java b/.../src/main/java/software/amazon/smithy/go/codegen/auth/GetIdentityMiddlewareGenerator.java
@@ -76,7 +76,7 @@ private GoWriter.Writable generateBody() {
 
  identity, err := resolver.GetIdentity(ctx, rscheme.IdentityProperties)
  if err != nil {
- return out, metadata, $errorf:T("get identity: %v", err)
+ return out, metadata, $errorf:T("get identity: %w", err)
  }
 
  ctx = setIdentity(ctx, identity)

diff --git a/...ain/java/software/amazon/smithy/go/codegen/auth/ResolveAuthSchemeMiddlewareGenerator.java b/...ain/java/software/amazon/smithy/go/codegen/auth/ResolveAuthSchemeMiddlewareGenerator.java
@@ -39,7 +39,7 @@ public ResolveAuthSchemeMiddlewareGenerator(ProtocolGenerator.GenerationContext
  public static GoWriter.Writable generateAddToProtocolFinalizers() {
  return goTemplate("""
  if err := stack.Finalize.Add(&$L{operation: operation, options: options}, $T); err != nil {
- return $T("add $L: %v", err)
+ return $T("add $L: %w", err)
  }
  """,
  MIDDLEWARE_NAME,
@@ -69,7 +69,7 @@ private GoWriter.Writable generateBody() {
  params := $1L(m.operation, getOperationInput(ctx), m.options)
  options, err := m.options.AuthSchemeResolver.ResolveAuthSchemes(ctx, params)
  if err != nil {
- return out, metadata, $2T("resolve auth scheme: %v", err)
+ return out, metadata, $2T("resolve auth scheme: %w", err)
  }
 
  scheme, ok := m.selectScheme(options)

diff --git a/.../src/main/java/software/amazon/smithy/go/codegen/auth/SignRequestMiddlewareGenerator.java b/.../src/main/java/software/amazon/smithy/go/codegen/auth/SignRequestMiddlewareGenerator.java
@@ -40,7 +40,7 @@ public SignRequestMiddlewareGenerator(ProtocolGenerator.GenerationContext contex
  public static GoWriter.Writable generateAddToProtocolFinalizers() {
  return goTemplate("""
  if err := stack.Finalize.Insert(&$L{}, $S, $T); err != nil {
- return $T("add $L: %v", err)
+ return $T("add $L: %w", err)
  }
  """,
  MIDDLEWARE_NAME,
@@ -82,7 +82,7 @@ private GoWriter.Writable generateBody() {
  }
 
  if err := signer.SignRequest(ctx, req, identity, rscheme.SignerProperties); err != nil {
- return out, metadata, $errorf:T("sign request: %v", err)
+ return out, metadata, $errorf:T("sign request: %w", err)
  }
 
  return next.HandleFinalize(ctx, in)