Skip to content

deps(go): bump module github.com/goccy/go-yaml#2949

Merged
olblak merged 5 commits intomainfrom
updatecli_main_dfe10c1469e046108c871fdedc6f20f43166d55ab8b96f0743fdb61429e85f61
Nov 3, 2024
Merged

deps(go): bump module github.com/goccy/go-yaml#2949
olblak merged 5 commits intomainfrom
updatecli_main_dfe10c1469e046108c871fdedc6f20f43166d55ab8b96f0743fdb61429e85f61

Conversation

@updateclibot
Copy link
Copy Markdown
Contributor

@updateclibot updateclibot bot commented Nov 2, 2024

deps(go): bump module github.com/goccy/go-yaml

clean: go mod tidy

ran shell command "go mod tidy"

deps(go): bump module github.com/goccy/go-yaml to v1.13.3

go.mod updated Module path "github.com/goccy/go-yaml" version from "v1.13.2" to "v1.13.3"

v1.13.2
Changelog retrieved from:
	https://github.com/goccy/go-yaml/releases/tag/v1.13.2
## What's Changed
* Fix invalid quoted-text handling by @goccy in https://github.com/goccy/go-yaml/pull/495
* Fix parsing of invalid yaml by @goccy in https://github.com/goccy/go-yaml/pull/496


**Full Changelog**: https://github.com/goccy/go-yaml/compare/v1.13.1...v1.13.2
v1.13.3
Changelog retrieved from:
	https://github.com/goccy/go-yaml/releases/tag/v1.13.3
## What's Changed
* feat: preserve line breaks from original input by @mcwarman in https://github.com/goccy/go-yaml/pull/412
* Fix invalid alias by @goccy in https://github.com/goccy/go-yaml/pull/497
* Fix parsing of number by @goccy in https://github.com/goccy/go-yaml/pull/498
* Fix parsing of invalid document by @goccy in https://github.com/goccy/go-yaml/pull/499

## New Contributors
* @mcwarman made their first contribution in https://github.com/goccy/go-yaml/pull/412

**Full Changelog**: https://github.com/goccy/go-yaml/compare/v1.13.2...v1.13.3
GitHub Action workflow link
Updatecli logo

Created automatically by Updatecli

Options:

Most of Updatecli configuration is done via its manifest(s).

  • If you close this pull request, Updatecli will automatically reopen it, the next time it runs.
  • If you close this pull request and delete the base branch, Updatecli will automatically recreate it, erasing all previous commits made.

Feel free to report any issues at github.com/updatecli/updatecli.
If you find this tool useful, do not hesitate to star our GitHub repository as a sign of appreciation, and/or to tell us directly on our chat!

Made with ❤️️ by updatecli
@updateclibot updateclibot bot added the dependencies Pull requests that update a dependency file label Nov 2, 2024
Made with ❤️️ by updatecli
@mcwarman
Copy link
Copy Markdown
Member

mcwarman commented Nov 2, 2024

@olblak this includes goccy/go-yaml#412

@mcwarman
Copy link
Copy Markdown
Member

mcwarman commented Nov 2, 2024

I don't think the test is actually valid as it would produce invalid yaml, I think it would need to be quoted:

diff --git a/pkg/plugins/resources/helm/target_test.go b/pkg/plugins/resources/helm/target_test.go
index 59728db1..2f953350 100644
--- a/pkg/plugins/resources/helm/target_test.go
+++ b/pkg/plugins/resources/helm/target_test.go
@@ -234,9 +234,9 @@ func TestTarget(t *testing.T) {
                                Key:              "$.dependencies[0].version",
                                VersionIncrement: AUTO,
                        },
-                       sourceInput:               ">=1.1.0",
+                       sourceInput:               `">=1.1.0"`,
                        expectedResult:            true,
