fix: do not print host_base to stdout

.github/integration/tests/35_list_from_ceph.sh

@@ -11,7 +11,7 @@ for n in {1..10}; do
     rm "data_file-$n.c4gh"
 done
 
-if [ "$(./sda-cli -config testing/ceph.conf list | wc -l)" -ne 11 ]; then
+if [ "$(./sda-cli -config testing/ceph.conf list | wc -l)" -ne 10 ]; then
     echo "Wrong number of files returned from ceph backend"
     exit 1
 fi

download/download.go

@@ -155,7 +155,7 @@ func Download(args []string, configPath string) error {
 	}
 
 	// print the host_base for the user
-	fmt.Printf("Remote server (host_base): %s\n", config.HostBase)
+	helpers.PrintHostBase(config.HostBase)
 
 	switch {
 	// Case where the user is setting the -dataset flag

download/download_test.go

@@ -100,21 +100,21 @@ func (suite *TestSuite) TestPrintHostBase() {
 	log.SetOutput(&str)
 	defer log.SetOutput(os.Stdout)
 
-	// check if the host_base is in the output
-	rescueStdout := os.Stdout
+	// check if the host_base is in the error output
+	rescueStderr := os.Stderr
 	r, w, _ := os.Pipe()
-	os.Stdout = w
+	os.Stderr = w
 
 	_ = Download(os.Args, confPath.Name())
 
 	w.Close()
-	os.Stdout = rescueStdout
-	uploadOutput, _ := io.ReadAll(r)
+	os.Stderr = rescueStderr
+	uploadError, _ := io.ReadAll(r)
 
 	// check if the host_base is in the output
 
 	expectedHostBase := "Remote server (host_base): " + "inbox.dummy.org"
-	assert.Contains(suite.T(), string(uploadOutput), expectedHostBase)
+	assert.Contains(suite.T(), string(uploadError), expectedHostBase)
 }
 func (suite *TestSuite) TestGetBody() {
 	// Create a test server

helpers/helpers.go

@@ -593,3 +593,7 @@ func paginateListV2(svc *s3.S3, params *s3.ListObjectsV2Input) ([]*s3.Object, er
 
 	return fullResult, nil
 }
+
+func PrintHostBase(hostBase string) {
+	fmt.Fprintf(os.Stderr, "Remote server (host_base): %s\n", hostBase)
+}

list/list.go

@@ -76,7 +76,7 @@ func List(args []string, configPath string) error {
 	}
 
 	// print the host_base for the user
-	fmt.Printf("Remote server (host_base): %s\n", config.HostBase)
+	helpers.PrintHostBase(config.HostBase)
 
 	// case datasets
 	if *datasets {

list/list_test.go

@@ -141,6 +141,10 @@ func (suite *TestSuite) TestFunctionality() {
 	r, w, _ := os.Pipe()
 	os.Stdout = w
 
+	rescueStderr := os.Stderr
+	errR, errW, _ := os.Pipe()
+	os.Stderr = errW
+
 	os.Args = []string{"list"}
 	err = List(os.Args, configPath.Name())
 	assert.NoError(suite.T(), err)
@@ -151,7 +155,12 @@ func (suite *TestSuite) TestFunctionality() {
 	msg1 := fmt.Sprintf("%v", filepath.Base(testfile.Name()))
 	assert.Contains(suite.T(), string(listOutput), msg1)
 
-	// Check if host_base is in the output
+	errW.Close()
+	os.Stderr = rescueStderr
+	listError, _ := io.ReadAll(errR)
+
+	// Check that host_base is in the error output, not in the stdout
 	expectedHostBase := "Remote server (host_base): " + strings.TrimPrefix(ts.URL, "http://")
-	assert.Contains(suite.T(), string(listOutput), expectedHostBase)
+	assert.NotContains(suite.T(), string(listOutput), expectedHostBase)
+	assert.Contains(suite.T(), string(listError), expectedHostBase)
 }

upload/upload.go

@@ -321,7 +321,7 @@ func Upload(args []string, configPath string) error {
 	}
 
 	// print the host_base for the user
-	fmt.Printf("Remote server (host_base): %s\n", config.HostBase)
+	helpers.PrintHostBase(config.HostBase)
 
 	// Check that input file/folder list is not empty
 	if len(Args.Args()) == 0 {

upload/upload_test.go

@@ -303,18 +303,25 @@ func (suite *TestSuite) TestFunctionality() {
 	rescueStdout := os.Stdout
 	r, w, _ := os.Pipe()
 	os.Stdout = w
+	rescueStderr := os.Stderr
+	errR, errW, _ := os.Pipe()
+	os.Stderr = errW
 
 	os.Args = []string{"upload", "--force-unencrypted", "-r", dir}
 	_ = Upload(os.Args, configPath.Name())
 
 	w.Close()
+	errW.Close()
 	os.Stdout = rescueStdout
+	os.Stderr = rescueStderr
 	uploadOutput, _ := io.ReadAll(r)
+	uploadError, _ := io.ReadAll(errR)
 
 	// check if the host_base is in the output
 
 	expectedHostBase := "Remote server (host_base): " + strings.TrimPrefix(ts.URL, "http://")
-	assert.Contains(suite.T(), string(uploadOutput), expectedHostBase)
+	assert.NotContains(suite.T(), string(uploadOutput), expectedHostBase)
+	assert.Contains(suite.T(), string(uploadError), expectedHostBase)
 
 	// Check that trying to encrypt already encrypted files returns error and aborts
 	newArgs = []string{"upload", "--encrypt-with-key", publicKey.Name(), dir, "-r"}