Skip to content

Commit a3e4149

Browse files
akinrosslhercot
akinross
authored and
lhercot
committed
[ignore] add ignore conditional of read-only attributes to defaults and all in testvars
1 parent 8ad4fad commit a3e4149

File tree

1 file changed

+115
-106
lines changed

1 file changed

+115
-106
lines changed

‎gen/templates/testvars.yaml.tmpl‎

Lines changed: 115 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44

55
{{ $versionMismatch := .VersionMismatched}}
66
default:
7-
{{- $versionMismatchExists := false}}
8-
{{- range .Properties}}{{- if keyExists $versionMismatch .RawVersion}}{{$versionMismatchExists = true}}{{- end}}{{- if and (not (keyExists $versionMismatch .RawVersion)) (not .IgnoreInTest) (not .ReadOnly)}}{{$overwritePropertyName := overwriteProperty .PkgName .SnakeCaseName $.Definitions}}
7+
{{- $versionMismatchExists := false}}
8+
{{- range .Properties}}
9+
{{- if keyExists $versionMismatch .RawVersion}}{{$versionMismatchExists = true}}{{- end}}
10+
{{- if and (not (keyExists $versionMismatch .RawVersion)) (not .IgnoreInTest) (not .ReadOnly)}}{{$overwritePropertyName := overwriteProperty .PkgName .SnakeCaseName $.Definitions}}
911
{{- if .DefaultValue}}
1012
{{- if eq .ValueType "bitmask"}}
1113
{{- if lt 0 (len (overwritePropertyValue .PkgName $overwritePropertyName .DefaultValue "default" 0 $.Definitions))}}
@@ -31,57 +33,59 @@ default:
3133
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: "{{overwritePropertyValue .PkgName $overwritePropertyName "" "default" 0 $.Definitions}}"
3234
{{- end}}
3335
{{- end}}
34-
{{- end}}{{- end}}
35-
{{- if $versionMismatchExists}}
36-
{{- $properties := .Properties }}
36+
{{- end}}
37+
{{- end}}
38+
{{- if $versionMismatchExists}}{{- $properties := .Properties }}
3739
version_mismatch:
38-
{{- range $versionMismatchNumber, $propertyNames := $versionMismatch }}
39-
{{- $printedVersionMismatchNumberAll := false }}
40-
{{- range $propertyNames }}
41-
{{- $propertyInMismatch := .}}
42-
{{- range $properties}}
43-
{{- if eq .PropertyName $propertyInMismatch}}
44-
{{- if not $printedVersionMismatchNumberAll }}
45-
{{- $printedVersionMismatchNumberAll = true }}
40+
{{- range $versionMismatchNumber, $propertyNames := $versionMismatch }}{{- $printedVersionMismatchNumberAll := false }}
41+
{{- range $propertyNames }}{{- $propertyInMismatch := .}}
42+
{{- range $properties}}
43+
{{- if and (not .IgnoreInTest) (not .ReadOnly)}}
44+
{{- if eq .PropertyName $propertyInMismatch}}
45+
{{- if not $printedVersionMismatchNumberAll }}{{- $printedVersionMismatchNumberAll = true }}
4646
{{ $versionMismatchNumber }}:
47-
{{- end }}
47+
{{- end }}
4848
{{- $overwritePropertyName := overwriteProperty .PkgName .SnakeCaseName $.Definitions}}
49-
{{- if .DefaultValue}}
50-
{{- if eq .ValueType "bitmask"}}
51-
{{- if lt 0 (len (overwritePropertyValue .PkgName $overwritePropertyName .DefaultValue "default" 0 $.Definitions))}}
49+
{{- if .DefaultValue}}
50+
{{- if eq .ValueType "bitmask"}}
51+
{{- if lt 0 (len (overwritePropertyValue .PkgName $overwritePropertyName .DefaultValue "default" 0 $.Definitions))}}
5252
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: {{range $index, $value := (overwritePropertyValue .PkgName $overwritePropertyName .DefaultValue "default" 0 $.Definitions)}}
5353
- "{{ $value}}"
54-
{{- end}}
55-
{{- else}}
54+
{{- end}}
55+
{{- else}}
5656
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: []
57-
{{- end}}
58-
{{- else}}
57+
{{- end}}
58+
{{- else}}
5959
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: "{{overwritePropertyValue .PkgName $overwritePropertyName .DefaultValue "default" 0 $.Definitions}}"
60-
{{- end}}
61-
{{- else if not .IsNaming}}
62-
{{- if eq .ValueType "bitmask"}}
63-
{{- if lt 0 (len (overwritePropertyValue .PkgName $overwritePropertyName "" "default" 0 $.Definitions))}}
60+
{{- end}}
61+
{{- else if not .IsNaming}}
62+
{{- if eq .ValueType "bitmask"}}
63+
{{- if lt 0 (len (overwritePropertyValue .PkgName $overwritePropertyName "" "default" 0 $.Definitions))}}
6464
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: {{range $index, $value := (overwritePropertyValue .PkgName $overwritePropertyName "" "default" 0 $.Definitions)}}
6565
- "{{ $value}}"
66-
{{- end}}
67-
{{- else}}
66+
{{- end}}
67+
{{- else}}
6868
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: []
69-
{{- end}}
70-
{{- else}}
69+
{{- end}}
70+
{{- else}}
7171
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: "{{overwritePropertyValue .PkgName $overwritePropertyName "" "default" 0 $.Definitions}}"
72+
{{- end}}
73+
{{- end}}
7274
{{- end}}
7375
{{- end}}
74-
{{- end}}{{- end}}
7576
{{- end}}
76-
{{- end}}
77-
{{- end}}
77+
{{- end}}
78+
{{- end}}
79+
{{- end}}
7880
{{ if .HasNaming }}
7981
datasource_non_existing:
80-
{{- range .Properties}}{{- if and (not (keyExists $versionMismatch .RawVersion)) (not .IgnoreInTest) (not .ReadOnly)}}{{$testValue := createNonExistingValue .SnakeCaseName}}{{$overwritePropertyName := overwriteProperty .PkgName .SnakeCaseName $.Definitions}}
81-
{{- if .IsNaming }}
82+
{{- range .Properties}}
83+
{{- if and (not (keyExists $versionMismatch .RawVersion)) (not .IgnoreInTest) (not .ReadOnly)}}{{$testValue := createNonExistingValue .SnakeCaseName}}{{$overwritePropertyName := overwriteProperty .PkgName .SnakeCaseName $.Definitions}}
84+
{{- if .IsNaming }}
8285
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: "{{overwritePropertyValue .PkgName $overwritePropertyName $testValue "datasource_non_existing" 0 $.Definitions}}"
86+
{{- end}}
8387
{{- end}}
84-
{{- end}}{{- end}}
88+
{{- end}}
8589

