release 0.0.17

- added cache control headers to requests
- return ErrSystemNotReady for Connection refused and 502, also always
  reset the client's compatibility error property when versionCheck is called
  so that it always queries the backend.
- bumped semver to 3.2.1

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 Lists the changes in the gocmlclient package.
 
+## Version 0.0.17
+
+- added cache control headers to requests
+- return ErrSystemNotReady for Connection refused and 502, also always
+  reset the client's compatibility error property when versionCheck is called
+  so that it always queries the backend.
+- bumped semver to 3.2.1
+
 ## Version 0.0.16
 
 - added new API endpoints for groups and users

apiclient.go

@@ -8,7 +8,9 @@ import (
 	"io"
 	"log"
 	"net/http"
+	"strings"
 	"sync/atomic"
+	"syscall"
 )
 
 const (
@@ -39,6 +41,10 @@ func (c *Client) apiRequest(ctx context.Context, method string, path string, dat
 		setTokenHeader(req, c.apiToken)
 	}
 	req.Header.Set("Accept", contentType)
+	req.Header.Set("Cache-Control", "no-cache, no-store, must-revalidate")
+	req.Header.Set("Pragma", "no-cache")
+	req.Header.Set("Expires", "0")
+	req.Header.Set("Conenction", "close")
 	if data != nil {
 		req.Header.Set("Content-Type", contentType)
 	}
@@ -71,6 +77,9 @@ retry:
 	}
 	res, err := c.httpClient.Do(req)
 	if err != nil {
+		if errors.Is(err, syscall.ECONNREFUSED) {
+			return nil, ErrSystemNotReady
+		}
 		return nil, err
 	}
 	defer res.Body.Close()
@@ -99,11 +108,20 @@ retry:
 		c.state.set(stateAuthenticated)
 		goto retry
 	}
-	if res.StatusCode == http.StatusOK || res.StatusCode == http.StatusNoContent || res.StatusCode == http.StatusCreated {
+	switch res.StatusCode {
+	case http.StatusOK:
+		fallthrough
+	case http.StatusNoContent:
+		fallthrough
+	case http.StatusCreated:
 		return body, err
-	} else {
-		return nil, fmt.Errorf("status: %d, %s", res.StatusCode, body)
+	case http.StatusBadGateway:
+		return nil, ErrSystemNotReady
 	}
+	return nil, fmt.Errorf(
+		"status: %d, %s",
+		res.StatusCode, strings.TrimSpace(string(body)),
+	)
 }
 
 /* technically, only jsonGet and jsonPost need the depth as they are the only

auth_test.go

@@ -147,7 +147,7 @@ func TestClient_token_auth(t *testing.T) {
 			t.Error("not all data in mock client consumed")
 		}
 		if tt.wantErr {
-			assert.EqualError(t, err, tt.errstr)
+			assert.ErrorContains(t, err, tt.errstr)
 		}
 	}
 }

go.mod

@@ -3,7 +3,7 @@ module github.com/rschmied/gocmlclient
 go 1.19
 
 require (
-	github.com/Masterminds/semver/v3 v3.2.0
+	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/rschmied/mockresponder v1.0.4
 	github.com/stretchr/testify v1.8.2
 	golang.org/x/sync v0.1.0

go.sum

@@ -1,5 +1,5 @@
-github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=
-github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
+github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
+github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

system.go

@@ -32,9 +32,10 @@ func versionError(got string) error {
 
 func (c *Client) versionCheck(ctx context.Context, depth int32) error {
 
+	c.compatibilityErr = nil
 	sv := systemVersion{}
 	if err := c.jsonGet(ctx, systeminfoAPI, &sv, depth); err != nil {
-		return err
+		return fmt.Errorf("system info error %d (%w)", depth, err)
 	}
 
 	if !sv.Ready {

vendor/modules.txt

@@ -1,4 +1,4 @@
-# github.com/Masterminds/semver/v3 v3.2.0
+# github.com/Masterminds/semver/v3 v3.2.1
 ## explicit; go 1.18
 github.com/Masterminds/semver/v3
 # github.com/davecgh/go-spew v1.1.1