Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
.idea/**/tasks.xml
.idea/dictionaries
.idea
.vscode

# Sensitive or high-churn files:
.idea/**/dataSources/
Expand Down Expand Up @@ -376,10 +375,7 @@ GitHub.sublime-settings

### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/launch.json.template
.history

### Theia editor (GitPod)
Expand Down
67 changes: 67 additions & 0 deletions .vscode/launch.json.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Run: Remote Invoke Sync",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/samcli/__main__.py",
"python": "${command:python.interpreterPath}",
"args": [
"remote",
"invoke",
"<REMOTE_LAMBDA_ARN>",
"--debug",
"--output",
"json"
],
"env": {
"PYTHONPATH": "${workspaceFolder}"
},
"console": "integratedTerminal",
"justMyCode": false
},
{
"name": "Run: Remote Invoke Streaming Response",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/samcli/__main__.py",
"python": "${command:python.interpreterPath}",
"args": [
"remote",
"invoke",
"<REMOTE_LAMBDA_ARN>",
"--debug",
"--output",
"json"
],
"env": {
"PYTHONPATH": "${workspaceFolder}"
},
"console": "integratedTerminal",
"justMyCode": false
},
{
"name": "Test: Run current test file",
"type": "debugpy",
"request": "launch",
"module": "pytest",
"args": ["${file}", "-v"],
"python": "${command:python.interpreterPath}",
"console": "integratedTerminal",
"justMyCode": false
},
{
"name": "Format and PR",
"type": "node",
"request": "launch",
"runtimeExecutable": "bash",
"runtimeArgs": [
"-c",
"cd \"${workspaceFolder}\" && make black && make pr"
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
}
]
}
12 changes: 11 additions & 1 deletion DEVELOPMENT_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,18 @@ samdev --version # this will print something like "SAM CLI, version x.xx.x"
echo '__version__ = "123.456.789"' >> samcli/__init__.py
samdev --version # this will print "SAM CLI, version 123.456.789"
```
### 3 VS Code Debugger

### 3. (Optional) Install development version of SAM Transformer
For VS Code Launch configuration, run the following command to create your local VS Code launch configuration:

```bash
cp .vscode/launch.json.template .vscode/launch.json
```

This will create a local copy of the launch configuration that you can customize without affecting the shared template.


### 4. (Optional) Install development version of SAM Transformer

If you want to run the latest version of [SAM Transformer](https://github.com/aws/serverless-application-model/)
or work on it at the same time, you can clone it locally and install it in your virtual environment.
Expand Down
3 changes: 3 additions & 0 deletions appveyor-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,9 @@ install:
- sh: 'export AWS_KMS_KEY=$(echo "$test_env_var" | jq -j ".TestKMSKeyArn")'
- sh: 'export AWS_SIGNING_PROFILE_NAME=$(echo "$test_env_var" | jq -j ".TestSigningProfileName")'
- sh: 'export AWS_SIGNING_PROFILE_VERSION_ARN=$(echo "$test_env_var" | jq -j ".TestSigningProfileARN")'
- sh: 'export LMI_SUBNET_ID=$(echo "$test_env_var" | jq -j ".LMISubnetId")'
- sh: 'export LMI_SECURITY_GROUP_ID=$(echo "$test_env_var" | jq -j ".LMISecurityGroupId")'
- sh: 'export LMI_OPERATOR_ROLE_ARN=$(echo "$test_env_var" | jq -j ".LMIOperatorRoleArn")'

# Runtime-aware Docker Hub authentication with fail-fast
- sh: |
Expand Down
3 changes: 3 additions & 0 deletions appveyor-windows-al2023.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ install:
$env:AWS_KMS_KEY = $test_env_var_json.TestKMSKeyArn;
$env:AWS_SIGNING_PROFILE_NAME = $test_env_var_json.TestSigningProfileName;
$env:AWS_SIGNING_PROFILE_VERSION_ARN = $test_env_var_json.TestSigningProfileARN;
$env:LMI_SUBNET_ID = $test_env_var_json.LMISubnetId;
$env:LMI_SECURITY_GROUP_ID = $test_env_var_json.LMISecurityGroupId;
$env:LMI_OPERATOR_ROLE_ARN = $test_env_var_json.LMIOperatorRoleArn;
}"


Expand Down
3 changes: 3 additions & 0 deletions appveyor-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ install:
$env:AWS_KMS_KEY = $test_env_var_json.TestKMSKeyArn;
$env:AWS_SIGNING_PROFILE_NAME = $test_env_var_json.TestSigningProfileName;
$env:AWS_SIGNING_PROFILE_VERSION_ARN = $test_env_var_json.TestSigningProfileARN;
$env:LMI_SUBNET_ID = $test_env_var_json.LMISubnetId;
$env:LMI_SECURITY_GROUP_ID = $test_env_var_json.LMISecurityGroupId;
$env:LMI_OPERATOR_ROLE_ARN = $test_env_var_json.LMIOperatorRoleArn;
}"


Expand Down
6 changes: 3 additions & 3 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
chevron~=0.12
click==8.1.8
Flask<3.2
boto3[crt]>=1.29.2,<2
boto3[crt]==1.42.0
jmespath~=1.0.1
ruamel_yaml~=0.18.16
PyYAML~=6.0
cookiecutter~=2.6.0
aws-sam-translator==1.103.0
aws-sam-translator==1.104.0
#docker minor version updates can include breaking changes. Auto update micro version only.
docker~=7.1.0
dateparser~=1.2
Expand Down Expand Up @@ -34,4 +34,4 @@ tzlocal==5.3.1
cfn-lint~=1.41.0

# Type checking boto3 objects
boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.41.0
boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]>=1.41.0
106 changes: 53 additions & 53 deletions requirements/reproducible-linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,53 +22,53 @@ aws-lambda-builders==1.60.0 \
--hash=sha256:518b668130e550a4c88968432fba344a36aa965cca89bf8a30456f991053ae0e \
--hash=sha256:c61d49dd80ee00a484bea3754ff55fd45e6ec5cd3c56169a6eb8767882187dbd
# via aws-sam-cli (setup.py)
aws-sam-translator==1.103.0 \
--hash=sha256:8317b72ef412db581dc7846932a44dfc1729adea578d9307a3e6ece46a7882ca \
--hash=sha256:d4eb4a1efa62f00b253ee5f8c0084bd4b7687186c6a12338f900ebe07ff74dad
aws-sam-translator==1.104.0 \
--hash=sha256:907c50e812f88514fa8f41b8adcb37ba0ee28e1b8c0144b011c4985471b1201d \
--hash=sha256:d873a064df52a7e6426e34cb55ee737085757114776b6ea03e58416f6976d975
# via
# aws-sam-cli (setup.py)
# cfn-lint
awscrt==0.28.4 \
--hash=sha256:0024b3e26a5ce9ffc9a92533f0a62bd823e025465f3b90ad3dda2878a260171a \
--hash=sha256:046006703a7ed6278d5f80214c9aae02fc6b6a65a5f7ceb721becf9e1ad90604 \
--hash=sha256:08941fb1f603f1b7b722e8670f121ccf8f25a4073d2f92e3696ae763e309a39d \
--hash=sha256:08b884bb6809d22f80921feb0ae9353fea1a750109a18d02057b6bba742db439 \
--hash=sha256:13ed9b71a346146a89de85c173d007142416e6cc0358d7ca6b0d68dc1d159667 \
--hash=sha256:19adb9fa309111e20e1e850c876f093247ad084efdaa2dd654a15aef4b4bc637 \
--hash=sha256:1c6319d297d18ba7cf3c6a8f69f76fd22b949e4ea8a280eb2098a8d6ed0d25be \
--hash=sha256:1dd5dac3f761cb74c70c7feebf9f8dc96dc3b8db8248e5899bcbf34633d974a3 \
--hash=sha256:277af1c4e5ef666192bd04aea8c3afcbb26d7794594f6f7ba23d7285df5be65e \
--hash=sha256:43e1a88bec567e89eb398151ca6af389feb3a7f9b297141061fe759e65b43a52 \
--hash=sha256:4657eb947e214c8314d1b26df64e4f8c7c2f3b6817cebae00e3288a4bb1779c5 \
--hash=sha256:56e949e965a7668fe0bc6638edf88c009e44090216bb894a5ac758153b01757c \
--hash=sha256:5d95f06142634043dc5c9e20e8f7a16b710e32aa1ae3f42eebb3643cabbe4275 \
--hash=sha256:653f0c57f1f00cf526045ae2b76cd79f13cb751ed5400a545dcf44a9e5d0fa96 \
--hash=sha256:694c183bf2c3ef1d538caa5a73c007cddd841529bc43c6beeb02eb6a353094e6 \
--hash=sha256:6a8543c8637374a0963113663fe053c43868d091e5109bcdc1f14f79f780a6c7 \
--hash=sha256:726926408dea51284fc5f4ab112e797226d59c172bc58156e925099769cc4217 \
--hash=sha256:79217f918e02e02ef9ec6f2e77cdf5afc44a8c904840fe0f873d9116db1e8860 \
--hash=sha256:79d1cb861d017db8657a0fe0b4a02ddc60d596107e2e9e7816eaaca1afa30da4 \
--hash=sha256:7d4365d17bc44e24f861237e37c085aca89d22af756e6f1f5f05ffdc72c93737 \
--hash=sha256:7e0559ea770589958cdbed21f46d2ffdec2836ef43a00a4689d25205bb05cd22 \
--hash=sha256:86bb7612250925d49480a4648d30855d8f3d0e1dd8c322c586b4684847ff5d70 \
--hash=sha256:8bfbe9dae84acb76d05ffde64a85c06e71c05819890f4c28be3204c75e0d5c76 \
--hash=sha256:8f1aef999e0d48a4c3c2e6a713849392b883f918f4c1ce2b00d701c94c3252f8 \
--hash=sha256:9389743eb4c04d1fa0ed5448b4bc6c8283239ece9a9ff4145a5d41ddecd02d42 \
--hash=sha256:98dd46532ebb311123080c8df8805a94e66c02fa1b7d52d6d2f9abcf589c7f8b \
--hash=sha256:98deb64086f30454f791bd52aae2a2086d7896831b5966e8d22cb49b85758e4a \
--hash=sha256:a14b75f6c0cf79f2cb614c2459a492f8fed1836456e6488125652c9b2e7777aa \
--hash=sha256:a40aa941cf8201382986e4287c4fe51067a8bc2c78d9668937a6861cf14a54c6 \
--hash=sha256:b6d6de9172ef52ba1fb5cba12355bf6e845447a750a5214e9f57bf08aeeb6251 \
--hash=sha256:d1e205e53b08456f0f83210c20c674ebdef96e3e80f716d1bf4ad666db2c643b \
--hash=sha256:d2835094e92d0a3d1722d03afd54983115b2172d57581a664ad6a2af3d33c12c \
--hash=sha256:d419febaf110d8dbcfdcd7a37a74882a8fae68a6f96e40d7d53c93ef11fc9c70 \
--hash=sha256:d5b252bd5b30056b73827fdbc8d74d7d7af09e271b94ffca2cc3d96e625389ea \
--hash=sha256:dc11d00600888a690c1ad875759708a4d21bdf81b6c2032e0227687d27fca910 \
--hash=sha256:dd23b9bad57812d7b1d1de785e10a44e3352cf1f3c0e5bd7b678b27d93f482a4 \
--hash=sha256:e030f2036619d98e237a3561c8138b61fd4bf2f3f361d9f2e0b1112a8cd53d5b \
--hash=sha256:e20266fed25bd4198f59541b4343328479524042b781e810e8c6ad9c82a0420c \
--hash=sha256:e328d2afe68c772cae8cab23a210329ce1f434a1380fb585c2dba890cf08d3f1 \
--hash=sha256:e82b2ccd3caf1159d5a2ffea480eb5dbb0e9ea9baf4ac640d9fb86615ef22b9e
awscrt==0.29.1 \
--hash=sha256:002479448ee57c412f9543323ff9aeecc53d2bb7b0d39d8a0ba5909b8d51c459 \
--hash=sha256:1035bfa73e5eab360434bde20b991e674439073362ca45fd4cc7f95db7044ac6 \
--hash=sha256:1446d0ba07bf8fd9d034e45597bf526f01ca5a2fc0c72d0a20c3b360a32471af \
--hash=sha256:1af4d8f32f3bef192669a2bf302f01fe9451562b51d39a878287d276e83d922c \
--hash=sha256:210625ad30535afd9691da4293150801c89c1ef681ac3f45aa1186ba912c62ac \
--hash=sha256:21a19a299e998c9b0a72b685fcdbd60888ee3e40ef25136f6c10be9ee2183e28 \
--hash=sha256:21d120ab3d8d68cd380be88a680b2467da52899bdaa406265f1d72778401ac2a \
--hash=sha256:258ec1255bcdaf45154f67fb988e4a0b35a0e222e7bfe3d013fee3eb560ddca3 \
--hash=sha256:2b6907f5e0dcc61e76404e5dd5901aeddb0c3cfad25115a22048babf26982e2f \
--hash=sha256:342896264785dffef5a9022925899d100215025415f63388b8f228708a3de321 \
--hash=sha256:3c8acc0b8c6434f93d7341c875670df2af29de037da11386e19c9e1b773efd00 \
--hash=sha256:41ddbcbcf3ec9b67afcf13c6e532b90d0734b90ecadd15b2875319234bad63e3 \
--hash=sha256:45d1c06a634c7b4be34a04f21a46c6c08444a94fa44b96ab109be891fb2b606b \
--hash=sha256:4e71994e5e2923672983488666f2bc1cf108adacb22049cc1ce38493891f88e0 \
--hash=sha256:5b11e6b962d271bdff7b66c903df5d0e05611fb7e0dda91326a78a42b738dfed \
--hash=sha256:62073a50ca316018d27937ed881824181726e314fe6d1800f86a9bca3e9cadcb \
--hash=sha256:657cc493e3aa3a836b00fd7c17c9c8cbccd4d75059475826452d406a67722c95 \
--hash=sha256:6bd87da4eb4bbda738caad2e13d3943bb217bce1cdb21d411632c9b553322f5b \
--hash=sha256:701d7834967acae9802e4913521ba3bb7e2795e2391c987465da6bd97c8e2af2 \
--hash=sha256:74bb7c5f7a8203897aebf96a5d8b0a9993e6efa4e856a57f0fff1aa9cec482e9 \
--hash=sha256:7774450c90f29aaea0986e2cd85a1f10a47f67544af5453947df317f0a1b4708 \
--hash=sha256:794ab960ca5db0e24b9438d5ffe63f7d1c57e9b6f9c4b3f017a3b889135d3874 \
--hash=sha256:7cddff658bffc265a0df325575f0173d421772282f5da9f8e8bf9702a03deabc \
--hash=sha256:8a9442031ba341218878607f5a0d1df18ac98fb951c17f99b836784eb9380442 \
--hash=sha256:8c5b7a0cd1d6553882cea4340319a06e8b7583058b508bdab8859607a40c3350 \
--hash=sha256:8fc304af5f6f83e7e73096fb42eb51d4a85fa7a90456466ef22872095d4ca46f \
--hash=sha256:9ab168654175b4a869a2e61836bed0428cb72ac0a7aca63ce36cde04d941e2a2 \
--hash=sha256:9ae0921af7204ad2095d1e610b4a79a43282358bb5353167c5f497ef001af099 \
--hash=sha256:9cf1ed3552c498555f1eee64154be288f9ce1e6fe540368087870f11195db4a7 \
--hash=sha256:af8cb6898c2060d4b0cf2e4b9150ec49d3ed432ee8ae481413cef2edbbd53a9f \
--hash=sha256:bbe77db7e317080219ecad1ff9a0f69750b01265cab305586c24a3a587b7ba71 \
--hash=sha256:c55a4ad949b68811083bc8b010bf0bc64907a3c0dd048e783cb06733bcc60c56 \
--hash=sha256:c560faacb671cf494725f0a76558ae22db3ab6feeef0f7af757f64b94383b307 \
--hash=sha256:ca53a8cf69808a48a5f0a02a1a4270a203551b59c47ba7797e789c337feec50b \
--hash=sha256:ce87d70d511c50d192f068f0540df19dc5c6b0d35a902e0a213106e2854df3eb \
--hash=sha256:d21df9c33e20e2ab7f5cb595853752b7e49bb40de7a41e46eb37d66fd721a09e \
--hash=sha256:d75bafdb2ad8e1f5ab427d3efcea894c84207b3ed08405922ea0f74f61f13792 \
--hash=sha256:e826eb2cad73273cc6835e893e21e5b83ff42f505f88dc2cccdb2dc64dbca870 \
--hash=sha256:f3a5a37b6d26b2f33e9dbfa4849de5539c2463da3024519114236102b2676cfb \
--hash=sha256:f9c320b70986f054f5b3bebe8e05879eff5aaf4dc2b8b67b25eed5be23399acd
# via botocore
binaryornot==0.4.4 \
--hash=sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061 \
Expand All @@ -78,19 +78,19 @@ blinker==1.9.0 \
--hash=sha256:b4ce2265a7abece45e7cc896e98dbebe6cead56bcf805a3d23136d145f5445bf \
--hash=sha256:ba0efaa9080b619ff2f3459d1d500c57bddea4a6b424b60a91141db6fd2f08bc
# via flask
boto3[crt]==1.41.0 \
--hash=sha256:73bf7f63152406404c0359c013a692e884b98a3b297160058a38f00ef19e375b \
--hash=sha256:d5c454bb23655b052073c8dc6703dda5360825b72b1691822ae7709050b96390
boto3[crt]==1.42.0 \
--hash=sha256:9c67729a6112b7dced521ea70b0369fba138e89852b029a7876041cd1460c084 \
--hash=sha256:af32b7f61dd6293cad728ec205bcb3611ab1bf7b7dbccfd0f2bd7b9c9af96039
# via
# aws-sam-cli (setup.py)
# aws-sam-translator
boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.41.0 \
--hash=sha256:74d138f2d2f5f48140be81d680722b0194e09bcdf8d2080a914c21d277c2cfe3 \
--hash=sha256:9e373ac5f9c721c5e615ef694a992c333480c71905d3b8e940175dd7265eef93
# via aws-sam-cli (setup.py)
botocore[crt]==1.41.0 \
--hash=sha256:555afbf86a644bfa4ebd7bd98d717b53b792e6bbb2c49f2b308fb06964cf1655 \
--hash=sha256:a5018d6268eee358dfc5d86e596c3062b4e225690acaf946f54c00063b804bf8
botocore[crt]==1.41.6 \
--hash=sha256:08fe47e9b306f4436f5eaf6a02cb6d55c7745d13d2d093ce5d917d3ef3d3df75 \
--hash=sha256:963cc946e885acb941c96e7d343cb6507b479812ca22566ceb3e9410d0588de0
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -1182,9 +1182,9 @@ ruamel-yaml-clib==0.2.14 \
--hash=sha256:fbc08c02e9b147a11dfcaa1ac8a83168b699863493e183f7c0c8b12850b7d259 \
--hash=sha256:ff86876889ea478b1381089e55cf9e345707b312beda4986f823e1d95e8c0f59
# via ruamel-yaml
s3transfer==0.14.0 \
--hash=sha256:ea3b790c7077558ed1f02a3072fb3cb992bbbd253392f4b6e9e8976941c7d456 \
--hash=sha256:eff12264e7c8b4985074ccce27a3b38a485bb7f7422cc8046fee9be4983e4125
s3transfer==0.16.0 \
--hash=sha256:18e25d66fed509e3868dc1572b3f427ff947dd2c56f844a5bf09481ad3f3b2fe \
--hash=sha256:8e990f13268025792229cd52fa10cb7163744bf56e719e0b9cb925ab79abf920
# via boto3
six==1.17.0 \
--hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \
Expand Down
Loading
Loading