From b1a3c37984d814d4a1ecb39b5cf4932c773727dc Mon Sep 17 00:00:00 2001
From: MaksimZhukov <maksim.zhukov@akvelon.com>
Date: Tue, 18 Feb 2020 16:50:11 +0300
Subject: [PATCH 1/3] Add logs filter

---
 images.CI/build-image.ps1 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/images.CI/build-image.ps1 b/images.CI/build-image.ps1
index 6b75ec28..dabbb069 100644
--- a/images.CI/build-image.ps1
+++ b/images.CI/build-image.ps1
@@ -26,6 +26,8 @@ $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper()
 
 packer validate -syntax-only $TemplatePath
 
+$SensitiveData = @('OSType', 'StorageAccountLocation', 'OSDiskUri', 'OSDiskUriReadOnlySas', 'TemplateUri', 'TemplateUriReadOnlySas', ':  ->')
+
 Write-Host "Build $Image VM"
 packer build    -var "capture_name_prefix=$ResourcesNamePrefix" `
                 -var "client_id=$ClientId" `
@@ -41,4 +43,10 @@ packer build    -var "capture_name_prefix=$ResourcesNamePrefix" `
                 -var "virtual_network_name=$VirtualNetworkName" `
                 -var "virtual_network_resource_group_name=$VirtualNetworkRG" `
                 -var "virtual_network_subnet_name=$VirtualNetworkSubnet" `
-                $TemplatePath
\ No newline at end of file
+                $TemplatePath `
+        | Where-Object {
+            #Filter sensitive data from Packer logs
+            $currentString = $_
+            $matchedString = $SensitiveData | Where-Object { $currentString -match $_ }
+            return $matchedString -eq $null
+        }
\ No newline at end of file

From 9c41221b9ba903c48bb94173e0a9022d5d865b54 Mon Sep 17 00:00:00 2001
From: MaksimZhukov <maksim.zhukov@akvelon.com>
Date: Tue, 18 Feb 2020 17:05:00 +0300
Subject: [PATCH 2/3] Minor updates

---
 images.CI/build-image.ps1 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/images.CI/build-image.ps1 b/images.CI/build-image.ps1
index dabbb069..73455c02 100644
--- a/images.CI/build-image.ps1
+++ b/images.CI/build-image.ps1
@@ -26,7 +26,13 @@ $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper()
 
 packer validate -syntax-only $TemplatePath
 
-$SensitiveData = @('OSType', 'StorageAccountLocation', 'OSDiskUri', 'OSDiskUriReadOnlySas', 'TemplateUri', 'TemplateUriReadOnlySas', ':  ->')
+$SensitiveData = @('OSType',
+                    'StorageAccountLocation',
+                    'OSDiskUri',
+                    'OSDiskUriReadOnlySas',
+                    'TemplateUri',
+                    'TemplateUriReadOnlySas',
+                    ':  ->')
 
 Write-Host "Build $Image VM"
 packer build    -var "capture_name_prefix=$ResourcesNamePrefix" `
@@ -47,6 +53,6 @@ packer build    -var "capture_name_prefix=$ResourcesNamePrefix" `
         | Where-Object {
             #Filter sensitive data from Packer logs
             $currentString = $_
-            $matchedString = $SensitiveData | Where-Object { $currentString -match $_ }
-            return $matchedString -eq $null
+            $sensitiveString = $SensitiveData | Where-Object { $currentString -match $_ }
+            $sensitiveString -eq $null
         }
\ No newline at end of file

From f4bd0f2a6a7b6d72f6570b5ac3a873c4b8de85b8 Mon Sep 17 00:00:00 2001
From: MaksimZhukov <maksim.zhukov@akvelon.com>
Date: Tue, 18 Feb 2020 17:09:48 +0300
Subject: [PATCH 3/3] Minor update

---
 images.CI/build-image.ps1 | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/images.CI/build-image.ps1 b/images.CI/build-image.ps1
index 73455c02..54748e41 100644
--- a/images.CI/build-image.ps1
+++ b/images.CI/build-image.ps1
@@ -26,13 +26,15 @@ $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper()
 
 packer validate -syntax-only $TemplatePath
 
-$SensitiveData = @('OSType',
-                    'StorageAccountLocation',
-                    'OSDiskUri',
-                    'OSDiskUriReadOnlySas',
-                    'TemplateUri',
-                    'TemplateUriReadOnlySas',
-                    ':  ->')
+$SensitiveData = @(
+    'OSType',
+    'StorageAccountLocation',
+    'OSDiskUri',
+    'OSDiskUriReadOnlySas',
+    'TemplateUri',
+    'TemplateUriReadOnlySas',
+    ':  ->'
+)
 
 Write-Host "Build $Image VM"
 packer build    -var "capture_name_prefix=$ResourcesNamePrefix" `