Fix failing to start shell being hidden from user #5626
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /** | ||
|
Contributor
There was a problem hiding this comment. This whole file feels like an amazing kludge, and brittle too. Is there really no other way?
Collaborator
Author
There was a problem hiding this comment. Unfortunately I could not find one after banging my head for a few days. The fact that we use Electron seem to break some of the dependencies auto detecting certain configuration things. |
||
| * Copyright (c) OpenLens Authors. All rights reserved. | ||
| * Licensed under MIT License. See LICENSE in root directory for more information. | ||
| */ | ||
|
|
||
| import child_process from "child_process"; | ||
| import fsExtra from "fs-extra"; | ||
| import fetch from "node-fetch"; | ||
| import { platform } from "process"; | ||
| import stream from "stream"; | ||
| import { promisify } from "util"; | ||
| import { extract } from "tar"; | ||
|
|
||
| const { ensureDir, readJson } = fsExtra; | ||
|
|
||
| function canvasPrebuiltUrlBuilder(canvasVersion: string, nodeVersion: string) { | ||
| const compiler = platform === "linux" | ||
| ? "glibc" | ||
| : "unknown"; | ||
|
|
||
| return `https://github.com/Automattic/node-canvas/releases/download/v${canvasVersion}/canvas-v${canvasVersion}-node-v${nodeVersion}-${platform}-${compiler}-x64.tar.gz`; | ||
| } | ||
|
|
||
| const exec = promisify(child_process.exec); | ||
| const pipeline = promisify(stream.pipeline); | ||
|
|
||
| // This is done so that we can skip the scripts for only this package | ||
| await exec("npm install canvas@2 --no-save --no-package-lock --ignore-scripts --legacy-peer-deps"); | ||
|
|
||
| const nodeModuleVersion = process.versions.modules; | ||
| const canvasVersion = (await readJson("./node_modules/canvas/package.json")).version as string; | ||
| const canvasPrebuildUrl = canvasPrebuiltUrlBuilder(canvasVersion, nodeModuleVersion); | ||
|
|
||
| const canvasPrebuilt = await fetch(canvasPrebuildUrl); | ||
|
|
||
| if (canvasPrebuilt.status !== 200) { | ||
| throw new Error(`Failed to download prebuilt from ${canvasPrebuildUrl}: ${canvasPrebuilt.statusText}`); | ||
| } | ||
|
|
||
| await ensureDir("./node_modules/canvas/build"); | ||
|
|
||
| const dest = extract({ | ||
| cwd: "./node_modules/canvas/build", | ||
| }); | ||
|
|
||
| await pipeline(canvasPrebuilt.body, dest); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| /** | ||
| * Copyright (c) OpenLens Authors. All rights reserved. | ||
| * Licensed under MIT License. See LICENSE in root directory for more information. | ||
| */ | ||
|
|
||
| import { getGlobalOverride } from "../test-utils/get-global-override"; | ||
| import changePathModeInjectable from "./change-path-mode.injectable"; | ||
|
|
||
| export default getGlobalOverride(changePathModeInjectable, () => () => { | ||
| throw new Error("tried to change path mode without override"); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| /** | ||
| * Copyright (c) OpenLens Authors. All rights reserved. | ||
| * Licensed under MIT License. See LICENSE in root directory for more information. | ||
| */ | ||
|
|
||
| import { getInjectable } from "@ogre-tools/injectable"; | ||
| import fsInjectable from "./fs.injectable"; | ||
|
|
||
| export type ChangePathMode = (path: string, newMode: number) => Promise<void>; | ||
|
|
||
| const changePathModeInjectable = getInjectable({ | ||
| id: "change-path-mode", | ||
| instantiate: (di): ChangePathMode => di.inject(fsInjectable).chmod, | ||
| }); | ||
|
|
||
| export default changePathModeInjectable; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| /** | ||
| * Copyright (c) OpenLens Authors. All rights reserved. | ||
| * Licensed under MIT License. See LICENSE in root directory for more information. | ||
| */ | ||
|
|
||
| import { getGlobalOverride } from "../test-utils/get-global-override"; | ||
| import copyFileInjectable from "./copy-file.injectable"; | ||
|
|
||
| export default getGlobalOverride(copyFileInjectable, () => () => { | ||
| throw new Error("tried to copy a file without override"); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| /** | ||
| * Copyright (c) OpenLens Authors. All rights reserved. | ||
| * Licensed under MIT License. See LICENSE in root directory for more information. | ||
| */ | ||
| import { getInjectable } from "@ogre-tools/injectable"; | ||
| import fsInjectable from "./fs.injectable"; | ||
|
|
||
| export type CopyFile = (fromPath: string, toPath: string) => Promise<void>; | ||
|
|
||
| const copyFileInjectable = getInjectable({ | ||
| id: "copy-file", | ||
| instantiate: (di): CopyFile => di.inject(fsInjectable).copyFile, | ||
| }); | ||
|
|
||
| export default copyFileInjectable; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| /** | ||
| * Copyright (c) OpenLens Authors. All rights reserved. | ||
| * Licensed under MIT License. See LICENSE in root directory for more information. | ||
| */ | ||
|
|
||
| import { getGlobalOverride } from "../test-utils/get-global-override"; | ||
| import createReadFileStreamInjectable from "./create-read-file-stream.injectable"; | ||
|
|
||
| export default getGlobalOverride(createReadFileStreamInjectable, () => () => { | ||
| throw new Error("tried to create read stream for a file without override"); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| /** | ||
| * Copyright (c) OpenLens Authors. All rights reserved. | ||
| * Licensed under MIT License. See LICENSE in root directory for more information. | ||
| */ | ||
|
|
||
| import { getInjectable } from "@ogre-tools/injectable"; | ||
| import type { createWriteStream } from "fs"; | ||
| import fsInjectable from "./fs.injectable"; | ||
|
|
||
| export type CreateWriteFileStream = typeof createWriteStream; | ||
|
|
||
| const createWriteFileStreamInjectable = getInjectable({ | ||
| id: "create-write-file-stream", | ||
| instantiate: (di) => di.inject(fsInjectable).createWriteStream, | ||
| }); | ||
|
|
||
| export default createWriteFileStreamInjectable; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| /** | ||
| * Copyright (c) OpenLens Authors. All rights reserved. | ||
| * Licensed under MIT License. See LICENSE in root directory for more information. | ||
| */ | ||
|
|
||
| import { getGlobalOverride } from "../test-utils/get-global-override"; | ||
| import createWriteFileStreamInjectable from "./create-write-file-stream.injectable"; | ||
|
|
||
| export default getGlobalOverride(createWriteFileStreamInjectable, () => () => { | ||
| throw new Error("tried to create a file write stream without override"); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| /** | ||
| * Copyright (c) OpenLens Authors. All rights reserved. | ||
| * Licensed under MIT License. See LICENSE in root directory for more information. | ||
| */ | ||
|
|
||
| import { getGlobalOverride } from "../test-utils/get-global-override"; | ||
| import ensureDirectoryInjectable from "./ensure-directory.injectable"; | ||
|
|
||
| export default getGlobalOverride(ensureDirectoryInjectable, () => async () => { | ||
| throw new Error("tried to ensure directory without override"); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the requirement for
canvasin the first place? This is complexity which shouldn't be included without very good reason.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Canvas is required for some of the tests IIRC, might not be necessary if we upgrade to xtermJs 5 which adds the DOM based renderer for testing
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With this complexity, I would say that we stop testing xtermjs directly and only test the contract (our wrapper).