Dec 5, 2023 · Dec 5, 2023 · Dec 5, 2023 · Dec 5, 2023 · Dec 5, 2023 · Dec 5, 2023
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/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000173_provisioner_last_seen_at.down.sql b/coderd/database/migrations/000173_provisioner_last_seen_at.down.sql
 ALTER TABLE provisioner_daemons
 DROP COLUMN last_seen_at,
 DROP COLUMN version;
diff --git a/coderd/database/migrations/000173_provisioner_last_seen_at.up.sql b/coderd/database/migrations/000173_provisioner_last_seen_at.up.sql
 ALTER TABLE provisioner_daemons
 ADD COLUMN last_seen_at TIMESTAMP WITH TIME ZONE NULL,
 ADD COLUMN version TEXT NOT NULL DEFAULT ''::TEXT;
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/codersdk/provisionerdaemons.go b/codersdk/provisionerdaemons.go
 ID           uuid.UUID         `json:"id" format:"uuid"`
 CreatedAt    time.Time         `json:"created_at" format:"date-time"`
 UpdatedAt    sql.NullTime      `json:"updated_at" format:"date-time"`
 LastSeenAt   NullTime          `json:"last_seen_at,omitempty" format:"date-time"`
 Name         string            `json:"name"`
 Version      string            `json:"version"`
 Provisioners []ProvisionerType `json:"provisioners"`
 Tags         map[string]string `json:"tags"`
 }
diff --git a/docs/api/enterprise.md b/docs/api/enterprise.md
diff --git a/docs/api/schemas.md b/docs/api/schemas.md
diff --git a/enterprise/coderd/provisionerdaemons.go b/enterprise/coderd/provisionerdaemons.go

 func convertProvisionerDaemon(daemon database.ProvisionerDaemon) codersdk.ProvisionerDaemon {
 result := codersdk.ProvisionerDaemon{
 ID:        daemon.ID,
 CreatedAt: daemon.CreatedAt,
 UpdatedAt: daemon.UpdatedAt,
 Name:      daemon.Name,
 Tags:      daemon.Tags,
 ID:         daemon.ID,
 CreatedAt:  daemon.CreatedAt,
 UpdatedAt:  daemon.UpdatedAt,
 LastSeenAt: codersdk.NullTime{NullTime: daemon.LastSeenAt},
 Name:       daemon.Name,
 Tags:       daemon.Tags,
 Version:    daemon.Version,
 }
 for _, provisionerType := range daemon.Provisioners {
 result.Provisioners = append(result.Provisioners, codersdk.ProvisionerType(provisionerType))
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
    created_at: "",
    provisioners: [],
    tags: {},
    version: "v2.34.5",
  },
  {
    id: "cdr-basic",
    name: "Basic",
    created_at: "",
    provisioners: [],
    tags: {},
    version: "v2.34.5",
  },
 ];

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
 };

 export const MockProvisioner: TypesGen.ProvisionerDaemon = {
  created_at: "",
  created_at: "2022-05-17T17:39:01.382927298Z",
  updated_at: "2022-05-17T17:39:01.382927298Z",
  id: "test-provisioner",
  name: "Test Provisioner",
  provisioners: ["echo"],
  tags: {},
  version: "v2.34.5",
 };

 export const MockProvisionerJob: TypesGen.ProvisionerJob = {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		ALTER TABLE provisioner_daemons
		DROP COLUMN last_seen_at,
		DROP COLUMN version;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		ALTER TABLE provisioner_daemons
		ADD COLUMN last_seen_at TIMESTAMP WITH TIME ZONE NULL,
		ADD COLUMN version TEXT NOT NULL DEFAULT ''::TEXT;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,7 +40,9 @@ type ProvisionerDaemon struct {
		ID uuid.UUID `json:"id" format:"uuid"`
		CreatedAt time.Time `json:"created_at" format:"date-time"`
		UpdatedAt sql.NullTime `json:"updated_at" format:"date-time"`
Copy link Member mtojekDec 5, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. nit: just spotted, if this is`sql.NullTime`, then the property should have`omitempty`. johnstcn reacted with thumbs up emoji Copy link Member mafredriDec 5, 2023• edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Just a note here that`omitempty` isn't actually relevant. Since`sql.NullTime` is a struct, it can't be omitted even when the struct is "zero". https://go.dev/play/p/SGmN64SRt8F Omitemptycan be relevant in e.g. codersdk when we use`codersdk.NullTime` that implements`MarshalJSON`. In that case it might help with generation of TypeScript types (unless we handle the type specifically in gen). mtojek reacted with eyes emoji Copy link Member mafredriDec 5, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I just realized that using`format` here is wrong, too (it'd be OK for`codersdk.NullTime`). Copy link MemberAuthor johnstcnDec 5, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. @mafredri sounds like`UpdatedAt` should be a`codersdk.NullTime` then in the API struct? Copy link Member mafredriDec 5, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Yeah@johnstcn, I think that would be better 👍🏻 johnstcn reacted with thumbs up emoji Copy link MemberAuthor johnstcnDec 5, 2023• edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. #11037
		LastSeenAt NullTime `json:"last_seen_at,omitempty" format:"date-time"`
		Name string `json:"name"`
		Version string `json:"version"`
		Provisioners []ProvisionerType `json:"provisioners"`
		Tags map[string]string `json:"tags"`
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -310,11 +310,13 @@ func (api API) provisionerDaemonServe(rw http.ResponseWriter, r http.Request)

		func convertProvisionerDaemon(daemon database.ProvisionerDaemon) codersdk.ProvisionerDaemon {
		result := codersdk.ProvisionerDaemon{
		ID: daemon.ID,
		CreatedAt: daemon.CreatedAt,
		UpdatedAt: daemon.UpdatedAt,
		Name: daemon.Name,
		Tags: daemon.Tags,
		ID: daemon.ID,
		CreatedAt: daemon.CreatedAt,
		UpdatedAt: daemon.UpdatedAt,
		LastSeenAt: codersdk.NullTime{NullTime: daemon.LastSeenAt},
		Name: daemon.Name,
		Tags: daemon.Tags,
		Version: daemon.Version,
		}
		for _, provisionerType := range daemon.Provisioners {
		result.Provisioners = append(result.Provisioners, codersdk.ProvisionerType(provisionerType))
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -78,13 +78,15 @@ export const provisioners: TypesGen.ProvisionerDaemon[] = [
		created_at: "",
		provisioners: [],
		tags: {},
		version: "v2.34.5",
		},
		{
		id: "cdr-basic",
		name: "Basic",
		created_at: "",
		provisioners: [],
		tags: {},
		version: "v2.34.5",
		},
		];

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -325,11 +325,13 @@ export const SuspendedMockUser: TypesGen.User = {
		};

		export const MockProvisioner: TypesGen.ProvisionerDaemon = {
		created_at: "",
		created_at: "2022-05-17T17:39:01.382927298Z",
		updated_at: "2022-05-17T17:39:01.382927298Z",
		id: "test-provisioner",
		name: "Test Provisioner",
		provisioners: ["echo"],
		tags: {},
		version: "v2.34.5",
		};

		export const MockProvisionerJob: TypesGen.ProvisionerJob = {
Expand Down