@@ -507,15 +507,16 @@ func TestFnContainerGenerator(t *testing.T) {
507
507
skipIfNoDocker (t )
508
508
th := kusttest_test .MakeHarness (t )
509
509
o := th .MakeOptionsPluginsEnabled ()
510
- fSys := filesys .MakeFsOnDisk ()
511
- b := MakeKustomizer (& o )
512
510
tmpDir , err := filesys .NewTmpConfirmedDir ()
513
511
assert .NoError (t , err )
514
- assert .NoError (t , fSys .WriteFile (filepath .Join (tmpDir .String (), "kustomization.yaml" ), []byte (`
512
+ th .WriteK (tmpDir .String (), `
513
+ resources:
514
+ - deployment.yaml
515
515
generators:
516
516
- project-service-set.yaml
517
- ` )))
518
- assert .NoError (t , fSys .WriteFile (filepath .Join (tmpDir .String (), "project-service-set.yaml" ), []byte (`
517
+ ` )
518
+ // Create generator config
519
+ th .WriteF (filepath .Join (tmpDir .String (), "project-service-set.yaml" ), `
519
520
apiVersion: blueprints.cloud.google.com/v1alpha1
520
521
kind: ProjectServiceSet
521
522
metadata:
@@ -528,12 +529,23 @@ spec:
528
529
services:
529
530
- compute.googleapis.com
530
531
projectID: foo
531
- ` )))
532
- m , err := b .Run (fSys , tmpDir .String ())
533
- assert .NoError (t , err )
532
+ ` )
533
+ // Create another resource just to make sure everything is added
534
+ th .WriteF (filepath .Join (tmpDir .String (), "deployment.yaml" ), `
535
+ apiVersion: apps/v1
536
+ kind: Deployment
537
+ metadata:
538
+ name: foo
539
+ ` )
540
+ m := th .Run (tmpDir .String (), o )
534
541
actual , err := m .AsYaml ()
535
542
assert .NoError (t , err )
536
- assert .Equal (t , `apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1
543
+ assert .Equal (t , `apiVersion: apps/v1
544
+ kind: Deployment
545
+ metadata:
546
+ name: foo
547
+ ---
548
+ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1
537
549
kind: Service
538
550
metadata:
539
551
annotations:
0 commit comments