Move version to internal package

Signed-off-by: Andy Lo-A-Foe <[email protected]>
philips-software · Jan 27, 2021 · be15b03 · be15b03
1 parent 48f5802
commit be15b03
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 28 deletions.
diff --git a/audit/client.go b/audit/client.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/philips-software/go-hsdp-api/internal"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -21,9 +22,8 @@ import (
 )
 
 const (
-	libraryVersion = "0.29.0"
-	userAgent      = "go-hsdp-api/audit/" + libraryVersion
-	APIVersion     = "2"
+	userAgent  = "go-hsdp-api/audit/" + internal.LibraryVersion
+	APIVersion = "2"
 )
 
 // OptionFunc is the function signature function for options

diff --git a/cartel/client.go b/cartel/client.go
@@ -9,6 +9,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"github.com/philips-software/go-hsdp-api/internal"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -23,8 +24,7 @@ import (
 )
 
 const (
-	libraryVersion = "0.29.0"
-	userAgent      = "go-hsdp-api/cartel/" + libraryVersion
+	userAgent = "go-hsdp-api/cartel/" + internal.LibraryVersion
 )
 
 // Config the client

diff --git a/cdr/client.go b/cdr/client.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/philips-software/go-hsdp-api/internal"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -19,9 +20,8 @@ import (
 )
 
 const (
-	libraryVersion = "0.29.0"
-	userAgent      = "go-hsdp-api/cdr/" + libraryVersion
-	APIVersion     = "1"
+	userAgent  = "go-hsdp-api/cdr/" + internal.LibraryVersion
+	APIVersion = "1"
 )
 
 // OptionFunc is the function signature function for options

diff --git a/console/client.go b/console/client.go
@@ -6,6 +6,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/philips-software/go-hsdp-api/internal"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -26,8 +27,7 @@ type tokenType int
 type ContextKey string
 
 const (
-	libraryVersion = "0.29.0"
-	userAgent      = "go-hsdp-api/console/" + libraryVersion
+	userAgent = "go-hsdp-api/console/" + internal.LibraryVersion
 )
 
 type tokenResponse struct {

diff --git a/has/client.go b/has/client.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/philips-software/go-hsdp-api/internal"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -19,8 +20,7 @@ import (
 )
 
 const (
-	libraryVersion = "0.29.0"
-	userAgent      = "go-hsdp-api/has/" + libraryVersion
+	userAgent = "go-hsdp-api/has/" + internal.LibraryVersion
 )
 
 // OptionFunc is the function signature function for options
@@ -86,7 +86,7 @@ func newClient(iamClient *iam.Client, config *Config) (*Client, error) {
 // Close releases allocated resources of clients
 func (c *Client) Close() {
 	if c.debugFile != nil {
-		c.debugFile.Close()
+		_ = c.debugFile.Close()
 		c.debugFile = nil
 	}
 }

diff --git a/iam/client.go b/iam/client.go
@@ -6,6 +6,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/philips-software/go-hsdp-api/internal"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -28,8 +29,7 @@ type tokenType int
 type ContextKey string
 
 const (
-	libraryVersion  = "0.29.0"
-	userAgent       = "go-hsdp-api/iam/" + libraryVersion
+	userAgent       = "go-hsdp-api/iam/" + internal.LibraryVersion
 	loginAPIVersion = "2"
 )
 

diff --git a/internal/version.go b/internal/version.go
@@ -0,0 +1,5 @@
+package internal
+
+const (
+	LibraryVersion = "0.33.0"
+)
diff --git a/internal/version_test.go b/internal/version_test.go
@@ -0,0 +1,11 @@
+package internal_test
+
+import (
+	"github.com/philips-software/go-hsdp-api/internal"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestVersion(t *testing.T) {
+	assert.True(t, len(internal.LibraryVersion) > 0)
+}
diff --git a/iron/client.go b/iron/client.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/philips-software/go-hsdp-api/internal"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -17,9 +18,8 @@ import (
 )
 
 const (
-	libraryVersion = "0.20.1"
-	userAgent      = "go-hsdp-api/iron/" + libraryVersion
-	IronBaseURL    = "https://worker-aws-us-east-1.iron.io/"
+	userAgent   = "go-hsdp-api/iron/" + internal.LibraryVersion
+	IronBaseURL = "https://worker-aws-us-east-1.iron.io/"
 )
 
 // OptionFunc is the function signature function for options

diff --git a/logging/client.go b/logging/client.go
@@ -6,6 +6,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"github.com/philips-software/go-hsdp-api/internal"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -29,8 +30,7 @@ const (
 	// TimeFormat is the time format used for the LogTime field
 	TimeFormat = "2006-01-02T15:04:05.000Z07:00"
 
-	libraryVersion = "0.29.0"
-	userAgent      = "go-hsdp-api/logging/" + libraryVersion
+	userAgent = "go-hsdp-api/logging/" + internal.LibraryVersion
 )
 
 var (

diff --git a/pki/client.go b/pki/client.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/philips-software/go-hsdp-api/internal"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -26,9 +27,8 @@ import (
 )
 
 const (
-	libraryVersion = "0.29.0"
-	userAgent      = "go-hsdp-api/pki/" + libraryVersion
-	APIVersion     = "1"
+	userAgent  = "go-hsdp-api/pki/" + internal.LibraryVersion
+	APIVersion = "1"
 )
 
 // OptionFunc is the function signature function for options

diff --git a/tdr/client.go b/tdr/client.go
@@ -6,6 +6,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/philips-software/go-hsdp-api/internal"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -20,8 +21,7 @@ import (
 )
 
 const (
-	libraryVersion = "0.29.0"
-	userAgent      = "go-hsdp-api/tdr/" + libraryVersion
+	userAgent = "go-hsdp-api/tdr/" + internal.LibraryVersion
 )
 
 // OptionFunc is the function signature function for options
@@ -83,7 +83,7 @@ func newClient(iamClient *iam.Client, config *Config) (*Client, error) {
 // Close releases allocated resources of clients
 func (c *Client) Close() {
 	if c.debugFile != nil {
-		c.debugFile.Close()
+		_ = c.debugFile.Close()
 		c.debugFile = nil
 	}
 }

diff --git a/tpns/client.go b/tpns/client.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/philips-software/go-hsdp-api/internal"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -17,8 +18,7 @@ import (
 )
 
 const (
-	libraryVersion = "0.1.0"
-	userAgent      = "go-hsdp-api/tpns/" + libraryVersion
+	userAgent      = "go-hsdp-api/tpns/" + internal.LibraryVersion
 	tpnsAPIVersion = "2"
 )