Skip to content
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

Jump to bottom

2139 use shlex to split management args #2152

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

2139 use shlex to split management args #2152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
68c2989
fix: use shlex to split management args
jaredhobbs Aug 11, 2020
0c9a1c6
fix: typo
jaredhobbs Aug 11, 2020
31b3ece
Merge remote-tracking branch 'upstream/master' into 2139-use-shlex-to…
jaredhobbs Oct 9, 2020
eef8028
add output when pip install fails
jaredhobbs Dec 1, 2020
997b8df
Merge branch '2139-use-shlex-to-split-management-args' of github.com:…
jaredhobbs Dec 1, 2020
9319704
Only decode if necessary
jaredhobbs Jan 12, 2021
3c84297
Merge branch 'Miserlou:master' into 2139-use-shlex-to-split-managemen…
jaredhobbs Jun 21, 2021
2d1fb8b
Update core.py
shawnam Jul 6, 2021
fd60c80
Merge pull request #1 from shawnam/patch-1
jaredhobbs Jul 6, 2021
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
9 changes: 7 additions & 2 deletions zappa/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,12 @@ def create_handler_venv(self):
pip_return_code = pip_process.returncode

if pip_return_code:
raise EnvironmentError("Pypi lookup failed")
output = pip_process.stdout
if hasattr(output, 'decode'):
output = output.decode('utf-8')
raise EnvironmentError(
"Pypi lookup failed\n{}".format(output)
)

return ve_path

Expand Down Expand Up @@ -2135,7 +2140,7 @@ def create_stack_template( self,

# build a fresh template
self.cf_template = troposphere.Template()
self.cf_template.add_description('Automatically generated with Zappa')
self.cf_template.set_description('Automatically generated with Zappa')
self.cf_api_resources = []
self.cf_parameters = {}

Expand Down
3 changes: 2 additions & 1 deletion zappa/handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import json
import logging
import os
import shlex
import sys
import traceback
import tarfile
Expand Down Expand Up @@ -405,7 +406,7 @@ def handler(self, event, context):

# Couldn't figure out how to get the value into stdout with StringIO..
# Read the log for now. :[]
management.call_command(*event['manage'].split(' '))
management.call_command(*shlex.split(event['manage']))
return {}

# This is an AWS-event triggered invocation.
Expand Down