[Utilities] Updated ReadMe Utility to handle bicep test files when ge…

…nerating deployment examples (#1628) * Update to latest * Fixed incorrect param file ref (#1626) * Further updates * Further updates * Updated tool * Upper case title update
Azure · Jun 30, 2022 · 0dca935 · 0dca935
1 parent dd75daf
commit 0dca935
Show file tree

Hide file tree

Showing 4 changed files with 231 additions and 74 deletions.
diff --git a/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml b/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml
@@ -253,7 +253,7 @@ jobs:
 
                 if ($testTemplatePossibleParameters -contains 'namePrefix') {
                     $functionInput['additionalParameters'] += @{
-                        namePrefix = $projectSettings.parameterFileTokens.localTokens[0].value
+                        namePrefix = ($projectSettings.parameterFileTokens.localTokens | Where-Object { $_.name -eq 'namePrefix' }).value
                     }
                 }
             }
@@ -344,7 +344,7 @@ jobs:
 
                 if ($testTemplatePossibleParameters -contains 'namePrefix') {
                     $functionInput['additionalParameters'] += @{
-                        namePrefix = $projectSettings.parameterFileTokens.localTokens[0].value
+                        namePrefix = ($projectSettings.parameterFileTokens.localTokens  | Where-Object { $_.name -eq 'namePrefix' }).value
                     }
                 }
             }

diff --git a/.github/actions/templates/validateModuleDeployment/action.yml b/.github/actions/templates/validateModuleDeployment/action.yml
@@ -247,7 +247,7 @@ runs:
 
             if ($testTemplatePossibleParameters -contains 'namePrefix') {
               $functionInput['additionalParameters'] += @{
-                namePrefix = $projectSettings.parameterFileTokens.localTokens[0].value
+                namePrefix = ($projectSettings.parameterFileTokens.localTokens  | Where-Object { $_.name -eq 'namePrefix' }).value
               }
             }
           }
@@ -343,7 +343,7 @@ runs:
 
             if ($testTemplatePossibleParameters -contains 'namePrefix') {
               $functionInput['additionalParameters'] += @{
-                namePrefix = $projectSettings.parameterFileTokens.localTokens[0].value
+                namePrefix = ($projectSettings.parameterFileTokens.localTokens | Where-Object { $_.name -eq 'namePrefix' }).value
               }
             }
           }

diff --git a/modules/.global/global.module.tests.ps1 b/modules/.global/global.module.tests.ps1
@@ -931,7 +931,7 @@ Describe 'Deployment template tests' -Tag Template {
 
         foreach ($moduleFolderPath in $moduleFolderPaths) {
             if (Test-Path (Join-Path $moduleFolderPath '.test')) {
-                $testFilePaths = (Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.testeters.json') -Recurse -Force).FullName
+                $testFilePaths = (Get-ChildItem (Join-Path -Path $moduleFolderPath -ChildPath '.parameters.json') -Recurse -Force).FullName
                 foreach ($testFilePath in $testFilePaths) {
                     foreach ($token in $enforcedTokenList.Keys) {
                         $parameterFileTokenTestCases += @{