coder · kylecarbs · Sep 7, 2022 · Sep 7, 2022 · deansheather · Sep 7, 2022
diff --git a/cli/state.go b/cli/state.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"strconv"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -22,7 +23,7 @@ func state() *cobra.Command {
 }
 
 func statePull() *cobra.Command {
-	var buildName string
+	var buildNumber int
 	cmd := &cobra.Command{
 		Use:  "pull <workspace> [file]",
 		Args: cobra.MinimumNArgs(1),
@@ -31,15 +32,15 @@ func statePull() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			workspace, err := namedWorkspace(cmd, client, args[0])
-			if err != nil {
-				return err
-			}
 			var build codersdk.WorkspaceBuild
-			if buildName == "latest" {
+			if buildNumber == 0 {
+				workspace, err := namedWorkspace(cmd, client, args[0])
+				if err != nil {
+					return err
+				}
 				build = workspace.LatestBuild
 			} else {
-				build, err = client.WorkspaceBuildByName(cmd.Context(), workspace.ID, buildName)
+				build, err = client.WorkspaceBuildByUsernameAndWorkspaceNameAndBuildNumber(cmd.Context(), codersdk.Me, args[0], strconv.Itoa(buildNumber))
 				if err != nil {
 					return err
 				}
@@ -58,12 +59,12 @@ func statePull() *cobra.Command {
 			return os.WriteFile(args[1], state, 0600)
 		},
 	}
-	cmd.Flags().StringVarP(&buildName, "build", "b", "latest", "Specify a workspace build to target by name.")
+	cmd.Flags().IntVarP(&buildNumber, "build", "b", 0, "Specify a workspace build to target by name.")
 	return cmd
 }
 
 func statePush() *cobra.Command {
-	var buildName string
+	var buildNumber int
 	cmd := &cobra.Command{
 		Use:  "push <workspace> <file>",
 		Args: cobra.ExactArgs(2),
@@ -77,10 +78,10 @@ func statePush() *cobra.Command {
 				return err
 			}
 			var build codersdk.WorkspaceBuild
-			if buildName == "latest" {
+			if buildNumber == 0 {
 				build = workspace.LatestBuild
 			} else {
-				build, err = client.WorkspaceBuildByName(cmd.Context(), workspace.ID, buildName)
+				build, err = client.WorkspaceBuildByUsernameAndWorkspaceNameAndBuildNumber(cmd.Context(), codersdk.Me, args[0], strconv.Itoa(buildNumber))
 				if err != nil {
 					return err
 				}
@@ -108,6 +109,6 @@ func statePush() *cobra.Command {
 			return cliui.WorkspaceBuild(cmd.Context(), cmd.OutOrStderr(), client, build.ID, before)
 		},
 	}
-	cmd.Flags().StringVarP(&buildName, "build", "b", "latest", "Specify a workspace build to target by name.")
+	cmd.Flags().IntVarP(&buildNumber, "build", "b", 0, "Specify a workspace build to target by name.")
 	return cmd
 }
diff --git a/cli/state_test.go b/cli/state_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"testing"
 
@@ -113,7 +114,7 @@ func TestStatePush(t *testing.T) {
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
 		workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID)
 		coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
-		cmd, root := clitest.New(t, "state", "push", "--build", workspace.LatestBuild.Name, workspace.Name, "-")
+		cmd, root := clitest.New(t, "state", "push", "--build", strconv.Itoa(int(workspace.LatestBuild.BuildNumber)), workspace.Name, "-")
 		clitest.SetupConfig(t, client, root)
 		cmd.SetIn(strings.NewReader("some magic state"))
 		err := cmd.Execute()

diff --git a/coderd/autobuild/executor/lifecycle_executor.go b/coderd/autobuild/executor/lifecycle_executor.go
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/moby/moby/pkg/namesgenerator"
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/xerrors"
 
@@ -290,7 +289,6 @@ func build(ctx context.Context, store database.Store, workspace database.Workspa
 		WorkspaceID:       workspace.ID,
 		TemplateVersionID: priorHistory.TemplateVersionID,
 		BuildNumber:       priorBuildNumber + 1,
-		Name:              namesgenerator.GetRandomName(1),
 		ProvisionerState:  priorHistory.ProvisionerState,
 		InitiatorID:       workspace.OwnerID,
 		Transition:        trans,

diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -434,7 +434,6 @@ func New(options *Options) *API {
 				r.Route("/builds", func(r chi.Router) {
 					r.Get("/", api.workspaceBuilds)
 					r.Post("/", api.postWorkspaceBuilds)
-					r.Get("/{workspacebuildname}", api.workspaceBuildByName)
 				})
 				r.Route("/autostart", func(r chi.Router) {
 					r.Put("/", api.putWorkspaceAutostart)

diff --git a/coderd/coderdtest/authtest.go b/coderd/coderdtest/authtest.go
@@ -126,7 +126,6 @@ func NewAuthTester(ctx context.Context, t *testing.T, options *Options) *AuthTes
 		"{workspace}":           workspace.ID.String(),
 		"{workspacebuild}":      workspace.LatestBuild.ID.String(),
 		"{workspacename}":       workspace.Name,
-		"{workspacebuildname}":  workspace.LatestBuild.Name,
 		"{workspaceagent}":      workspaceResources[0].Agents[0].ID.String(),
 		"{buildnumber}":         strconv.FormatInt(int64(workspace.LatestBuild.BuildNumber), 10),
 		"{template}":            template.ID.String(),
@@ -211,10 +210,6 @@ func AGPLRoutes(a *AuthTester) (map[string]string, map[string]RouteCheck) {
 			AssertObject: rbac.ResourceWorkspace,
 			AssertAction: rbac.ActionRead,
 		},
-		"GET:/api/v2/workspaces/{workspace}/builds/{workspacebuildname}": {
-			AssertAction: rbac.ActionRead,
-			AssertObject: workspaceRBACObj,
-		},
 		"GET:/api/v2/workspacebuilds/{workspacebuild}": {
 			AssertAction: rbac.ActionRead,
 			AssertObject: workspaceRBACObj,

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -774,22 +774,6 @@ func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceID(_ context.Context,
 	return history, nil
 }
 
-func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDAndName(_ context.Context, arg database.GetWorkspaceBuildByWorkspaceIDAndNameParams) (database.WorkspaceBuild, error) {
-	q.mutex.RLock()
-	defer q.mutex.RUnlock()
-
-	for _, workspaceBuild := range q.workspaceBuilds {
-		if workspaceBuild.WorkspaceID.String() != arg.WorkspaceID.String() {
-			continue
-		}
-		if !strings.EqualFold(workspaceBuild.Name, arg.Name) {
-			continue
-		}
-		return workspaceBuild, nil
-	}
-	return database.WorkspaceBuild{}, sql.ErrNoRows
-}
-
 func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDAndBuildNumber(_ context.Context, arg database.GetWorkspaceBuildByWorkspaceIDAndBuildNumberParams) (database.WorkspaceBuild, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
@@ -1926,7 +1910,6 @@ func (q *fakeQuerier) InsertWorkspaceBuild(_ context.Context, arg database.Inser
 		CreatedAt:         arg.CreatedAt,
 		UpdatedAt:         arg.UpdatedAt,
 		WorkspaceID:       arg.WorkspaceID,
-		Name:              arg.Name,
 		TemplateVersionID: arg.TemplateVersionID,
 		BuildNumber:       arg.BuildNumber,
 		Transition:        arg.Transition,

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000045_workspacebuildname.down.sql b/coderd/database/migrations/000045_workspacebuildname.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE workspace_builds
+    ADD COLUMN name character varying(64) NOT NULL;
diff --git a/coderd/database/migrations/000045_workspacebuildname.up.sql b/coderd/database/migrations/000045_workspacebuildname.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE workspace_builds
+    DROP COLUMN name;
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE workspace_builds
		ADD COLUMN name character varying(64) NOT NULL;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE workspace_builds
		DROP COLUMN name;
Comment on lines +1 to +2 Copy link Member deansheather Sep 7, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Do we not have policies for keeping old columns around like we do in v1? @coadler Copy link Contributor coadler Sep 7, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. nah, i dont think we even support downgrades currently, so i doubt it makes a difference deansheather and kylecarbs reacted with thumbs up emoji