f3cdfc488e
runc rc95 contains a fix for CVE-2021-30465. runc rc94 provides fixes and improvements. One notable change is cgroup manager's Set now accept Resources rather than Cgroup (see https://github.com/opencontainers/runc/pull/2906). Modify the code accordingly. Also update runc dependencies (as hinted by hack/lint-depdendencies.sh): github.com/cilium/ebpf v0.5.0 github.com/containerd/console v1.0.2 github.com/coreos/go-systemd/v22 v22.3.1 github.com/godbus/dbus/v5 v5.0.4 github.com/moby/sys/mountinfo v0.4.1 golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 github.com/google/go-cmp v0.5.4 github.com/kr/pretty v0.2.1 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
55 lines
1.5 KiB
Go
55 lines
1.5 KiB
Go
// Copyright 2017, The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package cmp
|
|
|
|
// defaultReporter implements the reporter interface.
|
|
//
|
|
// As Equal serially calls the PushStep, Report, and PopStep methods, the
|
|
// defaultReporter constructs a tree-based representation of the compared value
|
|
// and the result of each comparison (see valueNode).
|
|
//
|
|
// When the String method is called, the FormatDiff method transforms the
|
|
// valueNode tree into a textNode tree, which is a tree-based representation
|
|
// of the textual output (see textNode).
|
|
//
|
|
// Lastly, the textNode.String method produces the final report as a string.
|
|
type defaultReporter struct {
|
|
root *valueNode
|
|
curr *valueNode
|
|
}
|
|
|
|
func (r *defaultReporter) PushStep(ps PathStep) {
|
|
r.curr = r.curr.PushStep(ps)
|
|
if r.root == nil {
|
|
r.root = r.curr
|
|
}
|
|
}
|
|
func (r *defaultReporter) Report(rs Result) {
|
|
r.curr.Report(rs)
|
|
}
|
|
func (r *defaultReporter) PopStep() {
|
|
r.curr = r.curr.PopStep()
|
|
}
|
|
|
|
// String provides a full report of the differences detected as a structured
|
|
// literal in pseudo-Go syntax. String may only be called after the entire tree
|
|
// has been traversed.
|
|
func (r *defaultReporter) String() string {
|
|
assert(r.root != nil && r.curr == nil)
|
|
if r.root.NumDiff == 0 {
|
|
return ""
|
|
}
|
|
ptrs := new(pointerReferences)
|
|
text := formatOptions{}.FormatDiff(r.root, ptrs)
|
|
resolveReferences(text)
|
|
return text.String()
|
|
}
|
|
|
|
func assert(ok bool) {
|
|
if !ok {
|
|
panic("assertion failure")
|
|
}
|
|
}
|