fix: block updating mutable parameters (#6717)

kylecarbs · web-flow · commit ad9c9b468f56 · 2023-03-22T11:05:04.000-05:00
diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -1265,7 +1265,8 @@ func TestWorkspaceUpdateAutostart(t *testing.T) {
 				if len(auditor.AuditLogs) < 7 {
 					return false
 				}
-				return auditor.AuditLogs[6].Action == database.AuditActionWrite
+				return auditor.AuditLogs[6].Action == database.AuditActionWrite ||
+					auditor.AuditLogs[5].Action == database.AuditActionWrite
 			}, testutil.WaitShort, testutil.IntervalFast)
 		})
 	}
@@ -1384,7 +1385,8 @@ func TestWorkspaceUpdateTTL(t *testing.T) {
 				if len(auditor.AuditLogs) != 7 {
 					return false
 				}
-				return auditor.AuditLogs[6].Action == database.AuditActionWrite
+				return auditor.AuditLogs[6].Action == database.AuditActionWrite ||
+					auditor.AuditLogs[5].Action == database.AuditActionWrite
 			}, testutil.WaitMedium, testutil.IntervalFast, "expected audit log to be written")
 		})
 	}
diff --git a/site/src/api/api.test.ts b/site/src/api/api.test.ts
@@ -2,6 +2,7 @@ import axios from "axios"
 import {
   MockTemplate,
   MockTemplateVersionParameter1,
+  MockTemplateVersionParameter2,
   MockWorkspace,
   MockWorkspaceBuild,
   MockWorkspaceBuildParameter1,
@@ -184,7 +185,10 @@ describe("api.ts", () => {
       jest.spyOn(api, "getWorkspaceBuildParameters").mockResolvedValue([])
       jest
         .spyOn(api, "getTemplateVersionRichParameters")
-        .mockResolvedValue([MockTemplateVersionParameter1])
+        .mockResolvedValue([
+          MockTemplateVersionParameter1,
+          { ...MockTemplateVersionParameter2, mutable: false },
+        ])
 
       let error = new Error()
       try {
@@ -194,6 +198,8 @@ describe("api.ts", () => {
       }
 
       expect(error).toBeInstanceOf(api.MissingBuildParameters)
+      // Verify if the correct missing parameters are being passed
+      // It should not require immutable parameters
       expect((error as api.MissingBuildParameters).parameters).toEqual([
         MockTemplateVersionParameter1,
       ])
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -976,7 +976,9 @@ const getMissingParameters = (
   templateParameters: TypesGen.TemplateVersionParameter[],
 ) => {
   const missingParameters: TypesGen.TemplateVersionParameter[] = []
-  const requiredParameters = templateParameters.filter((p) => p.required)
+  const requiredParameters = templateParameters.filter(
+    (p) => p.required && p.mutable,
+  )
 
   for (const parameter of requiredParameters) {
     // Check if there is a new value

Original file line number	Diff line number	Diff line change
`@@ -1265,7 +1265,8 @@ func TestWorkspaceUpdateAutostart(t *testing.T) {`
`1265`	`1265`	`if len(auditor.AuditLogs) < 7 {`
`1266`	`1266`	`return false`
`1267`	`1267`	`}`
`1268`		`- return auditor.AuditLogs[6].Action == database.AuditActionWrite`
	`1268`	`+ return auditor.AuditLogs[6].Action == database.AuditActionWrite \|\|`
	`1269`	`+ auditor.AuditLogs[5].Action == database.AuditActionWrite`
`1269`	`1270`	`}, testutil.WaitShort, testutil.IntervalFast)`
`1270`	`1271`	`})`
`1271`	`1272`	`}`
`@@ -1384,7 +1385,8 @@ func TestWorkspaceUpdateTTL(t *testing.T) {`
`1384`	`1385`	`if len(auditor.AuditLogs) != 7 {`
`1385`	`1386`	`return false`
`1386`	`1387`	`}`
`1387`		`- return auditor.AuditLogs[6].Action == database.AuditActionWrite`
	`1388`	`+ return auditor.AuditLogs[6].Action == database.AuditActionWrite \|\|`
	`1389`	`+ auditor.AuditLogs[5].Action == database.AuditActionWrite`
`1388`	`1390`	`}, testutil.WaitMedium, testutil.IntervalFast, "expected audit log to be written")`
`1389`	`1391`	`})`
`1390`	`1392`	`}`