Merge branch 'SCALRCORE-32692' of github.com:penja/scalr-vscode into SCALRCORE-32692

Author: penja

CHANGELOG.md

@@ -12,7 +12,6 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 
 -   HTTP proxy support ([#38](https://github.com/Scalr/scalr-vscode/issues/38))
 -   Scalr Workspaces & Runs Commands ([#36]https://github.com/Scalr/scalr-vscode/issues/36))
--   Added User-Agent scalr-vscode/version header for API tracking
 
 ## [0.0.5]
 

README.md

@@ -13,18 +13,44 @@ Please Note: This extension is currently in its early stages of development. Whi
 ## Features
 
 | Feature              | Description                                                                                                  |
-| -------------------- | ------------------------------------------------------------------------------------------------------------ |
+|----------------------|--------------------------------------------------------------------------------------------------------------|
 | Workspace Management | View a comprehensive list of available workspaces for logged-in users.                                       |
 | Run Overview         | Access a list of all runs, with the ability to filter runs specific to a workspace.                          |
 | Run triggering       | Preview, Apply, or Destroy infrastructure in the selected workspace and review changes right in the VS Code. |
 | Detailed Information | Get quick access to general information about any workspace or run.                                          |
 | Plan/Apply Output    | Read the output from Terraform plan and apply operations directly within VS Code.                            |
 | Scalr UI Integration | Convenient links provide quick navigation to the corresponding sections of the Scalr web UI.                 |
 
-## HTTP PROXY
+### Configuring an HTTP Proxy
 
-If the [proxy server](https://code.visualstudio.com/docs/setup/network#_proxy-server-support) is don't used. The proxy for https://scalr.io/ could be configured on vscode by http.proxy and http.proxyAuthorization variables (Settings > User > Applications > Poxy)
-or by HTTP_PROXY, HTTPS_PROXY environment variables.
+If your environment requires using an HTTP proxy to connect to external services, you can configure the VS Code extension to use a proxy by following these steps:
+
+1. **Open Settings**:  
+   - Go to the **Settings** tab in VS Code.  
+   - Alternatively, you can open the command palette (`Ctrl+Shift+P` or `Cmd+Shift+P` on macOS) and search for `Preferences: Open Settings (UI)`.
+
+2. **Search for Proxy Settings**:  
+   - In the Settings search bar, type `proxy`.
+
+3. **Configure Proxy**:  
+   - **HTTP Proxy**: Enter your HTTP proxy URL under `Proxy > HTTP: Proxy`.
+   - **HTTPS Proxy**: If your proxy also handles HTTPS traffic, enter it under `Proxy > HTTPS: Proxy`.
+   - **Proxy Strict SSL**: Toggle `Proxy > Strict SSL` if your proxy uses a self-signed certificate.
+
+4. **Configure the Extension**:  
+   - If the extension needs to use the proxy for specific API calls, ensure it respects the global proxy settings in VS Code. You can also configure proxy settings directly in the extension by setting the following in your `settings.json`:
+   
+   ```json
+   {
+     "http.proxy": "http://<proxy-url>:<port>",
+     "http.proxyStrictSSL": false
+   }
+   ```
+
+5. **Restart VS Code**:  
+   After configuring your proxy, restart VS Code to ensure the settings are applied.
+
+For more advanced proxy configurations, refer to the official [VS Code documentation](https://code.visualstudio.com/docs/setup/network#_proxy-server-support).
 
 ## Installation
 
@@ -66,7 +92,7 @@ If you want to install dependencies and build the extension locally, follow thes
 ## Usage
 
 | Command           | How to?                                                                                  |
-| ----------------- | ---------------------------------------------------------------------------------------- |
+|-------------------|------------------------------------------------------------------------------------------|
 | Login             | After installing, you can log in to your Scalr account through the extension.            |
 | View Workspaces   | Click on the Scalr icon in the sidebar to view your available workspaces.                |
 | Run Management    | Select a workspace to see all associated runs or access the list of all runs.            |

src/api/error.ts

@@ -13,7 +13,7 @@ export function getErrorMessage(error: unknown): string {
         if (axiosError.code === 'ECONNABORTED') {
             return 'Connection timeout please check your internet connection or proxy settings.';
         } else if (axiosError.status === 407) {
-            return 'Proxy authentication required. Please check your proxy settings.';
+            return 'Proxy authentication required. Please update your proxy settings.';
         } else if (axiosError.status === 401) {
             vscode.commands.executeCommand('setContext', 'scalr.signed-in', false);
         }