fix: trim space and remove redundant variables (#491)

# Pull Request

## Issue

Issue #, if available:

## Description

Description of changes:

## License

By submitting this pull request, I confirm that my contribution is made
under the terms of the projects associated license.

Author: jaredfholgate

src/ALZ/Private/Deploy-Accelerator-Helpers/New-Bootstrap.ps1

@@ -93,14 +93,21 @@ function New-Bootstrap {
         $starterFoldersToRetain = @()
 
         if ($hasStarter) {
-            if ($inputConfig.starter_module_name.Value -eq "") {
+            if (!$inputConfig.starter_module_name.Value) {
                 Write-InformationColored "No starter module has been specified. Please supply the starter module you wish to deploy..." -ForegroundColor Red -InformationAction Continue
                 throw "No starter module has been specified. Please supply the starter module you wish to deploy..."
             }
 
-            $chosenStarterConfig = $starterConfig.starter_modules.Value.$($inputConfig.starter_module_name.Value)
+            $starter_module_name = $inputConfig.starter_module_name.Value.Trim()
 
-            Write-Verbose "Selected Starter: $($inputConfig.starter_module_name.Value))"
+            $chosenStarterConfig = $starterConfig.starter_modules.Value.$($starter_module_name)
+
+            if($null -eq $chosenStarterConfig ) {
+                Write-InformationColored "The starter module name '$($starter_module_name)' does not exist in the starter configuration. Please check your input and try again." -ForegroundColor Red -InformationAction Continue
+                throw "The starter module name '$($starter_module_name)' does not exist in the starter configuration. Please check your input and try again."
+            }
+
+            Write-Verbose "Selected Starter: $starter_module_name"
             $starterModulePath = (Resolve-Path (Join-Path -Path $starterPath -ChildPath $chosenStarterConfig.location)).Path
             $starterRootModuleFolderPath = $starterModulePath
             Write-Verbose "Starter Module Path: $starterModulePath"

src/ALZ/Public/Deploy-Accelerator.ps1

@@ -20,29 +20,6 @@ function Deploy-Accelerator {
         [Alias("inputConfigFilePath")]
         [string[]] $inputConfigFilePaths = @(),
 
-        [Parameter(
-            Mandatory = $false,
-            HelpMessage = "[REQUIRED] The infrastructure as code type to target. Supported options are 'bicep', 'bicep-classic', 'terraform' or 'local'. Environment variable: ALZ_iac_type. Config file input: iac_type.")]
-        [Alias("i")]
-        [Alias("iac")]
-        [string] $iac_type = "",
-
-        [Parameter(
-            Mandatory = $false,
-            HelpMessage = "[REQUIRED] The bootstrap module to deploy. Environment variable: ALZ_bootstrap_module_name. Config file input: bootstrap_module_name."
-        )]
-        [Alias("b")]
-        [Alias("bootstrap")]
-        [string] $bootstrap_module_name = "",
-
-        [Parameter(
-            Mandatory = $false,
-            HelpMessage = "[REQUIRED] The starter module to deploy. Environment variable: ALZ_starter_module_name. Config file input: starter_module_name."
-        )]
-        [Alias("s")]
-        [Alias("starter")]
-        [string] $starter_module_name = "",
-
         [Parameter(
             Mandatory = $false,
             HelpMessage = "[OPTIONAL] The additional files or folders to be copied directly to the starter module root folder. Environment variable: ALZ_starter_additional_files. Config file input: starter_additional_files."
@@ -254,12 +231,12 @@ function Deploy-Accelerator {
         $inputConfig = Convert-ParametersToInputConfig -inputConfig $inputConfig -parameters $parametersWithValues
 
         # Throw if IAC type is not specified
-        if ($inputConfig.iac_type.Value -eq "") {
+        if (!$inputConfig.iac_type.Value) {
             Write-InformationColored "No Infrastructure as Code type has been specified. Please supply the IAC type you wish to deploy..." -ForegroundColor Red -InformationAction Continue
-            throw"No Infrastructure as Code type has been specified. Please supply the IAC type you wish to deploy..."
+            throw "No Infrastructure as Code type has been specified. Please supply the IAC type you wish to deploy..."
         }
 
-        if ($inputConfig.iac_type.Value -like "bicep*") {
+        if ($inputConfig.iac_type.Value.ToString() -like "bicep*") {
             Write-InformationColored "Although you have selected Bicep, the Accelerator leverages the Terraform tool to bootstrap your Version Control System and Azure. This will not impact your choice of Bicep post this initial bootstrap. Please refer to our documentation for further details..." -ForegroundColor Yellow -InformationAction Continue
         }
 
@@ -301,14 +278,16 @@ function Deploy-Accelerator {
         $zonesSupport = $null
 
         # Request the bootstrap type if not already specified
-        if($inputConfig.bootstrap_module_name.Value -eq "") {
+        if(!$inputConfig.bootstrap_module_name.Value) {
             Write-InformationColored "No bootstrap module has been specified. Please supply the bootstrap module you wish to deploy..." -ForegroundColor Red -InformationAction Continue
             throw "No bootstrap module has been specified. Please supply the bootstrap module you wish to deploy..."
         }
 
+        $bootstrap_module_name = $inputConfig.bootstrap_module_name.Value.Trim()
+
         $bootstrapAndStarterConfig = Get-BootstrapAndStarterConfig `
             -iac $inputConfig.iac_type.Value `
-            -bootstrap $inputConfig.bootstrap_module_name.Value `
+            -bootstrap $bootstrap_module_name `
             -bootstrapPath $bootstrapPath `
             -bootstrapConfigPath $inputConfig.bootstrap_config_path.Value `
             -toolsPath $toolsPath

src/Tests/Unit/Public/Deploy-Accelerator.Tests.ps1

@@ -45,7 +45,19 @@ InModuleScope 'ALZ' {
                 Mock -CommandName Copy-Item -MockWith { }
 
                 Mock -CommandName Get-ALZConfig -MockWith {
-                    @{
+                    [PSCustomObject]@{
+                        "iac_type" = @{
+                            Value = "bicep"
+                            Source = "yaml"
+                        }
+                        "bootstrap_module_name" = @{
+                            Value = "platform_landing_zone"
+                            Source = "yaml"
+                        }
+                        "starter_module_name" = @{
+                            Value = "alz_github"
+                            Source = "yaml"
+                        }
                         "module_url"   = "test"
                         "version"      = "v1.0.0"
                         "deployment_files" = @(
@@ -146,13 +158,13 @@ InModuleScope 'ALZ' {
             }
 
             It 'should call the correct functions for bicep module configuration' {
-                Deploy-Accelerator -i "bicep" -b "github" -inputs "example.yml"
+                Deploy-Accelerator -inputs "example.yml"
                 Assert-MockCalled -CommandName Get-BootstrapAndStarterConfig -Exactly 1
                 Assert-MockCalled -CommandName New-ModuleSetup -Exactly 2
             }
 
             It 'should call the correct functions for terraform module configuration' {
-                Deploy-Accelerator -i "terraform" -b "github" -inputs "example.yml"
+                Deploy-Accelerator -inputs "example.yml"
                 Assert-MockCalled -CommandName Get-BootstrapAndStarterConfig -Exactly 1
                 Assert-MockCalled -CommandName New-Bootstrap -Exactly 1
                 Assert-MockCalled -CommandName New-ModuleSetup -Exactly 2