diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 924dbd72a..05333241a 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -707,12 +707,6 @@ "{{ template_dir }}/scripts/Installers/Validate-AWS-SAM.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Validate-AWS-CLI-SM.ps1" - ] - }, { "type": "powershell", "scripts":[ diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index 826131781..cf10a9033 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -692,12 +692,6 @@ "{{ template_dir }}/scripts/Installers/Validate-AWS-SAM.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Validate-AWS-CLI-SM.ps1" - ] - }, { "type": "powershell", "scripts":[ diff --git a/images/win/scripts/Installers/Install-AWS.ps1 b/images/win/scripts/Installers/Install-AWS.ps1 index d3b698586..212e359cb 100644 --- a/images/win/scripts/Installers/Install-AWS.ps1 +++ b/images/win/scripts/Installers/Install-AWS.ps1 @@ -20,3 +20,13 @@ $sessionManagerName = "SessionManagerPluginSetup.exe" $sessionManagerUrl = "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/windows/$sessionManagerName" Install-Binary -Url $sessionManagerUrl -Name $sessionManagerName -ArgumentList ("/silent", "/install") Add-MachinePathItem -PathItem "C:\Program Files\Amazon\SessionManagerPlugin\bin" + +$sessionMessage = session-manager-plugin + +if ($sessionMessage -Match "*plugin was installed successfully*") { + Write-Host "$sessionMessage" + exit 0 +} else { + Write-Host "$sessionMessage" + exit 1 +} \ No newline at end of file diff --git a/images/win/scripts/Installers/Validate-AWS-CLI-SM.ps1 b/images/win/scripts/Installers/Validate-AWS-CLI-SM.ps1 deleted file mode 100644 index b6d9df4c5..000000000 --- a/images/win/scripts/Installers/Validate-AWS-CLI-SM.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -## File: Validate-AWS-CLI-SM.ps1 -## Desc: Validate aws cli session manager -################################################################################ - -$sessionMessage = session-manager-plugin - -if ($sessionMessage -Match "*plugin was installed successfully*") { - Write-Host "$sessionMessage" - exit 0 -} else { - Write-Host "$sessionMessage" - exit 1 -} \ No newline at end of file