From f7d6bd709177941989ccab4d6e7c5411a7f074ce Mon Sep 17 00:00:00 2001 From: MrMCake Date: Wed, 2 Feb 2022 12:27:51 +0100 Subject: [PATCH 1/5] Added token replacement to removal --- .../helper/Get-DependencyResourceNameList.ps1 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 index c3748e2dad..1afe0f6e1d 100644 --- a/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 +++ b/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 @@ -19,15 +19,30 @@ function Get-DependencyResourceNameList { [CmdletBinding()] param ( [Parameter(Mandatory = $false)] - [string] $DependencyParameterPath = (Join-Path (Split-Path (Split-Path $PSScriptRoot -Parent) -Parent) 'dependencies') + [string] $DependencyParameterPath = (Join-Path (Get-Item $PSScriptRoot).Parent.Parent.FullName 'dependencies') ) + # Load used function + $repoRootPath = (Get-Item $PSScriptRoot).Parent.Parent.Parent.Parent.FullName + . (Join-Path $repoRootPath 'utilities' 'pipelines' 'tokensReplacement' 'Convert-TokensInParameterFile.ps1') + $parameterFolders = Get-ChildItem -Path $dependencyParameterPath -Recurse -Filter 'parameters' -Directory $parameterFilePaths = [System.Collections.ArrayList]@() foreach ($parameterFolderPath in $parameterFolders.FullName) { $parameterFilePaths += Get-ChildItem -Path $parameterFolderPath -Recurse -Filter '*.json' } + $Settings = Get-Content -Path (Join-Path $repoRootPath 'settings.json') | ConvertFrom-Json + foreach ($parameterFilePath in $parameterFilePaths) { + $ConvertTokensInputs = @{ + ParameterFilePath = $parameterFilePath + LocalCustomParameterFileTokens = $Settings.parameterFileTokens.localTokens.tokens + TokenPrefix = $Settings.parameterFileTokens.tokenPrefix + TokenSuffix = $Settings.parameterFileTokens.tokenSuffix + } + $null = Convert-TokensInParameterFile @ConvertTokensInputs -Verbose + } + $dependencyResourceNames = [System.Collections.ArrayList]@() foreach ($parameterFilePath in $parameterFilePaths) { $paramFileContent = ConvertFrom-Json (Get-Content -Path $parameterFilePath -Raw) From 57fd3978d4b493384f1d948fdae10c36608d70e9 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Wed, 2 Feb 2022 12:29:45 +0100 Subject: [PATCH 2/5] Update to latest --- .../resourceRemoval/helper/Get-DependencyResourceNameList.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 index 1afe0f6e1d..12867b054e 100644 --- a/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 +++ b/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 @@ -40,7 +40,7 @@ function Get-DependencyResourceNameList { TokenPrefix = $Settings.parameterFileTokens.tokenPrefix TokenSuffix = $Settings.parameterFileTokens.tokenSuffix } - $null = Convert-TokensInParameterFile @ConvertTokensInputs -Verbose + $null = Convert-TokensInParameterFile @ConvertTokensInputs } $dependencyResourceNames = [System.Collections.ArrayList]@() From bc563e44bae6cd84b48cc0defabbcc867dec5fae Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 2 Feb 2022 12:42:31 +0100 Subject: [PATCH 3/5] Update utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../resourceRemoval/helper/Get-DependencyResourceNameList.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 index 12867b054e..f49d15248e 100644 --- a/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 +++ b/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 @@ -32,6 +32,7 @@ function Get-DependencyResourceNameList { $parameterFilePaths += Get-ChildItem -Path $parameterFolderPath -Recurse -Filter '*.json' } + # Replace tokens in parameter file $Settings = Get-Content -Path (Join-Path $repoRootPath 'settings.json') | ConvertFrom-Json foreach ($parameterFilePath in $parameterFilePaths) { $ConvertTokensInputs = @{ From 1645d297e1c56a66ac2484d2c4e16235a4ebceb0 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Wed, 2 Feb 2022 12:42:57 +0100 Subject: [PATCH 4/5] Update to latest --- .../resourceRemoval/helper/Get-DependencyResourceNameList.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 index f49d15248e..3eacfe2dec 100644 --- a/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 +++ b/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 @@ -32,7 +32,7 @@ function Get-DependencyResourceNameList { $parameterFilePaths += Get-ChildItem -Path $parameterFolderPath -Recurse -Filter '*.json' } - # Replace tokens in parameter file + # Replace tokens in dependency parameter files $Settings = Get-Content -Path (Join-Path $repoRootPath 'settings.json') | ConvertFrom-Json foreach ($parameterFilePath in $parameterFilePaths) { $ConvertTokensInputs = @{ From 2e0bebc4150a6a1283dc1c098e6f60f0c173d022 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Wed, 2 Feb 2022 12:55:05 +0100 Subject: [PATCH 5/5] Update to latest --- .../resourceRemoval/helper/Get-DependencyResourceNameList.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 index 3eacfe2dec..9280ac244b 100644 --- a/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 +++ b/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 @@ -40,6 +40,7 @@ function Get-DependencyResourceNameList { LocalCustomParameterFileTokens = $Settings.parameterFileTokens.localTokens.tokens TokenPrefix = $Settings.parameterFileTokens.tokenPrefix TokenSuffix = $Settings.parameterFileTokens.tokenSuffix + Verbose = $false } $null = Convert-TokensInParameterFile @ConvertTokensInputs }