Fix requested changes

kylecarbs · kylecarbs · commit c6cee947fd78 · 2022-02-12T19:06:42.000Z
diff --git a/cli/clitest/clitest.go b/cli/clitest/clitest.go
@@ -23,6 +23,7 @@ import (
 
 var (
 	// Used to ensure terminal output doesn't have anything crazy!
+	// See: https://stackoverflow.com/a/29497680
 	stripAnsi = regexp.MustCompile("[\u001B\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PRZcf-ntqry=><~]))")
 )
 
diff --git a/cli/projects.go b/cli/projects.go
@@ -17,7 +17,6 @@ func projects() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "projects",
 		Aliases: []string{"project"},
-		Long:    "Testing something",
 		Example: `
   - Create a project for developers to create workspaces
 
diff --git a/cli/workspacecreate.go b/cli/workspacecreate.go
@@ -120,8 +120,9 @@ func workspaceCreate() *cobra.Command {
 				_, _ = fmt.Printf("Terraform: %s\n", log.Output)
 			}
 
-			_, _ = fmt.Printf("Created workspace! %s\n", name)
+			// This command is WIP, and output will change!
 
+			_, _ = fmt.Printf("Created workspace! %s\n", name)
 			return nil
 		},
 	}
diff --git a/coderd/files.go b/coderd/files.go
@@ -40,8 +40,18 @@ func (api *api) postFiles(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 	hashBytes := sha256.Sum256(data)
-	file, err := api.Database.InsertFile(r.Context(), database.InsertFileParams{
-		Hash:      hex.EncodeToString(hashBytes[:]),
+	hash := hex.EncodeToString(hashBytes[:])
+	file, err := api.Database.GetFileByHash(r.Context(), hash)
+	if err == nil {
+		// The file already exists!
+		render.Status(r, http.StatusOK)
+		render.JSON(rw, r, UploadFileResponse{
+			Hash: file.Hash,
+		})
+		return
+	}
+	file, err = api.Database.InsertFile(r.Context(), database.InsertFileParams{
+		Hash:      hash,
 		CreatedBy: apiKey.UserID,
 		CreatedAt: database.Now(),
 		Mimetype:  contentType,
diff --git a/coderd/files_test.go b/coderd/files_test.go
@@ -27,4 +27,15 @@ func TestPostFiles(t *testing.T) {
 		_, err := client.UploadFile(context.Background(), codersdk.ContentTypeTar, make([]byte, 1024))
 		require.NoError(t, err)
 	})
+
+	t.Run("InsertAlreadyExists", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t)
+		_ = coderdtest.CreateInitialUser(t, client)
+		data := make([]byte, 1024)
+		_, err := client.UploadFile(context.Background(), codersdk.ContentTypeTar, data)
+		require.NoError(t, err)
+		_, err = client.UploadFile(context.Background(), codersdk.ContentTypeTar, data)
+		require.NoError(t, err)
+	})
 }
diff --git a/coderd/parameter/compute.go b/coderd/parameter/compute.go
@@ -88,7 +88,7 @@ func Compute(ctx context.Context, db database.Store, scope ComputeScope, options
 			continue
 		}
 		if _, ok := compute.computedParameterByName[parameterSchema.Name]; ok {
-			// We already have a value! No need to use th default.
+			// We already have a value! No need to use the default.
 			continue
 		}
 
diff --git a/coderd/provisionerjobs.go b/coderd/provisionerjobs.go
@@ -170,7 +170,6 @@ func (api *api) provisionerJobLogsByID(rw http.ResponseWriter, r *http.Request)
 	})
 	if errors.Is(err, sql.ErrNoRows) {
 		err = nil
-		provisionerJobLogs = []database.ProvisionerJobLog{}
 	}
 	if err != nil {
 		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
diff --git a/codersdk/files.go b/codersdk/files.go
@@ -20,7 +20,7 @@ func (c *Client) UploadFile(ctx context.Context, contentType string, content []b
 		return coderd.UploadFileResponse{}, err
 	}
 	defer res.Body.Close()
-	if res.StatusCode != http.StatusCreated {
+	if res.StatusCode != http.StatusCreated && res.StatusCode != http.StatusOK {
 		return coderd.UploadFileResponse{}, readBodyAsError(res)
 	}
 	var resp coderd.UploadFileResponse

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ import (`
`23`	`23`
`24`	`24`	`var (`
`25`	`25`	`// Used to ensure terminal output doesn't have anything crazy!`
	`26`	`+ // See: https://stackoverflow.com/a/29497680`
`26`	`27`	`stripAnsi = regexp.MustCompile("[\u001B\u009B][[\\]()#;?](?:(?:(?:[a-zA-Z\\d](?:;[a-zA-Z\\d]))?\u0007)\|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PRZcf-ntqry=><~]))")`
`27`	`28`	`)`
`28`	`29`
Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,9 @@ func workspaceCreate() *cobra.Command {`
`120`	`120`	`_, _ = fmt.Printf("Terraform: %s\n", log.Output)`
`121`	`121`	`}`
`122`	`122`
`123`		`- _, _ = fmt.Printf("Created workspace! %s\n", name)`
	`123`	`+ // This command is WIP, and output will change!`
`124`	`124`
	`125`	`+ _, _ = fmt.Printf("Created workspace! %s\n", name)`
`125`	`126`	`return nil`
`126`	`127`	`},`
`127`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func Compute(ctx context.Context, db database.Store, scope ComputeScope, options`
`88`	`88`	`continue`
`89`	`89`	`}`
`90`	`90`	`if _, ok := compute.computedParameterByName[parameterSchema.Name]; ok {`
`91`		`- // We already have a value! No need to use th default.`
	`91`	`+ // We already have a value! No need to use the default.`
`92`	`92`	`continue`
`93`	`93`	`}`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,6 @@ func (api api) provisionerJobLogsByID(rw http.ResponseWriter, r http.Request)`
`170`	`170`	`})`
`171`	`171`	`if errors.Is(err, sql.ErrNoRows) {`
`172`	`172`	`err = nil`
`173`		`- provisionerJobLogs = []database.ProvisionerJobLog{}`
`174`	`173`	`}`
`175`	`174`	`if err != nil {`
`176`	`175`	`httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ func (c *Client) UploadFile(ctx context.Context, contentType string, content []b`
`20`	`20`	`return coderd.UploadFileResponse{}, err`
`21`	`21`	`}`
`22`	`22`	`defer res.Body.Close()`
`23`		`- if res.StatusCode != http.StatusCreated {`
	`23`	`+ if res.StatusCode != http.StatusCreated && res.StatusCode != http.StatusOK {`
`24`	`24`	`return coderd.UploadFileResponse{}, readBodyAsError(res)`
`25`	`25`	`}`
`26`	`26`	`var resp coderd.UploadFileResponse`