Merge branch 'master' into minor-cleanup-tidy-up

creack · creack · commit b4a7ef8b1982 · 2020-09-15T13:02:24.000-04:00
Signed-off-by: Guillaume J. Charmes &lt;guillaume@coder.com&gt;
diff --git a/ci/steps/build.sh b/ci/steps/build.sh
@@ -7,10 +7,11 @@ popd() { builtin popd >/dev/null; }
 set -euo pipefail
 cd "$(dirname "$0")"
 
-export GOARCH=amd64
 tag=$(git describe --tags)
 
 build() {
+	echo "Building coder-cli for $GOOS-$GOARCH..."
+
 	tmpdir=$(mktemp -d)
 	go build -ldflags "-X main.version=${tag}" -o "$tmpdir/coder" ../../cmd/coder
 
@@ -33,12 +34,11 @@ build() {
 # Darwin builds do not work from Linux, so only try to build them from Darwin.
 # See: https://github.com/cdr/coder-cli/issues/20
 if [[ "$(uname)" == "Darwin" ]]; then
-	GOOS=linux build
-	CGO_ENABLED=1 GOOS=darwin build
-	GOOS=windows GOARCH=386 build
-	exit 0
+	CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 build
+else
+	echo "Warning: Darwin builds don't work on Linux."
+	echo "Please use an OSX machine to build Darwin tars."
 fi
 
-echo "Warning: Darwin builds don't work on Linux."
-echo "Please use an OSX machine to build Darwin tars."
-GOOS=linux build
+GOOS=linux GOARCH=amd64 build
+GOOS=windows GOARCH=386 build
diff --git a/coder-sdk/env.go b/coder-sdk/env.go
@@ -6,7 +6,9 @@ import (
 	"time"
 
 	"cdr.dev/coder-cli/internal/x/xjson"
+	"golang.org/x/xerrors"
 	"nhooyr.io/websocket"
+	"nhooyr.io/websocket/wsjson"
 )
 
 // Environment describes a Coder environment
@@ -85,10 +87,20 @@ type CreateEnvironmentRequest struct {
 // CreateEnvironment sends a request to create an environment.
 func (c Client) CreateEnvironment(ctx context.Context, orgID string, req CreateEnvironmentRequest) (*Environment, error) {
 	var env Environment
+<<<<<<< HEAD
 	if err := c.requestBody(ctx, http.MethodPost, "/api/orgs/"+orgID+"/environments", req, &env); err != nil {
 		return nil, err
 	}
 	return &env, nil
+=======
+	err := c.requestBody(
+		ctx,
+		http.MethodPost, "/api/orgs/"+orgID+"/environments",
+		req,
+		&env,
+	)
+	return &env, err
+>>>>>>> master
 }
 
 // EnvironmentsByOrganization gets the list of environments owned by the given user.
@@ -111,7 +123,12 @@ func (c Client) DialWsep(ctx context.Context, env *Environment) (*websocket.Conn
 	return c.dialWebsocket(ctx, "/proxy/environments/"+env.ID+"/wsep")
 }
 
-// DialEnvironmentBuildLog opens a websocket connection for the environment build log messages.
+// DialIDEStatus opens a websocket connection for cpu load metrics on the environment
+func (c Client) DialIDEStatus(ctx context.Context, envID string) (*websocket.Conn, error) {
+	return c.dialWs(ctx, "/proxy/environments/"+envID+"/ide/api/status")
+}
+
+// DialEnvironmentBuildLog opens a websocket connection for the environment build log messages
 func (c Client) DialEnvironmentBuildLog(ctx context.Context, envID string) (*websocket.Conn, error) {
 	return c.dialWebsocket(ctx, "/api/environments/"+envID+"/watch-update")
 }
@@ -120,3 +137,52 @@ func (c Client) DialEnvironmentBuildLog(ctx context.Context, envID string) (*web
 func (c Client) DialEnvironmentStats(ctx context.Context, envID string) (*websocket.Conn, error) {
 	return c.dialWebsocket(ctx, "/api/environments/"+envID+"/watch-stats")
 }
+
+// DialResourceLoad opens a websocket connection for cpu load metrics on the environment
+func (c Client) DialResourceLoad(ctx context.Context, envID string) (*websocket.Conn, error) {
+	return c.dialWs(ctx, "/api/environments/"+envID+"/watch-resource-load")
+}
+
+// BuildLogType describes the type of an event.
+type BuildLogType string
+
+const (
+	// BuildLogTypeStart signals that a new build log has begun.
+	BuildLogTypeStart BuildLogType = "start"
+	// BuildLogTypeStage is a stage-level event for an environment.
+	// It can be thought of as a major step in the environment's
+	// lifecycle.
+	BuildLogTypeStage BuildLogType = "stage"
+	// BuildLogTypeError describes an error that has occurred.
+	BuildLogTypeError BuildLogType = "error"
+	// BuildLogTypeSubstage describes a subevent that occurs as
+	// part of a stage. This can be the output from a user's
+	// personalization script, or a long running command.
+	BuildLogTypeSubstage BuildLogType = "substage"
+	// BuildLogTypeDone signals that the build has completed.
+	BuildLogTypeDone BuildLogType = "done"
+)
+
+type buildLogMsg struct {
+	Type BuildLogType `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 xerrors.Errorf("%s: dial build log: %w", env.Name, err)
+	}
+
+	for {
+		msg := buildLogMsg{}
+		err := wsjson.Read(ctx, conn, &msg)
+		if err != nil {
+			return xerrors.Errorf("%s: reading build log msg: %w", env.Name, err)
+		}
+
+		if msg.Type == BuildLogTypeDone {
+			return nil
+		}
+	}
+}
