Updates to VSCode extension (microsoft#2632)

.vscode/settings.json

@@ -44,6 +44,9 @@
       "url": "./schemas/PSRule-lock.schema.json"
     }
   ],
+  "[typescript]": {
+    "editor.tabSize": 4
+  },
   "[json]": {
     "editor.tabCompletion": "on",
     "editor.quickSuggestions": {
@@ -130,5 +133,6 @@
     "main",
     "release/*"
   ],
-  "dotnet.completion.showCompletionItemsFromUnimportedNamespaces": true
+  "dotnet.completion.showCompletionItemsFromUnimportedNamespaces": true,
+  "PSRule.options.path": "ps-rule-ci.yaml"
 }

.vscodeignore

@@ -16,18 +16,19 @@ bin/
 obj/
 out/
 !out/dist/
+!docs/CHANGELOG-v3.md
 
 .eslintignore
 .gitignore
 .markdownlint.json
 .platyps.yml
 .vscode-test.mjs
 CHANGELOG.md
+README.md
 GitVersion.yml
 NuGet.config
 PSRule.sln
 SECURITY.md
-SUPPORT.md
 build.ps1
 esbuild.mjs
 global.json

docs/updates/v3_0.md

@@ -0,0 +1,29 @@
+---
+date: 2024-11-30
+version: 3.0
+---
+
+## Visual Studio Code
+
+### New home and identity
+
+The Visual Studio Code (VSCode) extension for PSRule now lives side-by-side with the majority of the PSRule code base in `https://github.com/microsoft/PSRule`.
+
+As part of this change we are now publishing the extension as a **verified** Microsoft extension with the ID `ps-rule.code`.
+
+We hope this will not only help the community to log issues and get help on the correct repository,
+but also streamline how we deliver updates in the future.
+
+Bringing together the code base is the first step in building an all improved rich experience in VSCode for PSRule.
+
+### Runtime integration
+
+Previously to use PSRule within VSCode,
+a prerequisite step was to install PowerShell on non-Windows OSs and then install PSRule through PowerShell.
+
+We've done away with this approach entirely for the authoring experience in VSCode by providing native support in the extension.
+
+### Other minor features and improvements
+
+- You can now override the options file that VSCode uses when running PSRule.
+  - Previously only `ps-rule.yaml` was used by VSCode although PSRule generally supported changing the options file.

package.json

@@ -208,6 +208,13 @@
             "description": "Determines if a notification to install the PowerShell extension is shown on start up.",
             "scope": "application"
           },
+          "PSRule.options.path": {
+            "type": "string",
+            "default": null,
+            "description": "The path specifying a PSRule option file. When not set, the default ps-rule.yaml will be used from the current workspace.",
+            "markdownDescription": "The path specifying a PSRule option file. When not set, the default `ps-rule.yaml` will be used from the current workspace.",
+            "scope": "window"
+          },
           "PSRule.output.as": {
             "type": "string",
             "default": "Summary",
@@ -493,7 +500,7 @@
     "build:esbuild": "node esbuild.mjs",
     "package": "npm run package:dotnet && npm run package:esbuild && npm run package:pack",
     "package:dotnet": "dotnet build ./src/PSRule.EditorServices/ --output server/",
-    "package:pack": "vsce package --dependencies --pre-release --no-git-tag-version --no-update-package-json --githubBranch main --out out/package/",
+    "package:pack": "vsce package --dependencies --pre-release --no-git-tag-version --no-update-package-json --githubBranch main --out out/package/ --readme-path src/code/README.md --changelog-path docs/CHANGELOG-v3.md --baseImagesUrl https://raw.githubusercontent.com/microsoft/PSRule/refs/heads/main/",
     "package:esbuild": "node esbuild.mjs",
     "test": "npm run build:dotnet && npm run build:esbuild && vscode-test"
   },

src/code/README.md

