Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

feat: auto update workspace if required by template#233

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.

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

Already on GitHub?Sign in to your account

Merged
Emyrk merged 4 commits intomainfromstevenmasley/auto_update_workspace
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
12 changes: 12 additions & 0 deletionssrc/error.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { isAxiosError } from "axios"
import { isApiError, isApiErrorResponse } from "coder/site/src/api/errors"
import * as forge from "node-forge"
import * as tls from "tls"
import * as vscode from "vscode"
Expand DownExpand Up@@ -157,3 +158,14 @@ export class CertificateError extends Error {
}
}
}

// getErrorDetail is copied from coder/site, but changes the default return.
export const getErrorDetail = (error: unknown): string | undefined | null => {
if (isApiError(error)) {
return error.response.data.detail
}
if (isApiErrorResponse(error)) {
return error.detail
}
return null
}
44 changes: 35 additions & 9 deletionssrc/extension.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
"use strict"
import axios from "axios"
import axios, { isAxiosError } from "axios"
import { getAuthenticatedUser } from "coder/site/src/api/api"
import { getErrorMessage } from "coder/site/src/api/errors"
import fs from "fs"
import * as https from "https"
import * as module from "module"
import * as os from "os"
import * as vscode from "vscode"
import { Commands } from "./commands"
import { CertificateError } from "./error"
import { CertificateError, getErrorDetail } from "./error"
import { Remote } from "./remote"
import { Storage } from "./storage"
import { WorkspaceQuery, WorkspaceProvider } from "./workspacesProvider"
Expand DownExpand Up@@ -199,13 +200,38 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
try {
await remote.setup(vscodeProposed.env.remoteAuthority)
} catch (ex) {
if (ex instanceof CertificateError) {
return await ex.showModal("Failed to open workspace")
switch (true) {
case ex instanceof CertificateError:
await ex.showModal("Failed to open workspace")
break
case isAxiosError(ex):
{
const msg = getErrorMessage(ex, "")
const detail = getErrorDetail(ex)
const urlString = axios.getUri(ex.response?.config)
let path = urlString
try {
path = new URL(urlString).pathname
} catch (e) {
// ignore, default to full url
}

await vscodeProposed.window.showErrorMessage("Failed to open workspace", {
detail: `API ${ex.response?.config.method?.toUpperCase()} to '${path}' failed with code ${ex.response?.status}.\nMessage: ${msg}\nDetail: ${detail}`,
modal: true,
useCustom: true,
})
}
break
default:
await vscodeProposed.window.showErrorMessage("Failed to open workspace", {
detail: (ex as string).toString(),
modal: true,
useCustom: true,
})
}
await vscodeProposed.window.showErrorMessage("Failed to open workspace", {
detail: (ex as string).toString(),
modal: true,
useCustom: true,
})

// Always close remote session when we fail to open a workspace.
await remote.closeRemote()
}
}
22 changes: 16 additions & 6 deletionssrc/remote.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,23 +137,33 @@ export class Remote {

let buildComplete: undefined | (() => void)
if (this.storage.workspace.latest_build.status === "stopped") {
// If the workspace requires the latest active template version, we should attempt
// to update that here.
// TODO: If param set changes, what do we do??
const versionID = this.storage.workspace.template_require_active_version
? // Use the latest template version
this.storage.workspace.template_active_version_id
: // Default to not updating the workspace if not required.
this.storage.workspace.latest_build.template_version_id

this.vscodeProposed.window.withProgress(
{
location: vscode.ProgressLocation.Notification,
cancellable: false,
title: "Starting workspace...",
title: this.storage.workspace.template_require_active_version
? "Updating workspace..."
: "Starting workspace...",
},
() =>
new Promise<void>((r) => {
buildComplete = r
}),
)

const latestBuild = await startWorkspace(this.storage.workspace.id, versionID)
this.storage.workspace = {
...this.storage.workspace,
latest_build: await startWorkspace(
this.storage.workspace.id,
this.storage.workspace.latest_build.template_version_id,
),
latest_build: latestBuild,
}
}

Expand DownExpand Up@@ -796,7 +806,7 @@ export class Remote {
}

// closeRemote ends the current remote session.
private async closeRemote() {
public async closeRemote() {
await vscode.commands.executeCommand("workbench.action.remote.close")
}

Expand Down

[8]ページ先頭

©2009-2025 Movatter.jp