Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kubernetes-sigs/yaml
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.3.0
Choose a base ref
...
head repository: kubernetes-sigs/yaml
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.4.0
Choose a head ref

Commits on Oct 26, 2021

  1. remove vendor folder

    Signed-off-by: Inteon <42113979+inteon@users.noreply.github.com>
    inteon committed Oct 26, 2021
    Copy the full SHA
    740b971 View commit details
  2. add 1.16 and 1.17 to github workflows

    Signed-off-by: Inteon <42113979+inteon@users.noreply.github.com>
    inteon committed Oct 26, 2021
    Copy the full SHA
    59dc8b4 View commit details
  3. expand variable names in fields.go

    Signed-off-by: Inteon <42113979+inteon@users.noreply.github.com>
    inteon committed Oct 26, 2021
    Copy the full SHA
    4924d91 View commit details

Commits on Oct 31, 2021

  1. expand variable names in yaml.go, add better comments, improve errors…

    …, add copyright
    
    Signed-off-by: Inteon <42113979+inteon@users.noreply.github.com>
    inteon committed Oct 31, 2021
    Copy the full SHA
    3c98e65 View commit details
  2. greatly improve testing framework & added a lot of new tests

    Signed-off-by: Inteon <42113979+inteon@users.noreply.github.com>
    inteon committed Oct 31, 2021
    Copy the full SHA
    4f103b1 View commit details

Commits on Nov 2, 2021

  1. Merge pull request #65 from amurant/non_functional

    Non functional improvements
    k8s-ci-robot authored Nov 2, 2021
    Copy the full SHA
    39f74b9 View commit details

Commits on Dec 8, 2021

  1. Fix lint error

    Somehow a variable with snake_case got in and it breaks linting.
    
    Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
    ncdc committed Dec 8, 2021
    Copy the full SHA
    5e30182 View commit details
  2. Merge pull request #69 from ncdc/fix-lint-error

    Fix lint error
    k8s-ci-robot authored Dec 8, 2021
    Copy the full SHA
    78c1299 View commit details
  3. Remove myself (ncdc) from OWNERS

    Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
    ncdc committed Dec 8, 2021
    Copy the full SHA
    94f1bbd View commit details
  4. Merge pull request #66 from ncdc/remove-ncdc-from-owners

    Remove myself (ncdc) from OWNERS
    k8s-ci-robot authored Dec 8, 2021
    Copy the full SHA
    b5bdf49 View commit details

Commits on Apr 6, 2022

  1. Add benchmarks

    brianpursley committed Apr 6, 2022
    Copy the full SHA
    2d151d8 View commit details

Commits on May 27, 2022

  1. Add benchmarks

    brianpursley committed May 27, 2022
    Copy the full SHA
    0beda2b View commit details

Commits on Aug 2, 2022

  1. Merge pull request #75 from brianpursley/benchmarks

    Add benchmarks
    k8s-ci-robot authored Aug 2, 2022
    Copy the full SHA
    5303805 View commit details

Commits on Aug 9, 2022

  1. Bump version of golang to 1.19 and prune older versions

    Signed-off-by: Davanum Srinivas <davanum@gmail.com>
    dims committed Aug 9, 2022
    Copy the full SHA
    2f8489c View commit details
  2. reformat to golang 1.19 standards

    Signed-off-by: Davanum Srinivas <davanum@gmail.com>
    dims committed Aug 9, 2022
    Copy the full SHA
    b02c352 View commit details

Commits on Aug 10, 2022

  1. Merge pull request #83 from kubernetes-sigs/bump-version-of-golang-to…

    …-1.19-and-drop-older-versions
    
    Bump version of golang to 1.19 and prune older versions
    k8s-ci-robot authored Aug 10, 2022
    Copy the full SHA
    d865f09 View commit details

Commits on Jan 31, 2023

  1. Replace go-spew with go-cmp

    Produces more compact test failures messages.
    justinsb committed Jan 31, 2023
    Copy the full SHA
    13f0a74 View commit details
  2. Merge pull request #87 from justinsb/spew_no_more

    Replace go-spew with go-cmp
    k8s-ci-robot authored Jan 31, 2023
    Copy the full SHA
    65d71bb View commit details

