Add unit test

Emyrk · Emyrk · commit fe66e57d1ee6 · 2023-05-04T16:39:05.000-05:00
diff --git a/codersdk/workspaceproxy.go b/codersdk/workspaceproxy.go
@@ -46,9 +46,10 @@ type ProxyHealthReport struct {
 }
 
 type WorkspaceProxy struct {
-	ID   uuid.UUID `json:"id" format:"uuid" table:"id"`
-	Name string    `json:"name" table:"name,default_sort"`
-	Icon string    `json:"icon" table:"icon"`
+	ID          uuid.UUID `json:"id" format:"uuid" table:"id"`
+	Name        string    `json:"name" table:"name,default_sort"`
+	DisplayName string    `json:"display_name" table:"display_name""`
+	Icon        string    `json:"icon" table:"icon"`
 	// Full url including scheme of the proxy api url: https://us.example.com
 	URL string `json:"url" table:"url"`
 	// WildcardHostname with the wildcard for subdomain based app hosting: *.us.example.com
@@ -127,14 +128,14 @@ type PatchWorkspaceProxyResponse struct {
 func (c *Client) PatchWorkspaceProxy(ctx context.Context, req PatchWorkspaceProxy) (WorkspaceProxy, error) {
 	res, err := c.Request(ctx, http.MethodPatch,
 		fmt.Sprintf("/api/v2/workspaceproxies/%s", req.ID.String()),
-		nil,
+		req,
 	)
 	if err != nil {
 		return WorkspaceProxy{}, xerrors.Errorf("make request: %w", err)
 	}
 	defer res.Body.Close()
 
-	if res.StatusCode != http.StatusCreated {
+	if res.StatusCode != http.StatusOK {
 		return WorkspaceProxy{}, ReadBodyAsError(res)
 	}
 	var resp WorkspaceProxy
diff --git a/enterprise/coderd/workspaceproxy.go b/enterprise/coderd/workspaceproxy.go
@@ -576,6 +576,7 @@ func convertProxy(p database.WorkspaceProxy, status proxyhealth.ProxyStatus) cod
 	return codersdk.WorkspaceProxy{
 		ID:               p.ID,
 		Name:             p.Name,
+		DisplayName:      p.DisplayName,
 		Icon:             p.Icon,
 		URL:              p.Url,
 		WildcardHostname: p.WildcardHostname,
diff --git a/enterprise/coderd/workspaceproxy_test.go b/enterprise/coderd/workspaceproxy_test.go
@@ -177,7 +177,7 @@ func TestRegions(t *testing.T) {
 func TestWorkspaceProxyCRUD(t *testing.T) {
 	t.Parallel()
 
-	t.Run("create", func(t *testing.T) {
+	t.Run("CreateAndUpdate", func(t *testing.T) {
 		t.Parallel()
 
 		dv := coderdtest.DeploymentValues(t)
@@ -203,14 +203,33 @@ func TestWorkspaceProxyCRUD(t *testing.T) {
 		})
 		require.NoError(t, err)
 
-		proxies, err := client.WorkspaceProxies(ctx)
+		found, err := client.WorkspaceProxyByID(ctx, proxyRes.Proxy.ID)
 		require.NoError(t, err)
-		require.Len(t, proxies, 1)
-		require.Equal(t, proxyRes.Proxy.ID, proxies[0].ID)
+		// This will be different, so set it to the same
+		found.Status = proxyRes.Proxy.Status
+		require.Equal(t, proxyRes.Proxy, found, "expected proxy")
 		require.NotEmpty(t, proxyRes.ProxyToken)
+
+		// Update the proxy
+		expName := namesgenerator.GetRandomName(1)
+		expDisplayName := namesgenerator.GetRandomName(1)
+		expIcon := namesgenerator.GetRandomName(1)
+		_, err = client.PatchWorkspaceProxy(ctx, codersdk.PatchWorkspaceProxy{
+			ID:          proxyRes.Proxy.ID,
+			Name:        expName,
+			DisplayName: expDisplayName,
+			Icon:        expIcon,
+		})
+		require.NoError(t, err, "expected no error updating proxy")
+
+		found, err = client.WorkspaceProxyByID(ctx, proxyRes.Proxy.ID)
+		require.NoError(t, err)
+		require.Equal(t, expName, found.Name, "name")
+		require.Equal(t, expDisplayName, found.DisplayName, "display name")
+		require.Equal(t, expIcon, found.Icon, "icon")
 	})
 
-	t.Run("delete", func(t *testing.T) {
+	t.Run("Delete", func(t *testing.T) {
 		t.Parallel()
 
 		dv := coderdtest.DeploymentValues(t)
