diff --git a/.docker/Dockerfile-build b/.docker/Dockerfile-build index 88fb323a01..9878fdd537 100644 --- a/.docker/Dockerfile-build +++ b/.docker/Dockerfile-build @@ -8,7 +8,9 @@ RUN apt-get update && apt-get upgrade -y COPY go.mod go.mod COPY go.sum go.sum COPY oryx/go.mod oryx/go.mod -COPY oryx/go.sum proto/go.sum +COPY oryx/go.sum oryx/go.sum +COPY middleware/rpctest/go.mod middleware/rpctest/go.mod +COPY middleware/rpctest/go.sum middleware/rpctest/go.sum ENV CGO_ENABLED=0 diff --git a/oryx/jsonx/patch.go b/oryx/jsonx/patch.go index 6fd185c5b0..6166359dca 100644 --- a/oryx/jsonx/patch.go +++ b/oryx/jsonx/patch.go @@ -60,7 +60,8 @@ func ApplyJSONPatch[T any](p json.RawMessage, object T, denyPaths ...string) (re } for _, op := range patch { - // Some operations are buggy, see https://github.com/evanphx/json-patch/pull/158 + // Only "add", "remove", and "replace" operations are supported; "move", + // "copy", and "test" are intentionally rejected. if isUnsupported(op) { return result, errors.Errorf("unsupported operation: %s", op.Kind()) }