Skip to content

Commit e59d907

Browse files
aws-sam-cli-botaws-sam-cli-bot
authored
Merge from aws/aws-sam-cli/develop
2 parents 916db74 + 35dbc95 commit e59d907

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2050
-117
lines changed

‎.github/workflows/close-stale-issues.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
permissions:
1515
issues: write
1616
steps:
17-
- uses: aws-actions/stale-issue-cleanup@v3
17+
- uses: aws-actions/stale-issue-cleanup@v6
1818
with:
1919
issue-types: issues
2020

‎.github/workflows/need-attention-label.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
apply-label:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/github-script@v3
11+
- uses: actions/github-script@v6
1212
# the login of our bot called 'sam-cli-bot'
1313
if: github.event.sender.login != 'aws-sam-cli-stale-bot'
1414
with:

‎.github/workflows/pr-labeler.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ jobs:
99
pull-requests: write
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/labeler@v3
12+
- uses: actions/labeler@v4
1313
with:
1414
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1515
apply-internal-external-label:
1616
permissions:
1717
pull-requests: write
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/github-script@v5
20+
- uses: actions/github-script@v6
2121
with:
2222
github-token: ${{secrets.GITHUB_TOKEN}}
2323
script: |

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,12 @@ venv.*/
336336
# mypy
337337
.mypy_cache/
338338

339+
# ruff
340+
.ruff_cache/
341+
342+
# SAM default build folder
343+
.aws-sam/
344+
339345
### SublimeText ###
340346
# cache files for sublime text
341347
*.tmlanguage.cache

‎requirements/base.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jmespath~=0.10.0
99
ruamel_yaml==0.17.21
1010
PyYAML>=5.4.1,==5.*
1111
cookiecutter~=2.1.1
12-
aws-sam-translator==1.59.0
12+
aws-sam-translator==1.60.0
1313
#docker minor version updates can include breaking changes. Auto update micro version only.
1414
docker~=4.2.0
1515
dateparser~=1.0

‎requirements/reproducible-linux.txt‎

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ aws-lambda-builders==1.27.0 \
1919
--hash=sha256:8019d5d5d7de32b159e33ff447672308fc20dd58bc7452f82af15f6667037e1f \
2020
--hash=sha256:ca4374209755af250ae5c9b6e7c5a315ec39f41e7b901af050d242e1eaeedf27
2121
# via aws-sam-cli (setup.py)
22-
aws-sam-translator==1.59.0 \
23-
--hash=sha256:6761293a21bd1cb0e19f168926ebfc4a3a6c9011aca67bd448ef485a55d6f658 \
24-
--hash=sha256:9b8f23a5754cba92677d334ece5c5d9dc9b1f1a327a650fc8939ae3fc6da4141
22+
aws-sam-translator==1.60.0 \
23+
--hash=sha256:b104e327a8542cb966ca9e1ddf7f94d7821497d4c8c4a66ef0eb5e2ec4212af1 \
24+
--hash=sha256:ba3c4e38c6dd2f7e530f71eec2012b491fb7cde934d0ff5db4145209995095dd
2525
# via
2626
# aws-sam-cli (setup.py)
2727
# cfn-lint
@@ -304,44 +304,6 @@ pycparser==2.21 \
304304
--hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \
305305
--hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
306306
# via cffi
307-
pydantic==1.10.4 \
308-
--hash=sha256:05a81b006be15655b2a1bae5faa4280cf7c81d0e09fcb49b342ebf826abe5a72 \
309-
--hash=sha256:0b53e1d41e97063d51a02821b80538053ee4608b9a181c1005441f1673c55423 \
310-
--hash=sha256:2b3ce5f16deb45c472dde1a0ee05619298c864a20cded09c4edd820e1454129f \
311-
--hash=sha256:2e82a6d37a95e0b1b42b82ab340ada3963aea1317fd7f888bb6b9dfbf4fff57c \
312-
--hash=sha256:301d626a59edbe5dfb48fcae245896379a450d04baeed50ef40d8199f2733b06 \
313-
--hash=sha256:39f4a73e5342b25c2959529f07f026ef58147249f9b7431e1ba8414a36761f53 \
314-
--hash=sha256:4948f264678c703f3877d1c8877c4e3b2e12e549c57795107f08cf70c6ec7774 \
315-
--hash=sha256:4b05697738e7d2040696b0a66d9f0a10bec0efa1883ca75ee9e55baf511909d6 \
316-
--hash=sha256:51bdeb10d2db0f288e71d49c9cefa609bca271720ecd0c58009bd7504a0c464c \
317-
--hash=sha256:55b1625899acd33229c4352ce0ae54038529b412bd51c4915349b49ca575258f \
318-
--hash=sha256:572066051eeac73d23f95ba9a71349c42a3e05999d0ee1572b7860235b850cc6 \
319-
--hash=sha256:6a05a9db1ef5be0fe63e988f9617ca2551013f55000289c671f71ec16f4985e3 \
320-
--hash=sha256:6dc1cc241440ed7ca9ab59d9929075445da6b7c94ced281b3dd4cfe6c8cff817 \
321-
--hash=sha256:6e7124d6855b2780611d9f5e1e145e86667eaa3bd9459192c8dc1a097f5e9903 \
322-
--hash=sha256:75d52162fe6b2b55964fbb0af2ee58e99791a3138588c482572bb6087953113a \
323-
--hash=sha256:78cec42b95dbb500a1f7120bdf95c401f6abb616bbe8785ef09887306792e66e \
324-
--hash=sha256:7feb6a2d401f4d6863050f58325b8d99c1e56f4512d98b11ac64ad1751dc647d \
325-
--hash=sha256:8775d4ef5e7299a2f4699501077a0defdaac5b6c4321173bcb0f3c496fbadf85 \
326-
--hash=sha256:887ca463c3bc47103c123bc06919c86720e80e1214aab79e9b779cda0ff92a00 \
327-
--hash=sha256:9193d4f4ee8feca58bc56c8306bcb820f5c7905fd919e0750acdeeeef0615b28 \
328-
--hash=sha256:983e720704431a6573d626b00662eb78a07148c9115129f9b4351091ec95ecc3 \
329-
--hash=sha256:990406d226dea0e8f25f643b370224771878142155b879784ce89f633541a024 \
330-
--hash=sha256:9cbdc268a62d9a98c56e2452d6c41c0263d64a2009aac69246486f01b4f594c4 \
331-
--hash=sha256:a48f1953c4a1d9bd0b5167ac50da9a79f6072c63c4cef4cf2a3736994903583e \
332-
--hash=sha256:a9a6747cac06c2beb466064dda999a13176b23535e4c496c9d48e6406f92d42d \
333-
--hash=sha256:a9f2de23bec87ff306aef658384b02aa7c32389766af3c5dee9ce33e80222dfa \
334-
--hash=sha256:b5635de53e6686fe7a44b5cf25fcc419a0d5e5c1a1efe73d49d48fe7586db854 \
335-
--hash=sha256:b6f9d649892a6f54a39ed56b8dfd5e08b5f3be5f893da430bed76975f3735d15 \
336-
--hash=sha256:b9a3859f24eb4e097502a3be1fb4b2abb79b6103dd9e2e0edb70613a4459a648 \
337-
--hash=sha256:cd8702c5142afda03dc2b1ee6bc358b62b3735b2cce53fc77b31ca9f728e4bc8 \
338-
--hash=sha256:d7b5a3821225f5c43496c324b0d6875fde910a1c2933d726a743ce328fbb2a8c \
339-
--hash=sha256:d88c4c0e5c5dfd05092a4b271282ef0588e5f4aaf345778056fc5259ba098857 \
340-
--hash=sha256:eb992a1ef739cc7b543576337bebfc62c0e6567434e522e97291b251a41dad7f \
341-
--hash=sha256:f2f7eb6273dd12472d7f218e1fef6f7c7c2f00ac2e1ecde4db8824c457300416 \
342-
--hash=sha256:fdf88ab63c3ee282c76d652fc86518aacb737ff35796023fae56a65ced1a5978 \
343-
--hash=sha256:fdf8d759ef326962b4678d89e275ffc55b7ce59d917d9f72233762061fd04a2d
344-
# via aws-sam-translator
345307
pyopenssl==23.0.0 \
346308
--hash=sha256:c1cc5f86bcacefc84dada7d31175cae1b1518d5f60d3d0bb595a67822a868a6f \
347309
--hash=sha256:df5fc28af899e74e19fccb5510df423581047e10ab6f1f4ba1763ff5fde844c0
@@ -527,7 +489,6 @@ typing-extensions==4.4.0 \
527489
# aws-sam-cli (setup.py)
528490
# aws-sam-translator
529491
# importlib-metadata
530-
# pydantic
531492
tzlocal==3.0 \
532493
--hash=sha256:c736f2540713deb5938d789ca7c3fc25391e9a20803f05b60ec64987cf086559 \
533494
--hash=sha256:f4e6e36db50499e0d92f79b67361041f048e2609d166e93456b50746dc4aef12

