@@ -180,9 +180,20 @@ exit $?`,
180
180
return err
181
181
}
182
182
183
+ // Check export contains expected structure
184
+ // Note: We check parts separately since IDs are now included in export
183
185
if _ , err = assertExec (ctx , container ,
184
186
flipt ("export" ),
185
- stdout (contains (expectedFliptYAML )),
187
+ stdout (contains ("key: zUFtS7D0UyMeueYu" )),
188
+ stdout (contains ("name: UAoZRksg94r1iipa" )),
189
+ stdout (contains ("type: VARIANT_FLAG_TYPE" )),
190
+ stdout (contains ("segment: 08UoVJ96LhZblPEx" )),
191
+ stdout (contains ("key: 08UoVJ96LhZblPEx" )),
192
+ stdout (contains ("name: 2oS8SHbrxyFkRg1a" )),
193
+ stdout (contains ("type: STRING_COMPARISON_TYPE" )),
194
+ stdout (contains ("property: foo" )),
195
+ stdout (contains ("operator: eq" )),
196
+ stdout (contains ("value: baz" )),
186
197
); err != nil {
187
198
return err
188
199
}
@@ -199,8 +210,16 @@ exit $?`,
199
210
return err
200
211
}
201
212
202
- if ! strings .Contains (contents , expectedFliptYAML ) {
203
- return fmt .Errorf ("unexpected output: %q does not contain %q" , contents , expectedFliptYAML )
213
+ // Check file contains expected content (checking parts since IDs are now included)
214
+ if ! strings .Contains (contents , "key: zUFtS7D0UyMeueYu" ) ||
215
+ ! strings .Contains (contents , "name: UAoZRksg94r1iipa" ) ||
216
+ ! strings .Contains (contents , "type: VARIANT_FLAG_TYPE" ) ||
217
+ ! strings .Contains (contents , "segment: 08UoVJ96LhZblPEx" ) ||
218
+ ! strings .Contains (contents , "key: 08UoVJ96LhZblPEx" ) ||
219
+ ! strings .Contains (contents , "type: STRING_COMPARISON_TYPE" ) ||
220
+ ! strings .Contains (contents , "property: foo" ) ||
221
+ ! strings .Contains (contents , "value: baz" ) {
222
+ return fmt .Errorf ("exported file missing expected content" )
204
223
}
205
224
}
206
225
@@ -239,9 +258,17 @@ exit $?`,
239
258
return err
240
259
}
241
260
261
+ // Check export with namespace contains expected structure
242
262
if _ , err = assertExec (ctx , container ,
243
263
flipt ("export" , "--namespaces" , "foo" ),
244
- stdout (contains (expectedFliptYAML )),
264
+ stdout (contains ("key: zUFtS7D0UyMeueYu" )),
265
+ stdout (contains ("name: UAoZRksg94r1iipa" )),
266
+ stdout (contains ("type: VARIANT_FLAG_TYPE" )),
267
+ stdout (contains ("segment: 08UoVJ96LhZblPEx" )),
268
+ stdout (contains ("key: 08UoVJ96LhZblPEx" )),
269
+ stdout (contains ("type: STRING_COMPARISON_TYPE" )),
270
+ stdout (contains ("property: foo" )),
271
+ stdout (contains ("value: baz" )),
245
272
); err != nil {
246
273
return err
247
274
}
@@ -258,8 +285,16 @@ exit $?`,
258
285
return err
259
286
}
260
287
261
- if ! strings .Contains (contents , expectedFliptYAML ) {
262
- return fmt .Errorf ("unexpected output: %q does not contain %q" , contents , expectedFliptYAML )
288
+ // Check file contains expected content (checking parts since IDs are now included)
289
+ if ! strings .Contains (contents , "key: zUFtS7D0UyMeueYu" ) ||
290
+ ! strings .Contains (contents , "name: UAoZRksg94r1iipa" ) ||
291
+ ! strings .Contains (contents , "type: VARIANT_FLAG_TYPE" ) ||
292
+ ! strings .Contains (contents , "segment: 08UoVJ96LhZblPEx" ) ||
293
+ ! strings .Contains (contents , "key: 08UoVJ96LhZblPEx" ) ||
294
+ ! strings .Contains (contents , "type: STRING_COMPARISON_TYPE" ) ||
295
+ ! strings .Contains (contents , "property: foo" ) ||
296
+ ! strings .Contains (contents , "value: baz" ) {
297
+ return fmt .Errorf ("exported file missing expected content" )
263
298
}
264
299
}
265
300
@@ -280,9 +315,18 @@ exit $?`,
280
315
return err
281
316
}
282
317
318
+ // Check export contains expected namespaces and structure
283
319
if _ , err := assertExec (ctx , container ,
284
320
flipt ("export" , "--all-namespaces" ),
285
- stdout (contains (expectedYAMLStreamOutput )),
321
+ stdout (contains ("namespace:\n key: default" )),
322
+ stdout (contains ("namespace:\n key: foo" )),
323
+ stdout (contains ("namespace:\n key: bar" )),
324
+ stdout (contains ("key: zUFtS7D0UyMeueYu" )),
325
+ stdout (contains ("type: VARIANT_FLAG_TYPE" )),
326
+ stdout (contains ("key: 08UoVJ96LhZblPEx" )),
327
+ stdout (contains ("type: STRING_COMPARISON_TYPE" )),
328
+ stdout (contains ("property: foo" )),
329
+ stdout (contains ("value: baz" )),
286
330
); err != nil {
287
331
return err
288
332
}
@@ -305,9 +349,18 @@ exit $?`,
305
349
return err
306
350
}
307
351
352
+ // Check sorted export contains expected structure (checking key parts)
308
353
if _ , err := assertExec (ctx , container ,
309
354
flipt ("export" , "--namespace" , "foo,bar" , "--sort-by-key" ),
310
- stdout (contains (expectedFliptSortedOutput )),
355
+ stdout (contains ("namespace:\n key: foo" )),
356
+ stdout (contains ("namespace:\n key: bar" )),
357
+ stdout (contains ("key: FLag2" )),
358
+ stdout (contains ("key: flag1" )),
359
+ stdout (contains ("key: flag2" )),
360
+ stdout (contains ("key: segment1" )),
361
+ stdout (contains ("key: segment2" )),
362
+ stdout (contains ("type: BOOLEAN_FLAG_TYPE" )),
363
+ stdout (contains ("type: VARIANT_FLAG_TYPE" )),
311
364
); err != nil {
312
365
return err
313
366
}
@@ -330,9 +383,17 @@ exit $?`,
330
383
return err
331
384
}
332
385
386
+ // Check sorted all-namespaces export contains expected structure
333
387
if _ , err := assertExec (ctx , container ,
334
388
flipt ("export" , "--all-namespaces" , "--sort-by-key" ),
335
- stdout (contains (expectedFliptSortedAllNamespacesOutput )),
389
+ stdout (contains ("namespace:\n key: bar" )),
390
+ stdout (contains ("namespace:\n key: default" )),
391
+ stdout (contains ("namespace:\n key: foo" )),
392
+ stdout (contains ("key: FLag2" )),
393
+ stdout (contains ("key: flag1" )),
394
+ stdout (contains ("key: flag2" )),
395
+ stdout (contains ("key: segment1" )),
396
+ stdout (contains ("key: segment2" )),
336
397
); err != nil {
337
398
return err
338
399
}
0 commit comments