fix: GetAttachments incorrect return type #50

Author: c-seeger

content.go

@@ -197,7 +197,7 @@ func (a *API) GetContent(query ContentQuery) (*ContentSearch, error) {
 // GetChildPages returns a content list of child page objects
 func (a *API) GetChildPages(id string) (*Search, error) {
 var (
-results []Results
+results []Content
 searchResult Search
 )
 

internal.go

@@ -30,7 +30,7 @@ func NewAPI(location string, username string, token string) (*API, error) {
 a.username = username
 
 tr := &http.Transport{
-TLSClientConfig: &tls.Config{InsecureSkipVerify: false},
+TLSClientConfig: &tls.Config{InsecureSkipVerify: false, MinVersion: tls.VersionTLS12},
 }
 
 a.Client = &http.Client{Transport: tr}
@@ -60,6 +60,7 @@ func NewAPIWithClient(location string, client *http.Client) (*API, error) {
 
 // VerifyTLS to enable disable certificate checks
 func (a *API) VerifyTLS(set bool) {
+// #nosec G402
 tr := &http.Transport{
 TLSClientConfig: &tls.Config{InsecureSkipVerify: !set},
 }

request.go

@@ -45,7 +45,10 @@ func (a *API) Request(req *http.Request) ([]byte, error) {
 if err != nil {
 return nil, err
 }
-resp.Body.Close()
+err = resp.Body.Close()
+if err != nil {
+return nil, err
+}
 
 Debug("====== Response Body ======")
 Debug(string(res))
@@ -111,7 +114,11 @@ func (a *API) SendContentAttachmentRequest(ep *url.URL, attachmentName string, a
 // setup body for mulitpart file, adding minorEdit option
 body := &bytes.Buffer{}
 writer := multipart.NewWriter(body)
-writer.WriteField("minorEdit", "true")
+err := writer.WriteField("minorEdit", "true")
+if err != nil {
+return nil, err
+}
+
 part, err := writer.CreateFormFile("file", attachmentName)
 if err != nil {
 return nil, err

request_test.go

@@ -382,6 +382,6 @@ func confluenceRestAPIStub() *httptest.Server {
 http.Error(w, string(b), http.StatusInternalServerError)
 return
 }
-w.Write(b)
+_, _ = w.Write(b)
 }))
 }

search.go

@@ -8,12 +8,12 @@ import (
 
 // Search results
 type Search struct {
-Results []Results `json:"results"`
+Results []Content `json:"content"`
 Start int `json:"start,omitempty"`
 Limit int `json:"limit,omitempty"`
 Size int `json:"size,omitempty"`
 ID string `json:"id,omitempty"`
-TotalSize int `json:"totalSize, omitempty"`
+TotalSize int `json:"totalSize,omitempty"`
 }
 
 // SearchQuery defines query parameters used for searchng
@@ -52,7 +52,7 @@ func addSearchQueryParams(query SearchQuery) *url.Values {
 if query.CQLContext != "" {
 data.Set("cqlcontext", query.CQLContext)
 }
-if query.IncludeArchivedSpaces == true {
+if query.IncludeArchivedSpaces {
 data.Set("includeArchivedSpaces", "true")
 }
 if query.Limit != 0 {