-                       expectedResultDescription: "change detected:\n\t* key \"$.dependencies[0].version\" should be updated from \"1.0.0\" to \">=1.1.0\", in file \"testdata/Chart.yaml\"\nchange detected:\n\t* key \"$.version\" should be updated from \"0.3.0\" to \"0.4.0\", in file \"testdata/Chart.yaml\"",
+                       expectedResultDescription: "change detected:\n\t* key \"$.dependencies[0].version\" should be updated from \"1.0.0\" to \"\\\">=1.1.0\\\"\", in file \"testdata/Chart.yaml\"\nchange detected:\n\t* key \"$.version\" should be updated from \"0.3.0\" to \"0.4.0\", in file \"testdata/Chart.yaml\"",
                },
                {
                        name: "Success - Auto chart major and patch update Version Increment to Chart.yaml",

The current test would produce this which isn't valid yaml:

apiVersion: v2
name: webapp
version: 0.3.0
appVersion: 0.1.0
dependencies:
  - name: db
    version: >=1.1.0

@mcwarman
Copy link
Copy Markdown
Member

mcwarman commented Nov 2, 2024

go build -o bin/updatecli
./bin/updatecli --config e2e/updatecli.d/success.d/yaml/noscm.yaml apply

After

diff --git a/e2e/updatecli.d/success.d/yaml/duplicate.yaml b/e2e/updatecli.d/success.d/yaml/duplicate.yaml
index dc76ac24..9fc8b36f 100644
--- a/e2e/updatecli.d/success.d/yaml/duplicate.yaml
+++ b/e2e/updatecli.d/success.d/yaml/duplicate.yaml
@@ -3,7 +3,7 @@ name: Test duplicated YAML resource
 sources:
   scenario1:
     name: Basic yaml source
-    kind: yaml
+    kind: yaml-beta
     spec:
       file: e2e/updatecli.d/success.d/yaml/noscm.yaml
       key: $.sources.scenario1.kind
diff --git a/e2e/updatecli.d/success.d/yaml/noscm.yaml b/e2e/updatecli.d/success.d/yaml/noscm.yaml
index af28f0bd..e67ddcd5 100644
--- a/e2e/updatecli.d/success.d/yaml/noscm.yaml
+++ b/e2e/updatecli.d/success.d/yaml/noscm.yaml
@@ -3,7 +3,7 @@ name: Test YAML resource without scm
 sources:
   scenario1:
     name: Basic yaml source
-    kind: yaml
+    kind: yaml-beta
     spec:
       file: e2e/updatecli.d/success.d/yaml/noscm.yaml
       key: $.sources.scenario1.kind
@@ -90,4 +90,3 @@ targets:
       - e2e/updatecli.d/success.d/yaml/noscm.yaml
       - e2e/updatecli.d/success.d/yaml/duplicate.yaml
       key: $.sources.scenario1.kind
-

Before

View

diff --git a/e2e/updatecli.d/success.d/yaml/duplicate.yaml b/e2e/updatecli.d/success.d/yaml/duplicate.yaml
index dc76ac24..0b0cf11f 100644
--- a/e2e/updatecli.d/success.d/yaml/duplicate.yaml
+++ b/e2e/updatecli.d/success.d/yaml/duplicate.yaml
@@ -1,41 +1,35 @@
 name: Test duplicated YAML resource
-
 sources:
   scenario1:
     name: Basic yaml source
-    kind: yaml
+    kind: yaml-beta
     spec:
       file: e2e/updatecli.d/success.d/yaml/noscm.yaml
       key: $.sources.scenario1.kind
-
   scenario2:
     name: Basic yaml source
     kind: yaml
     spec:
       file: file://e2e/updatecli.d/success.d/yaml/noscm.yaml
       key: $.sources.scenario1.kind
-
   scenario21:
     name: Basic yaml source
     kind: yaml
     spec:
       file: file://e2e/updatecli.d/success.d/yaml/noscm.yaml
       key: $.sources.scenario1.kind
-
   scenario3:
     name: Test URL scheme
     kind: yaml
     spec:
       file: https://raw.githubusercontent.com/updatecli/updatecli/main/e2e/venom.d/test_diff.yaml
       key: $.name
-
   scenario31:
     name: Test URL scheme
     kind: yaml
     spec:
       file: https://raw.githubusercontent.com/updatecli/updatecli/main/e2e/venom.d/test_diff.yaml
       key: $.name
-
 conditions:
   scenario1:
     name: Basic yaml condition
@@ -47,7 +41,6 @@ conditions:
       - e2e/updatecli.d/success.d/yaml/duplicate.yaml
       key: $.sources.scenario1.kind
       value: yaml
-
   scenario2:
     name: Basic yaml condition
     kind: yaml
@@ -58,7 +51,6 @@ conditions:
       - file://e2e/updatecli.d/success.d/yaml/duplicate.yaml
       key: $.sources.scenario1.kind
       value: yaml
-
   scenario3:
     name: Test URL scheme
     kind: yaml
@@ -69,7 +61,6 @@ conditions:
       - https://raw.githubusercontent.com/updatecli/updatecli/main/e2e/updatecli.d/success.d/yaml/duplicate.yaml
       key: $.sources.scenario1.kind
       value: yaml
-
 targets:
   multiples:
     name: Update files content
diff --git a/e2e/updatecli.d/success.d/yaml/noscm.yaml b/e2e/updatecli.d/success.d/yaml/noscm.yaml
index af28f0bd..64fb62f4 100644
--- a/e2e/updatecli.d/success.d/yaml/noscm.yaml
+++ b/e2e/updatecli.d/success.d/yaml/noscm.yaml
@@ -1,41 +1,35 @@
 name: Test YAML resource without scm
-
 sources:
   scenario1:
     name: Basic yaml source
-    kind: yaml
+    kind: yaml-beta
     spec:
       file: e2e/updatecli.d/success.d/yaml/noscm.yaml
       key: $.sources.scenario1.kind
-
   scenario2:
     name: Basic yaml source
     kind: yaml
     spec:
       file: file://e2e/updatecli.d/success.d/yaml/noscm.yaml
       key: $.sources.scenario1.kind
-
   scenario21:
     name: Basic yaml source
     kind: yaml
     spec:
       file: file://e2e/updatecli.d/success.d/yaml/noscm.yaml
       key: $.sources.scenario1.kind
-
   scenario3:
     name: Test URL scheme
     kind: yaml
     spec:
       file: https://raw.githubusercontent.com/updatecli/updatecli/main/e2e/venom.d/test_diff.yaml
       key: $.name
-
   scenario31:
     name: Test URL scheme
     kind: yaml
     spec:
       file: https://raw.githubusercontent.com/updatecli/updatecli/main/e2e/venom.d/test_diff.yaml
       key: $.name
-
   getGo-Version-File:
     name: Test complex key
     kind: yaml
@@ -43,7 +37,6 @@ sources:
       engine: yamlpath
       file: .github/workflows/updatecli.yaml
       key: $.jobs.updatecli.steps[?(@.id =='go')].uses
-
 conditions:
   scenario1:
     name: Basic yaml condition
@@ -55,7 +48,6 @@ conditions:
       - e2e/updatecli.d/success.d/yaml/duplicate.yaml
       key: $.sources.scenario1.kind
       value: yaml
-
   scenario2:
     name: Basic yaml condition
     kind: yaml
@@ -66,7 +58,6 @@ conditions:
       - file://e2e/updatecli.d/success.d/yaml/duplicate.yaml
       key: $.sources.scenario1.kind
       value: yaml
-
   scenario3:
     name: Test URL scheme
     kind: yaml
@@ -77,7 +68,6 @@ conditions:
       - https://raw.githubusercontent.com/updatecli/updatecli/main/e2e/updatecli.d/success.d/yaml/duplicate.yaml
       key: $.sources.scenario1.kind
       value: yaml
-
 targets:
   multiples:
     name: Update files content
@@ -90,4 +80,3 @@ targets:
       - e2e/updatecli.d/success.d/yaml/noscm.yaml
       - e2e/updatecli.d/success.d/yaml/duplicate.yaml
       key: $.sources.scenario1.kind
-

@mcwarman mcwarman requested a review from olblak November 2, 2024 17:36
@olblak olblak merged commit 6838b66 into main Nov 3, 2024
@olblak olblak deleted the updatecli_main_dfe10c1469e046108c871fdedc6f20f43166d55ab8b96f0743fdb61429e85f61 branch November 3, 2024 00:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants