Skip to content

ING-1373: Include resource type in procondition failure subjects #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chvck merged 1 commit into from
Dec 11, 2025
Merged

ING-1373: Include resource type in procondition failure subjects #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions gateway/dataimpl/server_v1/errorhandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func (e ErrorHandler) NewBucketFlushDisabledStatus(baseErr error, bucketName str
st = e.tryAttachStatusDetails(st, &epb.PreconditionFailure{
Violations: []*epb.PreconditionFailure_Violation{{
Type: "FLUSH_DISABLED",
Subject: bucketName,
Subject: "bucket/" + bucketName,
Description: "",
}},
})
Expand Down Expand Up @@ -339,7 +339,7 @@ func (e ErrorHandler) NewQueryIndexNotBuildingStatus(baseErr error, bucketName,
st = e.tryAttachStatusDetails(st, &epb.PreconditionFailure{
Violations: []*epb.PreconditionFailure_Violation{{
Type: "NOT_BUILDING",
Subject: fmt.Sprintf("%s/%s/%s/%s", bucketName, scopeName, collectionName, indexName),
Subject: fmt.Sprintf("queryindex/%s/%s/%s/%s", bucketName, scopeName, collectionName, indexName),
Description: "",
}},
})
Expand Down Expand Up @@ -625,7 +625,7 @@ func (e ErrorHandler) NewDocLockedStatus(baseErr error, bucketName, scopeName, c
st = e.tryAttachStatusDetails(st, &epb.PreconditionFailure{
Violations: []*epb.PreconditionFailure_Violation{{
Type: "LOCKED",
Subject: fmt.Sprintf("%s/%s/%s/%s", bucketName, scopeName, collectionName, docId),
Subject: fmt.Sprintf("document/%s/%s/%s/%s", bucketName, scopeName, collectionName, docId),
Description: "",
}},
})
Expand All @@ -640,7 +640,7 @@ func (e ErrorHandler) NewDocNotLockedStatus(baseErr error, bucketName, scopeName
st = e.tryAttachStatusDetails(st, &epb.PreconditionFailure{
Violations: []*epb.PreconditionFailure_Violation{{
Type: "NOT_LOCKED",
Subject: fmt.Sprintf("%s/%s/%s/%s", bucketName, scopeName, collectionName, docId),
Subject: fmt.Sprintf("document/%s/%s/%s/%s", bucketName, scopeName, collectionName, docId),
Description: "",
}},
})
Expand All @@ -656,7 +656,7 @@ func (e ErrorHandler) NewDocNotNumericStatus(baseErr error, bucketName, scopeNam
st = e.tryAttachStatusDetails(st, &epb.PreconditionFailure{
Violations: []*epb.PreconditionFailure_Violation{{
Type: "DOC_NOT_NUMERIC",
Subject: fmt.Sprintf("%s/%s/%s/%s", bucketName, scopeName, collectionName, docId),
Subject: fmt.Sprintf("document/%s/%s/%s/%s", bucketName, scopeName, collectionName, docId),
Description: "",
}},
})
Expand All @@ -675,7 +675,7 @@ func (e ErrorHandler) NewValueTooLargeStatus(baseErr error, bucketName, scopeNam
st = e.tryAttachStatusDetails(st, &epb.PreconditionFailure{
Violations: []*epb.PreconditionFailure_Violation{{
Type: "VALUE_TOO_LARGE",
Subject: fmt.Sprintf("%s/%s/%s/%s", bucketName, scopeName, collectionName, docId),
Subject: fmt.Sprintf("document/%s/%s/%s/%s", bucketName, scopeName, collectionName, docId),
Description: "",
}},
})
Expand All @@ -696,7 +696,7 @@ func (e ErrorHandler) NewDurabilityImpossibleStatus(baseErr error, bucketName st
st = e.tryAttachStatusDetails(st, &epb.PreconditionFailure{
Violations: []*epb.PreconditionFailure_Violation{{
Type: "DURABILITY_IMPOSSIBLE",
Subject: fmt.Sprintf("%ss", bucketName),
Subject: fmt.Sprintf("bucket/%s", bucketName),
Description: "",
}},
})
Expand Down Expand Up @@ -770,7 +770,7 @@ func (e ErrorHandler) NewSdDocTooDeepStatus(baseErr error, bucketName, scopeName
st = e.tryAttachStatusDetails(st, &epb.PreconditionFailure{
Violations: []*epb.PreconditionFailure_Violation{{
Type: "DOC_TOO_DEEP",
Subject: fmt.Sprintf("%s/%s/%s/%s", bucketName, scopeName, collectionName, docId),
Subject: fmt.Sprintf("document/%s/%s/%s/%s", bucketName, scopeName, collectionName, docId),
Description: "",
}},
})
Expand All @@ -785,7 +785,7 @@ func (e ErrorHandler) NewSdDocNotJsonStatus(baseErr error, bucketName, scopeName
st = e.tryAttachStatusDetails(st, &epb.PreconditionFailure{
Violations: []*epb.PreconditionFailure_Violation{{
Type: "DOC_NOT_JSON",
Subject: fmt.Sprintf("%s/%s/%s/%s", bucketName, scopeName, collectionName, docId),
Subject: fmt.Sprintf("document/%s/%s/%s/%s", bucketName, scopeName, collectionName, docId),
Description: "",
}},
})
Expand Down Expand Up @@ -826,7 +826,7 @@ func (e ErrorHandler) NewSdPathMismatchStatus(baseErr error, bucketName, scopeNa
st = e.tryAttachStatusDetails(st, &epb.PreconditionFailure{
Violations: []*epb.PreconditionFailure_Violation{{
Type: "PATH_MISMATCH",
Subject: sdPath,
Subject: fmt.Sprintf("document/%s/%s/%s/%s/%s", bucketName, scopeName, collectionName, docId, sdPath),
Description: "",
}},
})
Expand All @@ -849,14 +849,14 @@ func (e ErrorHandler) NewSdBadValueStatus(baseErr error, sdPath string) *status.
return st
}

func (e ErrorHandler) NewSdValueOutOfRangeStatus(baseErr error, sdPath string) *status.Status {
func (e ErrorHandler) NewSdValueOutOfRangeStatus(baseErr error, bucketName, scopeName, collectionName, docId, sdPath string) *status.Status {
st := status.New(codes.FailedPrecondition,
fmt.Sprintf("Counter operation content for path '%s' would put the JSON value out of range.",
sdPath))
st = e.tryAttachStatusDetails(st, &epb.PreconditionFailure{
Violations: []*epb.PreconditionFailure_Violation{{
Type: "VALUE_OUT_OF_RANGE",
Subject: sdPath,
Subject: fmt.Sprintf("document/%s/%s/%s/%s/%s", bucketName, scopeName, collectionName, docId, sdPath),
Description: "",
}},
})
Expand All @@ -871,7 +871,7 @@ func (e ErrorHandler) NewSdBadRangeStatus(baseErr error, bucketName, scopeName,
st = e.tryAttachStatusDetails(st, &epb.PreconditionFailure{
Violations: []*epb.PreconditionFailure_Violation{{
Type: "PATH_VALUE_OUT_OF_RANGE",
Subject: sdPath,
Subject: fmt.Sprintf("document/%s/%s/%s/%s/%s", bucketName, scopeName, collectionName, docId, sdPath),
Description: "",
}},
})
Expand Down
2 changes: 1 addition & 1 deletion gateway/dataimpl/server_v1/kvserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1303,7 +1303,7 @@ func (s *KvServer) MutateIn(ctx context.Context, in *kv_v1.MutateInRequest) (*kv
} else if errors.Is(err, memdx.ErrSubDocCantInsert) {
opSpec := in.Specs[subdocErr.OpIndex]
if opSpec.Operation == kv_v1.MutateInRequest_Spec_OPERATION_COUNTER {
return nil, s.errorHandler.NewSdValueOutOfRangeStatus(err, in.Specs[subdocErr.OpIndex].Path).Err()
return nil, s.errorHandler.NewSdValueOutOfRangeStatus(err, in.BucketName, in.ScopeName, in.CollectionName, in.Key, in.Specs[subdocErr.OpIndex].Path).Err()
} else {
return nil, s.errorHandler.NewSdBadValueStatus(err, in.Specs[subdocErr.OpIndex].Path).Err()
}
Expand Down
Loading