test(entry_certificate): fix CRUD test order and raw data parsing

Author: DannyBedard

.gitignore

@@ -1 +1,2 @@
 .DS_Store
+.vscode

entry_certificate.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"io"
 	"net/http"
 	"net/url"
 	"strings"
@@ -165,15 +166,32 @@ func (c *EntryCertificateService) Get(entryId string) (EntryCertificate, error)
 func (c *EntryCertificateService) GetFileContent(entryId string) ([]byte, error) {
 	reqUrl, err := url.JoinPath(c.client.baseUri, entryConnectionsEndpoint, entryId, "document")
 	if err != nil {
-		return nil, fmt.Errorf("failed to build entry url. error: %w", err)
+		return nil, fmt.Errorf("failed to build entry url: %w", err)
 	}
 
-	resp, err := c.client.Request(reqUrl, http.MethodGet, nil, RequestOptions{RawBody: true})
+	req, err := http.NewRequest(http.MethodGet, reqUrl, nil)
 	if err != nil {
-		return nil, fmt.Errorf("error while fetching entry content. error: %w", err)
+		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
-	return resp.Response, nil
+	req.Header.Add("tokenId", c.client.credential.token)
+
+	httpResp, err := c.client.client.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("error while fetching entry content: %w", err)
+	}
+	defer httpResp.Body.Close()
+
+	if httpResp.StatusCode < 200 || httpResp.StatusCode >= 300 {
+		return nil, fmt.Errorf("unexpected status code %d when fetching file content", httpResp.StatusCode)
+	}
+
+	fileContent, err := io.ReadAll(httpResp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read response body: %w", err)
+	}
+
+	return fileContent, nil
 }
 
 // GetPassword returns the password of the entry specified by entry.

entry_certificate_test.go

@@ -1,7 +1,6 @@
 package dvls
 
 import (
-	"fmt"
 	"io"
 	"os"
 	"reflect"
@@ -35,9 +34,9 @@ func Test_EntryCertificate(t *testing.T) {
 	expiration := time.Date(2099, 1, 1, 0, 0, 0, 0, location)
 	testCertificateEntry.Expiration = expiration
 
-	t.Run("GetEntry", test_GetCertificateEntry)
 	t.Run("NewCertificateFile", test_NewCertificateEntryFile)
 	t.Run("NewCertificateURL", test_NewCertificateEntryURL)
+	t.Run("GetEntry", test_GetCertificateEntry)
 	t.Run("UpdateEntry", test_UpdateCertificateEntry)
 	t.Run("DeleteEntry", test_DeleteCertificateEntry)
 }
@@ -151,6 +150,7 @@ func test_NewCertificateEntryURL(t *testing.T) {
 	if !reflect.DeepEqual(entry, newEntry) {
 		t.Fatalf("fetched entry did not match test entry. Expected %#v, got %#v", entry, newEntry)
 	}
+	testCertificateEntry = entry
 }
 
 func test_UpdateCertificateEntry(t *testing.T) {
@@ -177,8 +177,6 @@ func test_UpdateCertificateEntry(t *testing.T) {
 }
 
 func test_DeleteCertificateEntry(t *testing.T) {
-	fmt.Println(testNewCertificateEntryURL.ID)
-	fmt.Println(testNewCertificateEntryFile.ID)
 	err := testClient.Entries.Certificate.Delete(testNewCertificateEntryURL.ID)
 	if err != nil {
 		t.Fatal(err)