Merge pull request #33 from philips-software/feature/dicom

DICOM Store support

Author: loafoe

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## v0.33.0
+- NEW: DICOM Config API support
+- Create internal package for consistent better versioning
+- S3Creds renaming (breaking change!)
+
 ## v0.32.3
 - Disable keep-alive for Cartel
 

README.md

@@ -39,6 +39,8 @@ The current implement covers only a subset of HSDP APIs. Basically we implement
   - [x] Contract management
   - [x] Data Item management
 - [x] S3 Credentials Policy management
+- [x] DICOM Store
+  - [x] Config management
 - [x] Hosted Application Streaming (HAS) management
 - [x] Configuration
 - [x] Console settings

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

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

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
@@ -48,7 +48,7 @@ type Client struct {
 
 	fhirStoreURL *url.URL
 
-	// User agent used when communicating with the HSDP IAM API.
+	// User agent used when communicating with the HSDP CDR API
 	UserAgent string
 
 	TenantSTU3     *TenantSTU3Service
@@ -187,8 +187,6 @@ func (c *Client) newCDRRequest(method, path string, bodyBytes []byte, options []
 
 	if method == "POST" || method == "PUT" || method == "PATCH" {
 		bodyReader := bytes.NewReader(bodyBytes)
-
-		u.RawQuery = ""
 		req.Body = ioutil.NopCloser(bodyReader)
 		req.ContentLength = int64(bodyReader.Len())
 	}

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 {