Address feedback

temporalio · Dec 20, 2022 · 81067a4 · 81067a4
1 parent 68d3676
commit 81067a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/common/persistence/visibility/store/elasticsearch/processor.go b/common/persistence/visibility/store/elasticsearch/processor.go
@@ -30,6 +30,7 @@ package elasticsearch
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"strings"
 	"sync/atomic"
@@ -217,8 +218,9 @@ func (p *processorImpl) bulkAfterAction(_ int64, requests []elastic.BulkableRequ
 	if err != nil {
 		const logFirstNRequests = 5
 		var httpStatus int
-		if err, isElasticErr := err.(*elastic.Error); isElasticErr {
-			httpStatus = err.Status
+		var esErr *elastic.Error
+		if errors.As(err, &esErr) {
+			httpStatus = esErr.Status
 		}
 
 		var logRequests strings.Builder

diff --git a/service/worker/addsearchattributes/workflow.go b/service/worker/addsearchattributes/workflow.go
@@ -156,12 +156,12 @@ func (a *activities) AddESMappingFieldActivity(ctx context.Context, params Workf
 }
 
 func (a *activities) isRetryableError(err error) bool {
-	var httpStatusCode int
-	if err, isElasticErr := err.(*elastic.Error); isElasticErr {
-		httpStatusCode = err.Status
+	var esErr *elastic.Error
+	if !errors.As(err, &esErr) {
+		return true
 	}
 
-	switch httpStatusCode {
+	switch esErr.Status {
 	case http.StatusBadRequest, http.StatusUnauthorized, http.StatusForbidden, http.StatusNotFound, http.StatusConflict:
 		return false
 	default: