mirror of
https://github.com/coder/coder.git
synced 2025-07-09 11:45:56 +00:00
@ -2,7 +2,6 @@ package cli
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
@ -16,10 +15,11 @@ import (
|
||||
"time"
|
||||
|
||||
"cloud.google.com/go/compute/metadata"
|
||||
"github.com/coder/retry"
|
||||
"golang.org/x/xerrors"
|
||||
"gopkg.in/natefinch/lumberjack.v2"
|
||||
|
||||
"github.com/coder/retry"
|
||||
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
|
||||
"cdr.dev/slog"
|
||||
@ -66,8 +66,7 @@ func (r *RootCmd) workspaceAgent() *serpent.Command {
|
||||
Handler: func(inv *serpent.Invocation) error {
|
||||
ctx, cancel := context.WithCancelCause(inv.Context())
|
||||
defer func() {
|
||||
fmt.Printf(">>>>>CANCELING CONTEXT")
|
||||
cancel(errors.New("defer"))
|
||||
cancel(xerrors.New("defer"))
|
||||
}()
|
||||
|
||||
var (
|
||||
|
@ -1070,7 +1070,7 @@ func (api *API) workspaceAgentReinit(rw http.ResponseWriter, r *http.Request) {
|
||||
workspace, err := api.Database.GetWorkspaceByAgentID(ctx, workspaceAgent.ID)
|
||||
if err != nil {
|
||||
log.Error(ctx, "failed to retrieve workspace from agent token", slog.Error(err))
|
||||
httpapi.InternalServerError(rw, errors.New("failed to determine workspace from agent token"))
|
||||
httpapi.InternalServerError(rw, xerrors.New("failed to determine workspace from agent token"))
|
||||
}
|
||||
|
||||
log.Info(ctx, "agent waiting for reinit instruction")
|
||||
@ -1094,7 +1094,7 @@ func (api *API) workspaceAgentReinit(rw http.ResponseWriter, r *http.Request) {
|
||||
})
|
||||
if err != nil {
|
||||
log.Error(ctx, "failed to subscribe to prebuild claimed channel", slog.Error(err))
|
||||
httpapi.InternalServerError(rw, errors.New("failed to subscribe to prebuild claimed channel"))
|
||||
httpapi.InternalServerError(rw, xerrors.New("failed to subscribe to prebuild claimed channel"))
|
||||
return
|
||||
}
|
||||
defer cancelSub()
|
||||
|
@ -15,6 +15,8 @@ import (
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/coder/terraform-provider-coder/provider"
|
||||
|
||||
"github.com/hashicorp/go-version"
|
||||
tfjson "github.com/hashicorp/terraform-json"
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
|
@ -4,12 +4,12 @@ import {within } from "@testing-library/react";
|
||||
import userEvent from "@testing-library/user-event";
|
||||
import { chromatic } from "testHelpers/chromatic";
|
||||
import {
|
||||
mockApiError,
|
||||
MockTemplate,
|
||||
MockTemplateVersionParameter1,
|
||||
MockTemplateVersionParameter2,
|
||||
MockTemplateVersionParameter3,
|
||||
MockUser,
|
||||
mockApiError,
|
||||
} from "testHelpers/entities";
|
||||
import { CreateWorkspacePageView } from "./CreateWorkspacePageView";
|
||||
|
||||
@ -128,8 +128,8 @@ export const PresetsButNoneSelected: Story = {
|
||||
{
|
||||
Name: MockTemplateVersionParameter1.name,
|
||||
Value: "preset 1 override",
|
||||
}
|
||||
]
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
ID: "preset-2",
|
||||
@ -138,8 +138,8 @@ export const PresetsButNoneSelected: Story = {
|
||||
{
|
||||
Name: MockTemplateVersionParameter2.name,
|
||||
Value: "42",
|
||||
}
|
||||
]
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
parameters: [
|
||||
|
@ -262,7 +262,10 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
|
||||
),
|
||||
);
|
||||
|
||||
form.setFieldValue("template_version_preset_id", option?.value)
|
||||
form.setFieldValue(
|
||||
"template_version_preset_id",
|
||||
option?.value,
|
||||
);
|
||||
}}
|
||||
placeholder="Select a preset"
|
||||
selectedOption={presetOptions[selectedPresetIndex]}
|
||||
|
Reference in New Issue
Block a user