Skip to content

Commit a70144b

Browse files
apelisseapelisse
committed
Revert "Create package v5 for backward incompatible change"
This reverts commit 1754a8d.
1 parent 4ad28cc commit a70144b

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

+125
-125
lines changed

‎fieldpath/element.go

+1-1
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/v5/value"
24+
"sigs.k8s.io/structured-merge-diff/v4/value"
2525
)
2626

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

‎fieldpath/element_test.go

+1-1
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/v5/value"
22+
"sigs.k8s.io/structured-merge-diff/v4/value"
2323
)
2424

2525
func TestPathElementSet(t *testing.T) {

‎fieldpath/fromvalue.go

+1-1
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/v5/value"
20+
"sigs.k8s.io/structured-merge-diff/v4/value"
2121
)
2222

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

‎fieldpath/fromvalue_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"testing"
2121

2222
"gopkg.in/yaml.v2"
23-
"sigs.k8s.io/structured-merge-diff/v5/value"
23+
"sigs.k8s.io/structured-merge-diff/v4/value"
2424
)
2525

2626
func TestFromValue(t *testing.T) {

‎fieldpath/managers_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"reflect"
2222
"testing"
2323

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

2727
var (

‎fieldpath/path.go

+1-1
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/v5/value"
23+
"sigs.k8s.io/structured-merge-diff/v4/value"
2424
)
2525

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

‎fieldpath/path_test.go

+1-1
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/v5/value"
22+
"sigs.k8s.io/structured-merge-diff/v4/value"
2323
)
2424

2525
var (

‎fieldpath/pathelementmap.go

+1-1
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/v5/value"
22+
"sigs.k8s.io/structured-merge-diff/v4/value"
2323
)
2424

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

‎fieldpath/pathelementmap_test.go

+1-1
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/v5/value"
22+
"sigs.k8s.io/structured-merge-diff/v4/value"
2323
)
2424

2525
func TestPathElementValueMap(t *testing.T) {

‎fieldpath/serialize-pe.go

+1-1
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/v5/value"
27+
"sigs.k8s.io/structured-merge-diff/v4/value"
2828
)
2929

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

‎fieldpath/set.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"sort"
2121
"strings"
2222

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

2626
// Set identifies a set of fields.

‎fieldpath/set_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"testing"
2424

2525
"gopkg.in/yaml.v2"
26-
"sigs.k8s.io/structured-merge-diff/v5/schema"
26+
"sigs.k8s.io/structured-merge-diff/v4/schema"
2727
)
2828

2929
type randomPathAlphabet []PathElement

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module sigs.k8s.io/structured-merge-diff/v5
1+
module sigs.k8s.io/structured-merge-diff/v4
22

33
require gopkg.in/yaml.v2 v2.2.8
44

‎internal/cli/operation.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"io"
2222
"io/ioutil"
2323

24-
"sigs.k8s.io/structured-merge-diff/v5/typed"
25-
"sigs.k8s.io/structured-merge-diff/v5/value"
24+
"sigs.k8s.io/structured-merge-diff/v4/typed"
25+
"sigs.k8s.io/structured-merge-diff/v4/value"
2626
)
2727

2828
type Operation interface {

‎internal/cli/options.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"io/ioutil"
2525
"os"
2626

27-
"sigs.k8s.io/structured-merge-diff/v5/typed"
27+
"sigs.k8s.io/structured-merge-diff/v4/typed"
2828
)
2929

3030
var (

‎internal/fixture/state.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020
"bytes"
2121
"fmt"
2222

23-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
24-
"sigs.k8s.io/structured-merge-diff/v5/merge"
25-
"sigs.k8s.io/structured-merge-diff/v5/typed"
26-
"sigs.k8s.io/structured-merge-diff/v5/value"
23+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
24+
"sigs.k8s.io/structured-merge-diff/v4/merge"
25+
"sigs.k8s.io/structured-merge-diff/v4/typed"
26+
"sigs.k8s.io/structured-merge-diff/v4/value"
2727
)
2828

