Publish only on demand the missing dependencies (#10)

jfrog · Mar 31, 2019 · 138ff67 · 138ff67
1 parent 2debc22
commit 138ff67
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/exec.go b/exec.go
@@ -9,8 +9,8 @@ func RecursivePublish(targetRepo, goModEditMessage string, serviceManager *artif
 	return executers.RecursivePublish(targetRepo, goModEditMessage, serviceManager)
 }
 
-func RunWithFallbacksAndPublish(goArg []string, targetRepo string, noRegistry bool, serviceManager *artifactory.ArtifactoryServicesManager) error {
-	return executers.RunWithFallbacksAndPublish(goArg, targetRepo, noRegistry, serviceManager)
+func RunWithFallbacksAndPublish(goArg []string, targetRepo string, noRegistry, publishDeps bool, serviceManager *artifactory.ArtifactoryServicesManager) error {
+	return executers.RunWithFallbacksAndPublish(goArg, targetRepo, noRegistry, publishDeps, serviceManager)
 }
 
 func RunWithFallback(goArg []string, url string) error {

diff --git a/executers/dependenciesutils.go b/executers/dependenciesutils.go
@@ -31,7 +31,7 @@ const (
 )
 
 // Resolve artifacts from VCS and publish the missing artifacts to Artifactory
-func collectDependenciesAndPublish(targetRepo string, failOnError bool, dependenciesInterface GoPackage, serviceManager *artifactory.ArtifactoryServicesManager) error {
+func collectDependenciesAndPublish(targetRepo string, failOnError, publishDeps bool, dependenciesInterface GoPackage, serviceManager *artifactory.ArtifactoryServicesManager) error {
 	rootProjectDir, err := cmd.GetProjectRoot()
 	if err != nil {
 		return err
@@ -48,9 +48,12 @@ func collectDependenciesAndPublish(targetRepo string, failOnError bool, dependen
 		}
 		log.Error("Received an error retrieving project dependencies:", err)
 	}
-	err = populateAndPublish(targetRepo, cachePath, dependenciesInterface, packageDependencies, &cache, serviceManager)
-	if err != nil {
-		return err
+
+	if publishDeps {
+		err = populateAndPublish(targetRepo, cachePath, dependenciesInterface, packageDependencies, &cache, serviceManager)
+		if err != nil {
+			return err
+		}
 	}
 	utils.LogFinishedMsg(&cache)
 	return nil

diff --git a/executers/fallbackandpublish.go b/executers/fallbackandpublish.go
@@ -9,7 +9,7 @@ import (
 )
 
 // Runs Go, with multiple fallbacks if needed and publish missing dependencies to Artifactory
-func RunWithFallbacksAndPublish(goArg []string, targetRepo string, noRegistry bool, serviceManager *artifactory.ArtifactoryServicesManager) error {
+func RunWithFallbacksAndPublish(goArg []string, targetRepo string, noRegistry, publishDeps bool, serviceManager *artifactory.ArtifactoryServicesManager) error {
 	if !noRegistry {
 		artDetails := serviceManager.GetConfig().GetArtDetails()
 		err := utils.SetGoProxyWithApi(targetRepo, artDetails)
@@ -28,7 +28,7 @@ func RunWithFallbacksAndPublish(goArg []string, targetRepo string, noRegistry bo
 				return err
 			}
 
-			err = collectDependenciesAndPublish(targetRepo, true,  &Package{}, serviceManager)
+			err = collectDependenciesAndPublish(targetRepo, true, publishDeps, &Package{}, serviceManager)
 			if err != nil {
 				return err
 			}

diff --git a/executers/populateandpublish.go b/executers/populateandpublish.go
@@ -42,7 +42,7 @@ func RecursivePublish(targetRepo, goModEditMessage string, serviceManager *artif
 	if err != nil {
 		return err
 	}
-	collectDependenciesAndPublish(targetRepo, false, pwd, serviceManager)
+	collectDependenciesAndPublish(targetRepo, false, true, pwd, serviceManager)
 	return nil
 }