Add test + remove extractors logic

commands/commands.go

@@ -18,12 +18,13 @@ type FrogbotCommand interface {
 }
 
 func Exec(command FrogbotCommand, name string) (err error) {
-	// Get frogbotUtils that contains the config, server and VCS client
+	// Get frogbotUtils that contains the config, server, and VCS client
 	log.Info("Frogbot version:", utils.FrogbotVersion)
 	frogbotUtils, err := utils.GetFrogbotUtils()
 	if err != nil {
 		return err
 	}
+
 	// Build the server configuration file
 	previousJfrogHomeDir, currentJFrogHomeDir, err := utils.BuildServerConfigFile(frogbotUtils.ServerDetails)
 	if err != nil {
@@ -32,6 +33,7 @@ func Exec(command FrogbotCommand, name string) (err error) {
 	defer func() {
 		err = errors.Join(err, os.Setenv(utils.JfrogHomeDirEnv, previousJfrogHomeDir), fileutils.RemoveTempDir(currentJFrogHomeDir))
 	}()
+
 	// Set releases remote repository env if needed
 	previousReleasesRepoEnv := os.Getenv(coreutils.ReleasesRemoteEnv)
 	if frogbotUtils.ReleasesRepo != "" {
@@ -42,16 +44,20 @@ func Exec(command FrogbotCommand, name string) (err error) {
 			err = errors.Join(err, os.Setenv(coreutils.ReleasesRemoteEnv, previousReleasesRepoEnv))
 		}()
 	}
+
 	// Send a usage report
 	usageReportSent := make(chan error)
 	go utils.ReportUsage(name, frogbotUtils.ServerDetails, usageReportSent)
+
 	// Invoke the command interface
 	log.Info(fmt.Sprintf("Running Frogbot %q command", name))
 	err = command.Run(frogbotUtils.Repositories, frogbotUtils.Client)
+
 	// Wait for a signal, letting us know that the usage reporting is done.
 	<-usageReportSent
+
 	if err == nil {
-		log.Info(fmt.Sprintf("Frogbot %q command finished successfully ", name))
+		log.Info(fmt.Sprintf("Frogbot %q command finished successfully", name))
 	}
 	return err
 }

commands/utils/utils_test.go

@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -296,3 +297,45 @@ func TestValidatedBranchName(t *testing.T) {
 		})
 	}
 }
+
+func TestBuildServerConfigFile(t *testing.T) {
+	preTestJFrogHome := os.Getenv(JfrogHomeDirEnv)
+	defer func() {
+		assert.NoError(t, os.Setenv(JfrogHomeDirEnv, preTestJFrogHome))
+	}()
+	assert.NoError(t, os.Setenv(JfrogHomeDirEnv, "path/to/nowhere"))
+	server := &config.ServerDetails{
+		Url:               "https://myserver.com",
+		ArtifactoryUrl:    "https://myserver.com/artifactory",
+		DistributionUrl:   "https://myserver.co/distribution",
+		XrayUrl:           "https://myserver.com/xray",
+		MissionControlUrl: "https://myserver.com/missioncontrol",
+		PipelinesUrl:      "https://myserver.com/pipelines",
+		AccessUrl:         "https://myserver.com/access",
+		AccessToken:       "abcdefg1234",
+	}
+	expectedConfigurationFile :=
+		`{
+  "servers": [
+    {
+      "url": "https://myserver.com/",
+      "artifactoryUrl": "https://myserver.com/artifactory/",
+      "distributionUrl": "https://myserver.co/distribution/",
+      "xrayUrl": "https://myserver.com/xray/",
+      "missionControlUrl": "https://myserver.com/missioncontrol/",
+      "pipelinesUrl": "https://myserver.com/pipelines/",
+      "accessUrl": "https://myserver.com/access",
+      "accessToken": "abcdefg1234",
+      "serverId": "frogbot",
+      "isDefault": true
+    }
+  ],
+  "version": "6"
+}`
+	previousJFrogHome, currentJFrogHome, err := BuildServerConfigFile(server)
+	assert.NoError(t, err)
+	assert.Equal(t, "path/to/nowhere", previousJFrogHome)
+	actualConfigurationFile, err := os.ReadFile(path.Join(currentJFrogHome, "jfrog-cli.conf.v6"))
+	assert.NoError(t, err)
+	assert.Equal(t, expectedConfigurationFile, string(actualConfigurationFile))
+}