Commits on Oct 23, 2023

  1. Revert error message changes

    Changes in PR 65 modified error messages. While some of the changes read better,
    also produced duplicate prefixes (like "error converting YAML to JSON: error converting YAML to JSON:").
    
    Even the improvements broke downstream unit tests relying on exact prefix matching.
    
    Reverting the error message changes before tagging a new release to avoid disrupting consumers
    until we consider the impact of these changes more thoroughly.
    liggitt committed Oct 23, 2023
    Copy the full SHA
    3f79f32 View commit details
  2. Merge pull request #96 from liggitt/msg

    Revert error message changes
    k8s-ci-robot authored Oct 23, 2023
    Copy the full SHA
    3566774 View commit details
  3. fork go-yaml v2 and v3

    natasha41575 committed Oct 23, 2023
    Copy the full SHA
    b96582b View commit details
  4. Copy the full SHA
    70ebea7 View commit details
  5. Copy the full SHA
    330e1e5 View commit details
  6. Copy the full SHA
    b6d8b45 View commit details
  7. Copy the full SHA
    a7b5665 View commit details
  8. Copy the full SHA
    20d25fa View commit details
  9. Copy the full SHA
    f2c0229 View commit details
  10. Merge pull request #76 from natasha41575/go-yaml-fork

    Create a fork of go-yaml
    k8s-ci-robot authored Oct 23, 2023
    Copy the full SHA
    eead467 View commit details
  11. Update owners

    liggitt committed Oct 23, 2023
    Copy the full SHA
    604031b View commit details

Commits on Oct 24, 2023

  1. Merge pull request #97 from liggitt/owners

    Update owners
    k8s-ci-robot authored Oct 24, 2023
    Copy the full SHA
    c3772b5 View commit details
Showing with 21,276 additions and 2,609 deletions.
  1. +2 −2 .github/workflows/go.yml
  2. +256 −0 LICENSE
  3. +2 −6 OWNERS
  4. +384 −0 bench_test.go
  5. +130 −0 err_test.go
  6. +27 −28 fields.go
  7. +2 −2 go.mod
  8. +2 −4 go.sum
  9. 0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/LICENSE
  10. 0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/LICENSE.libyaml
  11. 0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/NOTICE
  12. +24 −0 goyaml.v2/OWNERS
  13. +10 −0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/README.md
  14. 0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/apic.go
  15. 0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/decode.go
  16. +1,367 −0 goyaml.v2/decode_test.go
  17. 0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/emitterc.go
  18. 0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/encode.go
  19. +646 −0 goyaml.v2/encode_test.go
  20. +41 −0 goyaml.v2/example_embedded_test.go
  21. +128 −0 goyaml.v2/limit_test.go
  22. 0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/parserc.go
  23. 0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/readerc.go
  24. 0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/resolve.go
  25. 0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/scannerc.go
  26. 0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/sorter.go
  27. +12 −0 goyaml.v2/suite_test.go
  28. 0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/writerc.go
  29. 0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/yaml.go
  30. 0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/yamlh.go
  31. 0 {vendor/gopkg.in/yaml.v2 → goyaml.v2}/yamlprivateh.go
  32. +50 −0 goyaml.v3/LICENSE
  33. +13 −0 goyaml.v3/NOTICE
  34. +24 −0 goyaml.v3/OWNERS
  35. +160 −0 goyaml.v3/README.md
  36. +747 −0 goyaml.v3/apic.go
  37. +1,000 −0 goyaml.v3/decode.go
  38. +1,771 −0 goyaml.v3/decode_test.go
  39. +2,043 −0 goyaml.v3/emitterc.go
  40. +577 −0 goyaml.v3/encode.go
  41. +736 −0 goyaml.v3/encode_test.go
  42. +56 −0 goyaml.v3/example_embedded_test.go
  43. +128 −0 goyaml.v3/limit_test.go
  44. +2,886 −0 goyaml.v3/node_test.go
  45. +1,258 −0 goyaml.v3/parserc.go
  46. +39 −0 goyaml.v3/patch.go
  47. +160 −0 goyaml.v3/patch_test.go
  48. +434 −0 goyaml.v3/readerc.go
  49. +326 −0 goyaml.v3/resolve.go
  50. +3,038 −0 goyaml.v3/scannerc.go
  51. +134 −0 goyaml.v3/sorter.go
  52. +27 −0 goyaml.v3/suite_test.go
  53. +48 −0 goyaml.v3/writerc.go
  54. +698 −0 goyaml.v3/yaml.go
  55. +809 −0 goyaml.v3/yamlh.go
  56. +198 −0 goyaml.v3/yamlprivateh.go
  57. +0 −15 vendor/github.com/davecgh/go-spew/LICENSE
  58. +0 −145 vendor/github.com/davecgh/go-spew/spew/bypass.go
  59. +0 −38 vendor/github.com/davecgh/go-spew/spew/bypasssafe.go
  60. +0 −341 vendor/github.com/davecgh/go-spew/spew/common.go
  61. +0 −306 vendor/github.com/davecgh/go-spew/spew/config.go
  62. +0 −211 vendor/github.com/davecgh/go-spew/spew/doc.go
  63. +0 −509 vendor/github.com/davecgh/go-spew/spew/dump.go
  64. +0 −419 vendor/github.com/davecgh/go-spew/spew/format.go
  65. +0 −148 vendor/github.com/davecgh/go-spew/spew/spew.go
  66. +0 −17 vendor/gopkg.in/yaml.v2/.travis.yml
  67. +0 −5 vendor/gopkg.in/yaml.v2/go.mod
  68. +0 −4 vendor/modules.txt
  69. +92 −53 yaml.go
  70. +17 −0 yaml_go110.go
  71. +17 −0 yaml_go110_test.go
  72. +757 −356 yaml_test.go
