SAM INIT support for custom runtimes #3726
Conversation
github-actions
bot
added
pr/external
area/init
| @@ -263,8 +269,10 @@ def _get_app_template_properties( | |||
| InvalidInitOptionException | |||
| exception raised when invalid option is provided | |||
| """ | |||
| # breakpoint() | |||
There was a problem hiding this comment.
I think you might've forgotten to remove this line.
| @@ -192,6 +197,7 @@ def _generate_from_use_case( | |||
| [*] Test Function in the Cloud: sam sync --stack-name {{stack-name}} --watch | |||
| """ | |||
| click.secho(next_commands_msg, fg="yellow") | |||
| runtime = get_custom_runtime_base_runtime(runtime) if is_custom_runtime(runtime) else runtime | |||
There was a problem hiding this comment.
Can we define this value once above and re-use it avoid duplication of this line and line 173?
| """ | ||
| if not runtime: | ||
| return False | ||
| validation_result = get_custom_runtime_base_runtime(runtime) |
There was a problem hiding this comment.
| validation_result = get_custom_runtime_base_runtime(runtime) | |
| provided_runtime = get_custom_runtime_base_runtime(runtime) |
| return runtime in PROVIDED_RUNTIMES or bool(validation_result in PROVIDED_RUNTIMES) | ||
|
|
||
|
|
||
| def get_custom_runtime_base_runtime(runtime): |
There was a problem hiding this comment.
| def get_custom_runtime_base_runtime(runtime): | |
| def get_provided_runtime_from_custom_runtime(runtime): |
| bool | ||
| True if there is a match else False | ||
| """ | ||
| if is_custom_runtime(filter_value) and filter_value != get_custom_runtime_base_runtime(template_runtime): |
There was a problem hiding this comment.
is_custom_runtime is already calling get_custom_runtime_base_runtime in it, why do we need to call it here again?
There was a problem hiding this comment.
we have both provided.al2 and provided, if a customer wants provided.al2 SAM INIT filters all runtimes and even down to the custom runtime's base runtime and generate a list of only provided.al2 runtimes which should be the expected behavior.
Therefore knowing that the runtime is a custom runtime isn't enough, digging deeper to get the customer the right custom runtime is what we want here. Just like its shown below, it narrows the runtime result list down to the exact provided runtime the customer wants:
(samcli39) jonife@147dda19a1dc python39x % samdev init -r provided.al2
Which template source would you like to use?
1 - AWS Quick Start Templates
2 - Custom Template Location
Choice: 1
Based on your selections, the only Template available is Hello World Example.
We will proceed to selecting the Template as Hello World Example.
Which runtime would you like to use?
1 - graalvm.java11 (provided.al2)
2 - rust (provided.al2)
Runtime:
| @@ -179,7 +181,8 @@ def get_preprocessed_manifest( | |||
| # at the top of list template example displayed to the Customer. | |||
| preprocessed_manifest = {"Hello World Example": {}} # type: dict | |||
| for template_runtime in manifest_body: | |||
| if filter_value and filter_value != template_runtime: | |||
| if not filter_value_matches_template_runtime(filter_value, template_runtime): | |||
| LOG.debug("Template runtime {template_runtime} does not match filter value {filter_value}") | |||
There was a problem hiding this comment.
| LOG.debug("Template runtime {template_runtime} does not match filter value {filter_value}") | |
| LOG.debug("Template runtime %s does not match filter value %s", template_runtime, filter_value) |
Which issue(s) does this change fix?
Why is this change necessary?
This pr help us provide support for custom runtime in SAMCLI
How does it address the issue?
Adding this support will enable us to custom runtimes
What side effects does this change have?
None
Mandatory Checklist
PRs will only be reviewed after checklist is complete
make prpassesmake update-reproducible-reqsif dependencies were changedBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.