Fix: Use Internal CLI templates #3590
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
pr/external
area/init
jonife
changed the title
mildaniel
reviewed
Jan 17, 2022
| @@ -70,6 +70,10 @@ | |||
| } | |||
|
|
|||
|
|
|||
| def get_local_manifest_path(): | |||
| return os.path.join(_init_path, "lib", "init", "local_manifest.json") | |||
There was a problem hiding this comment.
Can we use pathlib here for consistency?
mildaniel
reviewed
Jan 17, 2022
| @@ -0,0 +1,176 @@ | |||
| { | |||
| "dotnetcore3.1": [ | |||
There was a problem hiding this comment.
Should we get rid of the runtimes no longer supported by lambda from this manifest? @mndeveci
There was a problem hiding this comment.
Agreed, we are working on to remove them from app template repo, let's don't include them here at all.
mildaniel
reviewed
Jan 17, 2022
| @@ -124,7 +128,9 @@ def get_app_template_location(self, template_directory): | |||
| return os.path.normpath(os.path.join(self._git_repo.local_path, template_directory)) | |||
|
|
|||
| def get_manifest_path(self): | |||
| return Path(self._git_repo.local_path, self.manifest_file_name) | |||
| if self._git_repo.local_path and os.path.exists(Path(self._git_repo.local_path, self.manifest_file_name)): | |||
There was a problem hiding this comment.
Instead of os.path.exists could we use Path(..).exists() for pathlib consistency moving forward?
mildaniel
reviewed
Jan 17, 2022
tests/unit/commands/init/test_cli.py
Outdated
| file_name_path = "local_manifest.json" | ||
| self.assertIn(file_name_path, manifest_path) | ||
|
|
||
| # @patch("samcli.commands.init.init_templates.InitTemplates.get_preprocessed_manifest") |
There was a problem hiding this comment.
Are these commented lines okay to remove if unused?
There was a problem hiding this comment.
Let's remove commented lines if we don't need them anymore
mndeveci
approved these changes
Jan 18, 2022
mildaniel
approved these changes
Jan 18, 2022
mndeveci
pushed a commit
to mndeveci/aws-sam-cli
that referenced
this pull request
Apr 5, 2022
* bug fix for sunning samcli when cloning fails * fixed failing test in Appveyor * change os.path to pathlib.Path
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue(s) does this change fix?
#3576
Why is this change necessary?
Customers are currently experience issues when they can't clone
How does it address the issue?
Allow customers without internet or who can't clone the git repo access internal template without breaking
What side effects does this change have?
None
Checklist
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.