4 changes: 2 additions & 2 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ jobs:
build:
strategy:
matrix:
go-versions: [1.13.x, 1.14.x, 1.15.x]
go-versions: [1.16.x, 1.17.x, 1.18.x, 1.19.x]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@@ -22,7 +22,7 @@ jobs:
- name: Run gofmt
run: diff -u <(echo -n) <(gofmt -d *.go)
- name: Run golint
run: diff -u <(echo -n) <(golint $(go list -e ./...) | grep -v YAMLToJSON)
run: diff -u <(echo -n) <(golint $(go list -e ./... | grep -v /goyaml) | grep -v YAMLToJSON)
- name: Run go vet
run: GO111MODULE=on go vet .
- name: Run go test
256 changes: 256 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -48,3 +48,259 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# The forked go-yaml.v3 library under this project is covered by two
different licenses (MIT and Apache):

#### MIT License ####

The following files were ported to Go from C files of libyaml, and thus
are still covered by their original MIT license, with the additional
copyright staring in 2011 when the project was ported over:

apic.go emitterc.go parserc.go readerc.go scannerc.go
writerc.go yamlh.go yamlprivateh.go

Copyright (c) 2006-2010 Kirill Simonov
Copyright (c) 2006-2011 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.

### Apache License ###

All the remaining project files are covered by the Apache license:

Copyright (c) 2011-2019 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.

# The forked go-yaml.v2 library under the project is covered by an
Apache license:

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.
8 changes: 2 additions & 6 deletions OWNERS
Original file line number Diff line number Diff line change
@@ -2,26 +2,22 @@

approvers:
- dims
- lavalamp
- jpbetz
- smarterclayton
- deads2k
- sttts
- liggitt
- caesarxuchao
reviewers:
- dims
- thockin
- lavalamp
- jpbetz
- smarterclayton
- wojtek-t
- deads2k
- derekwaynecarr
- caesarxuchao
- mikedanese
- liggitt
- gmarek
- sttts
- ncdc
- tallclair
labels:
- sig/api-machinery
Loading