8690
datasource_required:
8791
{{- range .Properties}}{{$testValue := createTestValue .SnakeCaseName}}{{$overwritePropertyName := overwriteProperty .PkgName .SnakeCaseName $.Definitions}}
@@ -101,7 +105,7 @@ resource_required:
101105
custom_type:
102106
{{- range .Properties}}{{$testValue := createTestValue .SnakeCaseName}}{{$overwritePropertyName := overwriteProperty .PkgName .SnakeCaseName $.Definitions}}
103107
{{- if .HasCustomType}}
104-
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: {{$validValuesMap := .ValidValuesMap}}{{range $key, $value := $validValuesMap}}{{if or (ne $value "unspecified") (eq (len $validValuesMap) 1)}}"{{$key}}"{{break}}{{end}}{{end}}
108+
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: {{$validValuesMap := .ValidValuesMap}}{{range $key, $value := $validValuesMap}}{{- if or (ne $value "unspecified") (eq (len $validValuesMap) 1)}}"{{$key}}"{{break}}{{end}}{{end}}
105109
{{- else if or .IsNaming (or .IsRequired (isRequiredInTestValue .PkgName $overwritePropertyName $.Definitions "resource_required"))}}
106110
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: "{{overwritePropertyValue .PkgName $overwritePropertyName $testValue "resource_required" 0 $.Definitions}}"
107111
{{- end}}
@@ -111,19 +115,23 @@ custom_type:
111115
{{- if .HasReadOnlyProperties}}
112116

113117
read_only:
114-
{{- range .Properties}}{{- if .ReadOnly}}
118+
{{- range .Properties}}
119+
{{- if .ReadOnly}}
115120
- "{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}"
116-
{{- end}}{{- end}}
121+
{{- end}}
122+
{{- end}}
117123
{{- end}}
118124

