ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

upgrade service downloader (#20703)

Browse Source 
* use new service downloader

* update other extensions

* fix errors
This commit is contained in:
Alan Ren
2022-10-02 20:30:53 -07:00
committed by GitHub
parent 85dc506a3c
commit 1df976d79d
19 changed files with 88 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/azuremonitor/config.json
View File

@@ -5,14 +5,7 @@
"Windows_86": "win-x86-net5.0.zip",
"Windows_64": "win-x64-net5.0.zip",
"OSX": "osx-x64-net5.0.tar.gz",
"CentOS_7": "rhel-x64-net5.0.tar.gz",
"Debian_8": "rhel-x64-net5.0.tar.gz",
"Fedora_23": "rhel-x64-net5.0.tar.gz",
"OpenSUSE_13_2": "rhel-x64-net5.0.tar.gz",
"RHEL_7": "rhel-x64-net5.0.tar.gz",
"SLES_12_2": "rhel-x64-net5.0.tar.gz",
"Ubuntu_14": "rhel-x64-net5.0.tar.gz",
"Ubuntu_16": "rhel-x64-net5.0.tar.gz"
"Linux": "rhel-x64-net5.0.tar.gz"
},
"installDirectory": "../sqltoolsservice/{#platform#}/{#version#}",
"executableFiles": [

2
extensions/azuremonitor/package.json
View File

@@ -212,7 +212,7 @@
"dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.0",
"figures": "^2.0.0",
"find-remove": "1.2.1",
"@microsoft/ads-service-downloader": "0.2.4",
"@microsoft/ads-service-downloader": "1.0.2",
"vscode-extension-telemetry": "0.4.2",
"vscode-languageclient": "5.2.1",
"vscode-nls": "^4.0.0"

11
extensions/azuremonitor/src/azuremonitorServer.ts
View File

@@ -3,7 +3,7 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { ServerProvider, IConfig, Events } from '@microsoft/ads-service-downloader';
import { ServerProvider, IConfig, Events, LogLevel } from '@microsoft/ads-service-downloader';
import { ServerOptions, TransportKind } from 'vscode-languageclient';
import * as Constants from './constants';
import * as vscode from 'vscode';
@@ -75,7 +75,7 @@ export class AzureMonitorServer {
this.config.strictSSL = vscode.workspace.getConfiguration('http').get('proxyStrictSSL') || true;
const serverdownloader = new ServerProvider(this.config);
serverdownloader.eventEmitter.onAny(() => generateHandleServerProviderEvent());
serverdownloader.eventEmitter.onAny(generateHandleServerProviderEvent());
return serverdownloader.getOrDownloadServer();
}
@@ -94,7 +94,7 @@ function generateServerOptions(logPath: string, executablePath: string): ServerO
function generateHandleServerProviderEvent() {
let dots = 0;
return (e: string, ...args: any[]) => {
return (e: string | string[], ...args: any[]) => {
switch (e) {
case Events.INSTALL_START:
outputChannel.show(true);
@@ -122,6 +122,11 @@ function generateHandleServerProviderEvent() {
outputChannel.appendLine('');
outputChannel.appendLine(localize('downloadServiceDoneChannelMsg', "Downloaded {0}", Constants.serviceName));
break;
case Events.LOG_EMITTED:
if (args[0] >= LogLevel.Warning) {
outputChannel.appendLine(args[1]);
}
break;
default:
console.error(`Unknown event from Server Provider ${e}`);
break;

8
extensions/azuremonitor/yarn.lock
View File

@@ -2,10 +2,10 @@
# yarn lockfile v1
"@microsoft/ads-service-downloader@0.2.4":
version "0.2.4"
resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-0.2.4.tgz#905a11eb2da19673629852d9764fb9fb94ad81bd"
integrity sha512-3J0YjH29a5pP+5Yu0HF7itRBZpNOgUN34Gh/p0Py/TQr7qUzZSXwOM+fWD1nCea+q9t8mfHr0yuy0aeDX+33vQ==
"@microsoft/ads-service-downloader@1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.0.2.tgz#76cc9a44074525ac65a6ea15f8b5ee7eac87efbe"
integrity sha512-Qpc5HNLywVZbSxeUC4S7d+VRAUddrYjkIfDXl76UwCA0iuwzi71RtciEgWfCWAZMm9CbKTIbtFGh4pYw+h81nQ==
dependencies:
async-retry "^1.2.3"
eventemitter2 "^5.0.1"