From 956f3242e68bd861a7ebd066ed934266704f8eac Mon Sep 17 00:00:00 2001 From: Matthias Diester Date: Mon, 17 May 2021 11:18:45 +0200 Subject: [PATCH] Backport unsafe Dot-style path parsing Introduce parsing of Dot-sytle (Spruce style) paths without having a document to check against. It assumes mapping contexts when unclear. The code is backported from the API rework for the next version. --- .github/workflows/build.yml | 14 +++++++--- errors.go | 9 +++++++ go.mod | 4 +-- go.sum | 31 ++++++++++++++++----- path.go | 43 +++++++++++++++++++++++++++++ path_test.go | 54 +++++++++++++++++++++++-------------- 6 files changed, 123 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41ee1d3..9b060a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,6 +28,16 @@ jobs: run: | go mod verify + - name: Install Tools + run: | + pushd "$(mktemp -d)" + go get github.com/gordonklaus/ineffassign + go get golang.org/x/lint/golint + go get github.com/client9/misspell/cmd/misspell + go get honnef.co/go/tools/cmd/staticcheck + go get github.com/onsi/ginkgo/ginkgo github.com/onsi/gomega/... + popd + - name: Build Go Code run: | go build ./... @@ -43,22 +53,18 @@ jobs: - name: Sanity Check (golint) run: | - go get golang.org/x/lint/golint golint ./... - name: Sanity Check (misspell) run: | - go get github.com/client9/misspell/cmd/misspell find . -type f | xargs misspell -source=text -error - name: Sanity Check (staticcheck) run: | - go get honnef.co/go/tools/cmd/staticcheck staticcheck ./... - name: Run Go Unit Tests run: | - go get github.com/onsi/ginkgo/ginkgo github.com/onsi/gomega/... ginkgo -randomizeAllSpecs -randomizeSuites -failOnPending -nodes=1 -compilers=1 -race -trace -cover - name: Upload Code Coverage Profile diff --git a/errors.go b/errors.go index c10ddd5..bd7676a 100644 --- a/errors.go +++ b/errors.go @@ -47,6 +47,15 @@ func (e *NoNamedEntryListError) Error() string { return "not a named-entry list, one or more entries are not of type map" } +// NewInvalidPathError creates a new InvalidPathString +func NewInvalidPathError(style PathStyle, pathString string, format string, a ...interface{}) *InvalidPathString { + return &InvalidPathString{ + Style: style, + PathString: pathString, + Explanation: fmt.Sprintf(format, a...), + } +} + // InvalidPathString represents the error that a path string is not a valid // Dot-style or GoPatch path syntax and does not match a provided document. type InvalidPathString struct { diff --git a/go.mod b/go.mod index 5cc70f8..72ffb2a 100644 --- a/go.mod +++ b/go.mod @@ -9,8 +9,8 @@ require ( github.com/gonvenience/text v1.0.6 github.com/gonvenience/wrap v1.1.0 github.com/gorilla/mux v1.8.0 - github.com/onsi/ginkgo v1.15.2 - github.com/onsi/gomega v1.11.0 + github.com/onsi/ginkgo v1.16.2 + github.com/onsi/gomega v1.12.0 github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ) diff --git a/go.sum b/go.sum index 4632736..4927d39 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,11 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= @@ -11,6 +14,8 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/gonvenience/bunt v1.1.3/go.mod h1:hZ898ZprNWgaVlq4s1ivsJu3AY+3wrlJadF5Gp7Yq2c= github.com/gonvenience/bunt v1.3.1/go.mod h1:G+d3dJBxxOqV2oca96psgAnPABVC9QptEifjVqPu+mo= github.com/gonvenience/bunt v1.3.2 h1:gDiyTDfPf87fCtIbFzvENrmlnDZYbENdhhRW2kun/tw= @@ -27,6 +32,7 @@ github.com/gonvenience/wrap v1.1.0/go.mod h1:L47Cm1sK1G8QmFAYQfkHcF/sQ1IBJUa0u4s github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -50,16 +56,21 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg= github.com/onsi/ginkgo v1.15.1/go.mod h1:Dd6YFfwBW84ETqqtL0CPyPXillHgY6XhQH3uuCCTr/o= -github.com/onsi/ginkgo v1.15.2 h1:l77YT15o814C2qVL47NOyjV/6RbaP7kKdrvZnxQ3Org= github.com/onsi/ginkgo v1.15.2/go.mod h1:Dd6YFfwBW84ETqqtL0CPyPXillHgY6XhQH3uuCCTr/o= +github.com/onsi/ginkgo v1.16.2 h1:HFB2fbVIlhIfCfOW81bZFbiC/RvnpXSdhbF2/DJr134= +github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= -github.com/onsi/gomega v1.11.0 h1:+CqWgvj0OZycCaqclBD1pxKHAU+tOkHmQIWvDHq2aug= github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg= +github.com/onsi/gomega v1.12.0 h1:p4oGGk2M2UJc0wWN4lHFvIB71lxsh0T/UiKCCgFADY8= +github.com/onsi/gomega v1.12.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 h1:JwtAtbp7r/7QSyGz8mKUbYJBg2+6Cd7OjM8o/GNOcVo= github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74/go.mod h1:RmMWU37GKR2s6pgrIEB4ixgpVCt/cf7dnJv3fuH1J1c= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -74,8 +85,9 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb h1:eBmm0M9fYhWpKZLjQUUKka/LtIxf46G4fxeEz5KJr9U= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 h1:DzZ89McO9/gWPsQXS/FVKAlG02ZjaQ6AlZRBimEYOd0= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck= @@ -92,14 +104,18 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091 h1:DMyOG0U+gKfu8JZzg2UQe9MeaC1X+xQWlAKcRnjxjCw= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -113,11 +129,14 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= diff --git a/path.go b/path.go index a3acba0..c4d2b74 100644 --- a/path.go +++ b/path.go @@ -23,12 +23,15 @@ package ytbx import ( "fmt" "reflect" + "regexp" "strconv" "strings" yamlv3 "gopkg.in/yaml.v3" ) +var dotRegEx = regexp.MustCompile(`^((\d+):)?(.*)$`) + // PathStyle is a custom type for supported path styles type PathStyle int @@ -446,6 +449,46 @@ func ParseDotStylePathString(path string, node *yamlv3.Node) (Path, error) { return Path{DocumentIdx: 0, PathElements: elements}, nil } +// ParseDotStylePathStringUnsafe returns a path by parsing a string +// representation, which is assumed to be a Dot-Style path, but *without* +// checking it against a YAML Node +func ParseDotStylePathStringUnsafe(path string) (Path, error) { + matches := dotRegEx.FindStringSubmatch(path) + if matches == nil { + return Path{}, NewInvalidPathError(GoPatchStyle, path, + "failed to parse path string, because path does not match expected format", + ) + } + + var documentIdx int + if len(matches[2]) > 0 { + var err error + documentIdx, err = strconv.Atoi(matches[2]) + if err != nil { + return Path{}, NewInvalidPathError(GoPatchStyle, path, + "failed to parse path string, cannot parse document index: %s", matches[2], + ) + } + } + + // Reset path variable to only contain the raw path string + path = matches[3] + + var elements []PathElement + for _, section := range strings.Split(path, ".") { + if idx, err := strconv.Atoi(section); err == nil { + elements = append(elements, PathElement{Idx: idx}) + + } else { + // This is the unsafe part here, since there is no YAML node to + // check against, it can only be assumed it is a mapping + elements = append(elements, PathElement{Idx: -1, Name: section}) + } + } + + return Path{DocumentIdx: documentIdx, PathElements: elements}, nil +} + // ParsePathString returns a path by parsing a string representation // of a path, which can be one of the supported types. func ParsePathString(pathString string, node *yamlv3.Node) (Path, error) { diff --git a/path_test.go b/path_test.go index 9b66231..507bea3 100644 --- a/path_test.go +++ b/path_test.go @@ -87,6 +87,20 @@ var _ = Describe("path tests", func() { {Idx: -1, Key: "", Name: "newkey"}, }})) }) + + It("should parse unsafe paths too", func() { + Expect(ParseDotStylePathStringUnsafe("list.one.newkey")).To(BeEquivalentTo(Path{DocumentIdx: 0, PathElements: []PathElement{ + {Idx: -1, Key: "", Name: "list"}, + {Idx: -1, Key: "", Name: "one"}, + {Idx: -1, Key: "", Name: "newkey"}, + }})) + + Expect(ParseDotStylePathStringUnsafe("list.0.newkey")).To(BeEquivalentTo(Path{DocumentIdx: 0, PathElements: []PathElement{ + {Idx: -1, Key: "", Name: "list"}, + {Idx: 0, Key: "", Name: ""}, + {Idx: -1, Key: "", Name: "newkey"}, + }})) + }) }) Context("parse go-patch style path strings into paths", func() { @@ -157,24 +171,24 @@ var _ = Describe("path tests", func() { listOfPaths := []Path{ { DocumentIdx: 0, PathElements: []PathElement{ - {Idx: -1, Key: "", Name: "yaml"}, - {Idx: -1, Key: "", Name: "structure"}, - {Idx: -1, Key: "", Name: "somekey"}, - }, + {Idx: -1, Key: "", Name: "yaml"}, + {Idx: -1, Key: "", Name: "structure"}, + {Idx: -1, Key: "", Name: "somekey"}, + }, }, { DocumentIdx: 0, PathElements: []PathElement{ - {Idx: -1, Key: "", Name: "yaml"}, - {Idx: -1, Key: "", Name: "structure"}, - {Idx: -1, Key: "", Name: "dot"}, - }, + {Idx: -1, Key: "", Name: "yaml"}, + {Idx: -1, Key: "", Name: "structure"}, + {Idx: -1, Key: "", Name: "dot"}, + }, }, { DocumentIdx: 0, PathElements: []PathElement{ - {Idx: -1, Key: "", Name: "list"}, - {Idx: -1, Key: "name", Name: "sametwo"}, - {Idx: -1, Key: "", Name: "somekey"}, - }, + {Idx: -1, Key: "", Name: "list"}, + {Idx: -1, Key: "name", Name: "sametwo"}, + {Idx: -1, Key: "", Name: "somekey"}, + }, }, } @@ -188,17 +202,17 @@ var _ = Describe("path tests", func() { listOfPathsWithSameValue := []Path{ { DocumentIdx: 0, PathElements: []PathElement{ - {Idx: -1, Key: "", Name: "yaml"}, - {Idx: -1, Key: "", Name: "structure"}, - {Idx: -1, Key: "", Name: "dot"}, - }, + {Idx: -1, Key: "", Name: "yaml"}, + {Idx: -1, Key: "", Name: "structure"}, + {Idx: -1, Key: "", Name: "dot"}, + }, }, { DocumentIdx: 0, PathElements: []PathElement{ - {Idx: -1, Key: "", Name: "list"}, - {Idx: -1, Key: "name", Name: "sametwo"}, - {Idx: -1, Key: "", Name: "somekey"}, - }, + {Idx: -1, Key: "", Name: "list"}, + {Idx: -1, Key: "name", Name: "sametwo"}, + {Idx: -1, Key: "", Name: "somekey"}, + }, }, }