Skip to content

Commit 1e9fede

Browse files
committed
pr changes
1 parent 5ea7c06 commit 1e9fede

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

coderd/workspaces.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,7 +1080,8 @@ func (api *API) resolveAutostart(rw http.ResponseWriter, r *http.Request) {
10801080
return
10811081
}
10821082

1083-
useActiveVersion := template.RequireActiveVersion || workspace.AutomaticUpdates == database.AutomaticUpdatesAlways
1083+
templateAccessControl := (*(api.AccessControlStore.Load())).GetTemplateAccessControl(template)
1084+
useActiveVersion := templateAccessControl.RequireActiveVersion || workspace.AutomaticUpdates == database.AutomaticUpdatesAlways
10841085
if !useActiveVersion {
10851086
httpapi.Write(ctx, rw, http.StatusOK, codersdk.ResolveAutostartResponse{})
10861087
return
@@ -1111,7 +1112,7 @@ func (api *API) resolveAutostart(rw http.ResponseWriter, r *http.Request) {
11111112

11121113
dbVersionParams, err := api.Database.GetTemplateVersionParameters(ctx, version.ID)
11131114
if err != nil {
1114-
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
1115+
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
11151116
Message: "Internal error fetching template version parameters.",
11161117
Detail: err.Error(),
11171118
})
@@ -1141,13 +1142,16 @@ func (api *API) resolveAutostart(rw http.ResponseWriter, r *http.Request) {
11411142
}
11421143

11431144
var response codersdk.ResolveAutostartResponse
1144-
for i := 0; i < len(versionParams) && !response.ParameterMismatch; i++ {
1145-
_, err := resolver.ValidateResolve(versionParams[i], nil)
1145+
for _, param := range versionParams {
1146+
_, err := resolver.ValidateResolve(param, nil)
11461147
// There's a parameter mismatch if we get an error back from the
11471148
// resolver.
11481149
response.ParameterMismatch = err != nil
1149-
}
1150+
if response.ParameterMismatch {
1151+
break
1152+
}
11501153

1154+
}
11511155
httpapi.Write(ctx, rw, http.StatusOK, response)
11521156
}
11531157

0 commit comments

Comments
 (0)