Skip to content

Commit

Permalink
Merge pirocchi/dotnet/merge-develop into develop (aws#594)
Browse files Browse the repository at this point in the history
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# (aws#477)

* Open sam template upon sam init (aws#481)

* C# run command (aws#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: aws#507

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

* Removing unused runtimes (aws#535)

* Implement "Debug Locally" code lens for .NET Core. (aws#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 (aws#493)' from develop.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* Port 'Add prettier formatter and git hook (aws#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 (aws#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. (aws#593)

* Address feedback from PR.
  • Loading branch information
mpiroc authored Jun 7, 2019
1 parent 85286ee commit 4e43030
Show file tree
Hide file tree
Showing 58 changed files with 2,482 additions and 1,604 deletions.
20 changes: 10 additions & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ All notable changes to the "aws-vscode-tools" extension will be documented in th

## NEXT (Developer Preview)

* Local Run/Debug of SAM Lambda Functions now outputs to the Output and Debug Console, and reduces timing issues for attaching the debugger
* Removed Lambda view that showed the Lambda Policy
* Removed Lambda view that showed the Lambda Configuration
* The AWS Explorer menu items no longer appear on other VS Code panel menus
* When creating a new SAM Application, the toolkit now checks for a valid SAM CLI version before prompting the user for inputs
* When deploying a SAM Application, the toolkit now checks for a valid SAM CLI version before prompting the user for inputs
* Telemetry now sends AWS account data
- Local Run/Debug is now available for .NET Core 2.1 functions within SAM Applications
- Local Run/Debug of SAM Lambda Functions now outputs to the Output and Debug Console, and reduces timing issues for attaching the debugger
- Removed Lambda view that showed the Lambda Policy
- Removed Lambda view that showed the Lambda Configuration
- The AWS Explorer menu items no longer appear on other VS Code panel menus
- When creating a new SAM Application, the toolkit now checks for a valid SAM CLI version before prompting the user for inputs
- When deploying a SAM Application, the toolkit now checks for a valid SAM CLI version before prompting the user for inputs
- Telemetry now sends AWS account data

## 0.1.1 (Developer Preview)

* Updated Marketplace page to display information on how to use the Toolkit once installed
- Updated Marketplace page to display information on how to use the Toolkit once installed

## 0.1.0 (Developer Preview)

* Initial release

- Initial release
2 changes: 1 addition & 1 deletion build-scripts/copyNonCodeFiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const outRoot = path.join(repoRoot, 'out');
// May be individual files or entire directories.
const relativePaths = [
path.join('src', 'schemas'),
path.join('src', 'test', 'shared', 'codelens', 'yaml')
path.join('src', 'test', 'shared', 'cloudformation', 'yaml')
];

(async () => {
Expand Down
23 changes: 10 additions & 13 deletions docs/debugging-nodejs-lambda-functions.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ You can debug your Serverless Application's Lambda Function locally using the Co

Throughout these instructions, replace the following:

|Name|Replace With|
|-|-|
|`<sam app root>`|The root of your SAM app (typically this is the directory containing `template.yaml`)|
|`<nodejs project root>`|The root of your NodeJS source code (the directory containing `package.json`)|
|`<protocol>`|Either `inspector` (for NodeJS 6.3+) or `legacy` (for prior versions of NodeJS)|
| Name | Replace With |
| ----------------------- | ------------------------------------------------------------------------------------- |
| `<sam app root>` | The root of your SAM app (typically this is the directory containing `template.yaml`) |
| `<nodejs project root>` | The root of your NodeJS source code (the directory containing `package.json`) |
| `<protocol>` | Either `inspector` (for NodeJS 6.3+) or `legacy` (for prior versions of NodeJS) |

1. Open `<sam app root>/.vscode/launch.json` (create a new file if it does not already exist), and add the following contents.

* Due to a bug in how VS Code handles path mappings, Windows users must provide an absolute path for `localRoot`. If you use a path relative to `${workspaceFolder}`, the path mappings will not work.
* If desired, replace `5678` with the port that you wish to use for debugging.
- Due to a bug in how VS Code handles path mappings, Windows users must provide an absolute path for `localRoot`. If you use a path relative to `${workspaceFolder}`, the path mappings will not work.
- If desired, replace `5678` with the port that you wish to use for debugging.

```jsonc
{
Expand All @@ -37,10 +37,7 @@ Throughout these instructions, replace the following:
"localRoot": "<nodejs project root>",
"remoteRoot": "/var/task",
"protocol": "<protocol>",
"skipFiles": [
"/var/runtime/node_modules/**/*.js",
"<node_internals>/**/*.js"
]
"skipFiles": ["/var/runtime/node_modules/**/*.js", "<node_internals>/**/*.js"]
}
]
}
Expand Down Expand Up @@ -108,8 +105,8 @@ With the above steps, you need to manually invoke SAM CLI from the command line,
"background": {
// This is how the debugger knows when it can attach
"activeOnStart": true,
"beginsPattern": "^Fetching lambci.* Docker container image......$",
"endsPattern": "^.* Mounting .* as .*:ro inside runtime container$"
"beginsPattern": "^Fetching lambci.* Docker container image......$",
"endsPattern": "^.* Mounting .* as .*:ro inside runtime container$"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion docs/debugging-python-lambda-functions.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,4 +167,4 @@ With the above steps, you need to manually invoke SAM CLI from the command line,
"preLaunchTask": "Debug Python Lambda Function",
```

Now you can just press `F5`, and Visual Studio Code will invoke SAM CLI and wait for the `waiting for debugger to attach...` message before attaching the debugger.
Now you can just press `F5`, and Visual Studio Code will invoke SAM CLI and wait for the `waiting for debugger to attach...` message before attaching the debugger.
Loading

0 comments on commit 4e43030

Please sign in to comment.