Merge pull request #223 from apelisse/v5

Create package v5 for backward incompatible change
kubernetes-sigs · Aug 1, 2022 · 4ad28cc · 4ad28cc
2 parents ebd569f + 1754a8d
commit 4ad28cc
Show file tree

Hide file tree

Showing 56 changed files with 125 additions and 125 deletions.
diff --git a/fieldpath/element.go b/fieldpath/element.go
@@ -21,7 +21,7 @@ import (
 	"sort"
 	"strings"
 
-	"sigs.k8s.io/structured-merge-diff/v4/value"
+	"sigs.k8s.io/structured-merge-diff/v5/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
@@ -19,7 +19,7 @@ package fieldpath
 import (
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/value"
+	"sigs.k8s.io/structured-merge-diff/v5/value"
 )
 
 func TestPathElementSet(t *testing.T) {

diff --git a/fieldpath/fromvalue.go b/fieldpath/fromvalue.go
@@ -17,7 +17,7 @@ limitations under the License.
 package fieldpath
 
 import (
-	"sigs.k8s.io/structured-merge-diff/v4/value"
+	"sigs.k8s.io/structured-merge-diff/v5/value"
 )
 
 // SetFromValue creates a set containing every leaf field mentioned in v.

diff --git a/fieldpath/fromvalue_test.go b/fieldpath/fromvalue_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"gopkg.in/yaml.v2"
-	"sigs.k8s.io/structured-merge-diff/v4/value"
+	"sigs.k8s.io/structured-merge-diff/v5/value"
 )
 
 func TestFromValue(t *testing.T) {

diff --git a/fieldpath/managers_test.go b/fieldpath/managers_test.go
@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
 )
 
 var (

diff --git a/fieldpath/path.go b/fieldpath/path.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"sigs.k8s.io/structured-merge-diff/v4/value"
+	"sigs.k8s.io/structured-merge-diff/v5/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
@@ -19,7 +19,7 @@ package fieldpath
 import (
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/value"
+	"sigs.k8s.io/structured-merge-diff/v5/value"
 )
 
 var (

diff --git a/fieldpath/pathelementmap.go b/fieldpath/pathelementmap.go
@@ -19,7 +19,7 @@ package fieldpath
 import (
 	"sort"
 
-	"sigs.k8s.io/structured-merge-diff/v4/value"
+	"sigs.k8s.io/structured-merge-diff/v5/value"
 )
 
 // PathElementValueMap is a map from PathElement to value.Value.

diff --git a/fieldpath/pathelementmap_test.go b/fieldpath/pathelementmap_test.go
@@ -19,7 +19,7 @@ package fieldpath
 import (
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/value"
+	"sigs.k8s.io/structured-merge-diff/v5/value"
 )
 
 func TestPathElementValueMap(t *testing.T) {

diff --git a/fieldpath/serialize-pe.go b/fieldpath/serialize-pe.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	jsoniter "github.com/json-iterator/go"
-	"sigs.k8s.io/structured-merge-diff/v4/value"
+	"sigs.k8s.io/structured-merge-diff/v5/value"
 )
 
 var ErrUnknownPathElementType = errors.New("unknown path element type")

diff --git a/fieldpath/set.go b/fieldpath/set.go
@@ -20,7 +20,7 @@ import (
 	"sort"
 	"strings"
 
-	"sigs.k8s.io/structured-merge-diff/v4/schema"
+	"sigs.k8s.io/structured-merge-diff/v5/schema"
 )
 
 // Set identifies a set of fields.

diff --git a/fieldpath/set_test.go b/fieldpath/set_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 
 	"gopkg.in/yaml.v2"
-	"sigs.k8s.io/structured-merge-diff/v4/schema"
+	"sigs.k8s.io/structured-merge-diff/v5/schema"
 )
 
 type randomPathAlphabet []PathElement

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module sigs.k8s.io/structured-merge-diff/v4
+module sigs.k8s.io/structured-merge-diff/v5
 
 require gopkg.in/yaml.v2 v2.2.8
 

diff --git a/internal/cli/operation.go b/internal/cli/operation.go
@@ -21,8 +21,8 @@ import (
 	"io"
 	"io/ioutil"
 
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
-	"sigs.k8s.io/structured-merge-diff/v4/value"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/value"
 )
 
 type Operation interface {

diff --git a/internal/cli/options.go b/internal/cli/options.go
@@ -24,7 +24,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
 )
 
 var (

diff --git a/internal/fixture/state.go b/internal/fixture/state.go
@@ -20,10 +20,10 @@ import (
 	"bytes"
 	"fmt"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	"sigs.k8s.io/structured-merge-diff/v4/merge"
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
-	"sigs.k8s.io/structured-merge-diff/v4/value"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	"sigs.k8s.io/structured-merge-diff/v5/merge"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/value"
 )
 
 // 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
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
 )
 
 func TestFixTabs(t *testing.T) {

diff --git a/merge/conflict.go b/merge/conflict.go
@@ -21,7 +21,7 @@ import (
 	"sort"
 	"strings"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
+	"sigs.k8s.io/structured-merge-diff/v5/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
@@ -19,9 +19,9 @@ package merge_test
 import (
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	"sigs.k8s.io/structured-merge-diff/v4/merge"
-	"sigs.k8s.io/structured-merge-diff/v4/value"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	"sigs.k8s.io/structured-merge-diff/v5/merge"
+	"sigs.k8s.io/structured-merge-diff/v5/value"
 )
 
 var (

diff --git a/merge/deduced_test.go b/merge/deduced_test.go
@@ -19,9 +19,9 @@ package merge_test
 import (
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
-	"sigs.k8s.io/structured-merge-diff/v4/merge"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
+	"sigs.k8s.io/structured-merge-diff/v5/merge"
 )
 
 func TestDeduced(t *testing.T) {

diff --git a/merge/default_keys_test.go b/merge/default_keys_test.go
@@ -16,10 +16,10 @@ package merge_test
 import (
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
-	"sigs.k8s.io/structured-merge-diff/v4/merge"
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
+	"sigs.k8s.io/structured-merge-diff/v5/merge"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
 )
 
 // portListParser sets the default value of key "protocol" to "TCP"

diff --git a/merge/extract_apply_test.go b/merge/extract_apply_test.go
@@ -19,9 +19,9 @@ package merge_test
 import (
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
 )
 
 var extractParser = func() Parser {

diff --git a/merge/field_level_overrides_test.go b/merge/field_level_overrides_test.go
@@ -3,10 +3,10 @@ package merge_test
 import (
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	"sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
-	"sigs.k8s.io/structured-merge-diff/v4/merge"
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	"sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
+	"sigs.k8s.io/structured-merge-diff/v5/merge"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
 )
 
 func TestFieldLevelOverrides(t *testing.T) {

diff --git a/merge/ignore_test.go b/merge/ignore_test.go
@@ -19,8 +19,8 @@ package merge_test
 import (
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
 )
 
 func TestIgnoredFields(t *testing.T) {

diff --git a/merge/key_test.go b/merge/key_test.go
@@ -19,9 +19,9 @@ package merge_test
 import (
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
 )
 
 var associativeListParser = func() Parser {

diff --git a/merge/leaf_test.go b/merge/leaf_test.go
@@ -19,10 +19,10 @@ package merge_test
 import (
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
-	"sigs.k8s.io/structured-merge-diff/v4/merge"
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
+	"sigs.k8s.io/structured-merge-diff/v5/merge"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
 )
 
 var leafFieldsParser = func() Parser {

diff --git a/merge/multiple_appliers_test.go b/merge/multiple_appliers_test.go
@@ -23,11 +23,11 @@ import (
 	"testing"
 
 	"gopkg.in/yaml.v2"
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
-	"sigs.k8s.io/structured-merge-diff/v4/merge"
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
-	"sigs.k8s.io/structured-merge-diff/v4/value"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
+	"sigs.k8s.io/structured-merge-diff/v5/merge"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/value"
 )
 
 func TestMultipleAppliersSet(t *testing.T) {

diff --git a/merge/nested_test.go b/merge/nested_test.go
@@ -19,9 +19,9 @@ package merge_test
 import (
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
 )
 
 var nestedTypeParser = func() Parser {

diff --git a/merge/obsolete_versions_test.go b/merge/obsolete_versions_test.go
@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
-	"sigs.k8s.io/structured-merge-diff/v4/merge"
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
+	"sigs.k8s.io/structured-merge-diff/v5/merge"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
 )
 
 // specificVersionConverter doesn't convert and return the exact same

diff --git a/merge/preserve_unknown_test.go b/merge/preserve_unknown_test.go
@@ -19,9 +19,9 @@ package merge_test
 import (
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
 )
 
 var preserveUnknownParser = func() Parser {

diff --git a/merge/real_test.go b/merge/real_test.go
@@ -21,8 +21,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
+	. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
 )
 
 func testdata(file string) string {

diff --git a/merge/schema_change_test.go b/merge/schema_change_test.go
@@ -19,10 +19,10 @@ package merge_test
 import (
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
-	"sigs.k8s.io/structured-merge-diff/v4/merge"
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
+	"sigs.k8s.io/structured-merge-diff/v5/merge"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
 )
 
 var structParser = func() *typed.Parser {

diff --git a/merge/set_test.go b/merge/set_test.go
@@ -19,9 +19,9 @@ package merge_test
 import (
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
 )
 
 var setFieldsParser = func() Parser {

diff --git a/merge/union_test.go b/merge/union_test.go
@@ -19,10 +19,10 @@ package merge_test
 import (
 	"testing"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
-	"sigs.k8s.io/structured-merge-diff/v4/merge"
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
+	"sigs.k8s.io/structured-merge-diff/v5/merge"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
 )
 
 var unionFieldsParser = func() Parser {

diff --git a/merge/update.go b/merge/update.go
@@ -16,8 +16,8 @@ package merge
 import (
 	"fmt"
 
-	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
+	"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
+	"sigs.k8s.io/structured-merge-diff/v5/typed"
 )
 
 // Converter is an interface to the conversion logic. The converter