Jan 8, 2024 · Jan 3, 2024 · Jan 4, 2024 · Jan 4, 2024 · Jan 4, 2024 · Jan 4, 2024
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/coderd.go b/coderd/coderd.go
 CurrentVersion:               buildinfo.Version(),
 WorkspaceProxiesFetchUpdater: *(options.WorkspaceProxiesFetchUpdater).Load(),
 },
 ProvisionerDaemons: healthcheck.ProvisionerDaemonsReportDeps{
 CurrentVersion:         buildinfo.Version(),
 CurrentAPIMajorVersion: provisionersdk.CurrentMajor,
 Store:                  options.Database,
 // TimeNow and StaleInterval set to defaults, see healthcheck/provisioner.go
 },
 })
 }
 }
 Tags:       provisionersdk.MutateTags(uuid.Nil, nil),
 LastSeenAt: sql.NullTime{Time: dbtime.Now(), Valid: true},
 Version:    buildinfo.Version(),
 APIVersion: provisionersdk.APIVersionCurrent,
 APIVersion: provisionersdk.VersionCurrent.String(),
 })
 if err != nil {
 return nil, xerrors.Errorf("failed to create in-memory provisioner daemon: %w", err)
diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
 }
 return apps
 }

 func ProvisionerDaemon(dbDaemon database.ProvisionerDaemon) codersdk.ProvisionerDaemon {
 result := codersdk.ProvisionerDaemon{
 ID:         dbDaemon.ID,
 CreatedAt:  dbDaemon.CreatedAt,
 LastSeenAt: codersdk.NullTime{NullTime: dbDaemon.LastSeenAt},
 Name:       dbDaemon.Name,
 Tags:       dbDaemon.Tags,
 Version:    dbDaemon.Version,
 APIVersion: dbDaemon.APIVersion,
 }
 for _, provisionerType := range dbDaemon.Provisioners {
 result.Provisioners = append(result.Provisioners, codersdk.ProvisionerType(provisionerType))
 }
 return result
 }
diff --git a/coderd/database/dbpurge/dbpurge_test.go b/coderd/database/dbpurge/dbpurge_test.go
 CreatedAt:    now.Add(-14 * 24 * time.Hour),
 LastSeenAt:   sql.NullTime{Valid: true, Time: now.Add(-7 * 24 * time.Hour).Add(time.Minute)},
 Version:      "1.0.0",
 APIVersion:   provisionersdk.APIVersionCurrent,
 APIVersion:   provisionersdk.VersionCurrent.String(),
 })
 require.NoError(t, err)
 _, err = db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
 CreatedAt:    now.Add(-8 * 24 * time.Hour),
 LastSeenAt:   sql.NullTime{Valid: true, Time: now.Add(-8 * 24 * time.Hour).Add(time.Hour)},
 Version:      "1.0.0",
 APIVersion:   provisionersdk.APIVersionCurrent,
 APIVersion:   provisionersdk.VersionCurrent.String(),
 })
 require.NoError(t, err)
 _, err = db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
 },
 CreatedAt:  now.Add(-9 * 24 * time.Hour),
 Version:    "1.0.0",
 APIVersion: provisionersdk.APIVersionCurrent,
 APIVersion: provisionersdk.VersionCurrent.String(),
 })
 require.NoError(t, err)
 _, err = db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
 CreatedAt:  now.Add(-6 * 24 * time.Hour),
 LastSeenAt: sql.NullTime{Valid: true, Time: now.Add(-6 * 24 * time.Hour)},
 Version:    "1.0.0",
 APIVersion: provisionersdk.APIVersionCurrent,
 APIVersion: provisionersdk.VersionCurrent.String(),
 })
 require.NoError(t, err)

diff --git a/coderd/healthcheck/health/model.go b/coderd/healthcheck/health/model.go

 CodeDERPNodeUsesWebsocket Code = `EDERP01`
 CodeDERPOneNodeUnhealthy  Code = `EDERP02`

 CodeProvisionerDaemonsNoProvisionerDaemons     Code = `EPD01`
 CodeProvisionerDaemonVersionMismatch           Code = `EPD02`
 CodeProvisionerDaemonAPIMajorVersionDeprecated Code = `EPD03`
 )

 // @typescript-generate Severity
