Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open sam template upon sam init #481

Merged
merged 4 commits into from
Apr 11, 2019

Conversation

micholas
Copy link
Contributor

@micholas micholas commented Apr 10, 2019

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Infrastructure (change which improves the lifecycle management (CI/CD, build, package, deploy, lint, etc) of the application, but does not change functionality.)
  • Technical debt (change which improves the maintainability of the codebase, but does not change functionality)
  • Testing (change which modifies or adds test coverage, but does not change functionality)
  • Documentation (change which modifies or adds documentation, but does not change functionality)

Description/Motivation/Context

There are numerous complexities associated with attempting to open the source file that a user wants to open upon running sam init. These complexities began to surface when attempting to do so for DotNet and are expected to be compounded once we add support for sam init --location.

We can avoid these complexities by simply opening ${samAppDir}/template.yaml upon sam init.

Related Issue(s)

Testing

Tested manually on OSX for all supported runtimes.

Checklist

  • I have read the README document
  • I have read the CONTRIBUTING document
  • My code follows the code style of this project
  • I have added tests to cover my changes
  • All new and existing tests passed
  • A short description of the change has been added to the CHANGELOG

License

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

root: vscode.Uri.file(path.join(config.location.fsPath, config.name))
})
} catch (err) {
const samTemplatePath = path.resolve(config.location.fsPath, config.name, 'template.yaml')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is path.resolve used instead of path.join?

Copy link
Contributor Author

@micholas micholas Apr 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general path.resolve always returns an absolute path while path.join could be either absolute or relative depending upon the arguments. Generally in programs, I prefer to pass around, log and print absolute paths since they work and can be understood both internally and externally regardless of current working directory, hence I tend to favor path.resolve in most cases.

@mpiroc mpiroc merged commit 4360748 into feature/dotnet Apr 11, 2019
@mpiroc mpiroc deleted the micholas/open-sam-template-upon-sam-init branch April 11, 2019 01:24
mpiroc pushed a commit that referenced this pull request Apr 11, 2019
mpiroc added a commit that referenced this pull request Jun 7, 2019
…y. (#599)

* Initial codelens implementation for C# (#477)

* Open sam template upon sam init (#481)

* C# run command (#488)

Added C# run command with some tests and some refactoring to the localLambdaRunner and pythonCodeRunner files. Additional work deemed out-of-scope for this feature can be found here: #507

* Prepare for .NET Core Debug implemention. (#513)

* Removing unused runtimes (#535)

* Implement "Debug Locally" code lens for .NET Core. (#552)

* Port changes from develop for eb07933..9c3d7c3.

* Fix npm audit issues.

* Port 'Switch away from Terminal to using Debug Console and Output tabs for local debug and run (#493)' from develop.

* Port 'Added AWS logo with min retina size (#461) (#498)' from develop.

* Port 'Handle port-waiting timeout; Catch Python debugging Errors (#494)' from develop.

* Python Path Mappings now provide both drive letter casings for Windows (#495)

* Port 'Explicitly show the Debug Console after each successful debugger attach (#496)' from develop.

* Port 'Prevent AWS Explorer context menu items from getting added to other extension/view menus (#506)' from develop

* Port 'Design for operations against resources attached to code pipelines (#503)' from develop.

* Port 'childProcess times out and dies if the debugger does not attach in time (#512)' from develop.

* Port 'Remove lambda views for Policy and Configuration (#505)' from develop.

* Port 'Normalizing telemetry (#534)' from develop.

* Port 'SAM calls that use AWS resources now correctly use an AWS profile (#554)' from develop.

* Port 'SAM CLI Validation Refactor (#555)' from develop.

* Port 'Fixes issue introduced in f9816c1 that caused the AWS Explorer context menu to disappear (#560)' from develop

* Port 'Added a help button to the sam init wizard's runtime selection step (#538)' from develop.

* Port 'Metrics overrides for result and duration (#562)Metrics overrides for result and duration (#562)' from develop.

* Port 'Added vs code task to run lint fixer (#561)' from develop.

* Port 'SAM CLI Validation at the start of Create New SAM App flow (#563)' from develop.

* Port 'Updated the message shown when SAM CLI is newer than valid range (#569)' from develop.

* Port 'SAM CLI Validation at the start of Deploy SAM App flow (#570)' from develop.

* Port 'Code Improvement: sam deploy calls (#571)' from develop.

* Port 'Code Improvement: sam package calls (#572)' from develop.

* Port 'Telemetry data includes active AWS account ID (if configured) (#557)' from develop.

* Port 'Code Improvement: sam deploy workflow (#573)' from develop.

* Port 'Code Improvement: Error handling on sam cli calls (#574)' from develop.

* Port 'Extension throws an error if the toolkitClientBuilder is not initialized before initial credential validation (#577)' from develop.

* Port 'addUserDataToContext throws an error if a profile's credentials are nonexistent (#579)' from develop.

* Port 'Ensure log folder exists prior to initialization (#583)' from develop.

* Port 'Adding help buttons to deploy workflow (#584)' from develop.

* Port 'Credentials are now passed to STS client correctly on validation. (#585)' from develop

* Port 'Add prettier formatter and git hook (#578)' from develop.

* Fix WAIT_FOR_DEBUGGER_MESSAGE for .NET Core.

* Disable prettier pre-commit hook, and fix linter issues introduced by prettier.

* Fix dotnet debug install issues on Mac, Linux (#592)

* Instead of installing VSDBG by manually invoking crossSpawn, use existing ChildProcess utility class.
* Simplify code by unconditionally installing debugger each time - the script is smart enough to determine if an install is needed.
* DockerContext outputs stdout to output channel
* Fix installing debugger on non-windows platforms

* Fix issue that caused templates.json to be ignored when invoking .NET Core functions. (#593)

* Address feedback from PR.
mpiroc added a commit that referenced this pull request Jun 7, 2019
Due to a series of misteps, we are squashing this entire feature branch into develop.

1. We allowed `feature/dotnet` to drift too far from `develop`, which required significant manual conflict resolution to resolve.
2. We should have squashed the conflict-resolution history *before* merging develop, but we did not. Therefore in order to squash the pre-merge commits, we would need to recreate the merge and re-resolve conflicts. This would reduce our confidence in the quality of the branch.

In the future:

1. We will regularly merge into feature branches to prevent drift.
2. If we do encounter a situation that involves manually porting, we will squash the ports *before* merging develop.

* Initial codelens implementation for C# (#477)

* Open sam template upon sam init (#481)

* C# run command (#488)

Added C# run command with some tests and some refactoring to the localLambdaRunner and pythonCodeRunner files. Additional work deemed out-of-scope for this feature can be found here: #507

* Prepare for .NET Core Debug implemention. (#513)

* Removing unused runtimes (#535)

* Implement "Debug Locally" code lens for .NET Core. (#552)

* Port changes from develop for eb07933..9c3d7c3.

* Fix npm audit issues.

* Port 'Switch away from Terminal to using Debug Console and Output tabs for local debug and run (#493)' from develop.

* Port 'Added AWS logo with min retina size (#461) (#498)' from develop.

* Port 'Handle port-waiting timeout; Catch Python debugging Errors (#494)' from develop.

* Python Path Mappings now provide both drive letter casings for Windows (#495)

* Port 'Explicitly show the Debug Console after each successful debugger attach (#496)' from develop.

* Port 'Prevent AWS Explorer context menu items from getting added to other extension/view menus (#506)' from develop

* Port 'Design for operations against resources attached to code pipelines (#503)' from develop.

* Port 'childProcess times out and dies if the debugger does not attach in time (#512)' from develop.

* Port 'Remove lambda views for Policy and Configuration (#505)' from develop.

* Port 'Normalizing telemetry (#534)' from develop.

* Port 'SAM calls that use AWS resources now correctly use an AWS profile (#554)' from develop.

* Port 'SAM CLI Validation Refactor (#555)' from develop.

* Port 'Fixes issue introduced in f9816c1 that caused the AWS Explorer context menu to disappear (#560)' from develop

* Port 'Added a help button to the sam init wizard's runtime selection step (#538)' from develop.

* Port 'Metrics overrides for result and duration (#562)Metrics overrides for result and duration (#562)' from develop.

* Port 'Added vs code task to run lint fixer (#561)' from develop.

* Port 'SAM CLI Validation at the start of Create New SAM App flow (#563)' from develop.

* Port 'Updated the message shown when SAM CLI is newer than valid range (#569)' from develop.

* Port 'SAM CLI Validation at the start of Deploy SAM App flow (#570)' from develop.

* Port 'Code Improvement: sam deploy calls (#571)' from develop.

* Port 'Code Improvement: sam package calls (#572)' from develop.

* Port 'Telemetry data includes active AWS account ID (if configured) (#557)' from develop.

* Port 'Code Improvement: sam deploy workflow (#573)' from develop.

* Port 'Code Improvement: Error handling on sam cli calls (#574)' from develop.

* Port 'Extension throws an error if the toolkitClientBuilder is not initialized before initial credential validation (#577)' from develop.

* Port 'addUserDataToContext throws an error if a profile's credentials are nonexistent (#579)' from develop.

* Port 'Ensure log folder exists prior to initialization (#583)' from develop.

* Port 'Adding help buttons to deploy workflow (#584)' from develop.

* Port 'Credentials are now passed to STS client correctly on validation. (#585)' from develop

* Port 'Add prettier formatter and git hook (#578)' from develop.

* Fix WAIT_FOR_DEBUGGER_MESSAGE for .NET Core.

* Disable prettier pre-commit hook, and fix linter issues introduced by prettier.

* Fix dotnet debug install issues on Mac, Linux (#592)

* Instead of installing VSDBG by manually invoking crossSpawn, use existing ChildProcess utility class.
* Simplify code by unconditionally installing debugger each time - the script is smart enough to determine if an install is needed.
* DockerContext outputs stdout to output channel
* Fix installing debugger on non-windows platforms

* Fix issue that caused templates.json to be ignored when invoking .NET Core functions. (#593)

* Address feedback from PR.
leigaol pushed a commit to leigaol/aws-toolkit-vscode that referenced this pull request Jun 28, 2022
aws#481)

* Telemetry Change on Pagination as ConsolasLastSuggestionIndex

* requestID for consolas_UserDecision is required

* updated comment changes

* test fix

* test bug fix

* Update LastSuggestionIndex condition

* Last index field optional
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants