Merge pull request #17 from datadrivers/v0.8.1

Fix maven repository format issue and add more repository format constants

repository.go

@@ -4,15 +4,22 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"strings"
 )
 
 const (
 	repositoryAPIEndpoint = "service/rest/beta/repositories"
 
 	RepositoryFormatApt    = "apt"
 	RepositoryFormatBower  = "bower"
+	RepositoryFormatConan  = "conan"
 	RepositoryFormatDocker = "docker"
-	RepositoryFormatMaven2 = "maven"
+	RepositoryFormatHelm   = "helm"
+	RepositoryFormatMaven2 = "maven2"
+	RepositoryFormatNPM    = "npm"
+	RepositoryFormatNuget  = "nuget"
+	RepositoryFormatPyPI   = "pypi"
+	RepositoryFormatYum    = "yum"
 
 	RepositoryTypeHosted = "hosted"
 	RepositoryTypeGroup  = "group"
@@ -159,13 +166,19 @@ func jsonUnmarshalRepositories(data []byte) ([]Repository, error) {
 	return repositories, nil
 }
 
+// Currently only used to replace repository format 'maven2' to 'maven' as API
+// returns a format of 'maven2' but requires to send to requests using 'maven'.
+func fixRepositoryFormat(s string) string {
+	return strings.Replace(s, RepositoryFormatMaven2, "maven", 1)
+}
+
 func (c client) RepositoryCreate(repo Repository) error {
 	data, err := jsonMarshalInterfaceToIOReader(repo)
 	if err != nil {
 		return err
 	}
 
-	body, resp, err := c.Post(fmt.Sprintf("%s/%s/%s", repositoryAPIEndpoint, repo.Format, repo.Type), data)
+	body, resp, err := c.Post(fmt.Sprintf("%s/%s/%s", repositoryAPIEndpoint, fixRepositoryFormat(repo.Format), repo.Type), data)
 	if err != nil {
 		return err
 	}
@@ -206,7 +219,7 @@ func (c client) RepositoryUpdate(id string, repo Repository) error {
 		return err
 	}
 
-	body, resp, err := c.Put(fmt.Sprintf("%s/%s/%s/%s", repositoryAPIEndpoint, repo.Format, repo.Type, id), data)
+	body, resp, err := c.Put(fmt.Sprintf("%s/%s/%s/%s", repositoryAPIEndpoint, fixRepositoryFormat(repo.Format), repo.Type, id), data)
 	if err != nil {
 		return err
 	}

repository_test.go

@@ -39,7 +39,7 @@ func TestJSONUnmarshalRepositories(t *testing.T) {
 func testJSONUnmarshalRepositories() string {
 	return fmt.Sprintf(`[
 	{
-		"format": "maven",
+		"format": "maven2",
 		"name": "maven-central",
 		"online": true,
 		"type": "proxy",