Skip to content

Store server version in workspace state #1426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 4, 2024
Merged

Store server version in workspace state #1426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/api/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import * as httpModule from "http";
import * as httpsModule from "https";
import * as vscode from "vscode";
import * as Cache from "vscode-cache";
import * as semver from "semver";
import {
getResolvedConnectionSpec,
config,
Expand All @@ -18,6 +19,7 @@ import {
import { currentWorkspaceFolder, outputChannel, outputConsole } from "../utils";

const DEFAULT_API_VERSION = 1;
const DEFAULT_SERVER_VERSION = "2016.2.0";
import * as Atelier from "./atelier";

// Map of the authRequest promises for each username@host:port target to avoid concurrency issues
Expand All @@ -27,6 +29,7 @@ export interface ConnectionSettings {
serverName: string;
active: boolean;
apiVersion: number;
serverVersion: string;
https: boolean;
host: string;
port: number;
Expand Down Expand Up @@ -61,12 +64,14 @@ export class AtelierAPI {
const port = this.externalServer ? this._config.port : workspaceState.get(wsKey + ":port", this._config.port);
const password = workspaceState.get(wsKey + ":password", this._config.password);
const apiVersion = workspaceState.get(wsKey + ":apiVersion", DEFAULT_API_VERSION);
const serverVersion = workspaceState.get(wsKey + ":serverVersion", DEFAULT_SERVER_VERSION);
const docker = workspaceState.get(wsKey + ":docker", false);
const dockerService = workspaceState.get<string>(wsKey + ":dockerService");
return {
serverName,
active,
apiVersion,
serverVersion,
https,
host,
port,
Expand Down Expand Up @@ -200,6 +205,7 @@ export class AtelierAPI {
serverName,
active: this.externalServer || conn.active,
apiVersion: workspaceState.get(this.configName.toLowerCase() + ":apiVersion", DEFAULT_API_VERSION),
serverVersion: workspaceState.get(this.configName.toLowerCase() + ":serverVersion", DEFAULT_SERVER_VERSION),
https: scheme === "https",
ns,
host,
Expand Down Expand Up @@ -466,6 +472,12 @@ export class AtelierAPI {
if (info && info.result && info.result.content && info.result.content.api > 0) {
const data = info.result.content;
const apiVersion = data.api;
const serverVersion = semver.coerce(
data.version
.slice(data.version.indexOf(") ") + 2)
.split(" ")
.shift()
).version;
if (this.ns && this.ns.length && !data.namespaces.includes(this.ns) && checkNs) {
throw {
code: "WrongNamespace",
Expand All @@ -476,6 +488,7 @@ export class AtelierAPI {
}
return Promise.all([
workspaceState.update(this.configName.toLowerCase() + ":apiVersion", apiVersion),
workspaceState.update(this.configName.toLowerCase() + ":serverVersion", serverVersion),
workspaceState.update(this.configName.toLowerCase() + ":iris", data.version.startsWith("IRIS")),
]).then(() => info);
}
Expand Down
3 changes: 3 additions & 0 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ export async function checkConnection(
await workspaceState.update(wsKey + ":port", undefined);
await workspaceState.update(wsKey + ":password", undefined);
await workspaceState.update(wsKey + ":apiVersion", undefined);
await workspaceState.update(wsKey + ":serverVersion", undefined);
await workspaceState.update(wsKey + ":docker", undefined);
_onDidChangeConnection.fire();
}
Expand Down Expand Up @@ -1528,6 +1529,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
password,
ns = "",
apiVersion,
serverVersion,
} = api.config;
return {
serverName,
Expand All @@ -1545,6 +1547,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
.get("password"),
namespace: ns,
apiVersion: active ? apiVersion : undefined,
serverVersion: active ? serverVersion : undefined,
};
},
serverDocumentUriForUri(uri: vscode.Uri): vscode.Uri {
Expand Down
Loading