fix: Fix problematic error returns (#1102)

cuishuang · web-flow · commit 8ce3b0f17ff3 · 2025-03-09T13:18:08.000+08:00
Signed-off-by: cuishuang &lt;imcusg@gmail.com&gt;
diff --git a/pkg/grpc/dapr/dapr_api_pubsub.go b/pkg/grpc/dapr/dapr_api_pubsub.go
@@ -242,7 +242,7 @@ func (d *daprGrpcAPI) publishMessageGRPC(ctx context.Context, msg *pubsub.NewMes
 		decoded, decodeErr := base64.StdEncoding.DecodeString(data.(string))
 		if decodeErr != nil {
 			log.DefaultLogger.Debugf("unable to base64 decode cloudEvent field data_base64: %s", decodeErr)
-			return err
+			return decodeErr
 		}
 
 		envelope.Data = decoded
diff --git a/pkg/grpc/default_api/api_pubsub.go b/pkg/grpc/default_api/api_pubsub.go
@@ -245,7 +245,7 @@ func (a *api) envelopeFromSubscriptionMessage(ctx context.Context, msg *pubsub.N
 		decoded, decodeErr := base64.StdEncoding.DecodeString(data.(string))
 		if decodeErr != nil {
 			log.DefaultLogger.Debugf("unable to base64 decode cloudEvent field data_base64: %s", decodeErr)
-			return nil, cloudEvent, err
+			return nil, cloudEvent, decodeErr
 		}
 
 		envelope.Data = decoded

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ func (d daprGrpcAPI) publishMessageGRPC(ctx context.Context, msg pubsub.NewMes`
`242`	`242`	`decoded, decodeErr := base64.StdEncoding.DecodeString(data.(string))`
`243`	`243`	`if decodeErr != nil {`
`244`	`244`	`log.DefaultLogger.Debugf("unable to base64 decode cloudEvent field data_base64: %s", decodeErr)`
`245`		`- return err`
	`245`	`+ return decodeErr`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`envelope.Data = decoded`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ func (a api) envelopeFromSubscriptionMessage(ctx context.Context, msg pubsub.N`
`245`	`245`	`decoded, decodeErr := base64.StdEncoding.DecodeString(data.(string))`
`246`	`246`	`if decodeErr != nil {`
`247`	`247`	`log.DefaultLogger.Debugf("unable to base64 decode cloudEvent field data_base64: %s", decodeErr)`
`248`		`- return nil, cloudEvent, err`
	`248`	`+ return nil, cloudEvent, decodeErr`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`envelope.Data = decoded`