Skip to content

Commit 978fdb4

Browse files
committed
Merge branch 'main' into feat/ssh-userpass
2 parents a092524 + 3471f30 commit 978fdb4

File tree

4 files changed

+18
-62
lines changed

4 files changed

+18
-62
lines changed

client/src/connection/rest/context.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ import { l10n } from "vscode";
44

55
import axios, { AxiosResponse } from "axios";
66

7-
import { Context, ContextSummary, ContextsApi, Link } from "./api/compute";
7+
import {
8+
Context,
9+
ContextSummary,
10+
ContextsApi,
11+
Link,
12+
SessionRequest,
13+
} from "./api/compute";
814
import { BaseCompute, Compute, getApiConfig } from "./common";
915
import { ComputeSession } from "./session";
1016

@@ -73,15 +79,13 @@ export class ComputeContext extends Compute {
7379
}
7480

7581
//Create the session
76-
//TODO: Add session create options
77-
//TODO: Session request should be an interface
78-
const body = {
82+
const body: SessionRequest = {
7983
version: 1,
8084
name: "mysess",
8185
description: "This is a session",
8286
attributes: {},
8387
environment: {
84-
options: ["-validmemname EXTEND", "-validvarname ANY", "-memsize 0"],
88+
options: ["-validmemname EXTEND", "-validvarname ANY"],
8589
autoExecLines: [],
8690
},
8791
};

client/src/connection/rest/server.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@ import { l10n } from "vscode";
44

55
import axios, { AxiosResponse } from "axios";
66

7-
import { Link, Server, ServersApi } from "./api/compute";
7+
import { Link, Server, ServersApi, SessionRequest } from "./api/compute";
88
import { BaseCompute, Compute, getApiConfig, stateOptions } from "./common";
99
import { ComputeSession } from "./session";
1010

11-
const DEFAULT_COMPUTE_OPTS = [
12-
"-validmemname EXTEND",
13-
"-validvarname ANY",
14-
"-memsize 0",
15-
];
11+
const DEFAULT_COMPUTE_OPTS = ["-validmemname EXTEND", "-validvarname ANY"];
1612

1713
export class ComputeServer extends Compute {
1814
api;
@@ -87,9 +83,7 @@ export class ComputeServer extends Compute {
8783
}
8884

8985
//Create the session
90-
//TODO: Add session create options
91-
//TODO: Session request should be an interface
92-
const body = {
86+
const body: SessionRequest = {
9387
version: 1,
9488
name: "mysess",
9589
description: "This is a session",

package-lock.json

Lines changed: 5 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1112,7 +1112,7 @@
11121112
"@typescript-eslint/parser": "^7.16.0",
11131113
"@vscode/l10n-dev": "^0.0.35",
11141114
"chai": "^4.4.1",
1115-
"concurrently": "^8.2.2",
1115+
"concurrently": "^9.0.0",
11161116
"esbuild": "^0.23.1",
11171117
"cross-env": "^7.0.3",
11181118
"eslint": "^8.57.0",

0 commit comments

Comments
 (0)