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

chore: cherry-pick bug fixes for release 2.23#18219

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
stirby merged 5 commits intorelease/2.23fromcherries/2.23
Jun 3, 2025
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
9 changes: 9 additions & 0 deletionscli/ssh.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1594,12 +1594,14 @@ func writeCoderConnectNetInfo(ctx context.Context, networkInfoDir string) error
// Converts workspace name input to owner/workspace.agent format
// Possible valid input formats:
// workspace
// workspace.agent
// owner/workspace
// owner--workspace
// owner/workspace--agent
// owner/workspace.agent
// owner--workspace--agent
// owner--workspace.agent
// agent.workspace.owner - for parity with Coder Connect
funcnormalizeWorkspaceInput(inputstring)string {
// Split on "/", "--", and "."
parts:=workspaceNameRe.Split(input,-1)
Expand All@@ -1608,8 +1610,15 @@ func normalizeWorkspaceInput(input string) string {
case1:
returninput// "workspace"
case2:
ifstrings.Contains(input,".") {
returnfmt.Sprintf("%s.%s",parts[0],parts[1])// "workspace.agent"
}
returnfmt.Sprintf("%s/%s",parts[0],parts[1])// "owner/workspace"
case3:
// If the only separator is a dot, it's the Coder Connect format
if!strings.Contains(input,"/")&&!strings.Contains(input,"--") {
returnfmt.Sprintf("%s/%s.%s",parts[2],parts[1],parts[0])// "owner/workspace.agent"
}
returnfmt.Sprintf("%s/%s.%s",parts[0],parts[1],parts[2])// "owner/workspace.agent"
default:
returninput// Fallback
Expand Down
2 changes: 2 additions & 0 deletionscli/ssh_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,12 +107,14 @@ func TestSSH(t *testing.T) {

cases := []string{
"myworkspace",
"myworkspace.dev",
"myuser/myworkspace",
"myuser--myworkspace",
"myuser/myworkspace--dev",
"myuser/myworkspace.dev",
"myuser--myworkspace--dev",
"myuser--myworkspace.dev",
"dev.myworkspace.myuser",
}

for _, tc := range cases {
Expand Down
2 changes: 1 addition & 1 deletioncoderd/coderd.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -860,7 +860,7 @@ func New(options *Options) *API {
next.ServeHTTP(w,r)
})
},
//httpmw.CSRF(options.DeploymentValues.HTTPCookies),
httpmw.CSRF(options.DeploymentValues.HTTPCookies),
)

// This incurs a performance hit from the middleware, but is required to make sure
Expand Down
97 changes: 90 additions & 7 deletionscoderd/parameters_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ import (
"github.com/coder/coder/v2/coderd/database/dbtestutil"
"github.com/coder/coder/v2/coderd/database/pubsub"
"github.com/coder/coder/v2/coderd/rbac"
"github.com/coder/coder/v2/coderd/util/ptr"
"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/codersdk/wsjson"
"github.com/coder/coder/v2/provisioner/echo"
Expand DownExpand Up@@ -211,6 +212,86 @@ func TestDynamicParametersWithTerraformValues(t *testing.T) {
require.Zero(t, setup.api.FileCache.Count())
})

t.Run("RebuildParameters", func(t *testing.T) {
t.Parallel()

dynamicParametersTerraformSource, err := os.ReadFile("testdata/parameters/modules/main.tf")
require.NoError(t, err)

modulesArchive, err := terraform.GetModulesArchive(os.DirFS("testdata/parameters/modules"))
require.NoError(t, err)

setup := setupDynamicParamsTest(t, setupDynamicParamsTestParams{
provisionerDaemonVersion: provProto.CurrentVersion.String(),
mainTF: dynamicParametersTerraformSource,
modulesArchive: modulesArchive,
plan: nil,
static: nil,
})

ctx := testutil.Context(t, testutil.WaitMedium)
stream := setup.stream
previews := stream.Chan()

// Should see the output of the module represented
preview := testutil.RequireReceive(ctx, t, previews)
require.Equal(t, -1, preview.ID)
require.Empty(t, preview.Diagnostics)

require.Len(t, preview.Parameters, 1)
require.Equal(t, "jetbrains_ide", preview.Parameters[0].Name)
require.True(t, preview.Parameters[0].Value.Valid)
require.Equal(t, "CL", preview.Parameters[0].Value.Value)
_ = stream.Close(websocket.StatusGoingAway)

wrk := coderdtest.CreateWorkspace(t, setup.client, setup.template.ID, func(request *codersdk.CreateWorkspaceRequest) {
request.RichParameterValues = []codersdk.WorkspaceBuildParameter{
{
Name: preview.Parameters[0].Name,
Value: "GO",
},
}
})
coderdtest.AwaitWorkspaceBuildJobCompleted(t, setup.client, wrk.LatestBuild.ID)

params, err := setup.client.WorkspaceBuildParameters(ctx, wrk.LatestBuild.ID)
require.NoError(t, err)
require.Len(t, params, 1)
require.Equal(t, "jetbrains_ide", params[0].Name)
require.Equal(t, "GO", params[0].Value)

// A helper function to assert params
doTransition := func(t *testing.T, trans codersdk.WorkspaceTransition) {
t.Helper()

fooVal := coderdtest.RandomUsername(t)
bld, err := setup.client.CreateWorkspaceBuild(ctx, wrk.ID, codersdk.CreateWorkspaceBuildRequest{
TemplateVersionID: setup.template.ActiveVersionID,
Transition: trans,
RichParameterValues: []codersdk.WorkspaceBuildParameter{
// No validation, so this should work as is.
// Overwrite the value on each transition
{Name: "foo", Value: fooVal},
},
EnableDynamicParameters: ptr.Ref(true),
})
require.NoError(t, err)
coderdtest.AwaitWorkspaceBuildJobCompleted(t, setup.client, wrk.LatestBuild.ID)

latestParams, err := setup.client.WorkspaceBuildParameters(ctx, bld.ID)
require.NoError(t, err)
require.ElementsMatch(t, latestParams, []codersdk.WorkspaceBuildParameter{
{Name: "jetbrains_ide", Value: "GO"},
{Name: "foo", Value: fooVal},
})
}

// Restart the workspace, then delete. Asserting params on all builds.
doTransition(t, codersdk.WorkspaceTransitionStop)
doTransition(t, codersdk.WorkspaceTransitionStart)
doTransition(t, codersdk.WorkspaceTransitionDelete)
})

t.Run("BadOwner", func(t *testing.T) {
t.Parallel()

Expand DownExpand Up@@ -266,9 +347,10 @@ type setupDynamicParamsTestParams struct {
}

type dynamicParamsTest struct {
client *codersdk.Client
api *coderd.API
stream *wsjson.Stream[codersdk.DynamicParametersResponse, codersdk.DynamicParametersRequest]
client *codersdk.Client
api *coderd.API
stream *wsjson.Stream[codersdk.DynamicParametersResponse, codersdk.DynamicParametersRequest]
template codersdk.Template
}

func setupDynamicParamsTest(t *testing.T, args setupDynamicParamsTestParams) dynamicParamsTest {
Expand DownExpand Up@@ -300,7 +382,7 @@ func setupDynamicParamsTest(t *testing.T, args setupDynamicParamsTestParams) dyn

version := coderdtest.CreateTemplateVersion(t, templateAdmin, owner.OrganizationID, files)
coderdtest.AwaitTemplateVersionJobCompleted(t, templateAdmin, version.ID)
_= coderdtest.CreateTemplate(t, templateAdmin, owner.OrganizationID, version.ID)
tpl := coderdtest.CreateTemplate(t, templateAdmin, owner.OrganizationID, version.ID)

ctx := testutil.Context(t, testutil.WaitShort)
stream, err := templateAdmin.TemplateVersionDynamicParameters(ctx, version.ID)
Expand All@@ -321,9 +403,10 @@ func setupDynamicParamsTest(t *testing.T, args setupDynamicParamsTestParams) dyn
})

return dynamicParamsTest{
client: ownerClient,
stream: stream,
api: api,
client: ownerClient,
api: api,
stream: stream,
template: tpl,
}
}

Expand Down
28 changes: 24 additions & 4 deletionscoderd/wsbuilder/wsbuilder.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -623,6 +623,11 @@ func (b *Builder) getParameters() (names, values []string, err error) {
returnnil,nil,BuildError{http.StatusBadRequest,"Unable to build workspace with unsupported parameters",err}
}

lastBuildParameterValues:=db2sdk.WorkspaceBuildParameters(lastBuildParameters)
resolver:= codersdk.ParameterResolver{
Rich:lastBuildParameterValues,
}

// Dynamic parameters skip all parameter validation.
// Deleting a workspace also should skip parameter validation.
// Pass the user's input as is.
Expand All@@ -632,19 +637,34 @@ func (b *Builder) getParameters() (names, values []string, err error) {
// conditional parameter existence, the static frame of reference
// is not sufficient. So assume the user is correct, or pull in the
// dynamic param code to find the actual parameters.
latestValues:=make(map[string]string,len(b.richParameterValues))
for_,latest:=rangeb.richParameterValues {
latestValues[latest.Name]=latest.Value
}

// Merge the inputs with values from the previous build.
for_,last:=rangelastBuildParameterValues {
// TODO: Ideally we use the resolver here and look at parameter
// fields such as 'ephemeral'. This requires loading the terraform
// files. For now, just send the previous inputs as is.
if_,exists:=latestValues[last.Name];exists {
// latestValues take priority, so skip this previous value.
continue
}
names=append(names,last.Name)
values=append(values,last.Value)
}

for_,value:=rangeb.richParameterValues {
names=append(names,value.Name)
values=append(values,value.Value)
}

b.parameterNames=&names
b.parameterValues=&values
returnnames,values,nil
}

resolver:= codersdk.ParameterResolver{
Rich:db2sdk.WorkspaceBuildParameters(lastBuildParameters),
}

for_,templateVersionParameter:=rangetemplateVersionParameters {
tvp,err:=db2sdk.TemplateVersionParameter(templateVersionParameter)
iferr!=nil {
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,27 +12,30 @@ const meta: Meta<typeof FeatureStageBadge> = {
exportdefaultmeta;
typeStory=StoryObj<typeofFeatureStageBadge>;

exportconstMediumBeta:Story={
exportconstSmallBeta:Story={
args:{
size:"md",
size:"sm",
contentType:"beta",
},
};

exportconstSmallBeta:Story={
exportconstMediumBeta:Story={
args:{
size:"sm",
size:"md",
contentType:"beta",
},
};

exportconstLargeBeta:Story={
exportconstSmallEarlyAccess:Story={
args:{
size:"lg",
size:"sm",
contentType:"early_access",
},
};

exportconstMediumExperimental:Story={
exportconstMediumEarlyAccess:Story={
args:{
size:"md",
contentType:"experimental",
contentType:"early_access",
},
};
Loading
Loading
[8]ページ先頭
©2009-2025 Movatter.jp