Original file line number	Diff line number	Diff line change
Expand Up		@@ -440,6 +440,12 @@ func New(options Options) API {
		CurrentVersion: buildinfo.Version(),
		WorkspaceProxiesFetchUpdater: *(options.WorkspaceProxiesFetchUpdater).Load(),
		},
		ProvisionerDaemons: healthcheck.ProvisionerDaemonsReportDeps{
		CurrentVersion: buildinfo.Version(),
		CurrentAPIMajorVersion: provisionersdk.CurrentMajor,
		Store: options.Database,
		// TimeNow and StaleInterval set to defaults, see healthcheck/provisioner.go
		},
		})
		}
		}
Expand DownExpand Up		@@ -1188,7 +1194,7 @@ func (api *API) CreateInMemoryProvisionerDaemon(ctx context.Context, name string
		Tags: provisionersdk.MutateTags(uuid.Nil, nil),
		LastSeenAt: sql.NullTime{Time: dbtime.Now(), Valid: true},
		Version: buildinfo.Version(),
		APIVersion: provisionersdk.APIVersionCurrent,
		APIVersion: provisionersdk.VersionCurrent.String(),
		})
		if err != nil {
		return nil, xerrors.Errorf("failed to create in-memory provisioner daemon: %w", err)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -416,3 +416,19 @@ func Apps(dbApps []database.WorkspaceApp, agent database.WorkspaceAgent, ownerNa
		}
		return apps
		}

		func ProvisionerDaemon(dbDaemon database.ProvisionerDaemon) codersdk.ProvisionerDaemon {
		result := codersdk.ProvisionerDaemon{
		ID: dbDaemon.ID,
		CreatedAt: dbDaemon.CreatedAt,
		LastSeenAt: codersdk.NullTime{NullTime: dbDaemon.LastSeenAt},
		Name: dbDaemon.Name,
		Tags: dbDaemon.Tags,
		Version: dbDaemon.Version,
		APIVersion: dbDaemon.APIVersion,
		}
		for _, provisionerType := range dbDaemon.Provisioners {
		result.Provisioners = append(result.Provisioners, codersdk.ProvisionerType(provisionerType))
		}
		return result
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -218,7 +218,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
		CreatedAt: now.Add(-14 * 24 * time.Hour),
		LastSeenAt: sql.NullTime{Valid: true, Time: now.Add(-7 * 24 * time.Hour).Add(time.Minute)},
		Version: "1.0.0",
		APIVersion: provisionersdk.APIVersionCurrent,
		APIVersion: provisionersdk.VersionCurrent.String(),
		})
		require.NoError(t, err)
		_, err = db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
Expand All		@@ -229,7 +229,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
		CreatedAt: now.Add(-8 * 24 * time.Hour),
		LastSeenAt: sql.NullTime{Valid: true, Time: now.Add(-8 * 24 * time.Hour).Add(time.Hour)},
		Version: "1.0.0",
		APIVersion: provisionersdk.APIVersionCurrent,
		APIVersion: provisionersdk.VersionCurrent.String(),
		})
		require.NoError(t, err)
		_, err = db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
Expand All		@@ -242,7 +242,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
		},
		CreatedAt: now.Add(-9 * 24 * time.Hour),
		Version: "1.0.0",
		APIVersion: provisionersdk.APIVersionCurrent,
		APIVersion: provisionersdk.VersionCurrent.String(),
		})
		require.NoError(t, err)
		_, err = db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
Expand All		@@ -256,7 +256,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
		CreatedAt: now.Add(-6 * 24 * time.Hour),
		LastSeenAt: sql.NullTime{Valid: true, Time: now.Add(-6 * 24 * time.Hour)},
		Version: "1.0.0",
		APIVersion: provisionersdk.APIVersionCurrent,
		APIVersion: provisionersdk.VersionCurrent.String(),
		})
		require.NoError(t, err)

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,6 +34,10 @@ const (

		CodeDERPNodeUsesWebsocket Code = `EDERP01`
		CodeDERPOneNodeUnhealthy Code = `EDERP02`

		CodeProvisionerDaemonsNoProvisionerDaemons Code = `EPD01`
		CodeProvisionerDaemonVersionMismatch Code = `EPD02`
		CodeProvisionerDaemonAPIMajorVersionDeprecated Code = `EPD03`
		)

		// @typescript-generate Severity
Expand Down