Merge pull request #349 from liggitt/v7
Bump to v7
diff --git a/fieldpath/element.go b/fieldpath/element.go
index f160760..98ecb1b 100644
--- a/fieldpath/element.go
+++ b/fieldpath/element.go
@@ -22,7 +22,7 @@
"slices"
"strings"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
// PathElement describes how to select a child field given a containing object.
diff --git a/fieldpath/element_test.go b/fieldpath/element_test.go
index aba96b1..b9afe88 100644
--- a/fieldpath/element_test.go
+++ b/fieldpath/element_test.go
@@ -19,7 +19,7 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
func TestPathElementSet(t *testing.T) {
diff --git a/fieldpath/fieldpath_test.go b/fieldpath/fieldpath_test.go
index 34812d6..2d704b3 100644
--- a/fieldpath/fieldpath_test.go
+++ b/fieldpath/fieldpath_test.go
@@ -17,8 +17,8 @@
package fieldpath_test
import (
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
// Type and function aliases to avoid typing...
diff --git a/fieldpath/fromvalue.go b/fieldpath/fromvalue.go
index 78383e4..e89077c 100644
--- a/fieldpath/fromvalue.go
+++ b/fieldpath/fromvalue.go
@@ -17,7 +17,7 @@
package fieldpath
import (
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
// SetFromValue creates a set containing every leaf field mentioned in v.
diff --git a/fieldpath/fromvalue_test.go b/fieldpath/fromvalue_test.go
index ae58cc1..be0606e 100644
--- a/fieldpath/fromvalue_test.go
+++ b/fieldpath/fromvalue_test.go
@@ -20,7 +20,7 @@
"testing"
yaml "go.yaml.in/yaml/v2"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
func TestFromValue(t *testing.T) {
diff --git a/fieldpath/managers_test.go b/fieldpath/managers_test.go
index 6984176..c1ed15f 100644
--- a/fieldpath/managers_test.go
+++ b/fieldpath/managers_test.go
@@ -20,7 +20,7 @@
"reflect"
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
)
func TestManagersEquals(t *testing.T) {
diff --git a/fieldpath/path.go b/fieldpath/path.go
index a865ec4..c8b97c4 100644
--- a/fieldpath/path.go
+++ b/fieldpath/path.go
@@ -20,7 +20,7 @@
"fmt"
"strings"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
// Path describes how to select a potentially deeply-nested child field given a
diff --git a/fieldpath/path_test.go b/fieldpath/path_test.go
index c5eea4f..898885e 100644
--- a/fieldpath/path_test.go
+++ b/fieldpath/path_test.go
@@ -19,7 +19,7 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
var (
diff --git a/fieldpath/pathelementmap.go b/fieldpath/pathelementmap.go
index ca50b84..43df135 100644
--- a/fieldpath/pathelementmap.go
+++ b/fieldpath/pathelementmap.go
@@ -19,7 +19,7 @@
import (
"slices"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
// PathElementValueMap is a map from PathElement to value.Value.
diff --git a/fieldpath/pathelementmap_test.go b/fieldpath/pathelementmap_test.go
index 8341370..b3ecfea 100644
--- a/fieldpath/pathelementmap_test.go
+++ b/fieldpath/pathelementmap_test.go
@@ -19,7 +19,7 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
func TestPathElementValueMap(t *testing.T) {
diff --git a/fieldpath/serialize-pe.go b/fieldpath/serialize-pe.go
index 71ce3f8..b845f24 100644
--- a/fieldpath/serialize-pe.go
+++ b/fieldpath/serialize-pe.go
@@ -25,8 +25,8 @@
"strconv"
"strings"
- internaljson "sigs.k8s.io/structured-merge-diff/v6/internal/json"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ internaljson "sigs.k8s.io/structured-merge-diff/v7/internal/json"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
var ErrUnknownPathElementType = errors.New("unknown path element type")
diff --git a/fieldpath/serialize-pe_test.go b/fieldpath/serialize-pe_test.go
index a62058d..74c137a 100644
--- a/fieldpath/serialize-pe_test.go
+++ b/fieldpath/serialize-pe_test.go
@@ -23,7 +23,7 @@
"testing"
"github.com/google/go-cmp/cmp"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
func TestPathElementRoundTrip(t *testing.T) {
diff --git a/fieldpath/set.go b/fieldpath/set.go
index d7fe643..5894b0f 100644
--- a/fieldpath/set.go
+++ b/fieldpath/set.go
@@ -23,9 +23,9 @@
"sort"
"strings"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
- "sigs.k8s.io/structured-merge-diff/v6/schema"
+ "sigs.k8s.io/structured-merge-diff/v7/schema"
)
// Set identifies a set of fields.
diff --git a/fieldpath/set_test.go b/fieldpath/set_test.go
index 794589b..f17e48e 100644
--- a/fieldpath/set_test.go
+++ b/fieldpath/set_test.go
@@ -22,10 +22,10 @@
"math/rand"
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/schema"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/schema"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
type intnFunc func(int) int
diff --git a/go.mod b/go.mod
index 20f709f..e9b4316 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module sigs.k8s.io/structured-merge-diff/v6
+module sigs.k8s.io/structured-merge-diff/v7
go 1.27
diff --git a/internal/cli/operation.go b/internal/cli/operation.go
index e80d538..b3d2463 100644
--- a/internal/cli/operation.go
+++ b/internal/cli/operation.go
@@ -21,8 +21,8 @@
"io"
"io/ioutil"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
type Operation interface {
diff --git a/internal/cli/options.go b/internal/cli/options.go
index 66626ff..9d9b0c2 100644
--- a/internal/cli/options.go
+++ b/internal/cli/options.go
@@ -24,7 +24,7 @@
"io/ioutil"
"os"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
var (
diff --git a/internal/fixture/state.go b/internal/fixture/state.go
index efa3548..c3f5fb0 100644
--- a/internal/fixture/state.go
+++ b/internal/fixture/state.go
@@ -22,9 +22,9 @@
"github.com/google/go-cmp/cmp"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/merge"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/merge"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
// For the sake of tests, a parser is something that can retrieve a
diff --git a/internal/fixture/state_test.go b/internal/fixture/state_test.go
index 5b8bae7..235fb93 100644
--- a/internal/fixture/state_test.go
+++ b/internal/fixture/state_test.go
@@ -20,7 +20,7 @@
"fmt"
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
func TestFixTabs(t *testing.T) {
diff --git a/merge/conflict.go b/merge/conflict.go
index dea6470..20ccd8a 100644
--- a/merge/conflict.go
+++ b/merge/conflict.go
@@ -21,7 +21,7 @@
"sort"
"strings"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
)
// Conflict is a conflict on a specific field with the current manager of
diff --git a/merge/conflict_test.go b/merge/conflict_test.go
index 8597842..a073945 100644
--- a/merge/conflict_test.go
+++ b/merge/conflict_test.go
@@ -19,9 +19,9 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/merge"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/merge"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
var (
diff --git a/merge/deduced_test.go b/merge/deduced_test.go
index fcd47c1..26d0a1f 100644
--- a/merge/deduced_test.go
+++ b/merge/deduced_test.go
@@ -19,9 +19,9 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- . "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
- "sigs.k8s.io/structured-merge-diff/v6/merge"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ . "sigs.k8s.io/structured-merge-diff/v7/internal/fixture"
+ "sigs.k8s.io/structured-merge-diff/v7/merge"
)
func TestDeduced(t *testing.T) {
diff --git a/merge/default_keys_test.go b/merge/default_keys_test.go
index 28f8103..c5dc660 100644
--- a/merge/default_keys_test.go
+++ b/merge/default_keys_test.go
@@ -16,10 +16,10 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- . "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
- "sigs.k8s.io/structured-merge-diff/v6/merge"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ . "sigs.k8s.io/structured-merge-diff/v7/internal/fixture"
+ "sigs.k8s.io/structured-merge-diff/v7/merge"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
// portListParser sets the default value of key "protocol" to "TCP"
diff --git a/merge/duplicates_test.go b/merge/duplicates_test.go
index 299da4e..e5ddbe4 100644
--- a/merge/duplicates_test.go
+++ b/merge/duplicates_test.go
@@ -19,10 +19,10 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- . "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
- "sigs.k8s.io/structured-merge-diff/v6/merge"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ . "sigs.k8s.io/structured-merge-diff/v7/internal/fixture"
+ "sigs.k8s.io/structured-merge-diff/v7/merge"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
var duplicatesParser = func() Parser {
diff --git a/merge/extract_apply_test.go b/merge/extract_apply_test.go
index 2ae1df0..bdb3514 100644
--- a/merge/extract_apply_test.go
+++ b/merge/extract_apply_test.go
@@ -19,9 +19,9 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- . "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ . "sigs.k8s.io/structured-merge-diff/v7/internal/fixture"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
var extractParser = func() Parser {
diff --git a/merge/field_level_overrides_test.go b/merge/field_level_overrides_test.go
index d47d0ef..3533cd4 100644
--- a/merge/field_level_overrides_test.go
+++ b/merge/field_level_overrides_test.go
@@ -3,10 +3,10 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
- "sigs.k8s.io/structured-merge-diff/v6/merge"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/internal/fixture"
+ "sigs.k8s.io/structured-merge-diff/v7/merge"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
func TestFieldLevelOverrides(t *testing.T) {
diff --git a/merge/ignore_test.go b/merge/ignore_test.go
index debbee2..aa35dca 100644
--- a/merge/ignore_test.go
+++ b/merge/ignore_test.go
@@ -19,8 +19,8 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- . "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ . "sigs.k8s.io/structured-merge-diff/v7/internal/fixture"
)
func TestIgnoreFilter(t *testing.T) {
diff --git a/merge/key_test.go b/merge/key_test.go
index 61969a8..135da07 100644
--- a/merge/key_test.go
+++ b/merge/key_test.go
@@ -19,9 +19,9 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- . "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ . "sigs.k8s.io/structured-merge-diff/v7/internal/fixture"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
var associativeListParser = func() Parser {
diff --git a/merge/leaf_test.go b/merge/leaf_test.go
index 5eccdaf..4b92a3a 100644
--- a/merge/leaf_test.go
+++ b/merge/leaf_test.go
@@ -19,10 +19,10 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- . "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
- "sigs.k8s.io/structured-merge-diff/v6/merge"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ . "sigs.k8s.io/structured-merge-diff/v7/internal/fixture"
+ "sigs.k8s.io/structured-merge-diff/v7/merge"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
var leafFieldsParser = func() Parser {
diff --git a/merge/multiple_appliers_test.go b/merge/multiple_appliers_test.go
index 7fad7b1..c8a7486 100644
--- a/merge/multiple_appliers_test.go
+++ b/merge/multiple_appliers_test.go
@@ -23,11 +23,11 @@
"testing"
yaml "go.yaml.in/yaml/v2"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- . "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
- "sigs.k8s.io/structured-merge-diff/v6/merge"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ . "sigs.k8s.io/structured-merge-diff/v7/internal/fixture"
+ "sigs.k8s.io/structured-merge-diff/v7/merge"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
func TestMultipleAppliersSet(t *testing.T) {
diff --git a/merge/nested_test.go b/merge/nested_test.go
index ffdb07b..dc8b2f8 100644
--- a/merge/nested_test.go
+++ b/merge/nested_test.go
@@ -19,9 +19,9 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- . "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ . "sigs.k8s.io/structured-merge-diff/v7/internal/fixture"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
var nestedTypeParser = func() Parser {
diff --git a/merge/obsolete_versions_test.go b/merge/obsolete_versions_test.go
index 226a870..c27b4dd 100644
--- a/merge/obsolete_versions_test.go
+++ b/merge/obsolete_versions_test.go
@@ -20,10 +20,10 @@
"fmt"
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- . "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
- "sigs.k8s.io/structured-merge-diff/v6/merge"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ . "sigs.k8s.io/structured-merge-diff/v7/internal/fixture"
+ "sigs.k8s.io/structured-merge-diff/v7/merge"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
// specificVersionConverter doesn't convert and return the exact same
diff --git a/merge/preserve_unknown_test.go b/merge/preserve_unknown_test.go
index f7db382..8a8948e 100644
--- a/merge/preserve_unknown_test.go
+++ b/merge/preserve_unknown_test.go
@@ -19,9 +19,9 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- . "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ . "sigs.k8s.io/structured-merge-diff/v7/internal/fixture"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
var preserveUnknownParser = func() Parser {
diff --git a/merge/real_test.go b/merge/real_test.go
index c8254fc..90e8a6a 100644
--- a/merge/real_test.go
+++ b/merge/real_test.go
@@ -21,8 +21,8 @@
"path/filepath"
"testing"
- . "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ . "sigs.k8s.io/structured-merge-diff/v7/internal/fixture"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
func testdata(file string) string {
diff --git a/merge/schema_change_test.go b/merge/schema_change_test.go
index db78ff5..62bd9e8 100644
--- a/merge/schema_change_test.go
+++ b/merge/schema_change_test.go
@@ -19,10 +19,10 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- . "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
- "sigs.k8s.io/structured-merge-diff/v6/merge"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ . "sigs.k8s.io/structured-merge-diff/v7/internal/fixture"
+ "sigs.k8s.io/structured-merge-diff/v7/merge"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
var structParser = func() *typed.Parser {
diff --git a/merge/set_test.go b/merge/set_test.go
index 73d7170..7c5ac9b 100644
--- a/merge/set_test.go
+++ b/merge/set_test.go
@@ -19,9 +19,9 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- . "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ . "sigs.k8s.io/structured-merge-diff/v7/internal/fixture"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
var setFieldsParser = func() Parser {
diff --git a/merge/update.go b/merge/update.go
index 99d722f..963aa7a 100644
--- a/merge/update.go
+++ b/merge/update.go
@@ -16,9 +16,9 @@
import (
"fmt"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
// Converter is an interface to the conversion logic. The converter
diff --git a/smd/main.go b/smd/main.go
index b8b2981..a00324a 100644
--- a/smd/main.go
+++ b/smd/main.go
@@ -22,7 +22,7 @@
"flag"
"log"
- "sigs.k8s.io/structured-merge-diff/v6/internal/cli"
+ "sigs.k8s.io/structured-merge-diff/v7/internal/cli"
)
func main() {
diff --git a/typed/compare.go b/typed/compare.go
index 488251f..68f8cbd 100644
--- a/typed/compare.go
+++ b/typed/compare.go
@@ -20,9 +20,9 @@
"fmt"
"strings"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/schema"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/schema"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
// Comparison is the return value of a TypedValue.Compare() operation.
diff --git a/typed/comparison_test.go b/typed/comparison_test.go
index 73c9362..7ef7415 100644
--- a/typed/comparison_test.go
+++ b/typed/comparison_test.go
@@ -3,8 +3,8 @@
import (
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
func TestComparisonExcludeFields(t *testing.T) {
diff --git a/typed/deduced_test.go b/typed/deduced_test.go
index 2d737a2..f7d48b6 100644
--- a/typed/deduced_test.go
+++ b/typed/deduced_test.go
@@ -20,8 +20,8 @@
"fmt"
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
func TestValidateDeducedType(t *testing.T) {
diff --git a/typed/helpers.go b/typed/helpers.go
index 8a9c0b5..e8b1e52 100644
--- a/typed/helpers.go
+++ b/typed/helpers.go
@@ -21,9 +21,9 @@
"fmt"
"strings"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/schema"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/schema"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
// ValidationError reports an error about a particular field
diff --git a/typed/helpers_test.go b/typed/helpers_test.go
index 2b0d1c4..9e3430f 100644
--- a/typed/helpers_test.go
+++ b/typed/helpers_test.go
@@ -4,8 +4,8 @@
"strings"
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/internal/fixture"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
func TestInvalidOverride(t *testing.T) {
diff --git a/typed/merge.go b/typed/merge.go
index f8ca9ab..27530b1 100644
--- a/typed/merge.go
+++ b/typed/merge.go
@@ -17,9 +17,9 @@
package typed
import (
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/schema"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/schema"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
type mergingWalker struct {
diff --git a/typed/merge_test.go b/typed/merge_test.go
index c799e32..0144d9b 100644
--- a/typed/merge_test.go
+++ b/typed/merge_test.go
@@ -20,8 +20,8 @@
"fmt"
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
type mergeTestCase struct {
diff --git a/typed/parser.go b/typed/parser.go
index c46e69f..c6273d5 100644
--- a/typed/parser.go
+++ b/typed/parser.go
@@ -20,8 +20,8 @@
"fmt"
yaml "go.yaml.in/yaml/v2"
- "sigs.k8s.io/structured-merge-diff/v6/schema"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/schema"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
// YAMLObject is an object encoded in YAML.
diff --git a/typed/parser_test.go b/typed/parser_test.go
index 9ef51cb..b800312 100644
--- a/typed/parser_test.go
+++ b/typed/parser_test.go
@@ -23,7 +23,7 @@
"testing"
yaml "go.yaml.in/yaml/v2"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
func testdata(file string) string {
diff --git a/typed/reconcile_schema.go b/typed/reconcile_schema.go
index 9b20e54..76a5ab9 100644
--- a/typed/reconcile_schema.go
+++ b/typed/reconcile_schema.go
@@ -20,8 +20,8 @@
"fmt"
"sync"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/schema"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/schema"
)
var fmPool = sync.Pool{
diff --git a/typed/reconcile_schema_test.go b/typed/reconcile_schema_test.go
index 9f0ace8..d801c6c 100644
--- a/typed/reconcile_schema_test.go
+++ b/typed/reconcile_schema_test.go
@@ -20,8 +20,8 @@
"fmt"
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
type reconcileTestCase struct {
diff --git a/typed/remove.go b/typed/remove.go
index 78ba6f5..972271b 100644
--- a/typed/remove.go
+++ b/typed/remove.go
@@ -14,9 +14,9 @@
package typed
import (
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/schema"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/schema"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
type removingWalker struct {
diff --git a/typed/remove_test.go b/typed/remove_test.go
index df59c16..1a7c6d2 100644
--- a/typed/remove_test.go
+++ b/typed/remove_test.go
@@ -20,9 +20,9 @@
"fmt"
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
type removeTestCase struct {
diff --git a/typed/symdiff_test.go b/typed/symdiff_test.go
index 50e7d42..e8cbe5f 100644
--- a/typed/symdiff_test.go
+++ b/typed/symdiff_test.go
@@ -20,8 +20,8 @@
"fmt"
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
type symdiffTestCase struct {
diff --git a/typed/tofieldset.go b/typed/tofieldset.go
index a52e342..5ee9f09 100644
--- a/typed/tofieldset.go
+++ b/typed/tofieldset.go
@@ -19,9 +19,9 @@
import (
"sync"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/schema"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/schema"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
var tPool = sync.Pool{
diff --git a/typed/toset_test.go b/typed/toset_test.go
index 8b3e9da..aabed36 100644
--- a/typed/toset_test.go
+++ b/typed/toset_test.go
@@ -20,9 +20,9 @@
"fmt"
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
type objSetPair struct {
diff --git a/typed/typed.go b/typed/typed.go
index 0f9968f..c7d666c 100644
--- a/typed/typed.go
+++ b/typed/typed.go
@@ -19,9 +19,9 @@
import (
"sync"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/schema"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/schema"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
// ValidationOptions is the list of all the options available when running the validation.
diff --git a/typed/validate.go b/typed/validate.go
index 3371f87..1da8e1f 100644
--- a/typed/validate.go
+++ b/typed/validate.go
@@ -19,9 +19,9 @@
import (
"sync"
- "sigs.k8s.io/structured-merge-diff/v6/fieldpath"
- "sigs.k8s.io/structured-merge-diff/v6/schema"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/fieldpath"
+ "sigs.k8s.io/structured-merge-diff/v7/schema"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
var vPool = sync.Pool{
diff --git a/typed/validate_test.go b/typed/validate_test.go
index 92ba141..400ae85 100644
--- a/typed/validate_test.go
+++ b/typed/validate_test.go
@@ -21,8 +21,8 @@
"strings"
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/schema"
- "sigs.k8s.io/structured-merge-diff/v6/typed"
+ "sigs.k8s.io/structured-merge-diff/v7/schema"
+ "sigs.k8s.io/structured-merge-diff/v7/typed"
)
type validationTestCase struct {
diff --git a/value/equals_test.go b/value/equals_test.go
index ecfc7d0..dd50ebf 100644
--- a/value/equals_test.go
+++ b/value/equals_test.go
@@ -22,7 +22,7 @@
"testing"
yaml "go.yaml.in/yaml/v2"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
func testdata(file string) string {
diff --git a/value/fields.go b/value/fields.go
index a435a55..294eeeb 100644
--- a/value/fields.go
+++ b/value/fields.go
@@ -25,7 +25,7 @@
"sort"
"strings"
- internaljson "sigs.k8s.io/structured-merge-diff/v6/internal/json"
+ internaljson "sigs.k8s.io/structured-merge-diff/v7/internal/json"
)
// Field is an individual key-value pair.
diff --git a/value/value.go b/value/value.go
index 846d69f..1f89337 100644
--- a/value/value.go
+++ b/value/value.go
@@ -24,7 +24,7 @@
yaml "go.yaml.in/yaml/v2"
- internaljson "sigs.k8s.io/structured-merge-diff/v6/internal/json"
+ internaljson "sigs.k8s.io/structured-merge-diff/v7/internal/json"
)
// A Value corresponds to an 'atom' in the schema. It should return true
diff --git a/value/value_test.go b/value/value_test.go
index 0de2748..493907d 100644
--- a/value/value_test.go
+++ b/value/value_test.go
@@ -20,7 +20,7 @@
"reflect"
"testing"
- "sigs.k8s.io/structured-merge-diff/v6/value"
+ "sigs.k8s.io/structured-merge-diff/v7/value"
)
func TestFromJSONTokenTypeErrors(t *testing.T) {
