Skip to content

Commit 4c9ff2f

Browse files
committed
Merge branch 'CSB-667-integrate-pint-ports-apis' into add-full-e2e-tests
2 parents 586982a + f03fdf9 commit 4c9ff2f

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

src/PintClient/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
import { Port } from "../pitcher-protocol/messages/port";
32
import { Emitter, EmitterSubscription, Event } from "../utils/event";
43
import { SandboxSession } from "../types";

src/Sandbox.ts

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,13 @@ export class Sandbox {
151151
return `export ${key}='${safe}'`;
152152
})
153153
.join("\n");
154-
commands.push(
155-
[
156-
`cat << 'EOF' > "$HOME/.private/.env"`,
157-
envStrings,
158-
`EOF`,
159-
].join("\n")
160-
);
154+
const cmd = [
155+
`mkdir -p "$HOME/.private"`,
156+
`cat << 'EOF' > "$HOME/.private/.env"`,
157+
envStrings,
158+
`EOF`,
159+
].join("\n");
160+
await client.commands.run(cmd);
161161
}
162162

163163
if (customSession.git) {
@@ -189,12 +189,11 @@ export class Sandbox {
189189
customSession?: SessionCreateOptions
190190
): Promise<SandboxSession> {
191191
// HACK: we currently do not get a flag for pint, but this is a check we can use for now
192-
const isPint =
193-
pitcherManagerResponse.userWorkspacePath ===
194-
pitcherManagerResponse.workspacePath;
192+
const isPint = false;
193+
195194
if (!customSession || !customSession.id) {
196195
return {
197-
isPint,
196+
isPint: isPint,
198197
sandboxId: this.id,
199198
bootupType: this.bootupType,
200199
hostToken: customSession?.hostToken,
@@ -219,7 +218,7 @@ export class Sandbox {
219218
});
220219

221220
return {
222-
isPint,
221+
isPint: isPint,
223222
sandboxId: this.id,
224223
sessionId: customSession?.id,
225224
hostToken: customSession?.hostToken,

src/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { VMTier } from "./VMTier";
22
import { HostToken } from "./HostTokens";
3-
import { Tracer } from "@opentelemetry/api";
43
import { Config } from "./api-clients/client/client";
4+
import { Tracer } from "@opentelemetry/api";
55

66
export interface PitcherManagerResponse {
77
bootupType: "RUNNING" | "CLEAN" | "RESUME" | "FORK";

0 commit comments

Comments
 (0)