summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Haller <stefan@haller-berlin.de>2024-04-01 11:15:02 +0200
committerGitHub <noreply@github.com>2024-04-01 11:15:02 +0200
commit53f0c4aeffadabfc0bad783831843fdd128b51be (patch)
treece6d5dd02b7a713a73b09f1aec3e159229ff132e
parent2385c1d1118fdee31fe74d24521975c5b6e266a2 (diff)
parent84e82ea8b69f9ef9fa768a255ac2959c381831d6 (diff)
Migrate null keybindings to <disabled>, and remove our yaml fork (#3459)
- **PR Description** Migrate users' config files to change all `null` keybindings to `"<disabled>"`. Then remove our yaml fork, since that was the only reason we were using it. Fixes #3458.
-rw-r--r--go.mod1
-rw-r--r--go.sum2
-rw-r--r--pkg/config/app_config.go18
-rw-r--r--pkg/config/dummies.go2
-rw-r--r--pkg/utils/yaml_utils/yaml_utils.go71
-rw-r--r--pkg/utils/yaml_utils/yaml_utils_test.go116
-rw-r--r--vendor/github.com/jesseduffield/yaml/LICENSE201
-rw-r--r--vendor/github.com/jesseduffield/yaml/LICENSE.libyaml31
-rw-r--r--vendor/github.com/jesseduffield/yaml/NOTICE13
-rw-r--r--vendor/github.com/jesseduffield/yaml/README.md135
-rw-r--r--vendor/github.com/jesseduffield/yaml/apic.go739
-rw-r--r--vendor/github.com/jesseduffield/yaml/decode.go764
-rw-r--r--vendor/github.com/jesseduffield/yaml/emitterc.go1685
-rw-r--r--vendor/github.com/jesseduffield/yaml/encode.go358
-rw-r--r--vendor/github.com/jesseduffield/yaml/parserc.go1095
-rw-r--r--vendor/github.com/jesseduffield/yaml/readerc.go394
-rw-r--r--vendor/github.com/jesseduffield/yaml/resolve.go245
-rw-r--r--vendor/github.com/jesseduffield/yaml/scannerc.go2702
-rw-r--r--vendor/github.com/jesseduffield/yaml/sorter.go104
-rw-r--r--vendor/github.com/jesseduffield/yaml/writerc.go26
-rw-r--r--vendor/github.com/jesseduffield/yaml/yaml.go466
-rw-r--r--vendor/github.com/jesseduffield/yaml/yamlh.go738
-rw-r--r--vendor/github.com/jesseduffield/yaml/yamlprivateh.go173
-rw-r--r--vendor/modules.txt3
24 files changed, 205 insertions, 9877 deletions
diff --git a/go.mod b/go.mod
index 58ad19c3c..8993d7504 100644
--- a/go.mod
+++ b/go.mod
@@ -20,7 +20,6 @@ require (
github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10
github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5
github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e
- github.com/jesseduffield/yaml v2.1.0+incompatible
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
github.com/karimkhaleel/jsonschema v0.0.0-20231001195015-d933f0d94ea3
github.com/kyokomi/emoji/v2 v2.2.8
diff --git a/go.sum b/go.sum
index 0e728ff52..ee6c9cfbb 100644
--- a/go.sum
+++ b/go.sum
@@ -195,8 +195,6 @@ github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 h1:CDuQmfOj
github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5/go.mod h1:qxN4mHOAyeIDLP7IK7defgPClM/z1Kze8VVQiaEjzsQ=
github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e h1:uw/oo+kg7t/oeMs6sqlAwr85ND/9cpO3up3VxphxY0U=
github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e/go.mod h1:u60qdFGXRd36jyEXxetz0vQceQIxzI13lIo3EFUDf4I=
-github.com/jesseduffield/yaml v2.1.0+incompatible h1:HWQJ1gIv2zHKbDYNp0Jwjlj24K8aqpFHnMCynY1EpmE=
-github.com/jesseduffield/yaml v2.1.0+incompatible/go.mod h1:w0xGhOSIJCGYYW+hnFPTutCy5aACpkcwbmORt5axGqk=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go
index 7f5757447..cd0d3e316 100644
--- a/pkg/config/app_config.go
+++ b/pkg/config/app_config.go
@@ -8,7 +8,7 @@ import (
"github.com/adrg/xdg"
"github.com/jesseduffield/lazygit/pkg/utils/yaml_utils"
- yaml "github.com/jesseduffield/yaml"
+ "gopkg.in/yaml.v3"
)
// AppConfig contains the base configuration fields required for lazygit.
@@ -180,6 +180,11 @@ func migrateUserConfig(path string, content []byte) ([]byte, error) {
return nil, fmt.Errorf("Couldn't migrate config file at `%s`: %s", path, err)
}
+ changedContent, err = changeNullKeybindingsToDisabled(changedContent)
+ if err != nil {
+ return nil, fmt.Errorf("Couldn't migrate config file at `%s`: %s", path, err)
+ }
+
// Add more migrations here...
// Write config back if changed
@@ -193,6 +198,17 @@ func migrateUserConfig(path string, content []byte) ([]byte, error) {
return content, nil
}
+func changeNullKeybindingsToDisabled(changedContent []byte) ([]byte, error) {
+ return yaml_utils.Walk(changedContent, func(node *yaml.Node, path string) bool {
+ if strings.HasPrefix(path, "keybinding.") && node.Kind == yaml.ScalarNode && node.Tag == "!!null" {
+ node.Value = "<disabled>"
+ node.Tag = "!!str"
+ return true
+ }
+ return false
+ })
+}
+
func (c *AppConfig) GetDebug() bool {
return c.Debug
}
diff --git a/pkg/config/dummies.go b/pkg/config/dummies.go
index 08150c765..077c93c57 100644
--- a/pkg/config/dummies.go
+++ b/pkg/config/dummies.go
@@ -1,7 +1,7 @@
package config
import (
- yaml "github.com/jesseduffield/yaml"
+ "gopkg.in/yaml.v3"
)
// NewDummyAppConfig creates a new dummy AppConfig for testing
diff --git a/pkg/utils/yaml_utils/yaml_utils.go b/pkg/utils/yaml_utils/yaml_utils.go
index 9d96fa7a7..48f70fff0 100644
--- a/pkg/utils/yaml_utils/yaml_utils.go
+++ b/pkg/utils/yaml_utils/yaml_utils.go
@@ -153,3 +153,74 @@ func renameYamlKey(node *yaml.Node, path []string, newKey string) (bool, error)
return renameYamlKey(valueNode, path[1:], newKey)
}
+
+// Traverses a yaml document, calling the callback function for each node. The
+// callback is allowed to modify the node in place, in which case it should
+// return true. The function returns the original yaml document if none of the
+// callbacks returned true, and the modified document otherwise.
+func Walk(yamlBytes []byte, callback func(node *yaml.Node, path string) bool) ([]byte, error) {
+ // Parse the YAML file.
+ var node yaml.Node
+ err := yaml.Unmarshal(yamlBytes, &node)
+ if err != nil {
+ return nil, fmt.Errorf("failed to parse YAML: %w", err)
+ }
+
+ // Empty document: nothing to do.
+ if len(node.Content) == 0 {
+ return yamlBytes, nil
+ }
+
+ body := node.Content[0]
+
+ if didChange, err := walk(body, "", callback); err != nil || !didChange {
+ return yamlBytes, err
+ }
+
+ // Convert the updated YAML node back to YAML bytes.
+ updatedYAMLBytes, err := yaml.Marshal(body)
+ if err != nil {
+ return nil, fmt.Errorf("failed to convert YAML node to bytes: %w", err)
+ }
+
+ return updatedYAMLBytes, nil
+}
+
+func walk(node *yaml.Node, path string, callback func(*yaml.Node, string) bool) (bool, error) {
+ didChange := callback(node, path)
+ switch node.Kind {
+ case yaml.DocumentNode:
+ return false, fmt.Errorf("Unexpected document node in the middle of a yaml tree")
+ case yaml.MappingNode:
+ for i := 0; i < len(node.Content); i += 2 {
+ name := node.Content[i].Value
+ childNode := node.Content[i+1]
+ var childPath string
+ if path == "" {
+ childPath = name
+ } else {
+ childPath = fmt.Sprintf("%s.%s", path, name)
+ }
+ didChangeChild, err := walk(childNode, childPath, callback)
+ if err != nil {
+ return false, err
+ }
+ didChange = didChange || didChangeChild
+ }
+ case yaml.SequenceNode:
+ for i := 0; i < len(node.Content); i++ {
+ childPath := fmt.Sprintf("%s[%d]", path, i)
+ didChangeChild, err := walk(node.Content[i], childPath, callback)
+ if err != nil {
+ return false, err
+ }
+ didChange = didChange || didChangeChild
+ }
+ case yaml.ScalarNode:
+ // nothing to do
+ case yaml.AliasNode:
+ return false, fmt.Errorf("Alias nodes are not supported")
+ }
+
+ return didChange, nil
+}
diff --git a/pkg/utils/yaml_utils/yaml_utils_test.go b/pkg/utils/yaml_utils/yaml_utils_test.go
index 7f9dc20f7..78e181d85 100644
--- a/pkg/utils/yaml_utils/yaml_utils_test.go
+++ b/pkg/utils/yaml_utils/yaml_utils_test.go
@@ -4,6 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
+ "gopkg.in/yaml.v3"
)
func TestUpdateYamlValue(t *testing.T) {
@@ -199,3 +200,118 @@ func TestRenameYamlKey(t *testing.T) {
})
}
}
+
+func TestWalk_paths(t *testing.T) {
+ tests := []struct {
+ name string
+ document string
+ expectedPaths []string
+ }{
+ {
+ name: "empty document",
+ document: "",
+ expectedPaths: []string{},
+ },
+ {
+ name: "scalar",
+ document: "x: 5",
+ expectedPaths: []string{"", "x"}, // called with an empty path for the root node
+ },
+ {
+ name: "nested",
+ document: "foo:\n x: 5",
+ expectedPaths: []string{"", "foo", "foo.x"},
+ },
+ {
+ name: "deeply nested",
+ document: "foo:\n bar:\n baz: 5",
+ expectedPaths: []string{"", "foo", "foo.bar", "foo.bar.baz"},
+ },
+ {
+ name: "array",
+ document: "foo:\n bar: [3, 7]",
+ expectedPaths: []string{"", "foo", "foo.bar", "foo.bar[0]", "foo.bar[1]"},
+ },
+ {
+ name: "nested arrays",
+ document: "foo:\n bar: [[3, 7], [8, 9]]",
+ expectedPaths: []string{"", "foo", "foo.bar", "foo.bar[0]", "foo.bar[0][0]", "foo.bar[0][1]", "foo.bar[1]", "foo.bar[1][0]", "foo.bar[1][1]"},
+ },
+ }
+
+ for _, test := range tests {
+ t.Run(test.name, func(t *testing.T) {
+ paths := []string{}
+ _, err := Walk([]byte(test.document), func(node *yaml.Node, path string) bool {
+ paths = append(paths, path)
+ return true
+ })
+
+ assert.NoError(t, err)
+ assert.Equal(t, test.expectedPaths, paths)
+ })
+ }
+}
+
+func TestWalk_inPlaceChanges(t *testing.T) {
+ tests := []struct {
+ name string
+ in string
+ callback func(node *yaml.Node, path string) bool
+ expectedOut string
+ }{
+ {
+ name: "no change",
+ in: "x: 5",
+ callback: func(node *yaml.Node, path string) bool { return false },
+ expectedOut: "x: 5",
+ },
+ {
+ name: "change value",
+ in: "x: 5\ny: 3",
+ callback: func(node *yaml.Node, path string) bool {
+ if path == "x" {
+ node.Value = "7"
+ return true
+ }
+ return false
+ },
+ expectedOut: "x: 7\ny: 3\n",
+ },
+ {
+ name: "change nested value",
+ in: "x:\n y: 5",
+ callback: func(node *yaml.Node, path string) bool {
+ if path == "x.y" {
+ node.Value = "7"
+ return true
+ }
+ return false
+ },
+ // indentation is not preserved. See https://github.com/go-yaml/yaml/issues/899
+ expectedOut: "x:\n y: 7\n",
+ },
+ {
+ name: "change array value",
+ in: "x:\n - y: 5",
+ callback: func(node *yaml.Node, path string) bool {
+ if path == "x[0].y" {
+ node.Value = "7"
+ return true
+ }
+ return false
+ },
+ // indentation is not preserved. See https://github.com/go-yaml/yaml/issues/899
+ expectedOut: "x:\n - y: 7\n",
+ },
+ }
+
+ for _, test := range tests {
+ t.Run(test.name, func(t *testing.T) {
+ result, err := Walk([]byte(test.in), test.callback)
+
+ assert.NoError(t, err)
+ assert.Equal(t, test.expectedOut, string(result))
+ })
+ }
+}
diff --git a/vendor/github.com/jesseduffield/yaml/LICENSE b/vendor/github.com/jesseduffield/yaml/LICENSE
deleted file mode 100644
index 8dada3eda..000000000
--- a/vendor/github.com/jesseduffield/yaml/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "{}"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright {yyyy} {name of copyright owner}
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/vendor/github.com/jesseduffield/yaml/LICENSE.libyaml b/vendor/github.com/jesseduffield/yaml/LICENSE.libyaml
deleted file mode 100644
index 8da58fbf6..000000000
--- a/vendor/github.com/jesseduffield/yaml/LICENSE.libyaml
+++ /dev/null
@@ -1,31 +0,0 @@
-The following files were ported to Go from C files of libyaml, and thus
-are still covered by their original copyright and license:
-
- apic.go
- emitterc.go
- parserc.go
- readerc.go
- scannerc.go
- writerc.go
- yamlh.go
- yamlprivateh.go
-
-Copyright (c) 2006 Kirill Simonov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/vendor/github.com/jesseduffield/yaml/NOTICE b/vendor/github.com/jesseduffield/yaml/NOTICE
deleted file mode 100644
index 866d74a7a..000000000
--- a/vendor/github.com/jesseduffield/yaml/NOTICE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2011-2016 Canonical Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/vendor/github.com/jesseduffield/yaml/README.md b/vendor/github.com/jesseduffield/yaml/README.md
deleted file mode 100644
index 2ed3314c7..000000000
--- a/vendor/github.com/jesseduffield/yaml/README.md
+++ /dev/null
@@ -1,135 +0,0 @@
-# YAML support for the Go language
-
-Introduction
-------------
-
-The yaml package enables Go programs to comfortably encode and decode YAML
-values. It was developed within [Canonical](https://www.canonical.com) as
-part of the [juju](https://juju.ubuntu.com) project, and is based on a
-pure Go port of the well-known [libyaml](http://pyyaml.org/wiki/LibYAML)
-C library to parse and generate YAML data quickly and reliably.
-
-Compatibility
--------------
-
-The yaml package supports most of YAML 1.1 and 1.2, including support for
-anchors, tags, map merging, etc. Multi-document unmarshalling is not yet
-implemented, and base-60 floats from YAML 1.1 are purposefully not
-supported since they're a poor design and are gone in YAML 1.2.
-
-Installation and usage
-----------------------
-
-The import path for the package is *gopkg.in/yaml.v2*.
-
-To install it, run:
-
- go get gopkg.in/yaml.v2
-
-API documentation
------------------
-
-If opened in a browser, the import path itself leads to the API documentation:
-
- * [https://gopkg.in/yaml.v2](https://gopkg.in/yaml.v2)
-
-API stability
--------------
-
-The package API for yaml v2 will remain stable as described in [gopkg.in](https://gopkg.in).
-
-
-License
--------
-
-The yaml package is licensed under the Apache License 2.0. Please see the LICENSE file for details.
-
-
-Example
--------
-
-Some more examples can be found in the "examples" folder.
-
-```Go
-package main
-
-import (
- "fmt"
- "log"
-
- "gopkg.in/yaml.v2"
-)
-
-var data = `
-a: Easy!
-b:
- c: 2
- d: [3, 4]
-`
-
-// Note: struct fields must be public in order for unmarshal to
-// correctly populate the data.
-type T struct {
- A string
- B struct {
- RenamedC int `yaml:"c"`
- D []int `yaml:",flow"`
- }
-}
-
-func main() {
- t := T{}
-
- err := yaml.Unmarshal([]byte(data), &t)
- if err != nil {
- log.Fatalf("error: %v", err)
- }
- fmt.Printf("--- t:\n%v\n\n", t)
-
- d, err := yaml.Marshal(&t)
- if err != nil {
- log.Fatalf("error: %v", err)
- }
- fmt.Printf("--- t dump:\n%s\n\n", string(d))
-
- m := make(map[interface{}]interface{})
-
- err = yaml.Unmarshal([]byte(data), &m)
- if err != nil {
- log.Fatalf("error: %v", err)
- }
- fmt.Printf("--- m:\n%v\n\n", m)
-
- d, err = yaml.Marshal(&m)
- if err != nil {
- log.Fatalf("error: %v", err)
- }
- fmt.Printf("--- m dump:\n%s\n\n", string(d))
-}
-```
-
-This example will generate the following output:
-
-```
---- t:
-{Easy! {2 [3 4]}}
-
---- t dump:
-a: Easy!
-b:
- c: 2
- d: [3, 4]
-
-
---- m:
-map[a:Easy! b:map[c:2 d:[3 4]]]
-
---- m dump:
-a: Easy!
-b:
- c: 2
- d:
- - 3
- - 4
-```
-
diff --git a/vendor/github.com/jesseduffield/yaml/apic.go b/vendor/github.com/jesseduffield/yaml/apic.go
deleted file mode 100644
index 3e24a0d7d..000000000
--- a/vendor/github.com/jesseduffield/yaml/apic.go
+++ /dev/null
@@ -1,739 +0,0 @@
-package yaml
-
-import (
- "io"
-)
-
-func yaml_insert_token(parser *yaml_parser_t, pos int, token *yaml_token_t) {
- //fmt.Println("yaml_insert_token", "pos:", pos, "typ:", token.typ, "head:", parser.tokens_head, "len:", len(parser.tokens))
-
- // Check if we can move the queue at the beginning of the buffer.
- if parser.tokens_head > 0 && len(parser.tokens) == cap(parser.tokens) {
- if parser.tokens_head != len(parser.tokens) {
- copy(parser.tokens, parser.tokens[parser.tokens_head:])
- }
- parser.tokens = parser.tokens[:len(parser.tokens)-parser.tokens_head]
- parser.tokens_head = 0
- }
- parser.tokens = append(parser.tokens, *token)
- if pos < 0 {
- return
- }
- copy(parser.tokens[parser.tokens_head+pos+1:], parser.tokens[parser.tokens_head+pos:])
- parser.tokens[parser.tokens_head+pos] = *token
-}
-
-// Create a new parser object.
-func yaml_parser_initialize(parser *yaml_parser_t) bool {
- *parser = yaml_parser_t{
- raw_buffer: make([]byte, 0, input_raw_buffer_size),
- buffer: make([]byte, 0, input_buffer_size),
- }
- return true
-}
-
-// Destroy a parser object.
-func yaml_parser_delete(parser *yaml_parser_t) {
- *parser = yaml_parser_t{}
-}
-
-// String read handler.
-func yaml_string_read_handler(parser *yaml_parser_t, buffer []byte) (n int, err error) {
- if parser.input_pos == len(parser.input) {
- return 0, io.EOF
- }
- n = copy(buffer, parser.input[parser.input_pos:])
- parser.input_pos += n
- return n, nil