From daa3a199edcc48f138daf17ff9ec1ea875f563b8 Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Wed, 5 Aug 2020 12:24:42 -0700 Subject: [PATCH] Udpate go mod package to v4 --- fieldpath/element.go | 2 +- fieldpath/element_test.go | 2 +- fieldpath/fromvalue.go | 2 +- fieldpath/fromvalue_test.go | 2 +- fieldpath/managers_test.go | 2 +- fieldpath/path.go | 2 +- fieldpath/path_test.go | 2 +- fieldpath/pathelementmap.go | 2 +- fieldpath/pathelementmap_test.go | 2 +- fieldpath/serialize-pe.go | 2 +- go.mod | 2 +- internal/cli/operation.go | 4 ++-- internal/cli/options.go | 2 +- internal/fixture/state.go | 8 ++++---- internal/fixture/state_test.go | 2 +- merge/conflict.go | 2 +- merge/conflict_test.go | 6 +++--- merge/deduced_test.go | 6 +++--- merge/ignore_test.go | 16 ++++++++-------- merge/key_test.go | 6 +++--- merge/leaf_test.go | 8 ++++---- merge/multiple_appliers_test.go | 10 +++++----- merge/nested_test.go | 6 +++--- merge/obsolete_versions_test.go | 8 ++++---- merge/preserve_unknown_test.go | 6 +++--- merge/real_test.go | 4 ++-- merge/set_test.go | 6 +++--- merge/union_test.go | 8 ++++---- merge/update.go | 4 ++-- smd/main.go | 2 +- typed/comparison_test.go | 4 ++-- typed/deduced_test.go | 4 ++-- typed/helpers.go | 6 +++--- typed/merge.go | 6 +++--- typed/merge_test.go | 4 ++-- typed/parser.go | 4 ++-- typed/parser_test.go | 2 +- typed/remove.go | 6 +++--- typed/symdiff_test.go | 4 ++-- typed/tofieldset.go | 6 +++--- typed/toset_test.go | 6 +++--- typed/typed.go | 6 +++--- typed/union.go | 4 ++-- typed/union_test.go | 2 +- typed/validate.go | 6 +++--- typed/validate_test.go | 4 ++-- 46 files changed, 105 insertions(+), 105 deletions(-) diff --git a/fieldpath/element.go b/fieldpath/element.go index 1b4872b8..1578f64c 100644 --- a/fieldpath/element.go +++ b/fieldpath/element.go @@ -21,7 +21,7 @@ import ( "sort" "strings" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/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 4f892eb4..05019a98 100644 --- a/fieldpath/element_test.go +++ b/fieldpath/element_test.go @@ -19,7 +19,7 @@ package fieldpath import ( "testing" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/value" ) func TestPathElementSet(t *testing.T) { diff --git a/fieldpath/fromvalue.go b/fieldpath/fromvalue.go index 36b2d4a9..20775ee0 100644 --- 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/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/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 aefea352..1cbf0b1b 100644 --- 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/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/value" ) func TestFromValue(t *testing.T) { diff --git a/fieldpath/managers_test.go b/fieldpath/managers_test.go index a50502fd..c3a9b2cf 100644 --- a/fieldpath/managers_test.go +++ b/fieldpath/managers_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "sigs.k8s.io/structured-merge-diff/v3/fieldpath" + "sigs.k8s.io/structured-merge-diff/v4/fieldpath" ) var ( diff --git a/fieldpath/path.go b/fieldpath/path.go index cc7fb9c6..0413130b 100644 --- a/fieldpath/path.go +++ b/fieldpath/path.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/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 58516073..d3086732 100644 --- a/fieldpath/path_test.go +++ b/fieldpath/path_test.go @@ -19,7 +19,7 @@ package fieldpath import ( "testing" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/value" ) var ( diff --git a/fieldpath/pathelementmap.go b/fieldpath/pathelementmap.go index fc8a1ff3..9b14ca58 100644 --- a/fieldpath/pathelementmap.go +++ b/fieldpath/pathelementmap.go @@ -19,7 +19,7 @@ package fieldpath import ( "sort" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/value" ) // PathElementValueMap is a map from PathElement to value.Value. diff --git a/fieldpath/pathelementmap_test.go b/fieldpath/pathelementmap_test.go index 3a8af52a..cbabf50f 100644 --- a/fieldpath/pathelementmap_test.go +++ b/fieldpath/pathelementmap_test.go @@ -19,7 +19,7 @@ package fieldpath import ( "testing" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/value" ) func TestPathElementValueMap(t *testing.T) { diff --git a/fieldpath/serialize-pe.go b/fieldpath/serialize-pe.go index fcb6b2fc..cb18e7b1 100644 --- 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/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/value" ) var ErrUnknownPathElementType = errors.New("unknown path element type") diff --git a/go.mod b/go.mod index 29e44aeb..404c5fed 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module sigs.k8s.io/structured-merge-diff/v3 +module sigs.k8s.io/structured-merge-diff/v4 require gopkg.in/yaml.v2 v2.2.1 diff --git a/internal/cli/operation.go b/internal/cli/operation.go index 12636d12..53789731 100644 --- a/internal/cli/operation.go +++ b/internal/cli/operation.go @@ -21,8 +21,8 @@ import ( "io" "io/ioutil" - "sigs.k8s.io/structured-merge-diff/v3/typed" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/typed" + "sigs.k8s.io/structured-merge-diff/v4/value" ) type Operation interface { diff --git a/internal/cli/options.go b/internal/cli/options.go index cf180ee4..9a4cbeb8 100644 --- a/internal/cli/options.go +++ b/internal/cli/options.go @@ -24,7 +24,7 @@ import ( "io/ioutil" "os" - "sigs.k8s.io/structured-merge-diff/v3/typed" + "sigs.k8s.io/structured-merge-diff/v4/typed" ) var ( diff --git a/internal/fixture/state.go b/internal/fixture/state.go index c275ce8d..b7c09946 100644 --- a/internal/fixture/state.go +++ b/internal/fixture/state.go @@ -20,10 +20,10 @@ import ( "bytes" "fmt" - "sigs.k8s.io/structured-merge-diff/v3/fieldpath" - "sigs.k8s.io/structured-merge-diff/v3/merge" - "sigs.k8s.io/structured-merge-diff/v3/typed" - "sigs.k8s.io/structured-merge-diff/v3/value" + "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" ) // 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 1e7fc3aa..0b88f755 100644 --- 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/v3/typed" + "sigs.k8s.io/structured-merge-diff/v4/typed" ) func TestFixTabs(t *testing.T) { diff --git a/merge/conflict.go b/merge/conflict.go index 88cb1417..75a492d8 100644 --- a/merge/conflict.go +++ b/merge/conflict.go @@ -21,7 +21,7 @@ import ( "sort" "strings" - "sigs.k8s.io/structured-merge-diff/v3/fieldpath" + "sigs.k8s.io/structured-merge-diff/v4/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 f742b5b4..f674f87c 100644 --- 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/v3/fieldpath" - "sigs.k8s.io/structured-merge-diff/v3/merge" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/fieldpath" + "sigs.k8s.io/structured-merge-diff/v4/merge" + "sigs.k8s.io/structured-merge-diff/v4/value" ) var ( diff --git a/merge/deduced_test.go b/merge/deduced_test.go index 1d08e929..3bde04b9 100644 --- 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/v3/fieldpath" - . "sigs.k8s.io/structured-merge-diff/v3/internal/fixture" - "sigs.k8s.io/structured-merge-diff/v3/merge" + "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" ) func TestDeduced(t *testing.T) { diff --git a/merge/ignore_test.go b/merge/ignore_test.go index 1853e137..21b3c847 100644 --- 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/v3/fieldpath" - . "sigs.k8s.io/structured-merge-diff/v3/internal/fixture" + "sigs.k8s.io/structured-merge-diff/v4/fieldpath" + . "sigs.k8s.io/structured-merge-diff/v4/internal/fixture" ) func TestIgnoredFields(t *testing.T) { @@ -220,7 +220,7 @@ func TestIgnoredFieldsUsesVersions(t *testing.T) { Manager: "update-one", Object: ` mapOfMapsRecursive: - a: + a: b: c: d: @@ -231,7 +231,7 @@ func TestIgnoredFieldsUsesVersions(t *testing.T) { Manager: "update-two", Object: ` mapOfMapsRecursive: - a: + a: b: c: e: @@ -241,7 +241,7 @@ func TestIgnoredFieldsUsesVersions(t *testing.T) { }, Object: ` mapOfMapsRecursive: - a: + a: b: c: e: @@ -279,7 +279,7 @@ func TestIgnoredFieldsUsesVersions(t *testing.T) { Manager: "apply-one", Object: ` mapOfMapsRecursive: - a: + a: b: c: d: @@ -290,7 +290,7 @@ func TestIgnoredFieldsUsesVersions(t *testing.T) { Manager: "apply-two", Object: ` mapOfMapsRecursive: - a: + a: b: c: e: @@ -300,7 +300,7 @@ func TestIgnoredFieldsUsesVersions(t *testing.T) { }, Object: ` mapOfMapsRecursive: - a: + a: b: c: d: diff --git a/merge/key_test.go b/merge/key_test.go index 8f87bc57..e76e67cb 100644 --- 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/v3/fieldpath" - . "sigs.k8s.io/structured-merge-diff/v3/internal/fixture" - "sigs.k8s.io/structured-merge-diff/v3/typed" + "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" ) var associativeListParser = func() Parser { diff --git a/merge/leaf_test.go b/merge/leaf_test.go index 57b6dad3..ab6d59ae 100644 --- 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/v3/fieldpath" - . "sigs.k8s.io/structured-merge-diff/v3/internal/fixture" - "sigs.k8s.io/structured-merge-diff/v3/merge" - "sigs.k8s.io/structured-merge-diff/v3/typed" + "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" ) var leafFieldsParser = func() Parser { diff --git a/merge/multiple_appliers_test.go b/merge/multiple_appliers_test.go index fcd1e8a9..fed31141 100644 --- 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/v3/fieldpath" - . "sigs.k8s.io/structured-merge-diff/v3/internal/fixture" - "sigs.k8s.io/structured-merge-diff/v3/merge" - "sigs.k8s.io/structured-merge-diff/v3/typed" - "sigs.k8s.io/structured-merge-diff/v3/value" + "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" ) func TestMultipleAppliersSet(t *testing.T) { diff --git a/merge/nested_test.go b/merge/nested_test.go index 0bb1ef5a..367adca2 100644 --- 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/v3/fieldpath" - . "sigs.k8s.io/structured-merge-diff/v3/internal/fixture" - "sigs.k8s.io/structured-merge-diff/v3/typed" + "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" ) var nestedTypeParser = func() Parser { diff --git a/merge/obsolete_versions_test.go b/merge/obsolete_versions_test.go index 751b63c3..fdb119eb 100644 --- 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/v3/fieldpath" - . "sigs.k8s.io/structured-merge-diff/v3/internal/fixture" - "sigs.k8s.io/structured-merge-diff/v3/merge" - "sigs.k8s.io/structured-merge-diff/v3/typed" + "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" ) // specificVersionConverter doesn't convert and return the exact same diff --git a/merge/preserve_unknown_test.go b/merge/preserve_unknown_test.go index 53f81c83..2d77384f 100644 --- 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/v3/fieldpath" - . "sigs.k8s.io/structured-merge-diff/v3/internal/fixture" - "sigs.k8s.io/structured-merge-diff/v3/typed" + "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" ) var preserveUnknownParser = func() Parser { diff --git a/merge/real_test.go b/merge/real_test.go index 5dfa26a6..1136bbdc 100644 --- a/merge/real_test.go +++ b/merge/real_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - . "sigs.k8s.io/structured-merge-diff/v3/internal/fixture" - "sigs.k8s.io/structured-merge-diff/v3/typed" + . "sigs.k8s.io/structured-merge-diff/v4/internal/fixture" + "sigs.k8s.io/structured-merge-diff/v4/typed" ) func testdata(file string) string { diff --git a/merge/set_test.go b/merge/set_test.go index 02a98a78..5882c6ef 100644 --- 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/v3/fieldpath" - . "sigs.k8s.io/structured-merge-diff/v3/internal/fixture" - "sigs.k8s.io/structured-merge-diff/v3/typed" + "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" ) var setFieldsParser = func() Parser { diff --git a/merge/union_test.go b/merge/union_test.go index d9e417f3..9a8ba56b 100644 --- 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/v3/fieldpath" - . "sigs.k8s.io/structured-merge-diff/v3/internal/fixture" - "sigs.k8s.io/structured-merge-diff/v3/merge" - "sigs.k8s.io/structured-merge-diff/v3/typed" + "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" ) var unionFieldsParser = func() Parser { diff --git a/merge/update.go b/merge/update.go index 7b88cbd8..e648d8a2 100644 --- a/merge/update.go +++ b/merge/update.go @@ -16,8 +16,8 @@ package merge import ( "fmt" - "sigs.k8s.io/structured-merge-diff/v3/fieldpath" - "sigs.k8s.io/structured-merge-diff/v3/typed" + "sigs.k8s.io/structured-merge-diff/v4/fieldpath" + "sigs.k8s.io/structured-merge-diff/v4/typed" ) // Converter is an interface to the conversion logic. The converter diff --git a/smd/main.go b/smd/main.go index e38ce8f3..34a904e9 100644 --- a/smd/main.go +++ b/smd/main.go @@ -22,7 +22,7 @@ import ( "flag" "log" - "sigs.k8s.io/structured-merge-diff/v3/internal/cli" + "sigs.k8s.io/structured-merge-diff/v4/internal/cli" ) func main() { diff --git a/typed/comparison_test.go b/typed/comparison_test.go index ef2934d6..321f90cc 100644 --- a/typed/comparison_test.go +++ b/typed/comparison_test.go @@ -3,8 +3,8 @@ package typed_test import ( "testing" - "sigs.k8s.io/structured-merge-diff/v3/fieldpath" - "sigs.k8s.io/structured-merge-diff/v3/typed" + "sigs.k8s.io/structured-merge-diff/v4/fieldpath" + "sigs.k8s.io/structured-merge-diff/v4/typed" ) func TestComparisonExcludeFields(t *testing.T) { diff --git a/typed/deduced_test.go b/typed/deduced_test.go index c9d9cfd6..0719eae1 100644 --- a/typed/deduced_test.go +++ b/typed/deduced_test.go @@ -20,8 +20,8 @@ import ( "fmt" "testing" - "sigs.k8s.io/structured-merge-diff/v3/typed" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/typed" + "sigs.k8s.io/structured-merge-diff/v4/value" ) func TestValidateDeducedType(t *testing.T) { diff --git a/typed/helpers.go b/typed/helpers.go index 0834f4d3..9b6845e8 100644 --- a/typed/helpers.go +++ b/typed/helpers.go @@ -21,9 +21,9 @@ import ( "fmt" "strings" - "sigs.k8s.io/structured-merge-diff/v3/fieldpath" - "sigs.k8s.io/structured-merge-diff/v3/schema" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/fieldpath" + "sigs.k8s.io/structured-merge-diff/v4/schema" + "sigs.k8s.io/structured-merge-diff/v4/value" ) // ValidationError reports an error about a particular field diff --git a/typed/merge.go b/typed/merge.go index e9573cc2..5112e253 100644 --- a/typed/merge.go +++ b/typed/merge.go @@ -19,9 +19,9 @@ package typed import ( "math" - "sigs.k8s.io/structured-merge-diff/v3/fieldpath" - "sigs.k8s.io/structured-merge-diff/v3/schema" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/fieldpath" + "sigs.k8s.io/structured-merge-diff/v4/schema" + "sigs.k8s.io/structured-merge-diff/v4/value" ) type mergingWalker struct { diff --git a/typed/merge_test.go b/typed/merge_test.go index 012f4e72..5862fb69 100644 --- a/typed/merge_test.go +++ b/typed/merge_test.go @@ -20,8 +20,8 @@ import ( "fmt" "testing" - "sigs.k8s.io/structured-merge-diff/v3/typed" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/typed" + "sigs.k8s.io/structured-merge-diff/v4/value" ) type mergeTestCase struct { diff --git a/typed/parser.go b/typed/parser.go index 845fdfe4..3949a78f 100644 --- a/typed/parser.go +++ b/typed/parser.go @@ -20,8 +20,8 @@ import ( "fmt" yaml "gopkg.in/yaml.v2" - "sigs.k8s.io/structured-merge-diff/v3/schema" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/schema" + "sigs.k8s.io/structured-merge-diff/v4/value" ) // YAMLObject is an object encoded in YAML. diff --git a/typed/parser_test.go b/typed/parser_test.go index 82bdb310..fdb7d9fc 100644 --- a/typed/parser_test.go +++ b/typed/parser_test.go @@ -23,7 +23,7 @@ import ( "testing" yaml "gopkg.in/yaml.v2" - "sigs.k8s.io/structured-merge-diff/v3/typed" + "sigs.k8s.io/structured-merge-diff/v4/typed" ) func testdata(file string) string { diff --git a/typed/remove.go b/typed/remove.go index cfa6365a..a2811953 100644 --- a/typed/remove.go +++ b/typed/remove.go @@ -14,9 +14,9 @@ limitations under the License. package typed import ( - "sigs.k8s.io/structured-merge-diff/v3/fieldpath" - "sigs.k8s.io/structured-merge-diff/v3/schema" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/fieldpath" + "sigs.k8s.io/structured-merge-diff/v4/schema" + "sigs.k8s.io/structured-merge-diff/v4/value" ) type removingWalker struct { diff --git a/typed/symdiff_test.go b/typed/symdiff_test.go index c4ea116f..57751a73 100644 --- a/typed/symdiff_test.go +++ b/typed/symdiff_test.go @@ -20,8 +20,8 @@ import ( "fmt" "testing" - "sigs.k8s.io/structured-merge-diff/v3/fieldpath" - "sigs.k8s.io/structured-merge-diff/v3/typed" + "sigs.k8s.io/structured-merge-diff/v4/fieldpath" + "sigs.k8s.io/structured-merge-diff/v4/typed" ) type symdiffTestCase struct { diff --git a/typed/tofieldset.go b/typed/tofieldset.go index b3c4ff00..0662d0f0 100644 --- a/typed/tofieldset.go +++ b/typed/tofieldset.go @@ -19,9 +19,9 @@ package typed import ( "sync" - "sigs.k8s.io/structured-merge-diff/v3/fieldpath" - "sigs.k8s.io/structured-merge-diff/v3/schema" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/fieldpath" + "sigs.k8s.io/structured-merge-diff/v4/schema" + "sigs.k8s.io/structured-merge-diff/v4/value" ) var tPool = sync.Pool{ diff --git a/typed/toset_test.go b/typed/toset_test.go index 816cf4fe..2cc6810c 100644 --- a/typed/toset_test.go +++ b/typed/toset_test.go @@ -20,9 +20,9 @@ import ( "fmt" "testing" - "sigs.k8s.io/structured-merge-diff/v3/fieldpath" - "sigs.k8s.io/structured-merge-diff/v3/typed" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/fieldpath" + "sigs.k8s.io/structured-merge-diff/v4/typed" + "sigs.k8s.io/structured-merge-diff/v4/value" ) type objSetPair struct { diff --git a/typed/typed.go b/typed/typed.go index 056a07de..1a99159a 100644 --- a/typed/typed.go +++ b/typed/typed.go @@ -21,9 +21,9 @@ import ( "strings" "sync" - "sigs.k8s.io/structured-merge-diff/v3/fieldpath" - "sigs.k8s.io/structured-merge-diff/v3/schema" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/fieldpath" + "sigs.k8s.io/structured-merge-diff/v4/schema" + "sigs.k8s.io/structured-merge-diff/v4/value" ) // AsTyped accepts a value and a type and returns a TypedValue. 'v' must have diff --git a/typed/union.go b/typed/union.go index 26526cb8..1fa5d88a 100644 --- a/typed/union.go +++ b/typed/union.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "sigs.k8s.io/structured-merge-diff/v3/schema" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/schema" + "sigs.k8s.io/structured-merge-diff/v4/value" ) func normalizeUnions(w *mergingWalker) error { diff --git a/typed/union_test.go b/typed/union_test.go index ba6613a8..a3ed129a 100644 --- a/typed/union_test.go +++ b/typed/union_test.go @@ -19,7 +19,7 @@ package typed_test import ( "testing" - "sigs.k8s.io/structured-merge-diff/v3/typed" + "sigs.k8s.io/structured-merge-diff/v4/typed" ) var unionParser = func() typed.ParseableType { diff --git a/typed/validate.go b/typed/validate.go index 5c5a1cb6..a2f8f4ef 100644 --- a/typed/validate.go +++ b/typed/validate.go @@ -19,9 +19,9 @@ package typed import ( "sync" - "sigs.k8s.io/structured-merge-diff/v3/fieldpath" - "sigs.k8s.io/structured-merge-diff/v3/schema" - "sigs.k8s.io/structured-merge-diff/v3/value" + "sigs.k8s.io/structured-merge-diff/v4/fieldpath" + "sigs.k8s.io/structured-merge-diff/v4/schema" + "sigs.k8s.io/structured-merge-diff/v4/value" ) var vPool = sync.Pool{ diff --git a/typed/validate_test.go b/typed/validate_test.go index 88a2c1db..43357c5c 100644 --- a/typed/validate_test.go +++ b/typed/validate_test.go @@ -21,8 +21,8 @@ import ( "strings" "testing" - "sigs.k8s.io/structured-merge-diff/v3/schema" - "sigs.k8s.io/structured-merge-diff/v3/typed" + "sigs.k8s.io/structured-merge-diff/v4/schema" + "sigs.k8s.io/structured-merge-diff/v4/typed" ) type validationTestCase struct {