refactor(kv): augment bucket and org json errors

CHANGELOG.md

@@ -5,6 +5,7 @@
 1. [16523](https://github.com/influxdata/influxdb/pull/16523): Change influx packages to be CRD compliant
 1. [16547](https://github.com/influxdata/influxdb/pull/16547): Allow trailing newline in credentials file and CLI integration
 1. [16545](https://github.com/influxdata/influxdb/pull/16545): Add support for prefixed cursor search to ForwardCursor types
+1. [16522](https://github.com/influxdata/influxdb/pull/16522): Introduce resource logger to tasks, buckets and organizations
 
 ### UI Improvements
 

bucket.go

@@ -2,6 +2,7 @@ package influxdb
 
 import (
 	"context"
+	"fmt"
 	"strings"
 	"time"
 )
@@ -68,6 +69,7 @@ var (
 	OpFindBucket     = "FindBucket"
 	OpFindBuckets    = "FindBuckets"
 	OpCreateBucket   = "CreateBucket"
+	OpPutBucket      = "PutBucket"
 	OpUpdateBucket   = "UpdateBucket"
 	OpDeleteBucket   = "DeleteBucket"
 )
@@ -153,3 +155,12 @@ func (f BucketFilter) String() string {
 	}
 	return "[" + strings.Join(parts, ", ") + "]"
 }
+
+func ErrInternalBucketServiceError(op string, err error) *Error {
+	return &Error{
+		Code: EInternal,
+		Msg:  fmt.Sprintf("unexpected error in buckets; Err: %v", err),
+		Op:   op,
+		Err:  err,
+	}
+}

kv/bucket.go

@@ -481,9 +481,7 @@ func (s *Service) createBucket(ctx context.Context, tx Tx, b *influxdb.Bucket) (
 
 	v, err := json.Marshal(b)
 	if err != nil {
-		return &influxdb.Error{
-			Err: err,
-		}
+		return influxdb.ErrInternalBucketServiceError(influxdb.OpCreateBucket, err)
 	}
 	if err := s.putBucket(ctx, tx, b, v); err != nil {
 		return err
@@ -514,9 +512,7 @@ func (s *Service) PutBucket(ctx context.Context, b *influxdb.Bucket) error {
 	return s.kv.Update(ctx, func(tx Tx) error {
 		v, err := json.Marshal(b)
 		if err != nil {
-			return &influxdb.Error{
-				Err: err,
-			}
+			return influxdb.ErrInternalBucketServiceError(influxdb.OpPutBucket, err)
 		}
 
 		if err := s.putBucket(ctx, tx, b, v); err != nil {
@@ -722,9 +718,7 @@ func (s *Service) updateBucket(ctx context.Context, tx Tx, id influxdb.ID, upd i
 
 	v, err := json.Marshal(b)
 	if err != nil {
-		return nil, &influxdb.Error{
-			Err: err,
-		}
+		return nil, influxdb.ErrInternalBucketServiceError(influxdb.OpUpdateBucket, err)
 	}
 
 	if err := s.putBucket(ctx, tx, b, v); err != nil {

kv/org.go

@@ -297,9 +297,7 @@ func (s *Service) createOrganization(ctx context.Context, tx Tx, o *influxdb.Org
 
 	v, err := json.Marshal(o)
 	if err != nil {
-		return &influxdb.Error{
-			Err: err,
-		}
+		return influxdb.ErrInternalOrgServiceError(influxdb.OpCreateOrganization, err)
 	}
 	if err := s.putOrganization(ctx, tx, o, v); err != nil {
 		return &influxdb.Error{
@@ -328,9 +326,7 @@ func (s *Service) PutOrganization(ctx context.Context, o *influxdb.Organization)
 	return s.kv.Update(ctx, func(tx Tx) error {
 		v, err := json.Marshal(o)
 		if err != nil {
-			return &influxdb.Error{
-				Err: err,
-			}
+			return influxdb.ErrInternalOrgServiceError(influxdb.OpPutOrganization, err)
 		}
 
 		if err := s.putOrganization(ctx, tx, o, v); err != nil {
@@ -482,9 +478,7 @@ func (s *Service) updateOrganization(ctx context.Context, tx Tx, id influxdb.ID,
 
 	v, err := json.Marshal(o)
 	if err != nil {
-		return nil, &influxdb.Error{
-			Err: err,
-		}
+		return nil, influxdb.ErrInternalOrgServiceError(influxdb.OpUpdateOrganization, err)
 	}
 	if pe := s.putOrganization(ctx, tx, o, v); pe != nil {
 		return nil, pe

organization.go

@@ -1,6 +1,9 @@
 package influxdb
 
-import "context"
+import (
+	"context"
+	"fmt"
+)
 
 // Organization is an organization. 🎉
 type Organization struct {
@@ -25,6 +28,7 @@ const (
 	OpFindOrganization     = "FindOrganization"
 	OpFindOrganizations    = "FindOrganizations"
 	OpCreateOrganization   = "CreateOrganization"
+	OpPutOrganization      = "PutOrganization"
 	OpUpdateOrganization   = "UpdateOrganization"
 	OpDeleteOrganization   = "DeleteOrganization"
 )
@@ -70,3 +74,12 @@ type OrganizationFilter struct {
 	Name *string
 	ID   *ID
 }
+
+func ErrInternalOrgServiceError(op string, err error) *Error {
+	return &Error{
+		Code: EInternal,
+		Msg:  fmt.Sprintf("unexpected error in organizations; Err: %v", err),
+		Op:   op,
+		Err:  err,
+	}
+}