Merge pull request #1394 from nagilson/nagilson-proxy-reg

Dont let proxy check fail if registry access is disabled

Author: nagilson

azure-pipelines.yml

@@ -94,11 +94,11 @@ stages:
         addToPath: true
         architecture: 'x64'
     - task: PythonScript@0
+      continueOnError: true
       inputs:
         scriptSource: 'filePath'
         scriptPath: 'dependency-verifier.py'
         arguments: '$(System.PullRequest.TargetBranch)'
-        failOnStderr: true
   ##### Package and Publish #####
   - job: Package
     displayName: 'Package and Publish'

dependency-verifier.py

@@ -14,10 +14,10 @@ def main():
 
 def VerifyDependencies(targetBranch):
     """Enumerate through all changed files to check diffs."""
-    # origin/ requires origin/ to be up to date. 
+    # origin/ requires origin/ to be up to date.
     changedFiles = [Path(path) for path in subprocess.getoutput(f"git diff --name-only origin/{targetBranch}..").splitlines()]
     npmLockFile = "package-lock.json"
-    
+
     for file in changedFiles:
         fileName = os.path.basename(os.path.realpath(file))
         if fileName == npmLockFile:
@@ -48,7 +48,7 @@ def GetYarnDependencyUpdates(yarnLockDiffLines):
     return dependencies
 
 def GetUnmatchedDiffs(yarnDiff, npmDiff):
-    """Returns [] if dependency updates are reflected in both diffs, elsewise the dependencies out of sync."""
+    """Returns [] if dependency updates are reflected in both diffs, else the dependencies out of sync."""
                                         # v Remove + or - from diff and additional git diff context lines
     yarnDeps = GetYarnDependencyUpdates([line[1:] for line in yarnDiff.splitlines() if line.startswith("+") or line.startswith("-")])
     npmDeps = GetNpmDependencyUpdates([line[1:] for line in npmDiff.splitlines() if line.startswith("+") or line.startswith("-")])
@@ -61,11 +61,11 @@ def GetUnmatchedDiffs(yarnDiff, npmDiff):
     return outOfSyncDependencies
 
 def NpmChangesMirrorYarnChanges(changedFiles, packageLockPath, targetBranch):
-    """Returns successfully if yarn.lock matches packagelock changes, if not, throws exit code"""
+    """Returns successfully if yarn.lock matches package lock changes, if not, throws exit code"""
     yarnLockFile = "yarn.lock"
     yarnLockPath = Path(os.path.join(os.path.dirname(packageLockPath), yarnLockFile))
     outOfDateYarnLocks = []
-    
+
     if yarnLockPath in changedFiles:
         yarnDiff = subprocess.getoutput(f"git diff origin/{targetBranch}.. -- {str(yarnLockPath)}")
         npmDiff = subprocess.getoutput(f"git diff origin/{targetBranch}..  -- {packageLockPath}")
@@ -77,9 +77,13 @@ def NpmChangesMirrorYarnChanges(changedFiles, packageLockPath, targetBranch):
     else:
         outOfDateYarnLocks.append(yarnLockPath)
     if(outOfDateYarnLocks != []):
-        sys.exit(f"The yarn.lock and package-lock appear to be out of sync with the changes made after {targetBranch}. Update by first using npm to push to the registry, doing npm install package@version. Then, do yarn add package@version for {outOfDateYarnLocks}. During the yarn add process, you may need to npm install specific dependencies that yarn will flag to allow yarn to proceed. You may consider (yarn import). Note this tool will list dependencies of packages, but you should try adding just the main package first. If you can confirm the new changes are in sync, then you may ignore this failure.")
+        sys.exit(f"""{outOfDateYarnLocks} may be out of sync with node.
+
+        The yarn.lock and package-lock appear to be out of sync with the changes made after {targetBranch}.
+        Update by first using npm to push to the registry, doing npm install package@version. Then, do yarn add package@version for each primary package. During the yarn add process, you may need to npm install specific dependencies that yarn will flag to allow yarn to proceed. You may consider (yarn import). Note this tool will list dependencies of packages, but you should try adding just the main package first.
+        If you can confirm the new changes are in sync, then you may ignore this failure.""")
     else:
         return 0 # OK, status here is not used
-    
+
 if __name__ == "__main__":
     main()

sample/package-lock.json

@@ -1277,7 +1277,7 @@
 
 "vscode-dotnet-runtime@file:../vscode-dotnet-runtime-extension":
   "resolved" "file:../vscode-dotnet-runtime-extension"
-  "version" "1.7.3"
+  "version" "1.7.4"
   dependencies:
     "axios" "^1.3.4"
     "axios-cache-interceptor" "^1.0.1"

sample/yarn.lock

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+## [1.7.4] - 2023-08-24
+
+Install using node.arch() instead of environment variable architecture from root terminal to prevent mismatching shell architecture with vs code architecture.
+Don't read registry for proxy lookup if permission is unavailable to do so, requires manual proxy setting in this case.
+
 ## [1.7.3] - 2023-08-24
 
 Fixes an issue where install script files could have race conditions by introducing file locking mechanisms.

