chore: refactor - rm write/Error, exec goimports, simplify return from Service.HandleWrite

Author: karel-rehor

api/examples_test.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/influxdata/influxdb-client-go/v2/api"
+	apiHttp "github.com/influxdata/influxdb-client-go/v2/api/http"
 	"github.com/influxdata/influxdb-client-go/v2/api/write"
 	"github.com/influxdata/influxdb-client-go/v2/domain"
 	influxdb2 "github.com/influxdata/influxdb-client-go/v2/internal/examples"
@@ -123,7 +124,7 @@ func ExampleWriteAPI_errors() {
 	go func() {
 		for err := range errorsCh {
 			fmt.Printf("write error: %s\n", err.Error())
-			fmt.Printf("trace-id: %s\n", err.(*write.Error).GetHeader("Trace-ID"))
+			fmt.Printf("trace-id: %s\n", err.(*apiHttp.Error).Header.Get("Trace-ID"))
 		}
 	}()
 	// write some points

api/write/error.go

@@ -294,15 +294,13 @@ func TestWriteApiErrorHeaders(t *testing.T) {
 		for i := 0; i < 3; i++ {
 			recErr = <-errCh
 			assert.NotNil(t, recErr, "errCh should not run out of values")
-			header, okh := recErr.(*write.Error).HTTPHeader()
-			assert.Nil(t, okh)
-			assert.Len(t, header, 6)
-			assert.NotEqual(t, "", recErr.(*write.Error).GetHeader("Date"))
-			assert.NotEqual(t, "", recErr.(*write.Error).GetHeader("Content-Length"))
-			assert.NotEqual(t, "", recErr.(*write.Error).GetHeader("Content-Type"))
-			assert.Equal(t, strconv.Itoa(i+1), recErr.(*write.Error).GetHeader("X-Call-Count"))
-			assert.Equal(t, "Not All Correct", recErr.(*write.Error).GetHeader("X-Test-Val1"))
-			assert.Equal(t, "Atlas LV-3B", recErr.(*write.Error).GetHeader("X-Test-Val2"))
+			assert.Len(t, recErr.(*http.Error).Header, 6)
+			assert.NotEqual(t, "", recErr.(*http.Error).Header.Get("Date"))
+			assert.NotEqual(t, "", recErr.(*http.Error).Header.Get("Content-Length"))
+			assert.NotEqual(t, "", recErr.(*http.Error).Header.Get("Content-Type"))
+			assert.Equal(t, strconv.Itoa(i+1), recErr.(*http.Error).Header.Get("X-Call-Count"))
+			assert.Equal(t, "Not All Correct", recErr.(*http.Error).Header.Get("X-Test-Val1"))
+			assert.Equal(t, "Atlas LV-3B", recErr.(*http.Error).Header.Get("X-Test-Val2"))
 		}
 		wg.Done()
 	}()

api/write/error_test.go

@@ -210,7 +210,10 @@ func (w *Service) HandleWrite(ctx context.Context, batch *Batch) error {
 						}
 						log.Error(logMessage)
 					}
-					return write.NewError(perror, fmt.Sprintf("write failed (retry attempts %d)", batchToWrite.RetryAttempts))
+					log.Errorf("Write failed (retry attempts %d): Status Code %d",
+						batchToWrite.RetryAttempts,
+						perror.StatusCode)
+					return perror
 				}
 			}
 

api/write_test.go

@@ -339,7 +339,7 @@ func TestMaxRetryTime(t *testing.T) {
 	err = srv.HandleWrite(ctx, b)
 	require.NotNil(t, err)
 	// 1st Batch expires and writing 2nd trows error
-	assert.Equal(t, "write failed (retry attempts 1):\n   Unexpected status code 429", err.Error())
+	assert.Equal(t, "Unexpected status code 429", err.Error())
 	assert.Equal(t, 1, srv.retryQueue.list.Len())
 
 	//wait until remaining accumulated retryDelay has passed, because there hasn't been a successful write yet
@@ -715,7 +715,7 @@ func TestHttpErrorHeaders(t *testing.T) {
 		write.DefaultOptions())
 	err := svc.HandleWrite(context.Background(), NewBatch("1", 20))
 	assert.Error(t, err)
-	assert.Equal(t, "write failed (retry attempts 0):\n   400 Bad Request: { \"code\": \"bad request\", \"message\": \"test header\" }", err.Error())
-	assert.Equal(t, "Not All Correct", err.(*write.Error).GetHeader("X-Test-Val1"))
-	assert.Equal(t, "Atlas LV-3B", err.(*write.Error).GetHeader("X-Test-Val2"))
+	assert.Equal(t, "400 Bad Request: { \"code\": \"bad request\", \"message\": \"test header\" }", err.Error())
+	assert.Equal(t, "Not All Correct", err.(*http.Error).Header.Get("X-Test-Val1"))
+	assert.Equal(t, "Atlas LV-3B", err.(*http.Error).Header.Get("X-Test-Val2"))
 }