Skip to content

Commit

Permalink
Merge from aws/aws-sam-cli/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
aws-sam-cli-bot authored May 9, 2023
2 parents c3ce941 + 8065e66 commit 129ac47
Show file tree
Hide file tree
Showing 146 changed files with 3,993 additions and 1,007 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ on:
- "feat/*"
- "feat-*"

# to automatically cancel the running workflow for same PR.
concurrency:
group: ${{ github.ref }}
cancel-in-progress: true

jobs:
run-workflow:
name: PR Workflow
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/close-issue-on-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Close issues on release cut

on:
release:
types: [released]

jobs:
run-workflow:
permissions:
issues: write
runs-on: ubuntu-latest
steps:
- name: Close issues marked
env:
REPO : ${{ github.repository }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
release_url=$(gh release view ${{ github.ref_name }} --repo $REPO --json url --jq ".url")
for issue_number in $(gh issue list -l "stage/waiting-for-release" --repo $REPO --json number --jq ".[].number"); do
gh issue close $issue_number -c "Patch is released in [${{ github.ref_name }}]($release_url). Closing" -r completed --repo $REPO
done
51 changes: 12 additions & 39 deletions appveyor-iac-integration-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,21 @@ image:
environment:
AWS_DEFAULT_REGION: us-east-1
SAM_CLI_DEV: 1

NOSE_PARAMETERIZED_NO_WARN: 1
APPVEYOR_CONSOLE_DISABLE_PTY: false
APPVEYOR_DETAILED_SHELL_LOGGING: true

matrix:
- PYTHON_HOME: "$HOME/venv3.7/bin"
PYTHON_VERSION: '3.7'

- PYTHON_HOME: "$HOME/venv3.8/bin"
PYTHON_VERSION: '3.8'

- PYTHON_VERSION: '3.7'
PYTHON_ARCH: '64'
NOSE_PARAMETERIZED_NO_WARN: 1
INSTALL_PY_38_PIP: 1
INSTALL_PY_39_PIP: 1
APPVEYOR_CONSOLE_DISABLE_PTY: true

- PYTHON_VERSION: '3.8'
PYTHON_ARCH: '64'
NOSE_PARAMETERIZED_NO_WARN: 1
INSTALL_PY_37_PIP: 1
INSTALL_PY_39_PIP: 1
APPVEYOR_CONSOLE_DISABLE_PTY: true

- PYTHON_VERSION: '3.9'
PYTHON_ARCH: '64'
NOSE_PARAMETERIZED_NO_WARN: 1
INSTALL_PY_37_PIP: 1
INSTALL_PY_38_PIP: 1
APPVEYOR_CONSOLE_DISABLE_PTY: true
- PYTHON_HOME: "$HOME/venv3.9/bin"
PYTHON_VERSION: '3.9'

install:
# apt repo for python3.9 installation
- sh: "sudo add-apt-repository ppa:deadsnakes/ppa"
# AppVeyor's apt-get cache might be outdated, and the package could potentially be 404.
- sh: "sudo apt-get update"

Expand All @@ -58,22 +46,7 @@ install:
- sh: "sudo apt install maven"
- sh: "mvn --version"

- sh: "sudo apt-get -y install python3.7"
- sh: "sudo apt-get -y install python3.8"
- sh: "sudo apt-get -y install python3.9 python3.9-venv"

- sh: "which python3.8"
- sh: "which python3.7"
- sh: "which python3.9"

- sh: "PATH=$PATH:/usr/bin/python3.9:/usr/bin/python3.8:/usr/bin/python3.7"
- sh: "curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py"

- sh: "sudo apt-get -y install python3-distutils"
- sh: "sudo apt-get -y install python3.9-distutils"
- ps: "If ($env:INSTALL_PY_39_PIP) {python3.9 get-pip.py --user}"
- ps: "If ($env:INSTALL_PY_38_PIP) {python3.8 get-pip.py --user}"
- ps: "If ($env:INSTALL_PY_37_PIP) {python3.7 get-pip.py --user}"
- sh: "PATH=$PATH:$HOME/venv3.7/bin:$HOME/venv3.8/bin:$HOME/venv3.9/bin:$HOME/venv3.10/bin"

# get testing env vars
- sh: "sudo apt install -y jq"
Expand Down
26 changes: 6 additions & 20 deletions appveyor-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,35 +25,21 @@ environment:
AWS_S3: 'AWS_S3_TESTING'
AWS_ECR: 'AWS_ECR_TESTING'
CARGO_LAMBDA_VERSION: "v0.17.1"

PYTHON_ARCH: '64'
NOSE_PARAMETERIZED_NO_WARN: 1
APPVEYOR_CONSOLE_DISABLE_PTY: false
APPVEYOR_DETAILED_SHELL_LOGGING: true

matrix:

- PYTHON_HOME: "$HOME/venv3.7/bin"
PYTHON_VERSION: '3.7'
PYTHON_ARCH: '64'
NOSE_PARAMETERIZED_NO_WARN: 1
INSTALL_PY_38_PIP: 1
INSTALL_PY_39_PIP: 1
INSTALL_PY_310_PIP: 1
APPVEYOR_CONSOLE_DISABLE_PTY: true

- PYTHON_HOME: "$HOME/venv3.8/bin"
PYTHON_VERSION: '3.8'
PYTHON_ARCH: '64'
NOSE_PARAMETERIZED_NO_WARN: 1
INSTALL_PY_37_PIP: 1
INSTALL_PY_39_PIP: 1
INSTALL_PY_310_PIP: 1
APPVEYOR_CONSOLE_DISABLE_PTY: true

- PYTHON_HOME: "$HOME/venv3.9/bin"
PYTHON_VERSION: '3.9'
PYTHON_ARCH: '64'
NOSE_PARAMETERIZED_NO_WARN: 1
INSTALL_PY_37_PIP: 1
INSTALL_PY_38_PIP: 1
INSTALL_PY_310_PIP: 1
APPVEYOR_CONSOLE_DISABLE_PTY: true

install:
# AppVeyor's apt-get cache might be outdated, and the package could potentially be 404.
Expand Down Expand Up @@ -347,7 +333,7 @@ for:
- "mypy setup.py samcli tests"
- "pytest -n 4 tests/functional --json-report --json-report-file=TEST_REPORT-functional.json"

- sh: "pytest tests/integration --ignore=tests/integration/buildcmd --ignore=tests/integration/delete --ignore=tests/integration/deploy --ignore=tests/integration/package --ignore=tests/integration/sync --ignore=tests/integration/local --json-report --json-report-file=TEST_REPORT-integration-others.json"
- sh: "pytest -vv -n 4 --reruns 4 --dist loadgroup tests/integration --ignore=tests/integration/buildcmd --ignore=tests/integration/delete --ignore=tests/integration/deploy --ignore=tests/integration/package --ignore=tests/integration/sync --ignore=tests/integration/local --json-report --json-report-file=TEST_REPORT-integration-others.json"
- sh: "pytest -vv tests/regression --json-report --json-report-file=TEST_REPORT-regression.json"
- sh: "black --check setup.py tests samcli"
- sh: "pytest -n 4 -vv tests/smoke --json-report --json-report-file=TEST_REPORT-smoke.json"
2 changes: 1 addition & 1 deletion appveyor-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ for:
- ps: "pytest --cov samcli --cov-report term-missing --cov-fail-under 94 tests/unit --json-report --json-report-file=TEST_REPORT-unit.json"
- "mypy setup.py samcli tests"
- ps: "pytest -n 4 tests/functional --json-report --json-report-file=TEST_REPORT-functional.json"
- ps: "pytest -vv tests/integration --ignore=tests/integration/buildcmd --ignore=tests/integration/delete --ignore=tests/integration/deploy --ignore=tests/integration/package --ignore=tests/integration/sync --ignore=tests/integration/local --json-report --json-report-file=TEST_REPORT-integration-others.json"
- ps: "pytest -vv -n 4 --reruns 4 --dist loadgroup tests/integration --ignore=tests/integration/buildcmd --ignore=tests/integration/delete --ignore=tests/integration/deploy --ignore=tests/integration/package --ignore=tests/integration/sync --ignore=tests/integration/local --json-report --json-report-file=TEST_REPORT-integration-others.json"
- ps: "pytest -vv tests/regression --json-report --json-report-file=TEST_REPORT-regression.json"
# Uncomment for RDP
# on_finish:
Expand Down
82 changes: 82 additions & 0 deletions installer/assets/THIRD-PARTY-LICENSES
Original file line number Diff line number Diff line change
Expand Up @@ -669,8 +669,37 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

The above BSD License Applies to all code, even that also covered by Apache 2.0.

--------------------------------------------------------------------------------
** pygments; version 2.15.0 -- https://pypi.org/project/pygemnts/

Copyright (c) 2006-2022 by the respective authors (see AUTHORS file).

All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------


** binaryornot; version 0.4.4 -- https://pypi.org/project/binaryornot/
Copyright (c) 2013, Audrey Roy
All rights reserved.
Expand Down Expand Up @@ -1991,6 +2020,10 @@ Copyright (c) 2019-2021 Anthon van der Neut, Ruamel bvba
** cfn-lint; version 0.72.2 -- https://pypi.org/project/cfn-lint/
** jschema-to-python; version 1.2.3 -- https://pypi.org/project/jschema-to-python/
** junit-xml; version 1.9 -- https://pypi.org/project/junit-xml/
** markdown-it-py; version 2.2.0 -- https://pypi.org/project/markdown-it-py/
Copyright (c) 2020, ExecutableBookProject
** rich; version 13.3.3 -- https://pypi.org/project/rich/
Copyright (c) 2020, Will McGugan
** sarif-om; version 1.0.4 https://pypi.org/project/sarif-om/
** wheel; version 0.36.2 -- https://github.com/pypa/wheel
"wheel" copyright (c) 2012-2014 Daniel Holth <[email protected]> and
Expand Down Expand Up @@ -2019,6 +2052,55 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

------

** mdurl; version 0.1.2 -- https://pypi.org/project/mdurl/
Copyright (c) 2015, Vitaly Puzrin, Alex Kocharin.
Copyright (c) 2021 Taneli Hukkinen
MIT License

Copyright (c) <year> <copyright holders>

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

------

.parse() is based on Joyent's node.js `url` code:

Copyright Joyent, Inc. and other Node contributors. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.

------

** jmespath; version 0.10.0 -- https://pypi.org/project/jmespath/
Copyright (c) 2013 Amazon.com, Inc. or its affiliates. All Rights Reserved

Expand Down
5 changes: 3 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@ jmespath~=0.10.0
ruamel_yaml==0.17.21
PyYAML>=5.4.1,==5.*
cookiecutter~=2.1.1
aws-sam-translator==1.65.0
aws-sam-translator==1.66.0
#docker minor version updates can include breaking changes. Auto update micro version only.
docker~=4.2.0
dateparser~=1.1
requests==2.28.2
serverlessrepo==0.1.10
aws_lambda_builders==1.30.0
aws_lambda_builders==1.31.0
tomlkit==0.11.7
watchdog==2.1.2
rich~=13.3.3
pyopenssl==23.0.0

# Needed for supporting Protocol in Python 3.7, Protocol class became public with python3.8
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ mypy==0.790
boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray]==1.21.21
types-pywin32==306.0.0.0
types-PyYAML==6.0.12
types-chevron==0.14.2
types-chevron==0.14.2.4
types-psutil==5.9.5.12
types-setuptools==65.4.0.0

