Orca 845

[msarvar]

No description provided.

[msarvar]

You don't need this.

[msarvar]

You're declaring a variable that is interface of type controllers.WebsocketHandler, but there is no assignment that implements this interface. Otherwise you're just passing nil pointers around.
You need to declare create a struct that implements controllers.WebsocketHandler interface. The struct itself is just a delegate Upgrade method to instance of websocket.Upgrader{}. Something like this:

type DefaultWebsocketHandler struct {
  handler websocket.Upgrader
}

func NewWebsocketHandler() WebsocketHandler {
  return &DefaultWebsocketHandler{
    handler: websocket.Upgrader{},
  }
}

func (wh *DefaultWebsocketHandler) Upgrade(w http.ResponseWriter, r *http.Request, responseHeader http.Header) (WebsocketResponseWriter, error) {
  return wh.handler.Upgrade(w, r, responseHeader)
}

[msarvar]

you don't need to change these

[msarvar]

As we discussed we should refactor our logic around how we are sending log streaming to the controller. Right now we are passing in the TerraformOutputLine channel into each struct.

Let's create an interface called ProjectCommandOutputHandler. It will implement sending and receiving messages and wrap the channel.
It should implement 3 functions.

type ProjectCommandOutputHandler interface {
  // Send will enqueue the msg and wait for Handle() to receive the message.
  // this will be called in the RunCommandAsync where we currently sending messages to the terraform channel
  Send(ctx models.ProjectCommandContext, msg string) error

  // Receive will create a channel for projectPullInfo and run callback function argument when the new channel receives a message. This will be called from the controller. 
  // j.ProjectCommandOutputHandler.Receive(pull, func(msg string) {
  //   j.Logger.Info(msg)
  //   if err := c.WriteMessage(websocket.BinaryMessage, []byte(msg+"\r\n\t")); err != nil {
  //     j.Logger.Warn("Failed to write ws message: %s", err)
  //     return err
  //   }
  // })
  Receive(projectPullInfo string, callback func(msg string) error) error
  // Is basically the same as Listen function from logstreaming controller.
  Handle() 
}

To implement the interface let's create a struct DefaultProjectCommandOutputHandler.

type DefaultProjectCommandOutputHandler struct {
    // this is TerraforOutputChan
    projectCmdOutput chan *models.ProjectCmdOutputLine
   // this logBuffers
    projectOutputBuffers       map[string][]string
    // this is wsChans
    controllerBuffers          map[string]map[chan string]bool
    // same as chanLock
    controllerBufferLock         sync.RWMutex
}

[msarvar]

True removing line 33 and 34. I don't think we need them anymore.

[msarvar]

Suggested change

	err = j.LogStreamErrorTemplate.Execute(w, err)
	if err != nil {
	if err := j.LogStreamErrorTemplate.Execute(w, err); err != nil {