rename serversideeventtype

coder · f0ssel · Sep 16, 2022 · Aug 25, 2022 · Aug 25, 2022 · Aug 25, 2022
commit 953bb620ce3c0ef4c39395612c05b63dfb4ce544
diff --git a/coderd/httpapi/httpapi.go b/coderd/httpapi/httpapi.go
@@ -162,7 +162,7 @@ func ServerSideEventSender(rw http.ResponseWriter, r *http.Request) (func(ctx co
 		panic("http.ResponseWriter is not http.Flusher")
 	}
 
-	pingMsg := fmt.Sprintf("event: %s\n\n", codersdk.EventTypePing)
+	pingMsg := fmt.Sprintf("event: %s\n\n", codersdk.ServerSideEventTypePing)
 	_, err := io.WriteString(rw, pingMsg)
 	if err != nil {
 		return nil, err

diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -807,7 +807,7 @@ func (api *API) watchWorkspace(rw http.ResponseWriter, r *http.Request) {
 			workspace, err := api.Database.GetWorkspaceByID(r.Context(), workspace.ID)
 			if err != nil {
 				_ = sendEvent(r.Context(), codersdk.ServerSideEvent{
-					Type: codersdk.EventTypeError,
+					Type: codersdk.ServerSideEventTypeError,
 					Data: codersdk.Response{
 						Message: "Internal error fetching workspace.",
 						Detail:  err.Error(),
@@ -818,7 +818,7 @@ func (api *API) watchWorkspace(rw http.ResponseWriter, r *http.Request) {
 			build, err := api.Database.GetLatestWorkspaceBuildByWorkspaceID(r.Context(), workspace.ID)
 			if err != nil {
 				_ = sendEvent(r.Context(), codersdk.ServerSideEvent{
-					Type: codersdk.EventTypeError,
+					Type: codersdk.ServerSideEventTypeError,
 					Data: codersdk.Response{
 						Message: "Internal error fetching workspace.",
 						Detail:  err.Error(),
@@ -924,7 +924,7 @@ func (api *API) watchWorkspace(rw http.ResponseWriter, r *http.Request) {
 			err = group.Wait()
 			if err != nil {
 				_ = sendEvent(r.Context(), codersdk.ServerSideEvent{
-					Type: codersdk.EventTypeError,
+					Type: codersdk.ServerSideEventTypeError,
 					Data: codersdk.Response{
 						Message: "Internal error fetching workspace.",
 						Detail:  err.Error(),
@@ -935,7 +935,7 @@ func (api *API) watchWorkspace(rw http.ResponseWriter, r *http.Request) {
 			apiWorkspace := convertWorkspace(workspace, build, job, template, findUser(workspace.OwnerID, users), findUser(build.InitiatorID, users))
 			apiWorkspace.LatestBuild.Resources = apiResources
 			_ = sendEvent(r.Context(), codersdk.ServerSideEvent{
-				Type: codersdk.EventTypeData,
+				Type: codersdk.ServerSideEventTypeData,
 				Data: apiWorkspace,
 			})
 		}

diff --git a/codersdk/sse.go b/codersdk/sse.go
@@ -10,16 +10,16 @@ import (
 )
 
 type ServerSideEvent struct {
-	Type EventType
+	Type ServerSideEventType
 	Data interface{}
 }
 
-type EventType string
+type ServerSideEventType string
 
 const (
-	EventTypePing  EventType = "ping"
-	EventTypeData  EventType = "data"
-	EventTypeError EventType = "error"
+	ServerSideEventTypePing  ServerSideEventType = "ping"
+	ServerSideEventTypeData  ServerSideEventType = "data"
+	ServerSideEventTypeError ServerSideEventType = "error"
 )
 
 func ServerSideEventReader(rc io.ReadCloser) func() (*ServerSideEvent, error) {
@@ -51,29 +51,29 @@ func ServerSideEventReader(rc io.ReadCloser) func() (*ServerSideEvent, error) {
 				return nil, xerrors.Errorf("reading next line value: %w", err)
 			}
 
-			switch EventType(t) {
-			case EventTypePing:
+			switch ServerSideEventType(t) {
+			case ServerSideEventTypePing:
 				return &ServerSideEvent{
-					Type: EventTypePing,
+					Type: ServerSideEventTypePing,
 				}, nil
-			case EventTypeData:
+			case ServerSideEventTypeData:
 				d, err := nextLineValue("data")
 				if err != nil {
 					return nil, xerrors.Errorf("reading next line value: %w", err)
 				}
 
 				return &ServerSideEvent{
-					Type: EventTypeData,
+					Type: ServerSideEventTypeData,
 					Data: d,
 				}, nil
-			case EventTypeError:
+			case ServerSideEventTypeError:
 				d, err := nextLineValue("data")
 				if err != nil {
 					return nil, xerrors.Errorf("reading next line value: %w", err)
 				}
 
 				return &ServerSideEvent{
-					Type: EventTypeError,
+					Type: ServerSideEventTypeError,
 					Data: d,
 				}, nil
 			default:

diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go
@@ -145,7 +145,7 @@ func (c *Client) WatchWorkspace(ctx context.Context, id uuid.UUID) (<-chan Works
 				if err != nil {
 					return
 				}
-				if sse.Type == EventTypeData {
+				if sse.Type == ServerSideEventTypeData {
 					var ws Workspace
 					b, ok := sse.Data.([]byte)
 					if !ok {