send "going away" mesasge on licenses pubsub on close

Emyrk · Emyrk · commit 20f421ae6b07 · 2023-08-17T16:08:32.000-05:00
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -800,6 +800,13 @@ func (api *API) runEntitlementsLoop(ctx context.Context) {
 	updates := make(chan struct{}, 1)
 	subscribed := false
 
+	defer func() {
+		// If this function ends, it means the context was cancelled and this
+		// coderd is shutting down. In this case, post a pubsub message to
+		// tell other coderd's to resync their entitlements. This is required to
+		// make sure things like replica counts are updated in the UI.
+		_ = api.Pubsub.Publish(PubsubEventLicenses, []byte("going away"))
+	}()
 	for {
 		select {
 		case <-ctx.Done():
diff --git a/enterprise/coderd/licenses.go b/enterprise/coderd/licenses.go
@@ -184,13 +184,22 @@ func (api *API) postRefreshEntitlements(rw http.ResponseWriter, r *http.Request)
 		wait := time.Minute - diff
 		rw.Header().Set("Retry-After", strconv.Itoa(int(wait.Seconds())))
 		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
-			Message: fmt.Sprintf("Entitlements already recently refreshed, please wait %d seconds to force a new refresh", wait),
+			Message: fmt.Sprintf("Entitlements already recently refreshed, please wait %d seconds to force a new refresh", int(wait.Seconds())),
 			Detail:  fmt.Sprintf("Last refresh at %s", now.UTC().String()),
 		})
 		return
 	}
 
-	err := api.updateEntitlements(ctx)
+	err := api.replicaManager.UpdateNow(ctx)
+	if err != nil {
+		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
+			Message: "Failed to sync replicas",
+			Detail:  err.Error(),
+		})
+		return
+	}
+
+	err = api.updateEntitlements(ctx)
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Failed to update entitlements",
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -821,6 +821,7 @@ export const getEntitlements = async (): Promise<TypesGen.Entitlements> => {
         require_telemetry: false,
         trial: false,
         warnings: [],
+        refreshed_at:"",
       }
     }
     throw ex

Original file line number	Diff line number	Diff line change
`@@ -821,6 +821,7 @@ export const getEntitlements = async (): Promise<TypesGen.Entitlements> => {`
`821`	`821`	`require_telemetry: false,`
`822`	`822`	`trial: false,`
`823`	`823`	`warnings: [],`
	`824`	`+ refreshed_at:"",`
`824`	`825`	`}`
`825`	`826`	`}`
`826`	`827`	`throw ex`