@@ -90,27 +90,8 @@ func TestNoDiggerYaml(t *testing.T) {
90
90
defer deleteFile ()
91
91
92
92
os .Chdir (tempDir )
93
- dg , _ , _ , err := LoadDiggerConfig ("./" , true , nil )
94
-
95
- assert .NoError (t , err , "expected error to be nil" )
96
- assert .NotNil (t , dg , "expected digger digger_config to be not nil" )
97
- assert .Equal (t , 1 , len (dg .Projects ))
98
- assert .Equal (t , false , dg .AutoMerge )
99
- assert .Equal (t , true , dg .Telemetry )
100
- assert .Equal (t , false , dg .TraverseToNestedProjects )
101
- assert .Equal (t , 1 , len (dg .Workflows ))
102
- assert .Equal (t , "default" , dg .Projects [0 ].Name )
103
- assert .Equal (t , "./" , dg .Projects [0 ].Dir )
104
-
105
- workflow := dg .Workflows ["default" ]
106
- assert .NotNil (t , workflow , "expected workflow to be not nil" )
107
- assert .NotNil (t , workflow .Plan )
108
- assert .NotNil (t , workflow .Plan .Steps )
109
-
110
- assert .NotNil (t , workflow .Apply )
111
- assert .NotNil (t , workflow .Apply .Steps )
112
- assert .NotNil (t , workflow .EnvVars )
113
- assert .NotNil (t , workflow .Configuration )
93
+ _ , _ , _ , err := LoadDiggerConfig ("./" , true , nil )
94
+ assert .Error (t , err , "expected error since digger.yml and digger.yaml is missing" )
114
95
}
115
96
116
97
func TestDefaultDiggerConfig (t * testing.T ) {
@@ -367,37 +348,6 @@ generate_projects:
367
348
assert .Equal (t , 2 , len (dg .Projects ))
368
349
}
369
350
370
- func TestGenerateProjectsWithoutDiggerConfig (t * testing.T ) {
371
- tempDir , teardown := setUp ()
372
- defer teardown ()
373
-
374
- dirsWithTfToCreate := []string {"dev/test1" , "dev/test1/db" , "dev/test1/vpc" , "dev/test2" , "dev/test2/db" , "dev/test2/vpc" , "dev/project" , "prod/test1" , "prod/test2" , "prod/project" , "test" , "modules/test1" , "modules/test2" }
375
-
376
- for _ , dir := range dirsWithTfToCreate {
377
- err := os .MkdirAll (path .Join (tempDir , dir ), os .ModePerm )
378
- defer createFile (path .Join (tempDir , dir , "main.tf" ), "" )()
379
- assert .NoError (t , err , "expected error to be nil" )
380
- }
381
-
382
- dirtsWithoutTfToCreate := []string {"docs" , "random" , "docs/random" }
383
- for _ , dir := range dirtsWithoutTfToCreate {
384
- err := os .MkdirAll (path .Join (tempDir , dir ), os .ModePerm )
385
- assert .NoError (t , err , "expected error to be nil" )
386
- }
387
-
388
- dg , _ , _ , err := LoadDiggerConfig (tempDir , true , nil )
389
- assert .NoError (t , err , "expected error to be nil" )
390
- assert .NotNil (t , dg , "expected digger digger_config to be not nil" )
391
- assert .Equal (t , "dev_project" , dg .Projects [0 ].Name )
392
- assert .Equal (t , "dev_test1" , dg .Projects [1 ].Name )
393
- assert .Equal (t , "dev_test2" , dg .Projects [2 ].Name )
394
- assert .Equal (t , "prod_project" , dg .Projects [3 ].Name )
395
- assert .Equal (t , "prod_test1" , dg .Projects [4 ].Name )
396
- assert .Equal (t , "prod_test2" , dg .Projects [5 ].Name )
397
- assert .Equal (t , "test" , dg .Projects [6 ].Name )
398
- assert .Equal (t , 7 , len (dg .Projects ))
399
- }
400
-
401
351
func TestDiggerGenerateProjectsWithSubDirs (t * testing.T ) {
402
352
tempDir , teardown := setUp ()
403
353
defer teardown ()
@@ -431,28 +381,6 @@ generate_projects:
431
381
assert .Equal (t , 2 , len (dg .Projects ))
432
382
}
433
383
434
- // A .tfvars file should not be recognised as .tf and break parsing for projects nested deeper
435
- // Issue: https://github.com/diggerhq/digger/issues/887
436
- func TestDiggerGenerateProjectsWithTfvars (t * testing.T ) {
437
- tempDir , teardown := setUp ()
438
- defer teardown ()
439
-
440
- dirsWithTfToCreate := []string {"dev/us-east-1" }
441
-
442
- for _ , dir := range dirsWithTfToCreate {
443
- err := os .MkdirAll (path .Join (tempDir , dir ), os .ModePerm )
444
- defer createFile (path .Join (tempDir , dir , "main.tf" ), "" )()
445
- assert .NoError (t , err , "expected error to be nil" )
446
- }
447
-
448
- defer createFile (path .Join (tempDir , "dev" , "blank.tfvars" ), "" )()
449
-
450
- dg , _ , _ , err := LoadDiggerConfig (tempDir , true , nil )
451
- assert .NoError (t , err , "expected error to be nil" )
452
- assert .NotNil (t , dg , "expected digger digger_config to be not nil" )
453
- assert .Equal (t , 1 , len (dg .Projects ))
454
- }
455
-
456
384
func TestDiggerGenerateProjectsIgnoreSubdirs (t * testing.T ) {
457
385
tempDir , teardown := setUp ()
458
386
defer teardown ()
0 commit comments