@@ -0,0 +1,158 @@
+# PSRule
+
+Validate infrastructure as code (IaC) and DevOps repositories using the PSRule PowerShell module.
+PSRule is powerful, feature rich, and highly customizable to meet your needs.
+
+![module-version-badge]
+
+This extension is available in two release channels:
+
+Channel | Description | Version/ downloads
+------- | ----------- | ---
+[Preview][ext-preview] | More frequent releases but more likely to contain bugs. | [![Preview][ext-preview-version-badge]][ext-preview] ![ext-preview-installs-badge]
+[Stable][ext-stable] | Less frequent releases, with more user testing, experimental features are disabled. | [![Stable][ext-stable-version-badge]][ext-stable] ![ext-stable-installs-badge]
+
+## Features
+
+### CodeLens
+
+<p align="center">
+  <img src="./docs/images/codelens-doc-link.png" alt="CodeLens showing link to create documentation" width="640px" />
+</p>
+
+- CodeLens shows links to create or edit markdown documentation from rules in YAML, JSON, or PowerShell.
+  - **Open documentation** &mdash; Opens rule markdown documentation in the editor.
+    - The location for storing documentation is configurable in the extension settings.
+    - By default, a locale specific folder is created in the same directory as the rule file.
+  - **Create documentation** &mdash; Creates a new markdown file for the rule based on a snippet.
+    - New markdown documentation is created with the built-in _Rule Doc_ snippet.
+    - An alternative snippet can be specified by configuring extension settings.
+
+### IntelliSense
+
+<p align="center">
+  <img src="./docs/images/options-schema-flyout.png" alt="Options suggestion context menu" width="640px" />
+</p>
+
+- Adds IntelliSense and validation support for configuring options and resources.
+  - **Workspace options** &mdash; use IntelliSense to configure options for the workspace.
+    - Type or trigger IntelliSense with `Ctrl+Space` from `ps-rule.yaml`.
+  - **Create resources** &mdash; define _baselines_ and _selectors_ by using pre-built snippets and IntelliSense.
+
+<p align="center">
+  <img src="./docs/images/snippet-rule-type.png" alt="Rule definition snippet" width="520px" />
+</p>
+
+- Adds snippets for defining new rules.
+  - **Define rules** with snippets and IntelliSense support.
+    - Trigger IntelliSense by typing `rule` in a `.Rule.ps1`, `.Rule.yaml`, or `.Rule.jsonc` file.
+    IntelliSense can also be triggered by using the shortcut `Ctrl+Space`.
+
+<p align="center">
+  <img src="./docs/images/snippet-markdown.png" alt="Rule markdown documentation snippet" width="640px" />
+</p>
+
+- Adds snippets for creating markdown documentation.
+  - **Quick documentation** &mdash; create rule documentation to provide rule recommendations and examples.
+    - Trigger IntelliSense by typing `rule` in a `.md` file.
+    IntelliSense can also be triggered by using the shortcut `Ctrl+Space`.
+
+### Quick tasks
+
+<p align="center">
+  <img src="./docs/images/tasks-provider.png" alt="Built-in tasks shown in task list" width="640px" />
+</p>
+
+- Adds quick tasks for analysis directly from Visual Studio Code.
+  - **Run analysis** &mdash; runs rules against files in the current workspace.
+    - _Input path_, _Baseline_, _Modules_, and _Outcome_ options can be configured per task.
+    - _Output as_, and showing a _Not processed warning_ options can be configured by workspace or user.
+    - Rule stored in `.ps-rule/` are automatically used by default.
+    - Use the built-in analysis task by running or configuring the task from the _Terminal_ menu.
+
+## Configuration
+
+In addition to configuring the [ps-rule.yaml] options file, the following settings are available.
+
+Name                                            | Description
+----                                            | -----------
+`PSRule.codeLens.ruleDocumentationLinks`        | Enables Code Lens that displays links to rule documentation. This is an experimental feature that requires experimental features to be enabled.
+`PSRule.documentation.path`                     | The path to look for rule documentation. When not set, the path containing rules will be used.
+`PSRule.documentation.localePath`               | The locale path to use for locating rule documentation. The VS Code locale will be used by default.
+`PSRule.documentation.customSnippetPath`        | The path to a file containing a rule documentation snippet. When not set, built-in PSRule snippets will be used.
+`PSRule.documentation.snippet`                  | The name of a snippet to use when creating new rule documentation. By default, the built-in `Rule Doc` snippet will be used.
+`PSRule.execution.notProcessedWarning`          | Warn when objects are not processed by any rule. This option is deprecated and replaced by `PSRule.execution.unprocessedObject`.
+`PSRule.execution.ruleExcluded`                 | Determines how to handle excluded rules. When set to `None`, PSRule will use the default (`Ignore`), unless set by PSRule options.
+`PSRule.execution.ruleSuppressed`               | Determines how to handle suppressed rules. When set to `None`, PSRule will use the default (`Warn`), unless set by PSRule options.
+`PSRule.execution.unprocessedObject`            | Determines how to report objects that are not processed by any rule. When set to `None`, PSRule will use the default (`Warn`), unless set by PSRule options.
+`PSRule.experimental.enabled`                   | Enables experimental features in the PSRule extension.
+`PSRule.notifications.showChannelUpgrade`       | Determines if a notification to switch to the stable channel is shown on start up.
+`PSRule.notifications.showPowerShellExtension`  | Determines if a notification to install the PowerShell extension is shown on start up.
+`PSRule.options.path`                           | The path specifying a PSRule option file. When not set, the default `ps-rule.yaml` will be used from the current workspace.
+`PSRule.output.as`                              | Configures the output of analysis tasks, either summary or detailed.
+`PSRule.rule.baseline`                          | The name of the default baseline to use for executing rules. This setting can be overridden on individual PSRule tasks.
+
+## Support
+
+This project uses GitHub Issues to track bugs and feature requests.
+Please search the existing issues before filing new issues to avoid duplicates.
+
+- For new issues, file your bug or feature request as a new [issue].
+- For help, discussion, and support questions about using this project, join or start a [discussion].
+
+Support for this project/ product is limited to the resources listed above.
+
+## Installing PSRule module
+
+PSRule is available from the PowerShell Gallery and is required for this extension to work.
+
+To install the module use the following command from a PowerShell prompt.
+
+```powershell
+Install-Module -Name PSRule -Scope CurrentUser;
+```
+
+## Installing the extension
+
+You can install the latest release of the extension by following the steps in the [Visual Studio Code documentation][vscode-ext-gallery].
+In the Extensions pane, search for _PSRule_ extension and install it there.
+You will get notified automatically about any future extension updates.
+
+```text
+code --install-extension bewhite.psrule-vscode-preview
+```
+
+> NOTE: If you are using VS Code Insiders, the command will be `code-insiders`.
+
+## Contributing
+
+This project welcomes contributions and suggestions.
+If you are ready to contribute, please visit the [contribution guide].
+
+## Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
+or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
+
+## Maintainers
+
+- [Bernie White](https://github.com/BernieWhite)
+
+## License
+
+This project is [licensed under the MIT License][license].
+
+[issue]: https://github.com/Microsoft/PSRule/issues
+[discussion]: https://github.com/microsoft/PSRule/discussions
+[vscode-ext-gallery]: https://code.visualstudio.com/docs/editor/extension-gallery
+[ext-preview]: https://marketplace.visualstudio.com/items?itemName=bewhite.psrule-vscode-preview
+[ext-preview-version-badge]: https://img.shields.io/visual-studio-marketplace/v/bewhite.psrule-vscode-preview?label=Version
+[ext-preview-installs-badge]: https://img.shields.io/visual-studio-marketplace/i/bewhite.psrule-vscode-preview?label=Installs
+[ext-stable]: https://marketplace.visualstudio.com/items?itemName=bewhite.psrule-vscode
+[ext-stable-version-badge]: https://img.shields.io/visual-studio-marketplace/v/bewhite.psrule-vscode?label=Version
+[ext-stable-installs-badge]: https://img.shields.io/visual-studio-marketplace/i/bewhite.psrule-vscode?label=Installs
+[module-version-badge]: https://img.shields.io/powershellgallery/v/PSRule?label=PowerShell%20Gallery
+[contribution guide]: https://github.com/Microsoft/PSRule/blob/main/CONTRIBUTING.md
+[license]: https://github.com/Microsoft/PSRule/blob/main/LICENSE
+[ps-rule.yaml]: https://aka.ms/ps-rule/options

src/code/configuration.ts

@@ -81,6 +81,12 @@ export interface ISetting {
      */
     experimentalEnabled: boolean;
 
+    /**
+     * The path specifying a PSRule option file.
+     * When not set, the default ps-rule.yaml will be used from the current workspace.
+     */
+    optionsPath: string | undefined;
+
     outputAs: OutputAs;
     notificationsShowChannelUpgrade: boolean;
     notificationsShowPowerShellExtension: boolean;
@@ -114,6 +120,7 @@ const globalDefaults: ISetting = {
     executionRuleSuppressed: ExecutionActionPreference.None,
     executionUnprocessedObject: ExecutionActionPreference.None,
     experimentalEnabled: false,
+    optionsPath: undefined,
     outputAs: OutputAs.Summary,
     notificationsShowChannelUpgrade: true,
     notificationsShowPowerShellExtension: true,
@@ -199,6 +206,8 @@ export class ConfigurationManager {
         this.current.executionRuleSuppressed = config.get<ExecutionActionPreference>('execution.ruleSuppressed', this.default.executionRuleSuppressed);
         this.current.executionUnprocessedObject = config.get<ExecutionActionPreference>('execution.unprocessedObject', this.default.executionUnprocessedObject);
 
+        this.current.optionsPath = config.get<string>('options.path') ?? this.default.optionsPath;
+
         this.current.outputAs = config.get<OutputAs>('output.as', this.default.outputAs);
 
         this.current.notificationsShowChannelUpgrade = config.get<boolean>(

src/code/tasks.ts

@@ -222,6 +222,7 @@ export class PSRuleTaskProvider implements vscode.TaskProvider {
         const executionRuleExcluded = configuration.get().executionRuleExcluded;
         const executionRuleSuppressed = configuration.get().executionRuleSuppressed;
         const executionUnprocessedObject = configuration.get().executionUnprocessedObject;
+        const optionsPath = configuration.get().optionsPath;
         const outputAs = configuration.get().outputAs;
         const ruleBaseline = configuration.get().ruleBaseline;
         const traceTask = configuration.get().traceTask;
@@ -239,6 +240,12 @@ export class PSRuleTaskProvider implements vscode.TaskProvider {
                 params.push(`'${path}'`);
             }
 
+            // Options Path
+            if (optionsPath !== undefined && optionsPath !== '') {
+                params.push('--option');
+                params.push(`'${optionsPath}'`);
+            }
+
             // Input Path
             if (inputPath !== undefined && inputPath !== '') {
                 params.push('--input-path');