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

Commit5d66f1f

Browse files
fix(provisioner): use sidebar app id instead of app id (#20246)
In a previous PR we set SidebarApp.Id equal to the appID instead of thesidebarAppID.
1 parent8f2394c commit5d66f1f

12 files changed

+756
-2
lines changed

‎provisioner/terraform/resources.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,11 +1022,16 @@ func ConvertState(ctx context.Context, modules []*tfjson.StateModule, rawGraph s
10221022
returnnil,xerrors.Errorf("decode coder_ai_task attributes: %w",err)
10231023
}
10241024

1025+
appID:=task.AppID
1026+
ifappID==""&&len(task.SidebarApp)>0 {
1027+
appID=task.SidebarApp[0].ID
1028+
}
1029+
10251030
aiTasks=append(aiTasks,&proto.AITask{
10261031
Id:task.ID,
1027-
AppId:task.AppID,
1032+
AppId:appID,
10281033
SidebarApp:&proto.AITaskSidebarApp{
1029-
Id:task.AppID,
1034+
Id:appID,
10301035
},
10311036
})
10321037
}

‎provisioner/terraform/resources_test.go‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,6 +1549,60 @@ func TestAITasks(t *testing.T) {
15491549
// This is validated once all parameters are resolved etc as part of the workspace build, but for now we can allow it.
15501550
require.Len(t,state.AITasks,2)
15511551
})
1552+
1553+
t.Run("Can use sidebar app ID",func(t*testing.T) {
1554+
t.Parallel()
1555+
1556+
// nolint:dogsled
1557+
_,filename,_,_:=runtime.Caller(0)
1558+
1559+
dir:=filepath.Join(filepath.Dir(filename),"testdata","resources","ai-tasks-sidebar")
1560+
tfPlanRaw,err:=os.ReadFile(filepath.Join(dir,"ai-tasks-sidebar.tfplan.json"))
1561+
require.NoError(t,err)
1562+
vartfPlan tfjson.Plan
1563+
err=json.Unmarshal(tfPlanRaw,&tfPlan)
1564+
require.NoError(t,err)
1565+
tfPlanGraph,err:=os.ReadFile(filepath.Join(dir,"ai-tasks-sidebar.tfplan.dot"))
1566+
require.NoError(t,err)
1567+
1568+
state,err:=terraform.ConvertState(ctx, []*tfjson.StateModule{tfPlan.PlannedValues.RootModule,tfPlan.PriorState.Values.RootModule},string(tfPlanGraph),logger)
1569+
require.NotNil(t,state)
1570+
require.NoError(t,err)
1571+
require.True(t,state.HasAITasks)
1572+
require.Len(t,state.AITasks,1)
1573+
1574+
sidebarApp:=state.AITasks[0].GetSidebarApp()
1575+
require.NotNil(t,sidebarApp)
1576+
require.Equal(t,"5ece4674-dd35-4f16-88c8-82e40e72e2fd",sidebarApp.GetId())
1577+
require.Equal(t,"5ece4674-dd35-4f16-88c8-82e40e72e2fd",state.AITasks[0].AppId)
1578+
})
1579+
1580+
t.Run("Can use app ID",func(t*testing.T) {
1581+
t.Parallel()
1582+
1583+
// nolint:dogsled
1584+
_,filename,_,_:=runtime.Caller(0)
1585+
1586+
dir:=filepath.Join(filepath.Dir(filename),"testdata","resources","ai-tasks-app")
1587+
tfPlanRaw,err:=os.ReadFile(filepath.Join(dir,"ai-tasks-app.tfplan.json"))
1588+
require.NoError(t,err)
1589+
vartfPlan tfjson.Plan
1590+
err=json.Unmarshal(tfPlanRaw,&tfPlan)
1591+
require.NoError(t,err)
1592+
tfPlanGraph,err:=os.ReadFile(filepath.Join(dir,"ai-tasks-app.tfplan.dot"))
1593+
require.NoError(t,err)
1594+
1595+
state,err:=terraform.ConvertState(ctx, []*tfjson.StateModule{tfPlan.PlannedValues.RootModule,tfPlan.PriorState.Values.RootModule},string(tfPlanGraph),logger)
1596+
require.NotNil(t,state)
1597+
require.NoError(t,err)
1598+
require.True(t,state.HasAITasks)
1599+
require.Len(t,state.AITasks,1)
1600+
1601+
sidebarApp:=state.AITasks[0].GetSidebarApp()
1602+
require.NotNil(t,sidebarApp)
1603+
require.Equal(t,"5ece4674-dd35-4f16-88c8-82e40e72e2fd",sidebarApp.GetId())
1604+
require.Equal(t,"5ece4674-dd35-4f16-88c8-82e40e72e2fd",state.AITasks[0].AppId)
1605+
})
15521606
}
15531607

15541608
funcTestExternalAgents(t*testing.T) {

‎provisioner/terraform/testdata/resources/ai-tasks-app/ai-tasks-app.tfplan.dot‎

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎provisioner/terraform/testdata/resources/ai-tasks-app/ai-tasks-app.tfplan.json‎

Lines changed: 187 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎provisioner/terraform/testdata/resources/ai-tasks-app/ai-tasks-app.tfstate.dot‎

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp