Publish zip and mod with api (#27)

* Publish zip and mod with api
jfrog · Dec 24, 2018 · aff0239 · aff0239
1 parent af471e7
commit aff0239
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/artifactory/services/go/go_test.go b/artifactory/services/go/go_test.go
@@ -40,9 +40,10 @@ func TestShouldUseHeaders(t *testing.T) {
 		{"6.2.0", "*_go.publishWithHeader"},
 		{"5.9.0", "*_go.publishWithHeader"},
 		{"6.0.0", "*_go.publishWithHeader"},
-		{"6.6.0", "*_go.publishWithoutApi"},
-		{"development", "*_go.publishWithoutApi"},
-		{"6.10.2", "*_go.publishWithoutApi"},
+		{"6.6.0", "*_go.publishWithMatrixParams"},
+		{"6.6.1", "*_go.publishZipAndModApi"},
+		{"development", "*_go.publishZipAndModApi"},
+		{"6.10.2", "*_go.publishZipAndModApi"},
 	}
 	for _, test := range tests {
 		t.Run(test.artifactoryVersion, func(t *testing.T) {

diff --git a/artifactory/services/go/publishwithmatrixparams.go b/artifactory/services/go/publishwithmatrixparams.go
@@ -12,13 +12,13 @@ func init() {
 	register(&publishWithMatrixParams{})
 }
 
-// Support for Artifactory version between 6.5.0 and 6.6.0 API
+// Support for Artifactory version between 6.5.0 and 6.6.1 API
 type publishWithMatrixParams struct {
 }
 
 func (pwmp *publishWithMatrixParams) isCompatible(artifactoryVersion string) bool {
 	propertiesApi := "6.5.0"
-	withoutApi := "6.6.0"
+	withoutApi := "6.6.1"
 	if version.Compare(artifactoryVersion, propertiesApi) < 0 {
 		return false
 	}

diff --git a/artifactory/services/go/publishmodandzip.go → artifactory/services/go/publishzipandmod.go b/artifactory/services/go/publishmodandzip.go → artifactory/services/go/publishzipandmod.go
@@ -11,23 +11,23 @@ import (
 )
 
 func init() {
-	register(&publishWithoutApi{})
+	register(&publishZipAndModApi{})
 }
 
-// Support for Artifactory 6.6.0 and above API
-type publishWithoutApi struct {
+// Support for Artifactory 6.6.1 and above API
+type publishZipAndModApi struct {
 }
 
-func (pwa *publishWithoutApi) isCompatible(artifactoryVersion string) bool {
-	propertiesApi := "6.6.0"
+func (pwa *publishZipAndModApi) isCompatible(artifactoryVersion string) bool {
+	propertiesApi := "6.6.1"
 	if version.Compare(artifactoryVersion, propertiesApi) < 0 && artifactoryVersion != "development" {
 		return false
 	}
 	return true
 }
 
-func (pwa *publishWithoutApi) PublishPackage(params GoParams, client *httpclient.HttpClient, ArtDetails auth.ArtifactoryDetails) error {
-	url, err := utils.BuildArtifactoryUrl(ArtDetails.GetUrl(), params.GetTargetRepo(), make(map[string]string))
+func (pwa *publishZipAndModApi) PublishPackage(params GoParams, client *httpclient.HttpClient, ArtDetails auth.ArtifactoryDetails) error {
+	url, err := utils.BuildArtifactoryUrl(ArtDetails.GetUrl(), "api/go/"+params.GetTargetRepo(), make(map[string]string))
 	if err != nil {
 		return err
 	}