wiring spaghetti

mtojek · mtojek · commit 648d992284ab · 2023-06-27T13:13:43.000+02:00
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templateversionparameters.sql b/coderd/database/queries/templateversionparameters.sql
@@ -41,4 +41,4 @@ VALUES
     ) RETURNING *;
 
 -- name: GetTemplateVersionParameters :many
-SELECT * FROM template_version_parameters WHERE template_version_id = $1;
+SELECT * FROM template_version_parameters WHERE template_version_id = $1 ORDER BY (priority, name) ASC;
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -825,6 +825,7 @@ func (server *Server) CompleteJob(ctx context.Context, completed *proto.Complete
 				ValidationMax:       validationMax,
 				ValidationMonotonic: richParameter.ValidationMonotonic,
 				Required:            richParameter.Required,
+				Priority:            richParameter.Priority,
 				LegacyVariableName:  richParameter.LegacyVariableName,
 			})
 			if err != nil {
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -494,6 +494,7 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string, rawParameterNa
 			DefaultValue:       param.Default,
 			Icon:               param.Icon,
 			Required:           !param.Optional,
+			Priority:           0, // FIXME: param.Priority
 			LegacyVariableName: param.LegacyVariableName,
 		}
 		if len(param.Validation) == 1 {

Original file line number	Diff line number	Diff line change
`@@ -494,6 +494,7 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string, rawParameterNa`
`494`	`494`	`DefaultValue: param.Default,`
`495`	`495`	`Icon: param.Icon,`
`496`	`496`	`Required: !param.Optional,`
	`497`	`+ Priority: 0, // FIXME: param.Priority`
`497`	`498`	`LegacyVariableName: param.LegacyVariableName,`
`498`	`499`	`}`
`499`	`500`	`if len(param.Validation) == 1 {`