119125
all:
120-
{{- $versionMismatchExists = false}}
121-
{{- range .Properties}}{{- if keyExists $versionMismatch .RawVersion}}{{$versionMismatchExists = true}}{{- end}}{{- if and (not (keyExists $versionMismatch .RawVersion)) (not .IgnoreInTest) (not .ReadOnly)}}{{$overwritePropertyName := overwriteProperty .PkgName .SnakeCaseName $.Definitions}}
122-
{{- if overwriteProperty .PkgName .SnakeCaseName $.Definitions | eq "annotation"}}
126+
{{- $versionMismatchExists = false}}
127+
{{- range .Properties}}
128+
{{- if keyExists $versionMismatch .RawVersion}}{{$versionMismatchExists = true}}{{- end}}
129+
{{- if and (not (keyExists $versionMismatch .RawVersion)) (not .IgnoreInTest) (not .ReadOnly)}}{{$overwritePropertyName := overwriteProperty .PkgName .SnakeCaseName $.Definitions}}
130+
{{- if overwriteProperty .PkgName .SnakeCaseName $.Definitions | eq "annotation"}}
123131
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: "annotation"
124-
{{- else if .DefaultValue}}{{$length := len .ValidValues}}
125-
{{- if eq .ValueType "bitmask"}}
126-
{{- if lt 0 (len (overwritePropertyValue .PkgName $overwritePropertyName .DefaultValue "all" 0 $.Definitions))}}
132+
{{- else if .DefaultValue}}{{$length := len .ValidValues}}
133+
{{- if eq .ValueType "bitmask"}}
134+
{{- if lt 0 (len (overwritePropertyValue .PkgName $overwritePropertyName .DefaultValue "all" 0 $.Definitions))}}
127135
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: {{range $index, $value := (overwritePropertyValue .PkgName $overwritePropertyName .DefaultValue "all" 0 $.Definitions)}}
128136
- "{{ $value}}"
129137
{{- end}}
@@ -148,62 +156,63 @@ all:
148156
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: "{{overwritePropertyValue .PkgName $overwritePropertyName $overwritePropertyName "all" 0 $.Definitions}}"
149157
{{- end}}
150158
{{- end}}
151-
{{- end}}{{- end}}
152-
{{- if $versionMismatchExists}}
153-
{{- $properties := .Properties }}
159+
{{- end}}
160+
{{- end}}
161+
{{- if $versionMismatchExists}}{{- $properties := .Properties }}
154162
version_mismatch:
155-
{{- range $versionMismatchNumber, $propertyNames := $versionMismatch }}
156-
{{- $printedVersionMismatchNumberAll := false }}
157-
{{- range $propertyNames }}
158-
{{- $propertyInMismatch := .}}
159-
{{- range $properties}}
160-
{{- if eq .PropertyName $propertyInMismatch}}
161-
{{- if not $printedVersionMismatchNumberAll }}
162-
{{- $printedVersionMismatchNumberAll = true }}
163+
{{- range $versionMismatchNumber, $propertyNames := $versionMismatch }}{{- $printedVersionMismatchNumberAll := false }}
164+
{{- range $propertyNames }}{{- $propertyInMismatch := .}}
165+
{{- range $properties}}
166+
{{- if and (not .IgnoreInTest) (not .ReadOnly)}}
167+
{{- if eq .PropertyName $propertyInMismatch}}
168+
{{- if not $printedVersionMismatchNumberAll }}{{- $printedVersionMismatchNumberAll = true }}
163169
{{ $versionMismatchNumber }}:
164-
{{- end }}
165-
{{- $overwritePropertyName := overwriteProperty .PkgName .SnakeCaseName $.Definitions}}
166-
{{- if .DefaultValue}}{{$length := len .ValidValues}}
167-
{{- if eq .ValueType "bitmask"}}
168-
{{- if lt 0 (len (overwritePropertyValue .PkgName $overwritePropertyName .DefaultValue "all" 0 $.Definitions))}}
170+
{{- end }}
171+
{{- $overwritePropertyName := overwriteProperty .PkgName .SnakeCaseName $.Definitions}}
172+
{{- if .DefaultValue}}{{$length := len .ValidValues}}
173+
{{- if eq .ValueType "bitmask"}}
174+
{{- if lt 0 (len (overwritePropertyValue .PkgName $overwritePropertyName .DefaultValue "all" 0 $.Definitions))}}
169175
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: {{range $index, $value := (overwritePropertyValue .PkgName $overwritePropertyName .DefaultValue "all" 0 $.Definitions)}}
170176
- "{{ $value}}"
171-
{{- end}}
172-
{{- else}}
177+
{{- end}}
178+
{{- else}}
173179
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: []
174-
{{- end}}
175-
{{- else if eq $length 0}}
180+
{{- end}}
181+
{{- else if eq $length 0}}
176182
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: "{{overwritePropertyValue .PkgName $overwritePropertyName .DefaultValue "all" 0 $.Definitions}}"
177-
{{- else }}{{$testValue := index .ValidValues 0 }}
183+
{{- else }}{{$testValue := index .ValidValues 0 }}
178184
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: "{{overwritePropertyValue .PkgName $overwritePropertyName $testValue "all" 0 $.Definitions}}"
179-
{{- end}}
180-
{{- else if not .IsNaming}}
181-
{{- if eq .ValueType "bitmask"}}
182-
{{- if lt 0 (len (overwritePropertyValue .PkgName $overwritePropertyName $overwritePropertyName "all" 0 $.Definitions))}}
185+
{{- end}}
186+
{{- else if not .IsNaming}}
187+
{{- if eq .ValueType "bitmask"}}
188+
{{- if lt 0 (len (overwritePropertyValue .PkgName $overwritePropertyName $overwritePropertyName "all" 0 $.Definitions))}}
183189
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: {{range $index, $value := (overwritePropertyValue .PkgName $overwritePropertyName $overwritePropertyName "all" 0 $.Definitions)}}
184190
- "{{ $value}}"
191+
{{- end}}
192+
{{- else}}
193+
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: []
185194
{{- end}}
186195
{{- else}}
187-
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: []
188-
{{- end}}
189-
{{- else}}
190196
{{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: "{{overwritePropertyValue .PkgName $overwritePropertyName $overwritePropertyName "all" 0 $.Definitions}}"
197+
{{- end}}
198+
{{- end}}
199+
{{- end}}
200+
{{- end}}
191201
{{- end}}
192202
{{- end}}
193-
{{- end}}
194-
{{- end}}
195-
{{- end}}
196-
{{- end}}
197203
{{- end}}
204+
{{- end}}
198205
{{ if .Children}}
199206
children:
200207
{{- range $key, $value := .Children}}
201208
{{- $newCtx := addToTemplateProperties . "Indent" "" -}}
202209
{{- template "nestedChildren" $newCtx }}
203-
{{- end}}{{- end}}
210+
{{- end}}
211+
{{- end}}
204212
{{- if and .ContainedBy (not .MultiParentFormats)}}
205213
parents:
206-
{{- $index := 0}}{{- range $key := .DocumentationExamples}}{{$parentDependency := getParentTestDependencies $.PkgName $index $.Definitions}}{{$index = add $index 1}}
214+
{{- $index := 0}}
215+
{{- range $key := .DocumentationExamples}}{{$parentDependency := getParentTestDependencies $.PkgName $index $.Definitions}}{{$index = add $index 1}}
207216
- class_name: "{{ $key }}"
208217
parent_dependency: "{{$parentDependency.parent_dependency}}"
209218
parent_dn: "{{createParentDnValue $key "test" $.Definitions}}"
@@ -219,50 +228,50 @@ parents:
219228
{{- end }}
220229
test_type: {{$.TestType}}
221230
{{- end}}
222-
{{- if .TestDependencies}}
231+
{{- if .TestDependencies}}
223232
targets:
224-
{{- range .TestDependencies }}
233+
{{- range .TestDependencies }}
225234
- class_name: "{{ .ClassName }}"
226235
target_dn: "{{ .TargetDn }}"
227236
target_dn_ref: "{{ .TargetDnRef }}"
228-
{{- if .TargetDnOverwriteDocs}}
237+
{{- if .TargetDnOverwriteDocs}}
229238
target_dn_overwrite_docs: "{{ .TargetDnOverwriteDocs }}"
230-
{{- end}}
239+
{{- end}}
231240
parent_dependency: "{{ .ParentDependency}}"
232241
parent_dependency_dn_ref: "{{.ParentDependencyDnRef}}"
233242
target_resource_name: "{{ .TargetResourceName }}"
234243
relation_resource_name: "{{ .RelationResourceName }}"
235244
parent_dn_key: "{{ .ParentDnKey }}"
236245
static: {{ .Static }}
237246
properties:
238-
{{- range $key, $value := .Properties}}
247+
{{- range $key, $value := .Properties}}
239248
{{ $key }}: "{{ $value }}"
240-
{{- end }}
241249
{{- end }}
250+
{{- end }}
242251
{{- end }}
243-
{{- if .ChildTestDependencies}}
252+
{{- if .ChildTestDependencies}}
244253
child_targets:
245-
{{- range .ChildTestDependencies }}
254+
{{- range .ChildTestDependencies }}
246255
- class_name: "{{ .ClassName }}"
247256
target_dn: "{{ .TargetDn }}"
248-
{{- if .TargetDnOverwriteDocs}}
257+
{{- if .TargetDnOverwriteDocs}}
249258
target_dn_overwrite_docs: "{{ .TargetDnOverwriteDocs }}"
250-
{{- end}}
259+
{{- end}}
251260
relation_resource_name: "{{ .RelationResourceName }}"
252261
static: {{ .Static }}
253-
{{- if not .Static}}
262+
{{- if not .Static}}
254263
target_dn_ref: "{{ .TargetDnRef }}"
255264
parent_dependency: "{{ .ParentDependency}}"
256265
parent_dependency_dn_ref: "{{.ParentDependencyDnRef}}"
257266
target_resource_name: "{{ .TargetResourceName }}"
258267
parent_dn_key: "{{ .ParentDnKey }}"
259268
properties:
260-
{{- range $key, $value := .Properties}}
269+
{{- range $key, $value := .Properties}}
261270
{{ $key }}: "{{ $value }}"
262-
{{- end }}
263271
{{- end }}
272+
{{- end }}
264273
{{- end }}
265-
{{- end}}
274+
{{- end}}
266275
{{- end}}
267276

268277
{{- if .MultiParentFormats}}
@@ -283,9 +292,9 @@ parents:
283292
{{- else }}
284293
test_type: both
285294
{{- end }}
286-
{{- end }}
295+
{{- end }}
287296

288-
{{- if .TestDependencies}}
297+
{{- if .TestDependencies}}
289298
targets:
290299
{{- range .TestDependencies }}
291300
- class_name: "{{ .ClassName }}"
@@ -297,37 +306,37 @@ targets:
297306
relation_resource_name: "{{ .RelationResourceName }}"
298307
parent_dn_key: "{{ .ParentDnKey }}"
299308
properties:
300-
{{- range $key, $value := .Properties}}
309+
{{- range $key, $value := .Properties}}
301310
{{ $key }}: "{{ $value }}"
302-
{{- end }}
303-
{{- end }}
304-
{{- end }}
311+
{{- end }}
312+
{{- end }}
313+
{{- end }}
305314
{{- end }}
306315

307316
{{- if or (and (not .ContainedBy) (not .MultiParentFormats)) (and (.ContainedBy) (not .DocumentationExamples) (not .MultiParentFormats)) }}
308-
{{- if .ChildTestDependencies}}
317+
{{- if .ChildTestDependencies}}
309318
child_targets:
310-
{{- range .ChildTestDependencies }}
319+
{{- range .ChildTestDependencies }}
311320
- class_name: "{{ .ClassName }}"
312321
target_dn: "{{ .TargetDn }}"
313-
{{- if .TargetDnOverwriteDocs}}
322+
{{- if .TargetDnOverwriteDocs}}
314323
target_dn_overwrite_docs: "{{ .TargetDnOverwriteDocs }}"
315-
{{- end}}
324+
{{- end}}
316325
relation_resource_name: "{{ .RelationResourceName }}"
317326
static: {{ .Static }}
318-
{{- if not .Static}}
327+
{{- if not .Static}}
319328
target_dn_ref: "{{ .TargetDnRef }}"
320329
parent_dependency: "{{ .ParentDependency}}"
321330
parent_dependency_dn_ref: "{{.ParentDependencyDnRef}}"
322331
target_resource_name: "{{ .TargetResourceName }}"
323332
parent_dn_key: "{{ .ParentDnKey }}"
324333
properties:
325-
{{- range $key, $value := .Properties}}
334+
{{- range $key, $value := .Properties}}
326335
{{ $key }}: "{{ $value }}"
327-
{{- end }}
328336
{{- end }}
337+
{{- end }}
329338
{{- end }}
330-
{{- end}}
339+
{{- end}}
331340

332341
test_type: {{ .TestType }}
333342
{{- end }}

0 commit comments

Comments
 (0)