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

fix(provisioner): use sidebar app id instead of app id#20246

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
DanielleMaywood merged 2 commits intomainfromdanielle/fix/provisioner
Oct 9, 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: 7 additions & 2 deletionsprovisioner/terraform/resources.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,11 +1022,16 @@ func ConvertState(ctx context.Context, modules []*tfjson.StateModule, rawGraph s
return nil, xerrors.Errorf("decode coder_ai_task attributes: %w", err)
}

appID := task.AppID
if appID == "" && len(task.SidebarApp) > 0 {
appID = task.SidebarApp[0].ID
}

aiTasks = append(aiTasks, &proto.AITask{
Id: task.ID,
AppId:task.AppID,
AppId:appID,
SidebarApp: &proto.AITaskSidebarApp{
Id:task.AppID,
Id:appID,
},
})
}
Expand Down
54 changes: 54 additions & 0 deletionsprovisioner/terraform/resources_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1549,6 +1549,60 @@ func TestAITasks(t *testing.T) {
// This is validated once all parameters are resolved etc as part of the workspace build, but for now we can allow it.
require.Len(t, state.AITasks, 2)
})

t.Run("Can use sidebar app ID", func(t *testing.T) {
t.Parallel()

// nolint:dogsled
_, filename, _, _ := runtime.Caller(0)

dir := filepath.Join(filepath.Dir(filename), "testdata", "resources", "ai-tasks-sidebar")
tfPlanRaw, err := os.ReadFile(filepath.Join(dir, "ai-tasks-sidebar.tfplan.json"))
require.NoError(t, err)
var tfPlan tfjson.Plan
err = json.Unmarshal(tfPlanRaw, &tfPlan)
require.NoError(t, err)
tfPlanGraph, err := os.ReadFile(filepath.Join(dir, "ai-tasks-sidebar.tfplan.dot"))
require.NoError(t, err)

state, err := terraform.ConvertState(ctx, []*tfjson.StateModule{tfPlan.PlannedValues.RootModule, tfPlan.PriorState.Values.RootModule}, string(tfPlanGraph), logger)
require.NotNil(t, state)
require.NoError(t, err)
require.True(t, state.HasAITasks)
require.Len(t, state.AITasks, 1)

sidebarApp := state.AITasks[0].GetSidebarApp()
require.NotNil(t, sidebarApp)
require.Equal(t, "5ece4674-dd35-4f16-88c8-82e40e72e2fd", sidebarApp.GetId())
require.Equal(t, "5ece4674-dd35-4f16-88c8-82e40e72e2fd", state.AITasks[0].AppId)
})

t.Run("Can use app ID", func(t *testing.T) {
t.Parallel()

// nolint:dogsled
_, filename, _, _ := runtime.Caller(0)

dir := filepath.Join(filepath.Dir(filename), "testdata", "resources", "ai-tasks-app")
tfPlanRaw, err := os.ReadFile(filepath.Join(dir, "ai-tasks-app.tfplan.json"))
require.NoError(t, err)
var tfPlan tfjson.Plan
err = json.Unmarshal(tfPlanRaw, &tfPlan)
require.NoError(t, err)
tfPlanGraph, err := os.ReadFile(filepath.Join(dir, "ai-tasks-app.tfplan.dot"))
require.NoError(t, err)

state, err := terraform.ConvertState(ctx, []*tfjson.StateModule{tfPlan.PlannedValues.RootModule, tfPlan.PriorState.Values.RootModule}, string(tfPlanGraph), logger)
require.NotNil(t, state)
require.NoError(t, err)
require.True(t, state.HasAITasks)
require.Len(t, state.AITasks, 1)

sidebarApp := state.AITasks[0].GetSidebarApp()
require.NotNil(t, sidebarApp)
require.Equal(t, "5ece4674-dd35-4f16-88c8-82e40e72e2fd", sidebarApp.GetId())
require.Equal(t, "5ece4674-dd35-4f16-88c8-82e40e72e2fd", state.AITasks[0].AppId)
})
}

func TestExternalAgents(t *testing.T) {
Expand Down
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

Loading
Loading
[8]ページ先頭
©2009-2025 Movatter.jp