‎samcli/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
SAM CLI version
33
"""
44

5-
__version__ = "1.74.0"
5+
__version__ = "1.75.0"

‎samcli/commands/_utils/table_print.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ def pprint_wrap(func):
6363
def wrap(*args, **kwargs):
6464
# The table is setup with the column names, format_string contains the column names.
6565
if table_header:
66-
click.secho("\n" + table_header.format(args[0].client_sleep) if display_sleep else table_header)
66+
click.secho(
67+
"\n" + table_header.format(args[0].client_sleep) if display_sleep else table_header, bold=True
68+
)
6769
click.secho("-" * usable_width, fg=color)
6870
click.secho(format_string.format(*format_args, **format_kwargs), fg=color)
6971
click.secho("-" * usable_width, fg=color)
@@ -74,7 +76,7 @@ def wrap(*args, **kwargs):
7476
kwargs["margin"] = margin if margin else min_margin
7577
result = func(*args, **kwargs)
7678
# Complete the table
77-
click.secho("-" * usable_width, fg=color)
79+
click.secho("-" * usable_width + "\n", fg=color)
7880
return result
7981

8082
return wrap

‎samcli/commands/deploy/guided_context.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ def guided_prompts(self, parameter_override_keys):
178178

179179
click.echo("\n\tLooking for resources needed for deployment:")
180180
s3_bucket = manage_stack(profile=self.profile, region=region)
181-
click.echo(f"\t Managed S3 bucket: {s3_bucket}")
182-
click.echo("\t A different default S3 bucket can be set in samconfig.toml")
181+
click.secho(f"\n\tManaged S3 bucket: {s3_bucket}", bold=True)
182+
click.echo("\tA different default S3 bucket can be set in samconfig.toml")
183183

184184
image_repositories = self.prompt_image_repository(
185185
stack_name, stacks, self.image_repositories, region, s3_bucket, self.s3_prefix

‎samcli/commands/deploy/utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def print_deploy_args(
8181
click.echo(f"\tParameter overrides : {parameter_overrides_format_text}")
8282
click.echo(f"\tSigning Profiles : {signing_profiles_format_text}")
8383

84-
click.secho("\nInitiating deployment\n=====================", fg="yellow")
84+
click.secho("\nInitiating deployment\n=====================\n", fg="yellow")
8585

8686

8787
def sanitize_parameter_overrides(parameter_overrides):

0 commit comments

Comments
 (0)