diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/all_types_match/with_field_validations/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/all_types_match/with_field_validations/testdata/validate-false.json index d4b4a7f7b86..65581342cfb 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/all_types_match/with_field_validations/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/all_types_match/with_field_validations/testdata/validate-false.json @@ -1,26 +1,26 @@ { - "*withfieldvalidations.T1": { - "s": [ - "field T1.S" - ], - "t2": [ - "field T1.T2" - ], - "t2.s": [ - "field T2.S" - ], - "t3": [ - "field T1.T3" - ] - }, - "*withfieldvalidations.T2": { - "s": [ - "field T2.S" - ] - }, - "*withfieldvalidations.T4": { - "s": [ - "field T4.S" - ] - } - } \ No newline at end of file + "*withfieldvalidations.T1": { + "s": [ + "field T1.S" + ], + "t2": [ + "field T1.T2" + ], + "t2.s": [ + "field T2.S" + ], + "t3": [ + "field T1.T3" + ] + }, + "*withfieldvalidations.T2": { + "s": [ + "field T2.S" + ] + }, + "*withfieldvalidations.T4": { + "s": [ + "field T4.S" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/all_types_match/with_type_validations/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/all_types_match/with_type_validations/testdata/validate-false.json index e2f425ee81d..54d46424b62 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/all_types_match/with_type_validations/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/all_types_match/with_type_validations/testdata/validate-false.json @@ -1,15 +1,15 @@ { - "*withtypevalidations.E1": { - "": [ - "type E1" - ] - }, - "*withtypevalidations.T1": { - "": [ - "type T1" - ], - "s": [ - "field T1.S" - ] - } - } \ No newline at end of file + "*withtypevalidations.E1": { + "": [ + "type E1" + ] + }, + "*withtypevalidations.T1": { + "": [ + "type T1" + ], + "s": [ + "field T1.S" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/cross_pkg/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/cross_pkg/testdata/validate-false.json index b5d7616a674..4793b76adbf 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/cross_pkg/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/cross_pkg/testdata/validate-false.json @@ -1,202 +1,202 @@ { - "*crosspkg.T1": { - "primitivest1.anothert2.b": [ - "field T2.B" - ], - "primitivest1.anothert2.f": [ - "field T2.F" - ], - "primitivest1.anothert2.i": [ - "field T2.I" - ], - "primitivest1.anothert2.s": [ - "field T2.S" - ], - "primitivest1.b": [ - "field T1.B" - ], - "primitivest1.f": [ - "field T1.F" - ], - "primitivest1.i": [ - "field T1.I" - ], - "primitivest1.s": [ - "field T1.S" - ], - "primitivest1.t2": [ - "field T1.T2" - ], - "primitivest1.t2.b": [ - "field T2.B" - ], - "primitivest1.t2.f": [ - "field T2.F" - ], - "primitivest1.t2.i": [ - "field T2.I" - ], - "primitivest1.t2.s": [ - "field T2.S" - ], - "primitivest1Ptr.anothert2.b": [ - "field T2.B" - ], - "primitivest1Ptr.anothert2.f": [ - "field T2.F" - ], - "primitivest1Ptr.anothert2.i": [ - "field T2.I" - ], - "primitivest1Ptr.anothert2.s": [ - "field T2.S" - ], - "primitivest1Ptr.b": [ - "field T1.B" - ], - "primitivest1Ptr.f": [ - "field T1.F" - ], - "primitivest1Ptr.i": [ - "field T1.I" - ], - "primitivest1Ptr.s": [ - "field T1.S" - ], - "primitivest1Ptr.t2": [ - "field T1.T2" - ], - "primitivest1Ptr.t2.b": [ - "field T2.B" - ], - "primitivest1Ptr.t2.f": [ - "field T2.F" - ], - "primitivest1Ptr.t2.i": [ - "field T2.I" - ], - "primitivest1Ptr.t2.s": [ - "field T2.S" - ], - "primitivest2.b": [ - "field T2.B" - ], - "primitivest2.f": [ - "field T2.F" - ], - "primitivest2.i": [ - "field T2.I" - ], - "primitivest2.s": [ - "field T2.S" - ], - "primitivest2Ptr.anothert2.b": [ - "field T2.B" - ], - "primitivest2Ptr.anothert2.f": [ - "field T2.F" - ], - "primitivest2Ptr.anothert2.i": [ - "field T2.I" - ], - "primitivest2Ptr.anothert2.s": [ - "field T2.S" - ], - "primitivest2Ptr.b": [ - "field T1.B" - ], - "primitivest2Ptr.f": [ - "field T1.F" - ], - "primitivest2Ptr.i": [ - "field T1.I" - ], - "primitivest2Ptr.s": [ - "field T1.S" - ], - "primitivest2Ptr.t2": [ - "field T1.T2" - ], - "primitivest2Ptr.t2.b": [ - "field T2.B" - ], - "primitivest2Ptr.t2.f": [ - "field T2.F" - ], - "primitivest2Ptr.t2.i": [ - "field T2.I" - ], - "primitivest2Ptr.t2.s": [ - "field T2.S" - ], - "primitivest3Ptr.anothert2.b": [ - "field T2.B" - ], - "primitivest3Ptr.anothert2.f": [ - "field T2.F" - ], - "primitivest3Ptr.anothert2.i": [ - "field T2.I" - ], - "primitivest3Ptr.anothert2.s": [ - "field T2.S" - ], - "primitivest3Ptr.b": [ - "field T1.B" - ], - "primitivest3Ptr.f": [ - "field T1.F" - ], - "primitivest3Ptr.i": [ - "field T1.I" - ], - "primitivest3Ptr.s": [ - "field T1.S" - ], - "primitivest3Ptr.t2": [ - "field T1.T2" - ], - "primitivest3Ptr.t2.b": [ - "field T2.B" - ], - "primitivest3Ptr.t2.f": [ - "field T2.F" - ], - "primitivest3Ptr.t2.i": [ - "field T2.I" - ], - "primitivest3Ptr.t2.s": [ - "field T2.S" - ], - "typedefse1": [ - "type E1" - ], - "typedefse1Ptr": [ - "type E1" - ], - "typedefse2": [ - "type E2" - ], - "typedefse2Ptr": [ - "type E2" - ], - "typedefse3": [ - "type E3" - ], - "typedefse3Ptr": [ - "type E3" - ], - "typedefse4": [ - "type E4" - ], - "typedefse4.s": [ - "field T2.S" - ], - "typedefse4Ptr": [ - "type E4" - ], - "typedefse4Ptr.s": [ - "field T2.S" - ] - } - } \ No newline at end of file + "*crosspkg.T1": { + "primitivest1.anothert2.b": [ + "field T2.B" + ], + "primitivest1.anothert2.f": [ + "field T2.F" + ], + "primitivest1.anothert2.i": [ + "field T2.I" + ], + "primitivest1.anothert2.s": [ + "field T2.S" + ], + "primitivest1.b": [ + "field T1.B" + ], + "primitivest1.f": [ + "field T1.F" + ], + "primitivest1.i": [ + "field T1.I" + ], + "primitivest1.s": [ + "field T1.S" + ], + "primitivest1.t2": [ + "field T1.T2" + ], + "primitivest1.t2.b": [ + "field T2.B" + ], + "primitivest1.t2.f": [ + "field T2.F" + ], + "primitivest1.t2.i": [ + "field T2.I" + ], + "primitivest1.t2.s": [ + "field T2.S" + ], + "primitivest1Ptr.anothert2.b": [ + "field T2.B" + ], + "primitivest1Ptr.anothert2.f": [ + "field T2.F" + ], + "primitivest1Ptr.anothert2.i": [ + "field T2.I" + ], + "primitivest1Ptr.anothert2.s": [ + "field T2.S" + ], + "primitivest1Ptr.b": [ + "field T1.B" + ], + "primitivest1Ptr.f": [ + "field T1.F" + ], + "primitivest1Ptr.i": [ + "field T1.I" + ], + "primitivest1Ptr.s": [ + "field T1.S" + ], + "primitivest1Ptr.t2": [ + "field T1.T2" + ], + "primitivest1Ptr.t2.b": [ + "field T2.B" + ], + "primitivest1Ptr.t2.f": [ + "field T2.F" + ], + "primitivest1Ptr.t2.i": [ + "field T2.I" + ], + "primitivest1Ptr.t2.s": [ + "field T2.S" + ], + "primitivest2.b": [ + "field T2.B" + ], + "primitivest2.f": [ + "field T2.F" + ], + "primitivest2.i": [ + "field T2.I" + ], + "primitivest2.s": [ + "field T2.S" + ], + "primitivest2Ptr.anothert2.b": [ + "field T2.B" + ], + "primitivest2Ptr.anothert2.f": [ + "field T2.F" + ], + "primitivest2Ptr.anothert2.i": [ + "field T2.I" + ], + "primitivest2Ptr.anothert2.s": [ + "field T2.S" + ], + "primitivest2Ptr.b": [ + "field T1.B" + ], + "primitivest2Ptr.f": [ + "field T1.F" + ], + "primitivest2Ptr.i": [ + "field T1.I" + ], + "primitivest2Ptr.s": [ + "field T1.S" + ], + "primitivest2Ptr.t2": [ + "field T1.T2" + ], + "primitivest2Ptr.t2.b": [ + "field T2.B" + ], + "primitivest2Ptr.t2.f": [ + "field T2.F" + ], + "primitivest2Ptr.t2.i": [ + "field T2.I" + ], + "primitivest2Ptr.t2.s": [ + "field T2.S" + ], + "primitivest3Ptr.anothert2.b": [ + "field T2.B" + ], + "primitivest3Ptr.anothert2.f": [ + "field T2.F" + ], + "primitivest3Ptr.anothert2.i": [ + "field T2.I" + ], + "primitivest3Ptr.anothert2.s": [ + "field T2.S" + ], + "primitivest3Ptr.b": [ + "field T1.B" + ], + "primitivest3Ptr.f": [ + "field T1.F" + ], + "primitivest3Ptr.i": [ + "field T1.I" + ], + "primitivest3Ptr.s": [ + "field T1.S" + ], + "primitivest3Ptr.t2": [ + "field T1.T2" + ], + "primitivest3Ptr.t2.b": [ + "field T2.B" + ], + "primitivest3Ptr.t2.f": [ + "field T2.F" + ], + "primitivest3Ptr.t2.i": [ + "field T2.I" + ], + "primitivest3Ptr.t2.s": [ + "field T2.S" + ], + "typedefse1": [ + "type E1" + ], + "typedefse1Ptr": [ + "type E1" + ], + "typedefse2": [ + "type E2" + ], + "typedefse2Ptr": [ + "type E2" + ], + "typedefse3": [ + "type E3" + ], + "typedefse3Ptr": [ + "type E3" + ], + "typedefse4": [ + "type E4" + ], + "typedefse4.s": [ + "field T2.S" + ], + "typedefse4Ptr": [ + "type E4" + ], + "typedefse4Ptr.s": [ + "field T2.S" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/elide_no_validations/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/elide_no_validations/testdata/validate-false.json index 4da806ac49e..8939a1cc3ed 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/elide_no_validations/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/elide_no_validations/testdata/validate-false.json @@ -1,13 +1,13 @@ { - "*elidenovalidations.T1": { - "hasFieldVal.s": [ - "field HasFieldVal.S" - ], - "hasNoValFieldVal": [ - "field T1.HasNoValFieldVal" - ], - "hasTypeVal": [ - "type HasTypeVal" - ] - } - } \ No newline at end of file + "*elidenovalidations.T1": { + "hasFieldVal.s": [ + "field HasFieldVal.S" + ], + "hasNoValFieldVal": [ + "field T1.HasNoValFieldVal" + ], + "hasTypeVal": [ + "type HasTypeVal" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/testdata/validate-false.json index bffd6adf0ff..fae9843f0a1 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/testdata/validate-false.json @@ -1,37 +1,37 @@ { - "*eachkey.Struct": { - "": [ - "type Struct" - ], - "mapField": [ - "field Struct.MapField", - "field Struct.MapField(keys)", - "field Struct.MapField(keys)" - ], - "mapTypeField": [ - "field Struct.MapTypeField", - "field Struct.MapTypeField(keys)", - "field Struct.MapTypeField(keys)" - ], - "mapTypedefField": [ - "field Struct.MapTypedefField", - "field Struct.MapTypedefField(keys)", - "field Struct.MapTypedefField(keys)" - ], - "mapValidatedTypedefField": [ - "ValidatedStringType", - "ValidatedStringType", - "field Struct.MapValidatedTypedefField", - "field Struct.MapValidatedTypedefField(keys)", - "field Struct.MapValidatedTypedefField(keys)" - ], - "validatedMapTypeField": [ - "ValidatedMapType", - "field Struct.ValidatedMapTypeField", - "field Struct.ValidatedMapTypeField(keys)", - "field Struct.ValidatedMapTypeField(keys)", - "type ValidatedMapType(keys)", - "type ValidatedMapType(keys)" - ] - } - } \ No newline at end of file + "*eachkey.Struct": { + "": [ + "type Struct" + ], + "mapField": [ + "field Struct.MapField", + "field Struct.MapField(keys)", + "field Struct.MapField(keys)" + ], + "mapTypeField": [ + "field Struct.MapTypeField", + "field Struct.MapTypeField(keys)", + "field Struct.MapTypeField(keys)" + ], + "mapTypedefField": [ + "field Struct.MapTypedefField", + "field Struct.MapTypedefField(keys)", + "field Struct.MapTypedefField(keys)" + ], + "mapValidatedTypedefField": [ + "ValidatedStringType", + "ValidatedStringType", + "field Struct.MapValidatedTypedefField", + "field Struct.MapValidatedTypedefField(keys)", + "field Struct.MapValidatedTypedefField(keys)" + ], + "validatedMapTypeField": [ + "ValidatedMapType", + "field Struct.ValidatedMapTypeField", + "field Struct.ValidatedMapTypeField(keys)", + "field Struct.ValidatedMapTypeField(keys)", + "type ValidatedMapType(keys)", + "type ValidatedMapType(keys)" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/map_of_primitive/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/map_of_primitive/testdata/validate-false.json index 255ff527486..5076a6fcff7 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/map_of_primitive/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/map_of_primitive/testdata/validate-false.json @@ -1,27 +1,27 @@ { - "*mapofprimitive.Struct": { - "": [ - "type Struct" - ], - "mapField": [ - "field Struct.MapField" - ], - "mapField[ÀYǎ3g成oɜH偩j0âȰ]": [ - "field Struct.MapField[*]" - ], - "mapField[岯Ȉ\u0026\u003c沲3]": [ - "field Struct.MapField[*]" - ], - "mapTypedefField": [ - "field Struct.MapTypedefField" - ], - "mapTypedefField[V噘¢\u003eóDz岋笨Gń條ģ]": [ - "field Struct.MapTypedefField[*]", - "type StringType" - ], - "mapTypedefField[þƿ髈儱Ŀ蒫÷K鬣壈]": [ - "field Struct.MapTypedefField[*]", - "type StringType" - ] - } - } \ No newline at end of file + "*mapofprimitive.Struct": { + "": [ + "type Struct" + ], + "mapField": [ + "field Struct.MapField" + ], + "mapField[ÀYǎ3g成oɜH偩j0âȰ]": [ + "field Struct.MapField[*]" + ], + "mapField[岯Ȉ\u0026\u003c沲3]": [ + "field Struct.MapField[*]" + ], + "mapTypedefField": [ + "field Struct.MapTypedefField" + ], + "mapTypedefField[V噘¢\u003eóDz岋笨Gń條ģ]": [ + "field Struct.MapTypedefField[*]", + "type StringType" + ], + "mapTypedefField[þƿ髈儱Ŀ蒫÷K鬣壈]": [ + "field Struct.MapTypedefField[*]", + "type StringType" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/map_of_struct/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/map_of_struct/testdata/validate-false.json index db82e46f0a0..ec038cbc5e6 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/map_of_struct/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/map_of_struct/testdata/validate-false.json @@ -1,29 +1,29 @@ { - "*mapofstruct.Struct": { - "": [ - "type Struct" - ], - "mapField": [ - "field Struct.MapField" - ], - "mapField[岯Ȉ\u0026\u003c沲3]": [ - "field Struct.MapField[*]", - "type OtherStruct" - ], - "mapField[铃]3g!fȺ苬ĥəƣ]": [ - "field Struct.MapField[*]", - "type OtherStruct" - ], - "mapTypedefField": [ - "field Struct.MapTypedefField" - ], - "mapTypedefField[]": [ - "field Struct.MapTypedefField[*]", - "type OtherTypedefStruct" - ], - "mapTypedefField[x飖Ǒp!ǪŰ]": [ - "field Struct.MapTypedefField[*]", - "type OtherTypedefStruct" - ] - } - } \ No newline at end of file + "*mapofstruct.Struct": { + "": [ + "type Struct" + ], + "mapField": [ + "field Struct.MapField" + ], + "mapField[岯Ȉ\u0026\u003c沲3]": [ + "field Struct.MapField[*]", + "type OtherStruct" + ], + "mapField[铃]3g!fȺ苬ĥəƣ]": [ + "field Struct.MapField[*]", + "type OtherStruct" + ], + "mapTypedefField": [ + "field Struct.MapTypedefField" + ], + "mapTypedefField[]": [ + "field Struct.MapTypedefField[*]", + "type OtherTypedefStruct" + ], + "mapTypedefField[x飖Ǒp!ǪŰ]": [ + "field Struct.MapTypedefField[*]", + "type OtherTypedefStruct" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/multiple_validations/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/multiple_validations/testdata/validate-false.json index 3ef93e96004..ea27e9a111f 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/multiple_validations/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/multiple_validations/testdata/validate-false.json @@ -1,23 +1,23 @@ { - "*multiplevalidations.Struct": { - "": [ - "type Struct" - ], - "mapField": [ - "field Struct.MapField #1", - "field Struct.MapField #2", - "field Struct.MapField(keys) #1", - "field Struct.MapField(keys) #1", - "field Struct.MapField(keys) #2", - "field Struct.MapField(keys) #2" - ], - "mapField[ÀYǎ3g成oɜH偩j0âȰ]": [ - "field Struct.MapField[*] #1", - "field Struct.MapField[*] #2" - ], - "mapField[岯Ȉ\u0026\u003c沲3]": [ - "field Struct.MapField[*] #1", - "field Struct.MapField[*] #2" - ] - } - } \ No newline at end of file + "*multiplevalidations.Struct": { + "": [ + "type Struct" + ], + "mapField": [ + "field Struct.MapField #1", + "field Struct.MapField #2", + "field Struct.MapField(keys) #1", + "field Struct.MapField(keys) #1", + "field Struct.MapField(keys) #2", + "field Struct.MapField(keys) #2" + ], + "mapField[ÀYǎ3g成oɜH偩j0âȰ]": [ + "field Struct.MapField[*] #1", + "field Struct.MapField[*] #2" + ], + "mapField[岯Ȉ\u0026\u003c沲3]": [ + "field Struct.MapField[*] #1", + "field Struct.MapField[*] #2" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/typedef_to_map/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/typedef_to_map/testdata/validate-false.json index fc567bc0b90..c4b147c06f9 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/typedef_to_map/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/typedef_to_map/testdata/validate-false.json @@ -1,33 +1,33 @@ { - "*typedeftomap.Struct": { - "": [ - "type Struct" - ], - "mapField": [ - "field Struct.MapField", - "type MapType" - ], - "mapField[ÀYǎ3g成oɜH偩j0âȰ]": [ - "field Struct.MapField[*]", - "type MapType[*]" - ], - "mapField[岯Ȉ\u0026\u003c沲3]": [ - "field Struct.MapField[*]", - "type MapType[*]" - ], - "mapTypedefField": [ - "field Struct.MapTypedefField", - "type MapTypedefType" - ], - "mapTypedefField[V噘¢\u003eóDz岋笨Gń條ģ]": [ - "field Struct.MapTypedefField[*]", - "type MapTypedefType[*]", - "type StringType" - ], - "mapTypedefField[þƿ髈儱Ŀ蒫÷K鬣壈]": [ - "field Struct.MapTypedefField[*]", - "type MapTypedefType[*]", - "type StringType" - ] - } - } \ No newline at end of file + "*typedeftomap.Struct": { + "": [ + "type Struct" + ], + "mapField": [ + "field Struct.MapField", + "type MapType" + ], + "mapField[ÀYǎ3g成oɜH偩j0âȰ]": [ + "field Struct.MapField[*]", + "type MapType[*]" + ], + "mapField[岯Ȉ\u0026\u003c沲3]": [ + "field Struct.MapField[*]", + "type MapType[*]" + ], + "mapTypedefField": [ + "field Struct.MapTypedefField", + "type MapTypedefType" + ], + "mapTypedefField[V噘¢\u003eóDz岋笨Gń條ģ]": [ + "field Struct.MapTypedefField[*]", + "type MapTypedefType[*]", + "type StringType" + ], + "mapTypedefField[þƿ髈儱Ŀ蒫÷K鬣壈]": [ + "field Struct.MapTypedefField[*]", + "type MapTypedefType[*]", + "type StringType" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/multiple_tags/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/multiple_tags/testdata/validate-false.json index 2098e7fe66a..7b8a6fec4a1 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/multiple_tags/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/multiple_tags/testdata/validate-false.json @@ -1,25 +1,25 @@ { - "*multipletags.T1": { - "": [ - "type T1 #1", - "type T1 #2", - "type T1 #3" - ], - "s": [ - "field T1.S false #1", - "field T1.S false #2", - "field T1.S false #3" - ], - "t2": [ - "field T1.T2 false #1", - "field T1.T2 false #2", - "field T1.T2 false #3", - "type T2 false #1", - "type T2 false #2" - ], - "t2.s": [ - "field T2.S false #1", - "field T2.S false #2" - ] - } - } \ No newline at end of file + "*multipletags.T1": { + "": [ + "type T1 #1", + "type T1 #2", + "type T1 #3" + ], + "s": [ + "field T1.S false #1", + "field T1.S false #2", + "field T1.S false #3" + ], + "t2": [ + "field T1.T2 false #1", + "field T1.T2 false #2", + "field T1.T2 false #3", + "type T2 false #1", + "type T2 false #2" + ], + "t2.s": [ + "field T2.S false #1", + "field T2.S false #2" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/one_type_match/with_field_validations/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/one_type_match/with_field_validations/testdata/validate-false.json index b45b12c9878..1f9f7529be2 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/one_type_match/with_field_validations/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/one_type_match/with_field_validations/testdata/validate-false.json @@ -1,23 +1,23 @@ { - "*withfieldvalidations.T1": { - "e1": [ - "field T1.E1", - "type E1" - ], - "e2": [ - "field T1.E2" - ], - "s": [ - "field T1.S" - ], - "t2": [ - "field T1.T2" - ], - "t2.s": [ - "field T2.S" - ], - "t3": [ - "field T1.T3" - ] - } - } \ No newline at end of file + "*withfieldvalidations.T1": { + "e1": [ + "field T1.E1", + "type E1" + ], + "e2": [ + "field T1.E2" + ], + "s": [ + "field T1.S" + ], + "t2": [ + "field T1.T2" + ], + "t2.s": [ + "field T2.S" + ], + "t3": [ + "field T1.T3" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/one_type_match/with_type_validations/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/one_type_match/with_type_validations/testdata/validate-false.json index 8c62fdd3d00..41291539862 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/one_type_match/with_type_validations/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/one_type_match/with_type_validations/testdata/validate-false.json @@ -1,7 +1,7 @@ { - "*withtypevalidations.T1": { - "": [ - "type T1" - ] - } - } \ No newline at end of file + "*withtypevalidations.T1": { + "": [ + "type T1" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/ordering/structs/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/ordering/structs/testdata/validate-false.json index 66ed34df340..6fe7d40337f 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/ordering/structs/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/ordering/structs/testdata/validate-false.json @@ -1,48 +1,48 @@ { - "*structs.T00": { - "pt.os": [ - "Tother, no flags" - ], - "t.os": [ - "Tother, no flags" - ] - }, - "*structs.T01": { - "": [ - "T01, no flags" - ], - "ps": [ - "T01.PS, no flags" - ], - "pt": [ - "T01.PT, no flags" - ], - "pt.os": [ - "Tother, no flags" - ], - "s": [ - "T01.S, no flags" - ], - "t": [ - "T01.T, no flags" - ], - "t.os": [ - "Tother, no flags" - ] - }, - "*structs.T02": { - "": [ - "T02, ShortCircuit" - ] - }, - "*structs.T03": { - "": [ - "T03, ShortCircuit" - ] - }, - "*structs.TMultiple": { - "": [ - "TMultiple, ShortCircuit 1" - ] - } - } \ No newline at end of file + "*structs.T00": { + "pt.os": [ + "Tother, no flags" + ], + "t.os": [ + "Tother, no flags" + ] + }, + "*structs.T01": { + "": [ + "T01, no flags" + ], + "ps": [ + "T01.PS, no flags" + ], + "pt": [ + "T01.PT, no flags" + ], + "pt.os": [ + "Tother, no flags" + ], + "s": [ + "T01.S, no flags" + ], + "t": [ + "T01.T, no flags" + ], + "t.os": [ + "Tother, no flags" + ] + }, + "*structs.T02": { + "": [ + "T02, ShortCircuit" + ] + }, + "*structs.T03": { + "": [ + "T03, ShortCircuit" + ] + }, + "*structs.TMultiple": { + "": [ + "TMultiple, ShortCircuit 1" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/ordering/typedefs/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/ordering/typedefs/testdata/validate-false.json index 29ff0f13168..f1a61e10fa8 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/ordering/typedefs/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/ordering/typedefs/testdata/validate-false.json @@ -1,22 +1,22 @@ { - "*typedefs.E01": { - "": [ - "E01, no flags" - ] - }, - "*typedefs.E02": { - "": [ - "E02, ShortCircuit" - ] - }, - "*typedefs.E03": { - "": [ - "E03, ShortCircuit" - ] - }, - "*typedefs.EMultiple": { - "": [ - "EMultiple, ShortCircuit 1" - ] - } - } \ No newline at end of file + "*typedefs.E01": { + "": [ + "E01, no flags" + ] + }, + "*typedefs.E02": { + "": [ + "E02, ShortCircuit" + ] + }, + "*typedefs.E03": { + "": [ + "E03, ShortCircuit" + ] + }, + "*typedefs.EMultiple": { + "": [ + "EMultiple, ShortCircuit 1" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/pointers/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/pointers/testdata/validate-false.json index e75f89c9c86..28909a7e395 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/pointers/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/pointers/testdata/validate-false.json @@ -1,31 +1,31 @@ { - "*pointers.T1": { - "pb": [ - "field T1.PB" - ], - "pf": [ - "field T1.PF" - ], - "pi": [ - "field T1.PI" - ], - "ps": [ - "field T1.PS" - ], - "pt2": [ - "field T1.PT2" - ], - "pt2.pb": [ - "field T2.PB" - ], - "pt2.pf": [ - "field T2.PF" - ], - "pt2.pi": [ - "field T2.PI" - ], - "pt2.ps": [ - "field T2.PS" - ] - } - } \ No newline at end of file + "*pointers.T1": { + "pb": [ + "field T1.PB" + ], + "pf": [ + "field T1.PF" + ], + "pi": [ + "field T1.PI" + ], + "ps": [ + "field T1.PS" + ], + "pt2": [ + "field T1.PT2" + ], + "pt2.pb": [ + "field T2.PB" + ], + "pt2.pf": [ + "field T2.PF" + ], + "pt2.pi": [ + "field T2.PI" + ], + "pt2.ps": [ + "field T2.PS" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/primitives/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/primitives/testdata/validate-false.json index 54612afdb2c..0046190d7bc 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/primitives/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/primitives/testdata/validate-false.json @@ -1,43 +1,43 @@ { - "*primitives.T1": { - "anothert2.b": [ - "field T2.B" - ], - "anothert2.f": [ - "field T2.F" - ], - "anothert2.i": [ - "field T2.I" - ], - "anothert2.s": [ - "field T2.S" - ], - "b": [ - "field T1.B" - ], - "f": [ - "field T1.F" - ], - "i": [ - "field T1.I" - ], - "s": [ - "field T1.S" - ], - "t2": [ - "field T1.T2" - ], - "t2.b": [ - "field T2.B" - ], - "t2.f": [ - "field T2.F" - ], - "t2.i": [ - "field T2.I" - ], - "t2.s": [ - "field T2.S" - ] - } - } \ No newline at end of file + "*primitives.T1": { + "anothert2.b": [ + "field T2.B" + ], + "anothert2.f": [ + "field T2.F" + ], + "anothert2.i": [ + "field T2.I" + ], + "anothert2.s": [ + "field T2.S" + ], + "b": [ + "field T1.B" + ], + "f": [ + "field T1.F" + ], + "i": [ + "field T1.I" + ], + "s": [ + "field T1.S" + ], + "t2": [ + "field T1.T2" + ], + "t2.b": [ + "field T2.B" + ], + "t2.f": [ + "field T2.F" + ], + "t2.i": [ + "field T2.I" + ], + "t2.s": [ + "field T2.S" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/public_private/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/public_private/testdata/validate-false.json index d40a32852c9..1deaa60b1e4 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/public_private/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/public_private/testdata/validate-false.json @@ -1,7 +1,7 @@ { - "*publicprivate.T1": { - "public": [ - "field T1.Public" - ] - } - } \ No newline at end of file + "*publicprivate.T1": { + "public": [ + "field T1.Public" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/slices/multiple_validations/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/slices/multiple_validations/testdata/validate-false.json index c44390ed930..4748ab66de4 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/slices/multiple_validations/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/slices/multiple_validations/testdata/validate-false.json @@ -1,20 +1,20 @@ { - "*multiplevalidations.Struct": { - "": [ - "type Struct #1", - "type Struct #2" - ], - "listField": [ - "field Struct.ListField #1", - "field Struct.ListField #2" - ], - "listField[0]": [ - "field Struct.ListField[*] #1", - "field Struct.ListField[*] #2" - ], - "listField[1]": [ - "field Struct.ListField[*] #1", - "field Struct.ListField[*] #2" - ] - } - } \ No newline at end of file + "*multiplevalidations.Struct": { + "": [ + "type Struct #1", + "type Struct #2" + ], + "listField": [ + "field Struct.ListField #1", + "field Struct.ListField #2" + ], + "listField[0]": [ + "field Struct.ListField[*] #1", + "field Struct.ListField[*] #2" + ], + "listField[1]": [ + "field Struct.ListField[*] #1", + "field Struct.ListField[*] #2" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/slices/slice_of_primitive/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/slices/slice_of_primitive/testdata/validate-false.json index bcfd8a0da59..5a3cacb656f 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/slices/slice_of_primitive/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/slices/slice_of_primitive/testdata/validate-false.json @@ -1,27 +1,27 @@ { - "*sliceofprimitive.Struct": { - "": [ - "type Struct" - ], - "listField": [ - "field Struct.ListField" - ], - "listField[0]": [ - "field Struct.ListField[*]" - ], - "listField[1]": [ - "field Struct.ListField[*]" - ], - "listTypedefField": [ - "field Struct.ListTypedefField" - ], - "listTypedefField[0]": [ - "field Struct.ListTypedefField[*]", - "type StringType" - ], - "listTypedefField[1]": [ - "field Struct.ListTypedefField[*]", - "type StringType" - ] - } - } \ No newline at end of file + "*sliceofprimitive.Struct": { + "": [ + "type Struct" + ], + "listField": [ + "field Struct.ListField" + ], + "listField[0]": [ + "field Struct.ListField[*]" + ], + "listField[1]": [ + "field Struct.ListField[*]" + ], + "listTypedefField": [ + "field Struct.ListTypedefField" + ], + "listTypedefField[0]": [ + "field Struct.ListTypedefField[*]", + "type StringType" + ], + "listTypedefField[1]": [ + "field Struct.ListTypedefField[*]", + "type StringType" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/slices/slice_of_struct/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/slices/slice_of_struct/testdata/validate-false.json index d8d4e1cc49f..7d0f90599c5 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/slices/slice_of_struct/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/slices/slice_of_struct/testdata/validate-false.json @@ -1,35 +1,35 @@ { - "*sliceofstruct.Struct": { - "": [ - "type Struct" - ], - "UnvalidatedListField[0]": [ - "type OtherStruct" - ], - "UnvalidatedListField[1]": [ - "type OtherStruct" - ], - "listField": [ - "field Struct.ListField" - ], - "listField[0]": [ - "field Struct.ListField[*]", - "type OtherStruct" - ], - "listField[1]": [ - "field Struct.ListField[*]", - "type OtherStruct" - ], - "listTypedefField": [ - "field Struct.ListTypedefField" - ], - "listTypedefField[0]": [ - "field Struct.ListTypedefField[*]", - "type OtherTypedefStruct" - ], - "listTypedefField[1]": [ - "field Struct.ListTypedefField[*]", - "type OtherTypedefStruct" - ] - } - } \ No newline at end of file + "*sliceofstruct.Struct": { + "": [ + "type Struct" + ], + "UnvalidatedListField[0]": [ + "type OtherStruct" + ], + "UnvalidatedListField[1]": [ + "type OtherStruct" + ], + "listField": [ + "field Struct.ListField" + ], + "listField[0]": [ + "field Struct.ListField[*]", + "type OtherStruct" + ], + "listField[1]": [ + "field Struct.ListField[*]", + "type OtherStruct" + ], + "listTypedefField": [ + "field Struct.ListTypedefField" + ], + "listTypedefField[0]": [ + "field Struct.ListTypedefField[*]", + "type OtherTypedefStruct" + ], + "listTypedefField[1]": [ + "field Struct.ListTypedefField[*]", + "type OtherTypedefStruct" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/slices/typedef_to_slice/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/slices/typedef_to_slice/testdata/validate-false.json index 226e13d4f69..a92dc6e4504 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/slices/typedef_to_slice/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/slices/typedef_to_slice/testdata/validate-false.json @@ -1,33 +1,33 @@ { - "*typedeftoslice.Struct": { - "": [ - "type Struct" - ], - "listField": [ - "field Struct.ListField", - "type ListType" - ], - "listField[0]": [ - "field Struct.ListField[*]", - "type ListType[*]" - ], - "listField[1]": [ - "field Struct.ListField[*]", - "type ListType[*]" - ], - "listTypedefField": [ - "field Struct.ListTypedefField", - "type ListTypedefType" - ], - "listTypedefField[0]": [ - "field Struct.ListTypedefField[*]", - "type ListTypedefType[*]", - "type StringType" - ], - "listTypedefField[1]": [ - "field Struct.ListTypedefField[*]", - "type ListTypedefType[*]", - "type StringType" - ] - } - } \ No newline at end of file + "*typedeftoslice.Struct": { + "": [ + "type Struct" + ], + "listField": [ + "field Struct.ListField", + "type ListType" + ], + "listField[0]": [ + "field Struct.ListField[*]", + "type ListType[*]" + ], + "listField[1]": [ + "field Struct.ListField[*]", + "type ListType[*]" + ], + "listTypedefField": [ + "field Struct.ListTypedefField", + "type ListTypedefType" + ], + "listTypedefField[0]": [ + "field Struct.ListTypedefField[*]", + "type ListTypedefType[*]", + "type StringType" + ], + "listTypedefField[1]": [ + "field Struct.ListTypedefField[*]", + "type ListTypedefType[*]", + "type StringType" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/type_args/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/type_args/testdata/validate-false.json index 3a905c8bba1..53d0f98df22 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/type_args/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/type_args/testdata/validate-false.json @@ -1,98 +1,98 @@ { - "*typeargs.T1": { - "e1": [ - "T1.E1", - "type E1" - ], - "i1": [ - "T1.I1" - ], - "pe1": [ - "type E1" - ], - "ps1": [ - "PT1.PS1" - ], - "ps1.anothert2.b": [ - "field T2.B" - ], - "ps1.anothert2.f": [ - "field T2.F" - ], - "ps1.anothert2.i": [ - "field T2.I" - ], - "ps1.anothert2.s": [ - "field T2.S" - ], - "ps1.b": [ - "field T1.B" - ], - "ps1.f": [ - "field T1.F" - ], - "ps1.i": [ - "field T1.I" - ], - "ps1.s": [ - "field T1.S" - ], - "ps1.t2": [ - "field T1.T2" - ], - "ps1.t2.b": [ - "field T2.B" - ], - "ps1.t2.f": [ - "field T2.F" - ], - "ps1.t2.i": [ - "field T2.I" - ], - "ps1.t2.s": [ - "field T2.S" - ], - "s1": [ - "T1.S1" - ], - "s1.anothert2.b": [ - "field T2.B" - ], - "s1.anothert2.f": [ - "field T2.F" - ], - "s1.anothert2.i": [ - "field T2.I" - ], - "s1.anothert2.s": [ - "field T2.S" - ], - "s1.b": [ - "field T1.B" - ], - "s1.f": [ - "field T1.F" - ], - "s1.i": [ - "field T1.I" - ], - "s1.s": [ - "field T1.S" - ], - "s1.t2": [ - "field T1.T2" - ], - "s1.t2.b": [ - "field T2.B" - ], - "s1.t2.f": [ - "field T2.F" - ], - "s1.t2.i": [ - "field T2.I" - ], - "s1.t2.s": [ - "field T2.S" - ] - } - } \ No newline at end of file + "*typeargs.T1": { + "e1": [ + "T1.E1", + "type E1" + ], + "i1": [ + "T1.I1" + ], + "pe1": [ + "type E1" + ], + "ps1": [ + "PT1.PS1" + ], + "ps1.anothert2.b": [ + "field T2.B" + ], + "ps1.anothert2.f": [ + "field T2.F" + ], + "ps1.anothert2.i": [ + "field T2.I" + ], + "ps1.anothert2.s": [ + "field T2.S" + ], + "ps1.b": [ + "field T1.B" + ], + "ps1.f": [ + "field T1.F" + ], + "ps1.i": [ + "field T1.I" + ], + "ps1.s": [ + "field T1.S" + ], + "ps1.t2": [ + "field T1.T2" + ], + "ps1.t2.b": [ + "field T2.B" + ], + "ps1.t2.f": [ + "field T2.F" + ], + "ps1.t2.i": [ + "field T2.I" + ], + "ps1.t2.s": [ + "field T2.S" + ], + "s1": [ + "T1.S1" + ], + "s1.anothert2.b": [ + "field T2.B" + ], + "s1.anothert2.f": [ + "field T2.F" + ], + "s1.anothert2.i": [ + "field T2.I" + ], + "s1.anothert2.s": [ + "field T2.S" + ], + "s1.b": [ + "field T1.B" + ], + "s1.f": [ + "field T1.F" + ], + "s1.i": [ + "field T1.I" + ], + "s1.s": [ + "field T1.S" + ], + "s1.t2": [ + "field T1.T2" + ], + "s1.t2.b": [ + "field T2.B" + ], + "s1.t2.f": [ + "field T2.F" + ], + "s1.t2.i": [ + "field T2.I" + ], + "s1.t2.s": [ + "field T2.S" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/typedefs/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/typedefs/testdata/validate-false.json index e97a52d4377..45d5766bddf 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/typedefs/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/typedefs/testdata/validate-false.json @@ -1,59 +1,59 @@ { - "*typedefs.T1": { - "": [ - "type T1" - ], - "e1": [ - "field T1.E1", - "type E1" - ], - "e2": [ - "field T1.E2", - "type E2" - ], - "e3": [ - "field T1.E3", - "type E3" - ], - "e4": [ - "field T1.E4", - "type E4" - ], - "e4.s": [ - "field T2.S" - ], - "pe1": [ - "field T1.PE1", - "type E1" - ], - "pe2": [ - "field T1.PE2", - "type E2" - ], - "pe3": [ - "field T1.PE3", - "type E3" - ], - "pe4": [ - "field T1.PE4", - "type E4" - ], - "pe4.s": [ - "field T2.S" - ], - "pt2": [ - "field T1.PT2", - "type T2" - ], - "pt2.s": [ - "field T2.S" - ], - "t2": [ - "field T1.T2", - "type T2" - ], - "t2.s": [ - "field T2.S" - ] - } - } \ No newline at end of file + "*typedefs.T1": { + "": [ + "type T1" + ], + "e1": [ + "field T1.E1", + "type E1" + ], + "e2": [ + "field T1.E2", + "type E2" + ], + "e3": [ + "field T1.E3", + "type E3" + ], + "e4": [ + "field T1.E4", + "type E4" + ], + "e4.s": [ + "field T2.S" + ], + "pe1": [ + "field T1.PE1", + "type E1" + ], + "pe2": [ + "field T1.PE2", + "type E2" + ], + "pe3": [ + "field T1.PE3", + "type E3" + ], + "pe4": [ + "field T1.PE4", + "type E4" + ], + "pe4.s": [ + "field T2.S" + ], + "pt2": [ + "field T1.PT2", + "type T2" + ], + "pt2.s": [ + "field T2.S" + ], + "t2": [ + "field T1.T2", + "type T2" + ], + "t2.s": [ + "field T2.S" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/update_validations/lists/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/update_validations/lists/testdata/validate-false.json index dffc6335f81..16572944973 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/update_validations/lists/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/update_validations/lists/testdata/validate-false.json @@ -1,15 +1,15 @@ { - "*lists.M1": { - "s": [ - "M1.S" - ] - }, - "*lists.T1": { - "lm1[0].s": [ - "M1.S" - ], - "lm1[1].s": [ - "M1.S" - ] - } - } \ No newline at end of file + "*lists.M1": { + "s": [ + "M1.S" + ] + }, + "*lists.T1": { + "lm1[0].s": [ + "M1.S" + ], + "lm1[1].s": [ + "M1.S" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/update_validations/maps/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/update_validations/maps/testdata/validate-false.json index c281007422b..1b140e6f39e 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/update_validations/maps/testdata/validate-false.json +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/update_validations/maps/testdata/validate-false.json @@ -1,15 +1,15 @@ { - "*maps.M1": { - "s": [ - "M1.S" - ] - }, - "*maps.T1": { - "msm1[ƒ岯Ȉ\u0026\u003c沲3镟Ō仲牚輠ɟɛ].s": [ - "M1.S" - ], - "msm1[Ȱ轷N].s": [ - "M1.S" - ] - } - } \ No newline at end of file + "*maps.M1": { + "s": [ + "M1.S" + ] + }, + "*maps.T1": { + "msm1[ƒ岯Ȉ\u0026\u003c沲3镟Ō仲牚輠ɟɛ].s": [ + "M1.S" + ], + "msm1[Ȱ轷N].s": [ + "M1.S" + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/testscheme/testscheme.go b/staging/src/k8s.io/code-generator/cmd/validation-gen/testscheme/testscheme.go index 60c92997e10..f4226401c37 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/testscheme/testscheme.go +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/testscheme/testscheme.go @@ -150,7 +150,7 @@ func (s *ValidationTestBuilder) ValidateFixtures() { if err := os.MkdirAll(path.Dir(testdataFilename), os.FileMode(0755)); err != nil { s.Fatal("error making directory", err) } - data, err := json.MarshalIndent(got, " ", " ") + data, err := json.MarshalIndent(got, "", " ") if err != nil { s.Fatal(err) }