Update

Author: craigthackerx

.azuredevops/templates/steps/terraform-init-plan.yaml

@@ -47,7 +47,7 @@ parameters:
   - name: TerraformInitCreateBackendStateFileName
     type: string
     values: [ "true", "false" ]
-    default: "false"
+    default: "true"
     displayName: 'Whether the script should attempt to make a state file based on stack name'
 
   - name: TerraformInitExtraArgsJson

.azuredevops/workflows/steps/terraform-init-plan.yaml

@@ -72,12 +72,6 @@ parameters:
     default: "false"
     displayName: "Debug mode enabled"
 
-  - name: TerraformInitCreateBackendStateFileName
-    type: string
-    values: [ "true", "false" ]
-    default: "true"
-    displayName: 'Whether the script should attempt to make a state file based on stack name'
-
   - name: TerraformInitExtraArgsJson
     type: string
     default: >
@@ -99,8 +93,8 @@ resources:
     - repository: githubTemplates
       type: github
       name: libre-devops/terraform-azure-azdo-pipeline-templates
-      ref: main  # or a tag like refs/tags/v1.0.0
-      endpoint: libredevops  # Service connection to GitHub
+      ref: main
+      endpoint: libredevops
 
 pool: 'Default'
 
@@ -111,7 +105,6 @@ steps:
   - template: .azuredevops/templates/steps/terraform-init-plan.yaml@githubTemplates  # path in the external repo
     parameters:
       TerraformCodeLocation: ${{ parameters.TerraformCodeLocation }}
-      TerraformInitCreateBackendStateFileName: ${{ parameters.TerraformInitCreateBackendStateFileName }}
       TerraformInitExtraArgsJson: ${{ parameters.TerraformInitExtraArgsJson }}
       TerraformPlanExtraArgsJson: ${{ parameters.TerraformPlanExtraArgsJson }}
       TerraformStackToRunJson: ${{ parameters.TerraformStackToRunJson }}

PowerShellModules/Terraform.psm1

@@ -53,8 +53,9 @@ function Get-TerraformStackFolders
         throw "Code root not found: $CodeRoot"
     }
 
+    # Match folders like 0_rg or 0-rg
     $allDirs = Get-ChildItem -Path $CodeRoot -Directory |
-            Where-Object { $_.Name -match '^\d+_.+' }
+            Where-Object { $_.Name -match '^\d+[-_].+' }
 
     if (-not $allDirs)
     {
@@ -67,10 +68,10 @@ function Get-TerraformStackFolders
     $stackLookup = @{ }
     foreach ($dir in $allDirs)
     {
-        if ($dir.Name -match '^(?<order>\d+)_(?<name>.+)$')
+        if ($dir.Name -match '^(?<order>\d+)[-_](?<name>.+)$')
         {
             $stackLookup[$matches.name.ToLower()] = @{
-                Path = $dir.FullName
+                Path  = $dir.FullName
                 Order = [int]$matches.order
             }
         }
@@ -127,6 +128,7 @@ function Get-TerraformStackFolders
     return $result
 }
 
+
 ###############################################################################
 # Run `terraform init`
 ###############################################################################

Run-AzTerraform.ps1

@@ -5,7 +5,7 @@ param (
     [string]$RunTerraformApply = "false",
     [string]$RunTerraformDestroy = "false",
     [string]$TerraformInitExtraArgsJson = '[]',
-    [string]$TerraformInitCreateBackendStateFileName = "false",
+    [string]$TerraformInitCreateBackendStateFileName = "true",
     [string]$TerraformPlanExtraArgsJson = '[]',
     [string]$TerraformPlanDestroyExtraArgsJson = '[]',
     [string]$TerraformApplyExtraArgsJson = '[]',