Add NewRawPostRequest and fix unit test for AddSSHKey

Author: christinak09

accounts.go

@@ -455,10 +455,10 @@ func (s *AccountsService) GetSSHKey(ctx context.Context, accountID, sshKeyID str
 
 // AddSSHKey adds an SSH key to a user's account.
 // Gerrit API docs: https://gerrit-review.googlesource.com/Documentation/rest-api-accounts.html#add-ssh-key
-func (s *AccountsService) AddSSHKey(ctx context.Context, accountID string, SSHKey string) (*SSHKeyInfo, *Response, error) {
+func (s *AccountsService) AddSSHKey(ctx context.Context, accountID string, sshKey string) (*SSHKeyInfo, *Response, error) {
 	u := fmt.Sprintf("accounts/%s/sshkeys", accountID)
 
-	req, err := s.client.NewRequest(ctx, "POST", u, SSHKey)
+	req, err := s.client.NewRawPostRequest(ctx, u, sshKey)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -471,7 +471,7 @@ func (s *AccountsService) AddSSHKey(ctx context.Context, accountID string, SSHKe
 		return nil, resp, err
 	}
 
-	return &keyInfo, resp, nil
+	return &keyInfo, resp, err
 }
 
 // ListGPGKeys returns the GPG keys of an account.

accounts_test.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"strings"
 	"testing"
+	"strings"
 )
 
 // TestAddSSHKey tests the addition of an SSH key to an account.
@@ -29,7 +29,6 @@ func TestAddSSHKey(t *testing.T) {
 		expectedSSHKey := "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0T...YImydZAw== john.doe@example.com"
 		body, _ := io.ReadAll(r.Body)
 		receivedSSHKey := strings.TrimSpace(string(body))
-		receivedSSHKey = strings.Trim(receivedSSHKey, `"`)
 
 		if receivedSSHKey != expectedSSHKey {
 			t.Errorf("Expected SSH key '%s', but received '%s'", expectedSSHKey, receivedSSHKey)

gerrit.go

@@ -289,6 +289,34 @@ func (c *Client) NewRawPutRequest(ctx context.Context, urlStr string, body strin
 	return req, nil
 }
 
+// NewRawPostRequest creates a raw POST request and makes no attempt to encode
+// or marshal the body. Just passes it straight through.
+func (c *Client) NewRawPostRequest(ctx context.Context, urlStr string, body string) (*http.Request, error) {
+	// Build URL for request
+	u, err := c.buildURLForRequest(urlStr)
+	if err != nil {
+		return nil, err
+	}
+
+	buf := bytes.NewBuffer([]byte(body))
+	req, err := http.NewRequestWithContext(ctx, "POST", u, buf)
+	if err != nil {
+		return nil, err
+	}
+
+	// Apply Authentication
+	if err := c.addAuthentication(ctx, req); err != nil {
+		return nil, err
+	}
+
+	// Request compact JSON
+	// See https://gerrit-review.googlesource.com/Documentation/rest-api.html#output
+	req.Header.Add("Accept", "application/json")
+	req.Header.Add("Content-Type", "text/plain")
+
+	return req, nil
+}
+
 // Call is a combine function for Client.NewRequest and Client.Do.
 //
 // Most API methods are quite the same.

gerrit_test.go

@@ -437,6 +437,38 @@ func TestNewRawPutRequest(t *testing.T) {
 	}
 }
 
+func TestNewRawPostRequest(t *testing.T) {
+	ctx := context.Background()
+	c, err := gerrit.NewClient(ctx, testGerritInstanceURL, nil)
+	if err != nil {
+		t.Errorf("An error occured. Expected nil. Got %+v.", err)
+	}
+
+	inURL, outURL := "/foo", testGerritInstanceURL+"foo"
+	req, _ := c.NewRawPostRequest(ctx, inURL, "test raw POST contents")
+
+	// Test that relative URL was expanded
+	if got, want := req.URL.String(), outURL; got != want {
+		t.Errorf("NewRequest(%q) URL is %v, want %v", inURL, got, want)
+	}
+
+	// Test that HTTP method is POST
+	if got, want := req.Method, http.MethodPost; got != want {
+		t.Errorf("NewRawPostRequest method is %v, want %v", got, want)
+	}
+
+	// Test that request body is passed correctly
+	body, _ := io.ReadAll(req.Body)
+	if got, want := string(body), "test raw POST contents"; got != want {
+		t.Errorf("NewRequest Body is %v, want %v", got, want)
+	}
+
+	// Test that Content-Type is set correctly
+	if got, want := req.Header.Get("Content-Type"), "text/plain"; got != want {
+		t.Errorf("NewRawPostRequest Content-Type is %v, want %v", got, want)
+	}
+}
+
 func testURLParseError(t *testing.T, err error) {
 	if err == nil {
 		t.Errorf("Expected error to be returned")