Skip to content

Avoid shell for Windows CodeDeploy MSI install #10368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dfgvaetyj3456356-hash wants to merge 2 commits into
base: develop
Choose a base branch
from
+25 −6
Open

Avoid shell for Windows CodeDeploy MSI install #10368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4abfda3
Avoid shell for Windows CodeDeploy MSI install
dfgvaetyj3456356-hash May 31, 2026
8ed1394
Merge branch 'develop' into security/codedeploy-msi-shell
dfgvaetyj3456356-hash Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions awscli/customizations/codedeploy/systems.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ def install(self, params):

subprocess.check_call(
[
r'.\{0}'.format(self.INSTALLER),
'msiexec.exe',
'/i', r'.\{0}'.format(self.INSTALLER),
'/quiet',
'/l', r'.\codedeploy-agent-install-log.txt'
],
shell=True
]
)
subprocess.check_call([
'powershell.exe',
Expand Down
25 changes: 22 additions & 3 deletions tests/unit/customizations/codedeploy/test_systems.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ def test_install(self):
self.check_call.assert_has_calls([
mock.call(
[
r'.\{0}'.format(self.installer),
'msiexec.exe',
'/i', r'.\{0}'.format(self.installer),
'/quiet',
'/l', r'.\codedeploy-agent-install-log.txt'
],
shell=True
]
),
mock.call([
'powershell.exe',
Expand All @@ -120,6 +120,25 @@ def test_install(self):
self.open.assert_called_with(self.installer, 'wb')
self.open().write.assert_called_with(self.body)

def test_install_uses_msiexec_for_custom_installer(self):
process = mock.MagicMock()
process.communicate.side_effect = [('', ''), ('Running', '')]
process.returncode = 0
self.popen.return_value = process
self.params.installer = 'agent&installer.msi'
self.windows.install(self.params)
self.check_call.assert_has_calls([
mock.call(
[
'msiexec.exe',
'/i', r'.\{0}'.format(self.params.installer),
'/quiet',
'/l', r'.\codedeploy-agent-install-log.txt'
]
)
])
self.open.assert_called_with(self.params.installer, 'wb')

def test_uninstall(self):
process = mock.MagicMock()
process.communicate.side_effect = [('', ''), ('', '')]
Expand Down