Skip to content

Commit 046e0a3

Browse files
committed
bump module to v6 for breaking change dropping jsoniter from public APIs
NOTE: v5 was used in a previous release attempt, so we skip to v6
1 parent 0957b10 commit 046e0a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+131
-128
lines changed

fieldpath/element.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"sort"
2222
"strings"
2323

24-
"sigs.k8s.io/structured-merge-diff/v4/value"
24+
"sigs.k8s.io/structured-merge-diff/v6/value"
2525
)
2626

2727
// PathElement describes how to select a child field given a containing object.

fieldpath/element_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package fieldpath
1919
import (
2020
"testing"
2121

22-
"sigs.k8s.io/structured-merge-diff/v4/value"
22+
"sigs.k8s.io/structured-merge-diff/v6/value"
2323
)
2424

2525
func TestPathElementSet(t *testing.T) {

fieldpath/fromvalue.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package fieldpath
1818

1919
import (
20-
"sigs.k8s.io/structured-merge-diff/v4/value"
20+
"sigs.k8s.io/structured-merge-diff/v6/value"
2121
)
2222

2323
// SetFromValue creates a set containing every leaf field mentioned in v.

fieldpath/fromvalue_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package fieldpath
1919
import (
2020
"testing"
2121

22-
"sigs.k8s.io/structured-merge-diff/v4/value"
22+
"sigs.k8s.io/structured-merge-diff/v6/value"
2323
yaml "sigs.k8s.io/yaml/goyaml.v2"
2424
)
2525

fieldpath/managers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"reflect"
2121
"testing"
2222

23-
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
23+
"sigs.k8s.io/structured-merge-diff/v6/fieldpath"
2424
)
2525

2626
var (

fieldpath/path.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121
"strings"
2222

23-
"sigs.k8s.io/structured-merge-diff/v4/value"
23+
"sigs.k8s.io/structured-merge-diff/v6/value"
2424
)
2525

2626
// Path describes how to select a potentially deeply-nested child field given a

fieldpath/path_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package fieldpath
1919
import (
2020
"testing"
2121

22-
"sigs.k8s.io/structured-merge-diff/v4/value"
22+
"sigs.k8s.io/structured-merge-diff/v6/value"
2323
)
2424

2525
var (

fieldpath/pathelementmap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package fieldpath
1919
import (
2020
"sort"
2121

22-
"sigs.k8s.io/structured-merge-diff/v4/value"
22+
"sigs.k8s.io/structured-merge-diff/v6/value"
2323
)
2424

2525
// PathElementValueMap is a map from PathElement to value.Value.

fieldpath/pathelementmap_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package fieldpath
1919
import (
2020
"testing"
2121

22-
"sigs.k8s.io/structured-merge-diff/v4/value"
22+
"sigs.k8s.io/structured-merge-diff/v6/value"
2323
)
2424

2525
func TestPathElementValueMap(t *testing.T) {

fieldpath/serialize-pe.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"strings"
2525

2626
jsoniter "github.com/json-iterator/go"
27-
"sigs.k8s.io/structured-merge-diff/v4/value"
27+
"sigs.k8s.io/structured-merge-diff/v6/value"
2828
)
2929

3030
var ErrUnknownPathElementType = errors.New("unknown path element type")

0 commit comments

Comments
 (0)