2929
// For the sake of tests, a parser is something that can retrieve a

‎internal/fixture/state_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121
"testing"
2222

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

2626
func TestFixTabs(t *testing.T) {

‎merge/conflict.go

+1-1
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/v5/fieldpath"
24+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
2525
)
2626

2727
// Conflict is a conflict on a specific field with the current manager of

‎merge/conflict_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package merge_test
1919
import (
2020
"testing"
2121

22-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
23-
"sigs.k8s.io/structured-merge-diff/v5/merge"
24-
"sigs.k8s.io/structured-merge-diff/v5/value"
22+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
23+
"sigs.k8s.io/structured-merge-diff/v4/merge"
24+
"sigs.k8s.io/structured-merge-diff/v4/value"
2525
)
2626

2727
var (

‎merge/deduced_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package merge_test
1919
import (
2020
"testing"
2121

22-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
23-
. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
24-
"sigs.k8s.io/structured-merge-diff/v5/merge"
22+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
23+
. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
24+
"sigs.k8s.io/structured-merge-diff/v4/merge"
2525
)
2626

2727
func TestDeduced(t *testing.T) {

‎merge/default_keys_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ package merge_test
1616
import (
1717
"testing"
1818

19-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
20-
. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
21-
"sigs.k8s.io/structured-merge-diff/v5/merge"
22-
"sigs.k8s.io/structured-merge-diff/v5/typed"
19+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
20+
. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
21+
"sigs.k8s.io/structured-merge-diff/v4/merge"
22+
"sigs.k8s.io/structured-merge-diff/v4/typed"
2323
)
2424

2525
// portListParser sets the default value of key "protocol" to "TCP"

‎merge/extract_apply_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package merge_test
1919
import (
2020
"testing"
2121

22-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
23-
. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
24-
"sigs.k8s.io/structured-merge-diff/v5/typed"
22+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
23+
. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
24+
"sigs.k8s.io/structured-merge-diff/v4/typed"
2525
)
2626

2727
var extractParser = func() Parser {

‎merge/field_level_overrides_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package merge_test
33
import (
44
"testing"
55

6-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
7-
"sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
8-
"sigs.k8s.io/structured-merge-diff/v5/merge"
9-
"sigs.k8s.io/structured-merge-diff/v5/typed"
6+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
7+
"sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
8+
"sigs.k8s.io/structured-merge-diff/v4/merge"
9+
"sigs.k8s.io/structured-merge-diff/v4/typed"
1010
)
1111

1212
func TestFieldLevelOverrides(t *testing.T) {

‎merge/ignore_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package merge_test
1919
import (
2020
"testing"
2121

22-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
23-
. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
22+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
23+
. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
2424
)
2525

2626
func TestIgnoredFields(t *testing.T) {

‎merge/key_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package merge_test
1919
import (
2020
"testing"
2121

22-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
23-
. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
24-
"sigs.k8s.io/structured-merge-diff/v5/typed"
22+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
23+
. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
24+
"sigs.k8s.io/structured-merge-diff/v4/typed"
2525
)
2626

2727
var associativeListParser = func() Parser {

‎merge/leaf_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ package merge_test
1919
import (
2020
"testing"
2121

22-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
23-
. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
24-
"sigs.k8s.io/structured-merge-diff/v5/merge"
25-
"sigs.k8s.io/structured-merge-diff/v5/typed"
22+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
23+
. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
24+
"sigs.k8s.io/structured-merge-diff/v4/merge"
25+
"sigs.k8s.io/structured-merge-diff/v4/typed"
2626
)
2727

2828
var leafFieldsParser = func() Parser {

‎merge/multiple_appliers_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import (
2323
"testing"
2424

2525
"gopkg.in/yaml.v2"
26-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
27-
. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
28-
"sigs.k8s.io/structured-merge-diff/v5/merge"
29-
"sigs.k8s.io/structured-merge-diff/v5/typed"
30-
"sigs.k8s.io/structured-merge-diff/v5/value"
26+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
27+
. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
28+
"sigs.k8s.io/structured-merge-diff/v4/merge"
29+
"sigs.k8s.io/structured-merge-diff/v4/typed"
30+
"sigs.k8s.io/structured-merge-diff/v4/value"
3131
)
3232

3333
func TestMultipleAppliersSet(t *testing.T) {

‎merge/nested_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package merge_test
1919
import (
2020
"testing"
2121

22-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
23-
. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
24-
"sigs.k8s.io/structured-merge-diff/v5/typed"
22+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
23+
. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
24+
"sigs.k8s.io/structured-merge-diff/v4/typed"
2525
)
2626

2727
var nestedTypeParser = func() Parser {

‎merge/obsolete_versions_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020
"fmt"
2121
"testing"
2222

23-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
24-
. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
25-
"sigs.k8s.io/structured-merge-diff/v5/merge"
26-
"sigs.k8s.io/structured-merge-diff/v5/typed"
23+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
24+
. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
25+
"sigs.k8s.io/structured-merge-diff/v4/merge"
26+
"sigs.k8s.io/structured-merge-diff/v4/typed"
2727
)
2828

2929
// specificVersionConverter doesn't convert and return the exact same

‎merge/preserve_unknown_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package merge_test
1919
import (
2020
"testing"
2121

22-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
23-
. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
24-
"sigs.k8s.io/structured-merge-diff/v5/typed"
22+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
23+
. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
24+
"sigs.k8s.io/structured-merge-diff/v4/typed"
2525
)
2626

2727
var preserveUnknownParser = func() Parser {

‎merge/real_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"path/filepath"
2222
"testing"
2323

24-
. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
25-
"sigs.k8s.io/structured-merge-diff/v5/typed"
24+
. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
25+
"sigs.k8s.io/structured-merge-diff/v4/typed"
2626
)
2727

2828
func testdata(file string) string {

‎merge/schema_change_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ package merge_test
1919
import (
2020
"testing"
2121

22-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
23-
. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
24-
"sigs.k8s.io/structured-merge-diff/v5/merge"
25-
"sigs.k8s.io/structured-merge-diff/v5/typed"
22+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
23+
. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
24+
"sigs.k8s.io/structured-merge-diff/v4/merge"
25+
"sigs.k8s.io/structured-merge-diff/v4/typed"
2626
)
2727

2828
var structParser = func() *typed.Parser {

‎merge/set_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package merge_test
1919
import (
2020
"testing"
2121

22-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
23-
. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
24-
"sigs.k8s.io/structured-merge-diff/v5/typed"
22+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
23+
. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
24+
"sigs.k8s.io/structured-merge-diff/v4/typed"
2525
)
2626

2727
var setFieldsParser = func() Parser {

‎merge/union_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ package merge_test
1919
import (
2020
"testing"
2121

22-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
23-
. "sigs.k8s.io/structured-merge-diff/v5/internal/fixture"
24-
"sigs.k8s.io/structured-merge-diff/v5/merge"
25-
"sigs.k8s.io/structured-merge-diff/v5/typed"
22+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
23+
. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
24+
"sigs.k8s.io/structured-merge-diff/v4/merge"
25+
"sigs.k8s.io/structured-merge-diff/v4/typed"
2626
)
2727

2828
var unionFieldsParser = func() Parser {

‎merge/update.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ package merge
1616
import (
1717
"fmt"
1818

19-
"sigs.k8s.io/structured-merge-diff/v5/fieldpath"
20-
"sigs.k8s.io/structured-merge-diff/v5/typed"
19+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
20+
"sigs.k8s.io/structured-merge-diff/v4/typed"
2121
)
2222

2323
// Converter is an interface to the conversion logic. The converter

0 commit comments

Comments
 (0)