style: format code with Gofumpt and Prettier

This commit fixes the style issues introduced in 75cb403 according to the output from Gofumpt and Prettier. Details: #2639 Signed-off-by: kpango <[email protected]>
vdaas · Sep 26, 2024 · a25afff · a25afff
1 parent 75cb403
commit a25afff
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/internal/net/grpc/errdetails/errdetails.go b/internal/net/grpc/errdetails/errdetails.go
@@ -54,7 +54,7 @@ const (
 	ValdResourceOwner          = "vdaas.org vald team <[email protected]>"
 	ValdGRPCResourceTypePrefix = "github.com/vdaas/vald/apis/grpc/v1"
 
-	typePrefix  = "type.googleapis.com/google.rpc."
+	typePrefix   = "type.googleapis.com/google.rpc."
 	typePrefixV1 = "type.googleapis.com/rpc.v1."
 )
 
@@ -84,7 +84,7 @@ func (d *Detail) MarshalJSON() (body []byte, err error) {
 	if d == nil {
 		return nil, nil
 	}
-	switch strings.TrimPrefix(strings.TrimPrefix(d.TypeURL, typePrefix), typePrefixV1){
+	switch strings.TrimPrefix(strings.TrimPrefix(d.TypeURL, typePrefix), typePrefixV1) {
 	case DebugInfoMessageName:
 		m, ok := d.Message.(*DebugInfo)
 		if ok {
@@ -314,7 +314,7 @@ func AnyToErrorDetail(a *types.Any) proto.Message {
 		return nil
 	}
 	var err error
-	switch strings.TrimPrefix(strings.TrimPrefix(a.GetTypeUrl(), typePrefix), typePrefixV1){
+	switch strings.TrimPrefix(strings.TrimPrefix(a.GetTypeUrl(), typePrefix), typePrefixV1) {
 	case DebugInfoMessageName:
 		var m DebugInfo
 		err = types.UnmarshalAny(a, &m)

diff --git a/internal/net/grpc/status/status.go b/internal/net/grpc/status/status.go
@@ -443,6 +443,7 @@ func withDetails(st *Status, err error, details ...any) *Status {
 					}
 				}
 			}
+			m.Detail = removeDuplicatesFromTSVLine(m.GetDetail())
 			msgs = append(msgs, m)
 		case errdetails.ErrorInfoMessageName:
 			m := new(errdetails.ErrorInfo)
@@ -470,6 +471,8 @@ func withDetails(st *Status, err error, details ...any) *Status {
 					}
 				}
 			}
+			m.Reason = removeDuplicatesFromTSVLine(m.GetReason())
+			m.Domain = removeDuplicatesFromTSVLine(m.GetDomain())
 			msgs = append(msgs, m)
 		case errdetails.BadRequestMessageName:
 			m := new(errdetails.BadRequest)
@@ -678,8 +681,8 @@ func withDetails(st *Status, err error, details ...any) *Status {
 					visited[r.String()] = true
 					if m.GetResourceType() == "" {
 						m.ResourceType = r.GetResourceType()
-					} else if m.GetResourceType() != r.GetResourceType() && !strings.Contains(m.GetResourceType(), r.GetResourceType()) {
-						m.ResourceType += "\t" + r.GetResourceType()
+					} else if m.GetResourceType() != r.GetResourceType() && len(m.GetResourceType()) < len(r.GetResourceType()) {
+						m.ResourceType += r.GetResourceType()
 					}
 					if m.GetResourceName() == "" {
 						m.ResourceName = r.GetResourceName()
@@ -776,6 +779,19 @@ func appendM[K comparable](maps ...map[K]string) (result map[K]string) {
 	return result
 }
 
+func removeDuplicatesFromTSVLine(line string) string {
+	fields := strings.Split(line, "\t")
+	uniqueFields := make(map[string]bool)
+	result := make([]string, 0, len(fields))
+	for _, field := range fields {
+		if !uniqueFields[field] {
+			uniqueFields[field] = true
+			result = append(result, field)
+		}
+	}
+	return strings.Join(result, "\t")
+}
+
 func Log(code codes.Code, err error) {
 	if err != nil {
 		switch code {