vscode-dotnet-runtime-extension/CHANGELOG.md

@@ -13,7 +13,7 @@
 	"description": "This extension installs and manages different versions of the .NET Runtime.",
 	"appInsightsKey": "02dc18e0-7494-43b2-b2a3-18ada5fcb522",
 	"icon": "images/dotnetIcon.png",
-	"version": "1.7.3",
+	"version": "1.7.4",
 	"publisher": "ms-dotnettools",
 	"engines": {
 		"vscode": "^1.72.0"

vscode-dotnet-runtime-extension/package-lock.json

@@ -80,7 +80,25 @@ export abstract class DotnetAcquisitionError extends IEvent {
     public getProperties(telemetry = false): { [key: string]: string } | undefined {
         return {ErrorName : this.error.name,
                 ErrorMessage : this.error.message,
-                StackTrace : this.error.stack ? this.error.stack : ''};
+                StackTrace : this.error.stack ? TelemetryUtilities.HashAllPaths(this.error.stack) : ''};
+    }
+}
+
+
+export class SuppressedAcquisitionError extends IEvent {
+    public readonly eventName = 'SuppressedAcquisitionError';
+    public readonly type = EventType.SuppressedAcquisitionError;
+
+    constructor(public readonly error: Error, public readonly supplementalMessage : string) {
+        super();
+    }
+
+    public getProperties(telemetry = false): { [key: string]: string } | undefined {
+        return {
+                SupplementMessage : this.supplementalMessage,
+                ErrorName : this.error.name,
+                ErrorMessage : telemetry ? 'redacted' : TelemetryUtilities.HashAllPaths(this.error.message),
+                StackTrace : telemetry ? 'redacted' : (this.error.stack ? TelemetryUtilities.HashAllPaths(this.error.stack) : '')};
     }
 }
 

vscode-dotnet-runtime-extension/package.json

@@ -1,17 +1,18 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-export enum EventType {
-    DotnetAcquisitionStart,
-    DotnetSDKAcquisitionStart,
-    DotnetRuntimeAcquisitionStart,
-    DotnetAcquisitionCompleted,
-    DotnetAcquisitionError,
-    DotnetAcquisitionSuccessEvent,
-    DotnetAcquisitionMessage,
-    DotnetAcquisitionTest,
-    DotnetAcquisitionAlreadyInstalled,
-    DotnetAcquisitionInProgress
-}
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export enum EventType {
+    DotnetAcquisitionStart,
+    DotnetSDKAcquisitionStart,
+    DotnetRuntimeAcquisitionStart,
+    DotnetAcquisitionCompleted,
+    DotnetAcquisitionError,
+    DotnetAcquisitionSuccessEvent,
+    DotnetAcquisitionMessage,
+    DotnetAcquisitionTest,
+    DotnetAcquisitionAlreadyInstalled,
+    DotnetAcquisitionInProgress,
+    SuppressedAcquisitionError
+}

vscode-dotnet-runtime-library/src/EventStream/EventStreamEvents.ts

@@ -8,9 +8,10 @@ import { HttpsProxyAgent } from 'https-proxy-agent';
 import { getProxySettings } from 'get-proxy-settings';
 import { AxiosCacheInstance, buildStorage, setupCache, StorageValue } from 'axios-cache-interceptor';
 import { IEventStream } from '../EventStream/EventStream';
-import { WebRequestError, WebRequestSent } from '../EventStream/EventStreamEvents';
+import { SuppressedAcquisitionError, WebRequestError, WebRequestSent } from '../EventStream/EventStreamEvents';
 import { IExtensionState } from '../IExtensionState';
 import { Debugging } from '../Utils/Debugging';
+/* tslint:disable:no-any */
 
 /*
 This wraps the VSCode memento state blob into an axios-cache-interceptor-compatible Storage.
@@ -149,14 +150,21 @@ export class WebRequestWorker
     {
         if(!this.proxyEnabled())
         {
-            const autoDetectProxies = await getProxySettings();
-            if(autoDetectProxies?.https)
+            try
             {
-                this.proxy = autoDetectProxies.https.toString();
+                const autoDetectProxies = await getProxySettings();
+                if(autoDetectProxies?.https)
+                {
+                    this.proxy = autoDetectProxies.https.toString();
+                }
+                else if(autoDetectProxies?.http)
+                {
+                    this.proxy = autoDetectProxies.http.toString();
+                }
             }
-            else if(autoDetectProxies?.http)
+            catch(error : any)
             {
-                this.proxy = autoDetectProxies.http.toString();
+                this.eventStream.post(new SuppressedAcquisitionError(error, `The proxy lookup failed, most likely due to limited registry access. Skipping automatic proxy lookup.`));
             }
         }
         if(this.proxyEnabled())