From 2646891cc46889a9ad273ea4e270732bc3221a56 Mon Sep 17 00:00:00 2001 From: Ida Hou Date: Thu, 14 Nov 2024 18:54:39 +0000 Subject: [PATCH] Updated goccy/go-yaml to v1.41.1 --- .../golden/linux-gpu/error | 9 ++++----- .../invalid-all-not_in_yaml_format/golden/linux/error | 9 ++++----- .../golden/windows-2012/error | 9 ++++----- .../invalid-all-not_in_yaml_format/golden/windows/error | 9 ++++----- .../golden/linux-gpu/error | 6 +++--- .../golden/linux/error | 6 +++--- .../golden/windows-2012/error | 6 +++--- .../golden/windows/error | 6 +++--- .../golden/linux-gpu/error | 6 +++--- .../golden/linux/error | 6 +++--- .../golden/windows-2012/error | 6 +++--- .../golden/windows/error | 6 +++--- go.mod | 2 +- go.sum | 2 ++ integration_test/metadata/integration_metadata.go | 2 +- 15 files changed, 44 insertions(+), 46 deletions(-) diff --git a/confgenerator/testdata/goldens/invalid-all-not_in_yaml_format/golden/linux-gpu/error b/confgenerator/testdata/goldens/invalid-all-not_in_yaml_format/golden/linux-gpu/error index c66532e09f..3cc5e56814 100644 --- a/confgenerator/testdata/goldens/invalid-all-not_in_yaml_format/golden/linux-gpu/error +++ b/confgenerator/testdata/goldens/invalid-all-not_in_yaml_format/golden/linux-gpu/error @@ -1,7 +1,6 @@ -[15:1] unknown field "logs" - 12 | # See the License for the specific language governing permissions and +[16:13] value is not allowed in this context 13 | # limitations under the License. 14 | -> 15 | logs: - ^ - 16 | files: "b"c \ No newline at end of file + 15 | logs: +> 16 | files: "b"c + ^ diff --git a/confgenerator/testdata/goldens/invalid-all-not_in_yaml_format/golden/linux/error b/confgenerator/testdata/goldens/invalid-all-not_in_yaml_format/golden/linux/error index c66532e09f..3cc5e56814 100644 --- a/confgenerator/testdata/goldens/invalid-all-not_in_yaml_format/golden/linux/error +++ b/confgenerator/testdata/goldens/invalid-all-not_in_yaml_format/golden/linux/error @@ -1,7 +1,6 @@ -[15:1] unknown field "logs" - 12 | # See the License for the specific language governing permissions and +[16:13] value is not allowed in this context 13 | # limitations under the License. 14 | -> 15 | logs: - ^ - 16 | files: "b"c \ No newline at end of file + 15 | logs: +> 16 | files: "b"c + ^ diff --git a/confgenerator/testdata/goldens/invalid-all-not_in_yaml_format/golden/windows-2012/error b/confgenerator/testdata/goldens/invalid-all-not_in_yaml_format/golden/windows-2012/error index c66532e09f..3cc5e56814 100644 --- a/confgenerator/testdata/goldens/invalid-all-not_in_yaml_format/golden/windows-2012/error +++ b/confgenerator/testdata/goldens/invalid-all-not_in_yaml_format/golden/windows-2012/error @@ -1,7 +1,6 @@ -[15:1] unknown field "logs" - 12 | # See the License for the specific language governing permissions and +[16:13] value is not allowed in this context 13 | # limitations under the License. 14 | -> 15 | logs: - ^ - 16 | files: "b"c \ No newline at end of file + 15 | logs: +> 16 | files: "b"c + ^ diff --git a/confgenerator/testdata/goldens/invalid-all-not_in_yaml_format/golden/windows/error b/confgenerator/testdata/goldens/invalid-all-not_in_yaml_format/golden/windows/error index c66532e09f..3cc5e56814 100644 --- a/confgenerator/testdata/goldens/invalid-all-not_in_yaml_format/golden/windows/error +++ b/confgenerator/testdata/goldens/invalid-all-not_in_yaml_format/golden/windows/error @@ -1,7 +1,6 @@ -[15:1] unknown field "logs" - 12 | # See the License for the specific language governing permissions and +[16:13] value is not allowed in this context 13 | # limitations under the License. 14 | -> 15 | logs: - ^ - 16 | files: "b"c \ No newline at end of file + 15 | logs: +> 16 | files: "b"c + ^ diff --git a/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_bad_scheme/golden/linux-gpu/error b/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_bad_scheme/golden/linux-gpu/error index e1e35dd203..58338cd39b 100644 --- a/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_bad_scheme/golden/linux-gpu/error +++ b/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_bad_scheme/golden/linux-gpu/error @@ -4,6 +4,6 @@ 19 | collection_interval: 60s > 20 | endpoint: tcp://localhost:8080 ^ - 22 | - 23 | service: - 24 | pipelines: \ No newline at end of file + 22 | service: + 23 | pipelines: + 24 | elasticsearch: \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_bad_scheme/golden/linux/error b/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_bad_scheme/golden/linux/error index e1e35dd203..58338cd39b 100644 --- a/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_bad_scheme/golden/linux/error +++ b/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_bad_scheme/golden/linux/error @@ -4,6 +4,6 @@ 19 | collection_interval: 60s > 20 | endpoint: tcp://localhost:8080 ^ - 22 | - 23 | service: - 24 | pipelines: \ No newline at end of file + 22 | service: + 23 | pipelines: + 24 | elasticsearch: \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_bad_scheme/golden/windows-2012/error b/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_bad_scheme/golden/windows-2012/error index e1e35dd203..58338cd39b 100644 --- a/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_bad_scheme/golden/windows-2012/error +++ b/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_bad_scheme/golden/windows-2012/error @@ -4,6 +4,6 @@ 19 | collection_interval: 60s > 20 | endpoint: tcp://localhost:8080 ^ - 22 | - 23 | service: - 24 | pipelines: \ No newline at end of file + 22 | service: + 23 | pipelines: + 24 | elasticsearch: \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_bad_scheme/golden/windows/error b/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_bad_scheme/golden/windows/error index e1e35dd203..58338cd39b 100644 --- a/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_bad_scheme/golden/windows/error +++ b/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_bad_scheme/golden/windows/error @@ -4,6 +4,6 @@ 19 | collection_interval: 60s > 20 | endpoint: tcp://localhost:8080 ^ - 22 | - 23 | service: - 24 | pipelines: \ No newline at end of file + 22 | service: + 23 | pipelines: + 24 | elasticsearch: \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_host_port/golden/linux-gpu/error b/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_host_port/golden/linux-gpu/error index 060a1319a9..0199267a36 100644 --- a/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_host_port/golden/linux-gpu/error +++ b/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_host_port/golden/linux-gpu/error @@ -4,6 +4,6 @@ 19 | collection_interval: 60s > 20 | endpoint: localhost:8080 ^ - 22 | - 23 | service: - 24 | pipelines: \ No newline at end of file + 22 | service: + 23 | pipelines: + 24 | elasticsearch: \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_host_port/golden/linux/error b/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_host_port/golden/linux/error index 060a1319a9..0199267a36 100644 --- a/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_host_port/golden/linux/error +++ b/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_host_port/golden/linux/error @@ -4,6 +4,6 @@ 19 | collection_interval: 60s > 20 | endpoint: localhost:8080 ^ - 22 | - 23 | service: - 24 | pipelines: \ No newline at end of file + 22 | service: + 23 | pipelines: + 24 | elasticsearch: \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_host_port/golden/windows-2012/error b/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_host_port/golden/windows-2012/error index 060a1319a9..0199267a36 100644 --- a/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_host_port/golden/windows-2012/error +++ b/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_host_port/golden/windows-2012/error @@ -4,6 +4,6 @@ 19 | collection_interval: 60s > 20 | endpoint: localhost:8080 ^ - 22 | - 23 | service: - 24 | pipelines: \ No newline at end of file + 22 | service: + 23 | pipelines: + 24 | elasticsearch: \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_host_port/golden/windows/error b/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_host_port/golden/windows/error index 060a1319a9..0199267a36 100644 --- a/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_host_port/golden/windows/error +++ b/confgenerator/testdata/goldens/invalid-metrics-receiver_elasticsearch_host_port/golden/windows/error @@ -4,6 +4,6 @@ 19 | collection_interval: 60s > 20 | endpoint: localhost:8080 ^ - 22 | - 23 | service: - 24 | pipelines: \ No newline at end of file + 22 | service: + 23 | pipelines: + 24 | elasticsearch: \ No newline at end of file diff --git a/go.mod b/go.mod index b072082805..cc1e0ae2c0 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/blang/semver v3.5.1+incompatible github.com/cenkalti/backoff/v4 v4.3.0 github.com/go-playground/validator/v10 v10.11.1 - github.com/goccy/go-yaml v1.11.2 + github.com/goccy/go-yaml v1.14.1 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.6.0 github.com/googleapis/gax-go/v2 v2.13.0 diff --git a/go.sum b/go.sum index b759dbabd3..c13ae02939 100644 --- a/go.sum +++ b/go.sum @@ -210,6 +210,8 @@ github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= github.com/goccy/go-yaml v1.11.2 h1:joq77SxuyIs9zzxEjgyLBugMQ9NEgTWxXfz2wVqwAaQ= github.com/goccy/go-yaml v1.11.2/go.mod h1:wKnAMd44+9JAAnGQpWVEgBzGt3YuTaQ4uXoHvE4m7WU= +github.com/goccy/go-yaml v1.14.1 h1:NJ9Ch49K/WichY7pAtSvIJbvGjmBDjHVQxuWBbPSOPg= +github.com/goccy/go-yaml v1.14.1/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= diff --git a/integration_test/metadata/integration_metadata.go b/integration_test/metadata/integration_metadata.go index 8d349999bd..7e6b0fb196 100644 --- a/integration_test/metadata/integration_metadata.go +++ b/integration_test/metadata/integration_metadata.go @@ -155,7 +155,7 @@ func UnmarshalAndValidate(fullPath string, data []byte, i interface{}) error { v := NewIntegrationMetadataValidator() // Note: Unmarshaler does not protect when only the key being declared. // https://github.com/goccy/go-yaml/issues/313 - if err := yaml.UnmarshalWithOptions(data, i, yaml.DisallowUnknownField(), yaml.DisallowDuplicateKey(), yaml.Validator(v)); err != nil { + if err := yaml.UnmarshalWithOptions(data, i, yaml.DisallowUnknownField(), yaml.Validator(v)); err != nil { return fmt.Errorf("%s%w", fullPath, err) } return nil