Skip to content

Commit 9c26eee

Browse files
Update module go.yaml.in/yaml/v4 to v4.0.0-rc.4 (#674)
* Update module go.yaml.in/yaml/v4 to v4.0.0-rc.4 * Adapt unit tests --------- Co-authored-by: Aleksandar Savchev <aleksandar.savchev@sap.com>
1 parent 5391193 commit 9c26eee

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/onsi/ginkgo/v2 v2.28.1
1515
github.com/onsi/gomega v1.39.1
1616
github.com/spf13/cobra v1.10.2
17-
go.yaml.in/yaml/v4 v4.0.0-rc.3
17+
go.yaml.in/yaml/v4 v4.0.0-rc.4
1818
k8s.io/api v0.34.3
1919
k8s.io/apimachinery v0.34.3
2020
k8s.io/apiserver v0.34.3

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,8 +695,8 @@ go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
695695
go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
696696
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
697697
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
698-
go.yaml.in/yaml/v4 v4.0.0-rc.3 h1:3h1fjsh1CTAPjW7q/EMe+C8shx5d8ctzZTrLcs/j8Go=
699-
go.yaml.in/yaml/v4 v4.0.0-rc.3/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
698+
go.yaml.in/yaml/v4 v4.0.0-rc.4 h1:UP4+v6fFrBIb1l934bDl//mmnoIZEDK0idg1+AIvX5U=
699+
go.yaml.in/yaml/v4 v4.0.0-rc.4/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
700700
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
701701
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
702702
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

pkg/provider/garden/ruleset/securityhardenedshoot/rules/2000_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ kind: AuthenticationConfiguration
197197
}
198198
},
199199
nil,
200-
[]rule.CheckResult{{Status: rule.Errored, Message: "yaml: unmarshal errors:\n line 1: cannot unmarshal !!str `foo` into v1beta1.AuthenticationConfiguration", Target: rule.NewTarget("name", "authentication-config", "namespace", "bar", "kind", "ConfigMap")}},
200+
[]rule.CheckResult{{Status: rule.Errored, Message: "yaml: construct errors:\n line 1: cannot construct !!str `foo` into v1beta1.AuthenticationConfiguration", Target: rule.NewTarget("name", "authentication-config", "namespace", "bar", "kind", "ConfigMap")}},
201201
),
202202
Entry("should pass if the structuredAuthentication configuration does not have anonymous authentication config set",
203203
func() {

pkg/shared/ruleset/disak8sstig/rules/242390_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ anonymous:
200200
Expect(fakeClient.Create(ctx, configMap)).To(Succeed())
201201
},
202202
nil,
203-
[]rule.CheckResult{{Status: rule.Errored, Message: "yaml: unmarshal errors:\n line 1: cannot unmarshal !!str `foo` into v1beta1.AuthenticationConfiguration", Target: target}},
203+
[]rule.CheckResult{{Status: rule.Errored, Message: "yaml: construct errors:\n line 1: cannot construct !!str `foo` into v1beta1.AuthenticationConfiguration", Target: target}},
204204
BeNil()),
205205
Entry("should fail if the authentication configuration has anonymous authentication enabled unconditionally.",
206206
corev1.Container{

pkg/shared/ruleset/disak8sstig/rules/274882_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ var _ = Describe("#274882", func() {
143143
},
144144
Entry("should error when the encryption config is not valid yaml",
145145
"foo",
146-
rule.CheckResult{Status: rule.Errored, Message: "yaml: unmarshal errors:\n line 1: cannot unmarshal !!str `foo` into apiserver.EncryptionConfiguration", Target: target},
146+
rule.CheckResult{Status: rule.Errored, Message: "yaml: construct errors:\n line 1: cannot construct !!str `foo` into apiserver.EncryptionConfiguration", Target: target},
147147
),
148148
Entry("should fail when the encryption config has no resources configured",
149149
`

0 commit comments

Comments
 (0)