@@ -110,6 +110,15 @@ expression_policy = Marshal.load(Marshal.dump(policy))
110110identity = expression_policy[' spec' ][' podSelector' ].delete(' matchLabels' )
111111expression_policy[' spec' ][' podSelector' ][' matchExpressions' ] = identity.map { |k , v | {' key' => k, ' operator' => ' In' , ' values' => [v]} }
112112File .write(" #{ ARGV [0 ]} /expression-identity.yaml" , (resources + [expression_policy]).map(& :to_yaml ).join)
113+ %w[helm.sh/hook argocd.argoproj.io/hook] .each_with_index do |key , i |
114+ wrapped = Marshal .load (Marshal .dump(typed_list))
115+ wrapped[' metadata' ] = {' annotations' => {key => i == 0 ? ' pre-upgrade' : ' PreSync' }}
116+ File .write(" #{ ARGV [0 ]} /wrapped-hook-#{ i } .yaml" , (resources + [wrapped]).map(& :to_yaml ).join)
117+ end
118+ defaulted = Marshal .load (Marshal .dump(policy))
119+ defaulted[' spec' ].delete(' policyTypes' )
120+ defaulted[' spec' ][' egress' ] = [{' ports' => [{' protocol' => ' TCP' , ' port' => 443 }]}]
121+ File .write(" #{ ARGV [0 ]} /defaulted-types.yaml" , (resources + [defaulted]).map(& :to_yaml ).join)
113122variants = {
114123 ' invalid-key' => -> (p ) { p [' spec' ][' podSelector' ][' matchExpressions' ] = [{' key' => ' bad key' , ' operator' => ' DoesNotExist' }] },
115124 ' invalid-value' => -> (p ) { p [' spec' ][' podSelector' ][' matchExpressions' ] = [{' key' => ' absent' , ' operator' => ' NotIn' , ' values' => [' bad value' ]}] },
@@ -140,11 +149,11 @@ gate <"$out/combined.yaml" >"$out/gated.yaml"
140149cmp " $out /combined.yaml" " $out /gated.yaml"
141150gate < " $out /list.yaml" > " $out /gated.yaml"
142151cmp " $out /list.yaml" " $out /gated.yaml"
143- for valid in typed-list expression-identity; do
152+ for valid in defaulted-types typed-list expression-identity; do
144153 gate < " $out /$valid .yaml" > " $out /gated.yaml"
145154 cmp " $out /$valid .yaml" " $out /gated.yaml"
146155done
147- for mutation in duplicate-typed-list argo-skip argo-presync invalid-key invalid-value numeric-value unknown-operator empty-notin valued-exists duplicate-list external hook-policy misspelled wrong-selector empty-selector wrong-namespace ingress-only wrong-expression; do
156+ for mutation in wrapped-hook-0 wrapped-hook-1 duplicate-typed-list argo-skip argo-presync invalid-key invalid-value numeric-value unknown-operator empty-notin valued-exists duplicate-list external hook-policy misspelled wrong-selector empty-selector wrong-namespace ingress-only wrong-expression; do
148157 if gate < " $out /$mutation .yaml" > " $out /gated.yaml" 2> " $out /gate-error" ; then
149158 echo " expected combined-render gate to reject $mutation " >&2
150159 exit 1
0 commit comments