Pass through providerd

coder · mtojek · Mar 7, 2023 · Mar 3, 2023 · Mar 3, 2023 · Mar 3, 2023
commit 110b10b998f67a56e7bb4df23c396c16bcb79f66
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbfake/databasefake.go b/coderd/database/dbfake/databasefake.go
@@ -2696,6 +2696,7 @@ func (q *fakeQuerier) InsertTemplateVersionParameter(_ context.Context, arg data
 		ValidationMin:       arg.ValidationMin,
 		ValidationMax:       arg.ValidationMax,
 		ValidationMonotonic: arg.ValidationMonotonic,
+		Required:            arg.Required,
 	}
 	q.templateVersionParameters = append(q.templateVersionParameters, param)
 	return param, nil

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
@@ -13,7 +13,8 @@ INSERT INTO
         validation_min,
         validation_max,
         validation_error,
-        validation_monotonic
+        validation_monotonic,
+        required
     )
 VALUES
     (
@@ -29,7 +30,8 @@ VALUES
         $10,
         $11,
         $12,
-        $13
+        $13,
+        $14
     ) RETURNING *;
 
 -- name: GetTemplateVersionParameters :many

diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -1621,6 +1621,7 @@ func convertTemplateVersionParameter(param database.TemplateVersionParameter) (c
 		ValidationMax:        param.ValidationMax,
 		ValidationError:      param.ValidationError,
 		ValidationMonotonic:  codersdk.ValidationMonotonicOrder(param.ValidationMonotonic),
+		Required:             param.Required,
 	}, nil
 }
 

diff --git a/codersdk/templateversions.go b/codersdk/templateversions.go
@@ -53,6 +53,7 @@ type TemplateVersionParameter struct {
 	ValidationMin        int32                            `json:"validation_min,omitempty"`
 	ValidationMax        int32                            `json:"validation_max,omitempty"`
 	ValidationMonotonic  ValidationMonotonicOrder         `json:"validation_monotonic,omitempty" enums:"increasing,decreasing"`
+	Required             bool                             `json:"required"`
 }
 
 // TemplateVersionParameterOption represents a selectable option for a template parameter.

diff --git a/docs/api/schemas.md b/docs/api/schemas.md
@@ -4838,6 +4838,7 @@ Parameter represents a set value for the scope.
       "value": "string"
     }
   ],
+  "required": true,
   "type": "string",
   "validation_error": "string",
   "validation_max": 0,
@@ -4858,6 +4859,7 @@ Parameter represents a set value for the scope.
 | `mutable`               | boolean                                                                                     | false    |              |             |
 | `name`                  | string                                                                                      | false    |              |             |
 | `options`               | array of [codersdk.TemplateVersionParameterOption](#codersdktemplateversionparameteroption) | false    |              |             |
+| `required`              | boolean                                                                                     | false    |              |             |
 | `type`                  | string                                                                                      | false    |              |             |
 | `validation_error`      | string                                                                                      | false    |              |             |
 | `validation_max`        | integer                                                                                     | false    |              |             |

diff --git a/docs/api/templates.md b/docs/api/templates.md
@@ -2182,6 +2182,7 @@ curl -X GET http://coder-server:8080/api/v2/templateversions/{templateversion}/r
         "value": "string"
       }
     ],
+    "required": true,
     "type": "string",
     "validation_error": "string",
     "validation_max": 0,
@@ -2216,6 +2217,7 @@ Status Code **200**
 | `»» icon`                 | string                                                                           | false    |              |             |
 | `»» name`                 | string                                                                           | false    |              |             |
 | `»» value`                | string                                                                           | false    |              |             |
+| `» required`              | boolean                                                                          | false    |              |             |
 | `» type`                  | string                                                                           | false    |              |             |
 | `» validation_error`      | string                                                                           | false    |              |             |
 | `» validation_max`        | integer                                                                          | false    |              |             |

diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -447,6 +447,7 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string) (*State, error
 				Mutable:      param.Mutable,
 				DefaultValue: param.Default,
 				Icon:         param.Icon,
+				Required:     param.Default == "", // FIXME pull from terraform-provider-coder
 			}
 			if len(param.Validation) == 1 {
 				protoParam.ValidationRegex = param.Validation[0].Regex