Merge branch 'main' into dean/user-maintenance-window

coder · deansheather · Jul 20, 2023 · Jun 20, 2023 · Jun 20, 2023 · Jun 21, 2023
commit 3dbd0772725d568e94729a875bd1c312e63857cd
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/...000131_user_quiet_hours_schedule.down.sql → ...000136_user_quiet_hours_schedule.down.sql b/...000131_user_quiet_hours_schedule.down.sql → ...000136_user_quiet_hours_schedule.down.sql
diff --git a/...s/000131_user_quiet_hours_schedule.up.sql → ...s/000136_user_quiet_hours_schedule.up.sql b/...s/000131_user_quiet_hours_schedule.up.sql → ...s/000136_user_quiet_hours_schedule.up.sql
diff --git a/...132_template_restart_requirement.down.sql → ...137_template_restart_requirement.down.sql b/...132_template_restart_requirement.down.sql → ...137_template_restart_requirement.down.sql
diff --git a/...00132_template_restart_requirement.up.sql → ...00137_template_restart_requirement.up.sql b/...00132_template_restart_requirement.up.sql → ...00137_template_restart_requirement.up.sql
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -228,6 +228,7 @@ func (api *API) postTemplateByOrganization(rw http.ResponseWriter, r *http.Reque
 		restartRequirementWeeks      int64
 		failureTTL                   time.Duration
 		inactivityTTL                time.Duration
+		lockedTTL                    time.Duration
 	)
 	if createTemplate.DefaultTTLMillis != nil {
 		defaultTTL = time.Duration(*createTemplate.DefaultTTLMillis) * time.Millisecond

diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -165,6 +165,7 @@ type DeploymentValues struct {
 	WgtunnelHost                    clibase.String                  `json:"wgtunnel_host,omitempty" typescript:",notnull"`
 	DisableOwnerWorkspaceExec       clibase.Bool                    `json:"disable_owner_workspace_exec,omitempty" typescript:",notnull"`
 	ProxyHealthStatusInterval       clibase.Duration                `json:"proxy_health_status_interval,omitempty" typescript:",notnull"`
+	EnableTerraformDebugMode        clibase.Bool                    `json:"enable_terraform_debug_mode,omitempty" typescript:",notnull"`
 	UserQuietHoursSchedule          UserQuietHoursScheduleConfig    `json:"user_quiet_hours_schedule,omitempty" typescript:",notnull"`
 
 	Config      clibase.YAMLConfigPath `json:"config,omitempty" typescript:",notnull"`

diff --git a/docs/admin/audit-logs.md b/docs/admin/audit-logs.md
diff --git a/docs/api/schemas.md b/docs/api/schemas.md
@@ -4649,6 +4649,20 @@ If the schedule is empty, the user will be updated to use the default schedule.|
 | `status` | `active`    |
 | `status` | `suspended` |
 
+## codersdk.UserLoginType
+
+```json
+{
+  "login_type": "password"
+}
+```
+
+### Properties
+
+| Name         | Type                                     | Required | Restrictions | Description |
+| ------------ | ---------------------------------------- | -------- | ------------ | ----------- |
+| `login_type` | [codersdk.LoginType](#codersdklogintype) | false    |              |             |
+
 ## codersdk.UserQuietHoursScheduleConfig
 
 ```json

diff --git a/enterprise/audit/table.go b/enterprise/audit/table.go
@@ -103,7 +103,7 @@ var auditableResourcesTypes = map[any]map[string]Action{
 		"updated_at":           ActionIgnore, // Changes, but is implicit and not helpful in a diff.
 		"status":               ActionTrack,
 		"rbac_roles":           ActionTrack,
-		"login_type":           ActionIgnore,
+		"login_type":           ActionTrack,
 		"avatar_url":           ActionIgnore,
 		"last_seen_at":         ActionIgnore,
 		"deleted":              ActionTrack,

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -381,6 +381,7 @@ export interface DeploymentValues {
   readonly wgtunnel_host?: string
   readonly disable_owner_workspace_exec?: boolean
   readonly proxy_health_status_interval?: number
+  readonly enable_terraform_debug_mode?: boolean
   readonly user_quiet_hours_schedule?: UserQuietHoursScheduleConfig
   // This is likely an enum in an external package ("github.com/coder/coder/cli/clibase.YAMLConfigPath")
   readonly config?: string
@@ -1107,6 +1108,11 @@ export interface User {
   readonly avatar_url: string
 }
 
+// From codersdk/users.go
+export interface UserLoginType {
+  readonly login_type: LoginType
+}
+
 // From codersdk/deployment.go
 export interface UserQuietHoursScheduleConfig {
   readonly default_schedule: string
@@ -1124,11 +1130,6 @@ export interface UserQuietHoursScheduleResponse {
   readonly next: string
 }
 
-// From codersdk/users.go
-export interface UserLoginType {
-  readonly login_type: LoginType
-}
-
 // From codersdk/users.go
 export interface UserRoles {
   readonly roles: string[]