Skip to content

Commit 2d056ee

Browse files
yhakbaryhakbar
committed
fix: Fixing tests
1 parent 9bda0b8 commit 2d056ee

3 files changed

Lines changed: 28 additions & 25 deletions

File tree

‎test/integration_catalog_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ func TestCatalogWithLocalDefaultTemplate(t *testing.T) {
159159
)
160160

161161
require.NoError(t, err)
162-
assert.Contains(t, stderr, "Scaffolding completed")
162+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
163163
assert.FileExists(t, filepath.Join(targetPath, "terragrunt.hcl"))
164164
assert.FileExists(t, filepath.Join(targetPath, "custom-template.txt"))
165165

‎test/integration_scaffold_ssh_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestSSHScaffoldWithCustomDefaultTemplate(t *testing.T) {
4343
))
4444

4545
require.NoError(t, err)
46-
assert.Contains(t, stderr, "Scaffolding completed")
46+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
4747

4848
assert.FileExists(t, filepath.Join(testPath, "unit", "terragrunt.hcl"))
4949
assert.FileExists(t, filepath.Join(testPath, "unit", "external-template.txt"))
@@ -56,7 +56,7 @@ func TestSSHScaffoldModuleExternalTemplate(t *testing.T) {
5656

5757
_, stderr, err := helpers.RunTerragruntCommandWithOutput(t, fmt.Sprintf("terragrunt scaffold --non-interactive --working-dir %s %s %s", tmpEnvPath, testScaffoldModuleGit, testScaffoldExternalTemplateModule))
5858
require.NoError(t, err)
59-
assert.Contains(t, stderr, "Scaffolding completed")
59+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
6060
// check that exists file from external template
6161
assert.FileExists(t, tmpEnvPath+"/external-template.txt")
6262
assert.FileExists(t, tmpEnvPath+"/dependency/dependency.txt")
@@ -70,7 +70,7 @@ func TestSSHScaffoldModuleDifferentRevisionAndSSH(t *testing.T) {
7070
_, stderr, err := helpers.RunTerragruntCommandWithOutput(t, fmt.Sprintf("terragrunt scaffold --non-interactive --working-dir %s %s --var=Ref=v0.67.4 --var=SourceUrlType=git-ssh", tmpEnvPath, testScaffoldModuleShort))
7171
require.NoError(t, err)
7272
assert.Contains(t, stderr, "git::ssh://git@github.com/gruntwork-io/terragrunt.git//test/fixtures/inputs?ref=v0.67.4")
73-
assert.Contains(t, stderr, "Scaffolding completed")
73+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
7474
}
7575

7676
func TestSSHScaffoldModuleSSH(t *testing.T) {
@@ -79,7 +79,7 @@ func TestSSHScaffoldModuleSSH(t *testing.T) {
7979
tmpEnvPath := helpers.TmpDirWOSymlinks(t)
8080
_, stderr, err := helpers.RunTerragruntCommandWithOutput(t, fmt.Sprintf("terragrunt scaffold --non-interactive --working-dir %s %s", tmpEnvPath, testScaffoldModuleGit))
8181
require.NoError(t, err)
82-
assert.Contains(t, stderr, "Scaffolding completed")
82+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
8383
}
8484

8585
func TestSSHScaffoldModuleTemplate(t *testing.T) {
@@ -89,7 +89,7 @@ func TestSSHScaffoldModuleTemplate(t *testing.T) {
8989

9090
_, stderr, err := helpers.RunTerragruntCommandWithOutput(t, fmt.Sprintf("terragrunt scaffold --non-interactive --working-dir %s %s", tmpEnvPath, testScaffoldTemplateModule))
9191
require.NoError(t, err)
92-
assert.Contains(t, stderr, "Scaffolding completed")
92+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
9393
// check that exists file from .boilerplate dir
9494
assert.FileExists(t, tmpEnvPath+"/template-file.txt")
9595
}
@@ -111,7 +111,7 @@ SourceUrlType: "git-ssh"
111111
_, stderr, err := helpers.RunTerragruntCommandWithOutput(t, fmt.Sprintf("terragrunt scaffold --non-interactive --working-dir %s %s --var-file=%s", tmpEnvPath, testScaffoldModuleShort, varFile))
112112
require.NoError(t, err)
113113
assert.Contains(t, stderr, "git::ssh://git@github.com/gruntwork-io/terragrunt.git//test/fixtures/inputs?ref=v0.67.4")
114-
assert.Contains(t, stderr, "Scaffolding completed")
114+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
115115

116116
content, err := util.ReadFileAsString(tmpEnvPath + "/terragrunt.hcl")
117117
require.NoError(t, err)

‎test/integration_scaffold_test.go‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestScaffoldModule(t *testing.T) {
3030

3131
_, stderr, err := helpers.RunTerragruntCommandWithOutput(t, fmt.Sprintf("terragrunt scaffold --non-interactive --working-dir %s %s", tmpEnvPath, testScaffoldModuleURL))
3232
require.NoError(t, err)
33-
assert.Contains(t, stderr, "Scaffolding completed")
33+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
3434
assert.FileExists(t, tmpEnvPath+"/terragrunt.hcl")
3535
}
3636

@@ -42,7 +42,7 @@ func TestScaffoldModuleShortUrl(t *testing.T) {
4242
_, stderr, err := helpers.RunTerragruntCommandWithOutput(t, fmt.Sprintf("terragrunt scaffold --non-interactive --working-dir %s %s", tmpEnvPath, testScaffoldModuleShort))
4343

4444
require.NoError(t, err)
45-
assert.Contains(t, stderr, "Scaffolding completed")
45+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
4646
// check that find_in_parent_folders is generated in terragrunt.hcl
4747
content, err := util.ReadFileAsString(tmpEnvPath + "/terragrunt.hcl")
4848
require.NoError(t, err)
@@ -56,7 +56,7 @@ func TestScaffoldModuleShortUrlNoRootInclude(t *testing.T) {
5656

5757
_, stderr, err := helpers.RunTerragruntCommandWithOutput(t, fmt.Sprintf("terragrunt scaffold --non-interactive --working-dir %s %s --var=EnableRootInclude=false", tmpEnvPath, testScaffoldModuleShort))
5858
require.NoError(t, err)
59-
assert.Contains(t, stderr, "Scaffolding completed")
59+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
6060
// check that find_in_parent_folders is NOT generated in terragrunt.hcl
6161
content, err := util.ReadFileAsString(tmpEnvPath + "/terragrunt.hcl")
6262
require.NoError(t, err)
@@ -71,8 +71,11 @@ func TestScaffoldModuleDifferentRevision(t *testing.T) {
7171
_, stderr, err := helpers.RunTerragruntCommandWithOutput(t, fmt.Sprintf("terragrunt scaffold --non-interactive --working-dir %s %s --var=Ref=v0.67.4", tmpEnvPath, testScaffoldModuleShort))
7272

7373
require.NoError(t, err)
74-
assert.Contains(t, stderr, "git::https://github.com/gruntwork-io/terragrunt.git//test/fixtures/inputs?ref=v0.67.4")
75-
assert.Contains(t, stderr, "Scaffolding completed")
74+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
75+
76+
content, err := util.ReadFileAsString(tmpEnvPath + "/terragrunt.hcl")
77+
require.NoError(t, err)
78+
assert.Contains(t, content, "git::https://github.com/gruntwork-io/terragrunt.git//test/fixtures/inputs?ref=v0.67.4")
7679
}
7780

7881
func TestScaffoldErrorNoModuleUrl(t *testing.T) {
@@ -95,7 +98,7 @@ func TestScaffoldLocalTofuModule(t *testing.T) {
9598

9699
_, stderr, err := helpers.RunTerragruntCommandWithOutput(t, fmt.Sprintf("terragrunt scaffold --non-interactive --working-dir %s %s", tmpEnvPath, fmt.Sprintf("%s//%s", workingDir, testScaffoldLocalTofuModulePath)))
97100
require.NoError(t, err)
98-
assert.Contains(t, stderr, "Scaffolding completed")
101+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
99102
assert.FileExists(t, tmpEnvPath+"/terragrunt.hcl")
100103

101104
// Verify variables from .tofu files were parsed and included in generated config
@@ -118,7 +121,7 @@ func TestScaffoldLocalModule(t *testing.T) {
118121

119122
_, stderr, err := helpers.RunTerragruntCommandWithOutput(t, fmt.Sprintf("terragrunt scaffold --non-interactive --working-dir %s %s", tmpEnvPath, fmt.Sprintf("%s//%s", workingDir, testScaffoldLocalModulePath)))
120123
require.NoError(t, err)
121-
assert.Contains(t, stderr, "Scaffolding completed")
124+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
122125
assert.FileExists(t, tmpEnvPath+"/terragrunt.hcl")
123126
}
124127

@@ -137,7 +140,7 @@ func TestScaffold3rdPartyModule(t *testing.T) {
137140

138141
_, stderr, err := helpers.RunTerragruntCommandWithOutput(t, fmt.Sprintf("terragrunt scaffold --non-interactive --working-dir %s %s", tmpEnvPath, testScaffold3rdPartyModulePath))
139142
require.NoError(t, err)
140-
assert.Contains(t, stderr, "Scaffolding completed")
143+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
141144
assert.FileExists(t, tmpEnvPath+"/terragrunt.hcl")
142145

143146
// validate the generated files
@@ -153,7 +156,7 @@ func TestScaffoldOutputFolderFlag(t *testing.T) {
153156
outputFolder := tmpEnvPath + "/foo/bar"
154157
_, stderr, err := helpers.RunTerragruntCommandWithOutput(t, fmt.Sprintf("terragrunt --non-interactive --working-dir %s scaffold %s --output-folder %s", tmpEnvPath, testScaffoldModuleURL, outputFolder))
155158
require.NoError(t, err)
156-
assert.Contains(t, stderr, "Scaffolding completed")
159+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
157160
assert.FileExists(t, outputFolder+"/terragrunt.hcl")
158161
}
159162

@@ -170,7 +173,7 @@ func TestScaffoldWithRootHCL(t *testing.T) {
170173
testScaffoldModuleURL,
171174
))
172175
require.NoError(t, err)
173-
assert.Contains(t, stderr, "Scaffolding completed")
176+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
174177

175178
assert.FileExists(t, filepath.Join(testPath, "unit", "terragrunt.hcl"))
176179

@@ -196,7 +199,7 @@ func TestScaffoldNoDependencyPrompt(t *testing.T) {
196199
assert.NotContains(t, stderr, "This boilerplate template has a dependency!")
197200
assert.FileExists(t, outputFolder+"/base/test.hcl")
198201
assert.FileExists(t, outputFolder+"/leaf/terragrunt.hcl")
199-
assert.Contains(t, stderr, "Scaffolding completed")
202+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
200203
}
201204

202205
func TestScaffoldWithShellCommandsEnabled(t *testing.T) {
@@ -218,7 +221,7 @@ func TestScaffoldWithShellCommandsEnabled(t *testing.T) {
218221
)
219222

220223
require.NoError(t, err)
221-
assert.Contains(t, stderr, "Scaffolding completed")
224+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
222225

223226
content, err := util.ReadFileAsString(filepath.Join(tmpEnvPath, "terragrunt.hcl"))
224227
require.NoError(t, err)
@@ -247,7 +250,7 @@ func TestScaffoldWithShellCommandsDisabled(t *testing.T) {
247250
)
248251

249252
require.NoError(t, err)
250-
assert.Contains(t, stderr, "Scaffolding completed")
253+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
251254

252255
content, err := util.ReadFileAsString(filepath.Join(tmpEnvPath, "terragrunt.hcl"))
253256
require.NoError(t, err)
@@ -275,7 +278,7 @@ func TestScaffoldWithHooksEnabled(t *testing.T) {
275278
)
276279

277280
require.NoError(t, err)
278-
assert.Contains(t, stderr, "Scaffolding completed")
281+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
279282

280283
content, err := util.ReadFileAsString(filepath.Join(tmpEnvPath, "terragrunt.hcl"))
281284
require.NoError(t, err)
@@ -301,7 +304,7 @@ func TestScaffoldWithHooksDisabled(t *testing.T) {
301304
)
302305

303306
require.NoError(t, err)
304-
assert.Contains(t, stderr, "Scaffolding completed")
307+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
305308

306309
content, err := util.ReadFileAsString(filepath.Join(tmpEnvPath, "terragrunt.hcl"))
307310
require.NoError(t, err)
@@ -327,7 +330,7 @@ func TestScaffoldWithBothFlagsDisabled(t *testing.T) {
327330
)
328331

329332
require.NoError(t, err)
330-
assert.Contains(t, stderr, "Scaffolding completed")
333+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
331334

332335
content, err := util.ReadFileAsString(filepath.Join(tmpEnvPath, "terragrunt.hcl"))
333336
require.NoError(t, err)
@@ -363,7 +366,7 @@ baz="qux"
363366
),
364367
)
365368
require.NoError(t, err)
366-
assert.Contains(t, stderr, "Scaffolding completed")
369+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
367370
assert.FileExists(t, filepath.Join(tmpEnvPath, "terragrunt.hcl"))
368371

369372
// Verify the pre-existing file was not modified by scaffold's formatting step.
@@ -403,7 +406,7 @@ func TestScaffoldCatalogConfigIntegration(t *testing.T) {
403406
)
404407

405408
require.NoError(t, err)
406-
assert.Contains(t, stderr, "Scaffolding completed")
409+
assert.Contains(t, stderr, "terragrunt.hcl was updated")
407410

408411
content, err := util.ReadFileAsString(filepath.Join(outputDir, "terragrunt.hcl"))
409412
require.NoError(t, err)

0 commit comments

Comments
 (0)