Sep 4, 2020 · Sep 4, 2020 · Sep 4, 2020 · Sep 4, 2020 · Sep 4, 2020 · Sep 4, 2020
diff --git a/coder-sdk/env.go b/coder-sdk/env.go

 import (
 "context"
 "fmt"
 "net/http"
 "time"

 "cdr.dev/coder-cli/internal/x/xjson"
 "nhooyr.io/websocket"
 "nhooyr.io/websocket/wsjson"
 )

 // Environment describes a Coder environment
 func (c Client) DialResourceLoad(ctx context.Context, envID string) (*websocket.Conn, error) {
 return c.dialWs(ctx, "/api/environments/"+envID+"/watch-resource-load")
 }

 type buildLogMsg struct {
 Type string `json:"type"`
 }

 // WaitForEnvironmentReady will watch the build log and return when done
 func (c Client) WaitForEnvironmentReady(ctx context.Context, env *Environment) error {
 conn, err := c.DialEnvironmentBuildLog(ctx, env.ID)
 if err != nil {
 return fmt.Errorf("%s: dial build log: %w", env.Name, err)
 }

 for {
 msg := buildLogMsg{}
 err := wsjson.Read(ctx, conn, &msg)
 if err != nil {
 return fmt.Errorf("%s: reading build log msg: %w", env.Name, err)
 }

 if msg.Type == "done" {
 return nil
 }
 }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,11 +2,13 @@ package coder

		import (
		"context"
		"fmt"
		"net/http"
		"time"

		"cdr.dev/coder-cli/internal/x/xjson"
		"nhooyr.io/websocket"
		"nhooyr.io/websocket/wsjson"
		)

		// Environment describes a Coder environment
Expand DownExpand Up		@@ -135,3 +137,27 @@ func (c Client) DialEnvironmentStats(ctx context.Context, envID string) (*websoc
		func (c Client) DialResourceLoad(ctx context.Context, envID string) (*websocket.Conn, error) {
cmoog marked this conversation as resolved. Show resolvedHide resolved
		return c.dialWs(ctx, "/api/environments/"+envID+"/watch-resource-load")
		}

		type buildLogMsg struct {
		Type string `json:"type"`
		}

		// WaitForEnvironmentReady will watch the build log and return when done
		func (c Client) WaitForEnvironmentReady(ctx context.Context, env *Environment) error {
Copy link Contributor coadlerSep 4, 2020 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Why does this need the full environment when the above function doesn't? Copy link Contributor cmoogSep 4, 2020 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Ah, good point.
		conn, err := c.DialEnvironmentBuildLog(ctx, env.ID)
		if err != nil {
		return fmt.Errorf("%s: dial build log: %w", env.Name, err)
cmoog marked this conversation as resolved. Show resolvedHide resolved
		}

		for {
		msg := buildLogMsg{}
		err := wsjson.Read(ctx, conn, &msg)
		if err != nil {
		return fmt.Errorf("%s: reading build log msg: %w", env.Name, err)
		}

		if msg.Type == "done" {
cmoog marked this conversation as resolved. Show resolvedHide resolved
		return nil
		}
		}
		}