Add tests

BrunoQuaresma · BrunoQuaresma · commit 7a39d3476f8b · 2023-03-21T19:23:17.000Z
diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -79,6 +79,9 @@ func (api *API) patchTemplateVersion(rw http.ResponseWriter, r *http.Request) {
 	if !httpapi.Read(ctx, rw, r, &params) {
 		return
 	}
+	if params.Name == "" {
+		params.Name = templateVersion.Name
+	}
 	templateVersion, err := api.Database.UpdateTemplateVersionByID(ctx, database.UpdateTemplateVersionByIDParams{
 		ID:   templateVersion.ID,
 		Name: params.Name,
diff --git a/coderd/templateversions_test.go b/coderd/templateversions_test.go
@@ -1334,3 +1334,38 @@ func TestTemplateVersionVariables(t *testing.T) {
 		require.Equal(t, "*redacted*", actualVariables[0].Value)
 	})
 }
+
+func TestTemplateVersionPatch(t *testing.T) {
+	t.Parallel()
+	t.Run("Update the name", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		user := coderdtest.CreateFirstUser(t, client)
+		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		updatedVersion, err := client.UpdateTemplateVersion(ctx, version.ID, codersdk.PatchTemplateVersionRequest{
+			Name: "new name",
+		})
+
+		require.NoError(t, err)
+		require.Equal(t, updatedVersion.Name, "new name")
+	})
+
+	t.Run("Use the same name if a new name is not passed", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		user := coderdtest.CreateFirstUser(t, client)
+		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		updatedVersion, err := client.UpdateTemplateVersion(ctx, version.ID, codersdk.PatchTemplateVersionRequest{})
+
+		require.NoError(t, err)
+		require.Equal(t, updatedVersion.Name, version.Name)
+	})
+}
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"flag"
-	"fmt"
 	"math"
 	"net/http"
 	"os"
@@ -199,7 +198,7 @@ func ParseSSHConfigOption(opt string) (key string, value string, err error) {
 		return r == ' ' || r == '='
 	})
 	if idx == -1 {
-		return "", "", xerrors.New(fmt.Sprintf("invalid config-ssh option %q", opt))
+		return "", "", xerrors.Errorf("invalid config-ssh option %q", opt)
 	}
 	return opt[:idx], opt[idx+1:], nil
 }
diff --git a/codersdk/templateversions.go b/codersdk/templateversions.go
@@ -296,14 +296,15 @@ func (c *Client) PreviousTemplateVersion(ctx context.Context, organization uuid.
 	return version, json.NewDecoder(res.Body).Decode(&version)
 }
 
-func (c *Client) UpdateTemplateVersion(ctx context.Context, version, req PatchTemplateVersionRequest) error {
-	res, err := c.Request(ctx, http.MethodPatch, fmt.Sprintf("/api/v2/templateversions/%s", version), req)
+func (c *Client) UpdateTemplateVersion(ctx context.Context, versionId uuid.UUID, req PatchTemplateVersionRequest) (TemplateVersion, error) {
+	res, err := c.Request(ctx, http.MethodPatch, fmt.Sprintf("/api/v2/templateversions/%s", versionId), req)
 	if err != nil {
-		return err
+		return TemplateVersion{}, err
 	}
 	defer res.Body.Close()
 	if res.StatusCode != http.StatusNoContent {
-		return ReadBodyAsError(res)
+		return TemplateVersion{}, ReadBodyAsError(res)
 	}
-	return nil
+	var version TemplateVersion
+	return version, json.NewDecoder(res.Body).Decode(&version)
 }

Original file line number	Diff line number	Diff line change
`@@ -296,14 +296,15 @@ func (c *Client) PreviousTemplateVersion(ctx context.Context, organization uuid.`
`296`	`296`	`return version, json.NewDecoder(res.Body).Decode(&version)`
`297`	`297`	`}`
`298`	`298`
`299`		`-func (c *Client) UpdateTemplateVersion(ctx context.Context, version, req PatchTemplateVersionRequest) error {`
`300`		`- res, err := c.Request(ctx, http.MethodPatch, fmt.Sprintf("/api/v2/templateversions/%s", version), req)`
	`299`	`+func (c *Client) UpdateTemplateVersion(ctx context.Context, versionId uuid.UUID, req PatchTemplateVersionRequest) (TemplateVersion, error) {`
	`300`	`+ res, err := c.Request(ctx, http.MethodPatch, fmt.Sprintf("/api/v2/templateversions/%s", versionId), req)`
`301`	`301`	`if err != nil {`
`302`		`- return err`
	`302`	`+ return TemplateVersion{}, err`
`303`	`303`	`}`
`304`	`304`	`defer res.Body.Close()`
`305`	`305`	`if res.StatusCode != http.StatusNoContent {`
`306`		`- return ReadBodyAsError(res)`
	`306`	`+ return TemplateVersion{}, ReadBodyAsError(res)`
`307`	`307`	`}`
`308`		`- return nil`
	`308`	`+ var version TemplateVersion`
	`309`	`+ return version, json.NewDecoder(res.Body).Decode(&version)`
`309`	`310`	`}`