Make schema formatting consistent.

This commit is contained in:
Kermit Alexander 2022-06-09 23:15:30 +00:00
parent ff3d04d5df
commit 9fb55af69b

View File

@ -170,14 +170,14 @@ var _ = SIGDescribe("CustomResourceValidationRules [Privileged:ClusterAdmin][Alp
ginkgo.It("MUST fail create of a custom resource definition that contains an x-kubernetes-validations rule that contains a syntax error", func() { ginkgo.It("MUST fail create of a custom resource definition that contains an x-kubernetes-validations rule that contains a syntax error", func() {
ginkgo.By("Defining a custom resource definition that contains a validation rule with a syntax error") ginkgo.By("Defining a custom resource definition that contains a validation rule with a syntax error")
var schemaWithSyntaxErrorRule = unmarshallSchema([]byte(`{ var schemaWithSyntaxErrorRule = unmarshallSchema([]byte(`{
"type":"object", "type":"object",
"properties":{ "properties":{
"spec":{ "spec":{
"type":"object", "type":"object",
"x-kubernetes-validations":[ "x-kubernetes-validations":[
{ "rule":"self = 42" } { "rule":"self = 42" }
] ]
} }
} }
}`)) }`))
crd := fixtures.NewRandomNameV1CustomResourceDefinitionWithSchema(v1.NamespaceScoped, schemaWithSyntaxErrorRule, false) crd := fixtures.NewRandomNameV1CustomResourceDefinitionWithSchema(v1.NamespaceScoped, schemaWithSyntaxErrorRule, false)
@ -192,26 +192,26 @@ var _ = SIGDescribe("CustomResourceValidationRules [Privileged:ClusterAdmin][Alp
ginkgo.It("MUST fail create of a custom resource definition that contains an x-kubernetes-validations rule that exceeds the estimated cost limit", func() { ginkgo.It("MUST fail create of a custom resource definition that contains an x-kubernetes-validations rule that exceeds the estimated cost limit", func() {
ginkgo.By("Defining a custom resource definition that contains a validation rule that exceeds the cost limit") ginkgo.By("Defining a custom resource definition that contains a validation rule that exceeds the cost limit")
var schemaWithExpensiveRule = unmarshallSchema([]byte(`{ var schemaWithExpensiveRule = unmarshallSchema([]byte(`{
"type": "object", "type":"object",
"properties": { "properties":{
"spec": { "spec":{
"type": "object", "type":"object",
"properties": { "properties":{
"x": { "x":{
"type": "array", "type":"array",
"items": { "items":{
"type": "array", "type":"array",
"items": { "items":{
"type": "string" "type":"string"
}, },
"x-kubernetes-validations": [{ "x-kubernetes-validations":[
"rule": "self.all(s, s == \"string constant\")" { "rule":"self.all(s, s == \"string constant\")" }
}] ]
} }
} }
} }
} }
} }
}`)) }`))
crd := fixtures.NewRandomNameV1CustomResourceDefinitionWithSchema(v1.NamespaceScoped, schemaWithExpensiveRule, false) crd := fixtures.NewRandomNameV1CustomResourceDefinitionWithSchema(v1.NamespaceScoped, schemaWithExpensiveRule, false)
_, err := fixtures.CreateNewV1CustomResourceDefinitionWatchUnsafe(crd, apiExtensionClient) _, err := fixtures.CreateNewV1CustomResourceDefinitionWatchUnsafe(crd, apiExtensionClient)