Expand Down
4 changes: 2 additions & 2 deletions requirements/pyinstaller-build.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Executable binary builder requirements
setuptools==65.5.1
pyinstaller==5.9.0
setuptools==67.7.2
pyinstaller==5.10.1
36 changes: 27 additions & 9 deletions requirements/reproducible-linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ attrs==22.2.0 \
# jschema-to-python
# jsonschema
# sarif-om
aws-lambda-builders==1.30.0 \
--hash=sha256:861d3e6099590562fcb9f6fc5d014a26f5b5fc8aebb1d18529cd4179514f2a48 \
--hash=sha256:ab22ffe47995bbbaff531af453746f3365fe01947c1ea8d98a7ae3ab52b46426
aws-lambda-builders==1.31.0 \
--hash=sha256:e8c8353eef983b9ac037015038da5b17222f61886ccfcadb1b4aa0af44a49b90 \
--hash=sha256:ffe186dfb6616ef1f64b62c921b43ad67f50fce257a39a8d2c66ac76cde4ed6b
# via aws-sam-cli (setup.py)
aws-sam-translator==1.65.0 \
--hash=sha256:34dcd1f86bfc3ae11f3defe6f67b74fe863dacf0a3b04156c41dc92600e8dc8d \
--hash=sha256:49cf0583a1bc17c686417c11132c5122b40ecbcb9980e0c9e58b65914dd76ebc
aws-sam-translator==1.66.0 \
--hash=sha256:0b9e9684ea0384fd84f5e722f7fea61896c514b95d3403aa782b69acd485dbbf \
--hash=sha256:dc4f38cd7ce2a4875d943bf10ba0745901a3a7b7fec1e40b8d13072641630c58
# via
# aws-sam-cli (setup.py)
# cfn-lint
Expand Down Expand Up @@ -330,6 +330,10 @@ junit-xml==1.9 \
--hash=sha256:de16a051990d4e25a3982b2dd9e89d671067548718866416faec14d9de56db9f \
--hash=sha256:ec5ca1a55aefdd76d28fcc0b135251d156c7106fa979686a4b48d62b761b4732
# via cfn-lint
markdown-it-py==2.2.0 \
--hash=sha256:5a35f8d1870171d9acc47b99612dc146129b631baf04970128b568f190d0cc30 \
--hash=sha256:7c9a5e412688bc771c67432cbfebcdd686c93ce6484913dccf06cb5a0bea35a1
# via rich
markupsafe==2.1.2 \
--hash=sha256:0576fe974b40a400449768941d5d0858cc624e3249dfd1e0c33674e5c7ca7aed \
--hash=sha256:085fd3201e7b12809f9e6e9bc1e5c96a368c8523fad5afb02afe3c051ae4afcc \
Expand Down Expand Up @@ -384,6 +388,10 @@ markupsafe==2.1.2 \
# via
# jinja2
# werkzeug
mdurl==0.1.2 \
--hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \
--hash=sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba
# via markdown-it-py
networkx==2.6.3 \
--hash=sha256:80b6b89c77d1dfb64a4c7854981b60aeea6360ac02c6d4e4913319e0a313abef \
--hash=sha256:c0946ed31d71f1b732b5aaa6da5a0388a345019af232ce2f49c766e2d6795c51
Expand Down Expand Up @@ -440,6 +448,10 @@ pydantic==1.10.7 \
--hash=sha256:ecbbc51391248116c0a055899e6c3e7ffbb11fb5e2a4cd6f2d0b93272118a209 \
--hash=sha256:f4a2b50e2b03d5776e7f21af73e2070e1b5c0d0df255a827e7c632962f8315af
# via aws-sam-translator
pygments==2.15.1 \
--hash=sha256:8ace4d3c1dd481894b2005f560ead0f9f19ee64fe983366be1a21e171d12775c \
--hash=sha256:db2db3deb4b4179f399a09054b023b6a586b76499d36965813c71aa8ed7b5fd1
# via rich
pyopenssl==23.0.0 \
--hash=sha256:c1cc5f86bcacefc84dada7d31175cae1b1518d5f60d3d0bb595a67822a868a6f \
--hash=sha256:df5fc28af899e74e19fccb5510df423581047e10ab6f1f4ba1763ff5fde844c0
Expand Down Expand Up @@ -622,6 +634,10 @@ requests==2.28.2 \
# aws-sam-cli (setup.py)
# cookiecutter
# docker
rich==13.3.3 \
--hash=sha256:540c7d6d26a1178e8e8b37e9ba44573a3cd1464ff6348b99ee7061b95d1c6333 \
--hash=sha256:dc84400a9d842b3a9c5ff74addd8eb798d155f36c1c91303888e0a66850d2a15
# via aws-sam-cli (setup.py)
ruamel-yaml==0.17.21 \
--hash=sha256:742b35d3d665023981bd6d16b3d24248ce5df75fdb4e2924e93a05c1f8b61ca7 \
--hash=sha256:8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af
Expand Down Expand Up @@ -701,7 +717,9 @@ typing-extensions==4.4.0 \
# aws-sam-translator
# importlib-metadata
# jsonschema
# markdown-it-py
# pydantic
# rich
tzlocal==3.0 \
--hash=sha256:c736f2540713deb5938d789ca7c3fc25391e9a20803f05b60ec64987cf086559 \
--hash=sha256:f4e6e36db50499e0d92f79b67361041f048e2609d166e93456b50746dc4aef12
Expand Down Expand Up @@ -753,7 +771,7 @@ zipp==3.15.0 \
# importlib-resources

# The following packages are considered to be unsafe in a requirements file:
setuptools==67.6.0 \
--hash=sha256:2ee892cd5f29f3373097f5a814697e397cf3ce313616df0af11231e2ad118077 \
--hash=sha256:b78aaa36f6b90a074c1fa651168723acbf45d14cb1196b6f02c0fd07f17623b2
setuptools==67.7.2 \
--hash=sha256:23aaf86b85ca52ceb801d32703f12d77517b2556af839621c641fca11287952b \
--hash=sha256:f104fa03692a2602fa0fec6c6a9e63b6c8a968de13e17c026957dd1f53d80990
# via aws-lambda-builders
2 changes: 1 addition & 1 deletion samcli/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
SAM CLI version
"""

__version__ = "1.82.0"
__version__ = "1.83.0"
Loading

0 comments on commit 129ac47

Please sign in to comment.