Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
792c6da
chore: Update CFN Lint version to support python 3.11 (#5651)
ConnorKirk Jul 31, 2023
e0de998
fix: Require file label to run before maintainers (#5656)
lucashuy Jul 31, 2023
275d44e
Add Windows config
mildaniel Jul 31, 2023
d0d68da
Fix formatting
mildaniel Jul 31, 2023
139964d
Merge changes from upstream
mildaniel Jul 31, 2023
f171723
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Jul 31, 2023
0ae07bb
Update config
mildaniel Jul 31, 2023
eeee79b
test
mildaniel Aug 1, 2023
91318ea
Update config
mildaniel Aug 1, 2023
99d80c5
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 1, 2023
b378f79
Update config
mildaniel Aug 1, 2023
8ba209a
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 1, 2023
88a21e1
Update config
mildaniel Aug 1, 2023
b3fe097
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 1, 2023
a5150f2
Update config
mildaniel Aug 1, 2023
1e14e6f
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 1, 2023
98f2cc8
Update config
mildaniel Aug 1, 2023
d264edd
chore: update aws_lambda_builders to 1.36.0 (#5655)
github-actions[bot] Aug 1, 2023
7457876
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 1, 2023
c754867
Update config
mildaniel Aug 1, 2023
bc08fa0
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 1, 2023
d854da7
Update config
mildaniel Aug 1, 2023
253852c
fix(invoke): Write in UTF-8 string instead of bytes (#5642)
jfuss Aug 1, 2023
27eb2e1
chore(deps): bump cryptography from 41.0.2 to 41.0.3 in /requirements…
dependabot[bot] Aug 2, 2023
e7413ae
Add linux config
mildaniel Aug 2, 2023
dfca9dd
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 2, 2023
135da3a
fix(test): Force reading file with utf8 in tests for windows (#5679)
jfuss Aug 2, 2023
b282ceb
fix(test): Increase max execution time for timeout tests (#5680)
jfuss Aug 2, 2023
3db9c79
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 2, 2023
78fe5a2
Update install links
mildaniel Aug 2, 2023
44d4bfa
Update linux config
mildaniel Aug 2, 2023
43332c4
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 2, 2023
b22459d
Update linux config
mildaniel Aug 2, 2023
5d8cb59
Resolve merge conflicts
mildaniel Aug 2, 2023
a263761
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 2, 2023
1ba36ac
Update linux config
mildaniel Aug 2, 2023
679d785
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 2, 2023
54972ab
Update linux config
mildaniel Aug 2, 2023
b10bd58
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 2, 2023
66a85e6
Update linux config
mildaniel Aug 2, 2023
f2bcf8b
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 2, 2023
fad6c46
Update linux config
mildaniel Aug 2, 2023
27ea704
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 2, 2023
748c100
Update linux config
mildaniel Aug 2, 2023
b994033
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 2, 2023
125f695
Update linux config
mildaniel Aug 2, 2023
2c953fc
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 2, 2023
6d093b2
Update linux config
mildaniel Aug 2, 2023
6ad913a
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 2, 2023
64ce0d8
Update linux config
mildaniel Aug 2, 2023
622bd18
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 2, 2023
abe74fb
Update linux config
mildaniel Aug 2, 2023
8ee525e
Merge branch 'develop' of https://github.com/aws/aws-sam-cli into tes…
mildaniel Aug 3, 2023
8b67713
chore: auto update reproducible requirements when there is a dependen…
mndeveci Aug 3, 2023
1af6375
fix: Repair failing integration test (#5698)
Leo10Gama Aug 3, 2023
841b2f4
Update Windows config
mildaniel Aug 3, 2023
766e036
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 3, 2023
e858489
fix: link the API gateway resource parent to either rest api or anoth…
moelasmar Aug 3, 2023
a3472d5
Update Windows config
mildaniel Aug 3, 2023
ed573cf
Update Windows config
mildaniel Aug 3, 2023
9e10d31
Update Windows config
mildaniel Aug 3, 2023
2296c6d
Update Windows config
mildaniel Aug 3, 2023
5b1de9a
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 3, 2023
15133a0
Update Windows config
mildaniel Aug 3, 2023
3a88be8
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 3, 2023
8f756dc
Update Windows config
mildaniel Aug 3, 2023
a6409da
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 3, 2023
a9703a2
Update Windows config
mildaniel Aug 3, 2023
07b7ffa
Update Windows config
mildaniel Aug 3, 2023
b9c6564
Update Windows config
mildaniel Aug 3, 2023
01b3014
Merge branch 'develop' of https://github.com/aws/aws-sam-cli into tes…
mildaniel Aug 3, 2023
0637cd8
Update Windows config
mildaniel Aug 3, 2023
1af97d2
Merge branch 'test/binary-canaries' of https://github.com/aws/aws-sam…
mildaniel Aug 3, 2023
bc2f386
Revert "Test/binary canaries (#5706)"
mildaniel Aug 3, 2023
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
132 changes: 0 additions & 132 deletions tests/iac_integration/cdk/test_sam_cdk_integration.py

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def setUp(self):
shutil.copytree(Path(self.terraform_application_path), Path(self.working_dir))

def run_command(self, command_list, env=None, input=None):
process = Popen(command_list, stdout=PIPE, stderr=PIPE, stdin=PIPE, env=env, cwd=self.working_dir, shell=True)
process = Popen(command_list, stdout=PIPE, stderr=PIPE, stdin=PIPE, env=env, cwd=self.working_dir)
try:
(stdout, stderr) = process.communicate(input=input)
return stdout, stderr, process.returncode
Expand Down
45 changes: 10 additions & 35 deletions tests/integration/init/test_init_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ def test_init_command_passes_and_dir_created(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -83,8 +82,7 @@ def test_init_command_passes_and_dir_created_image(self):
"--no-interactive",
"-o",
temp,
],
shell = True,
]
)
try:
process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -115,7 +113,6 @@ def test_init_new_app_template(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -148,7 +145,6 @@ def test_init_command_java_maven(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -181,7 +177,6 @@ def test_init_command_java_gradle(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -214,7 +209,6 @@ def test_init_command_go_provided_image(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -249,7 +243,6 @@ def test_init_command_with_extra_context_parameter(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -284,7 +277,6 @@ def test_init_command_passes_with_arm_architecture(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -319,7 +311,6 @@ def test_init_command_passes_with_x86_64_architecture(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -351,8 +342,7 @@ def test_init_command_passes_with_unknown_architecture(self):
temp,
"--architecture",
"unknown_arch",
],
shell=True,
]
)
capture_output = ""
try:
Expand Down Expand Up @@ -384,8 +374,7 @@ def test_init_command_passes_with_enabled_tracing(self):
"-o",
temp,
"--tracing",
],
shell=True,
]
)
try:
process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -415,8 +404,7 @@ def test_init_command_passes_with_disabled_tracing(self):
"-o",
temp,
"--no-tracing",
],
shell=True,
]
)
try:
process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -446,8 +434,7 @@ def test_init_command_passes_with_enabled_application_insights(self):
"-o",
temp,
"--application-insights",
],
shell=True,
]
)
try:
process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -477,8 +464,7 @@ def test_init_command_passes_with_disabled_application_insights(self):
"-o",
temp,
"--no-application-insights",
],
shell=True,
]
)
try:
process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -538,7 +524,6 @@ def test_init_command_no_interactive_missing_name(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -568,7 +553,6 @@ def test_init_command_no_interactive_apptemplate_location(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -601,7 +585,6 @@ def test_init_command_no_interactive_runtime_location(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -633,7 +616,6 @@ def test_init_command_no_interactive_base_image_location(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -666,7 +648,6 @@ def test_init_command_no_interactive_base_image_no_dependency(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -696,7 +677,6 @@ def test_init_command_no_interactive_packagetype_location(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -727,7 +707,6 @@ def test_init_command_no_interactive_base_image_no_packagetype(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand All @@ -754,7 +733,6 @@ def test_init_command_wrong_packagetype(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -807,7 +785,7 @@ def test_arbitrary_project(self, project_name):
if project_name:
args.extend(["--name", project_name])

process = Popen(args, shell=True,)
process = Popen(args)
try:
process.communicate(timeout=TIMEOUT)
except TimeoutExpired:
Expand All @@ -823,7 +801,7 @@ def test_zip_not_exists(self):
with tempfile.TemporaryDirectory() as temp:
args = [get_sam_command(), "init", "--location", str(Path("invalid", "zip", "path")), "-o", temp]

process = Popen(args, shell=True,)
process = Popen(args)
try:
process.communicate(timeout=TIMEOUT)
except TimeoutExpired:
Expand All @@ -847,7 +825,7 @@ def test_location_with_no_interactive_and_name(self):
"-o",
tmp,
]
process = Popen(args, shell=True,)
process = Popen(args)

try:
process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -959,7 +937,6 @@ def _run_init(self, cwd):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -1000,7 +977,6 @@ def test_zip_template_config(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -1036,7 +1012,6 @@ def test_image_template_config(self):
],
stdout=PIPE,
stderr=PIPE,
shell=True,
)
try:
stdout_data, stderr_data = process.communicate(timeout=TIMEOUT)
Expand Down Expand Up @@ -1097,7 +1072,7 @@ class TestInitCommand(InitIntegBase):
def test_graceful_exit(self):
# Run the Base Command
command_list = self.get_command()
process_execute = Popen(command_list, stdout=PIPE, stderr=PIPE, shell=True,)
process_execute = Popen(command_list, stdout=PIPE, stderr=PIPE)

# Wait for binary to be ready before sending interrupts.
time.sleep(self.BINARY_READY_WAIT_TIME)
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/local/generate_event/test_cli_integ.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@

class Test_EventGeneration_Integ(TestCase):
def test_generate_event_substitution(self):
process = Popen([get_sam_command(), "local", "generate-event", "s3", "put"], shell=True,)
process = Popen([get_sam_command(), "local", "generate-event", "s3", "put"])
process.communicate()
self.assertEqual(process.returncode, 0)
Loading