Merge pull request #171 from sol-eng/add-print-to-writestrings

Add the print and log directly to WriteStrings
sol-eng · May 19, 2023 · b8e1906 · b8e1906
2 parents 7207f17 + d9367f6
commit b8e1906
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/internal/ssl/trust.go b/internal/ssl/trust.go
@@ -4,6 +4,7 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
+
 	"github.com/sol-eng/wbi/internal/config"
 	"github.com/sol-eng/wbi/internal/system"
 )
@@ -14,7 +15,7 @@ func TrustRootCertificate(rootCA *x509.Certificate, osType config.OperatingSyste
 	pemCert = append(pemCert, string(pem.EncodeToMemory(&block)))
 	switch osType {
 	case config.Ubuntu18, config.Ubuntu20, config.Ubuntu22:
-		err := system.WriteStrings(pemCert, "/usr/local/share/ca-certificates/workbenchCA.crt", 0755)
+		err := system.WriteStrings(pemCert, "/usr/local/share/ca-certificates/workbenchCA.crt", 0755, true)
 		if err != nil {
 			return fmt.Errorf("writing certificate to disk failed: %w", err)
 		}
@@ -23,7 +24,7 @@ func TrustRootCertificate(rootCA *x509.Certificate, osType config.OperatingSyste
 			return fmt.Errorf("running command to trust root certificate: %w", err)
 		}
 	case config.Redhat7, config.Redhat8, config.Redhat9:
-		err := system.WriteStrings(pemCert, "/etc/pki/ca-trust/source/anchors/workbenchCA.crt", 0755)
+		err := system.WriteStrings(pemCert, "/etc/pki/ca-trust/source/anchors/workbenchCA.crt", 0755, true)
 		if err != nil {
 			return fmt.Errorf("writing CA certificate to disk failed: %w", err)
 		}

diff --git a/internal/system/path.go b/internal/system/path.go
@@ -5,7 +5,7 @@ import "fmt"
 // AddToPATH adds a path to the PATH environment variable in a profile.d script
 func AddToPATH(path string, filename string) error {
 	fullFileName := "/etc/profile.d/wbi_" + filename + ".sh"
-	err := WriteStrings([]string{"PATH=" + path + ":$PATH"}, fullFileName, 0644)
+	err := WriteStrings([]string{"PATH=" + path + ":$PATH"}, fullFileName, 0644, true)
 	if err != nil {
 		return fmt.Errorf("failed to add to PATH: %w", err)
 	}

diff --git a/internal/system/write.go b/internal/system/write.go
@@ -8,7 +8,11 @@ import (
 )
 
 // WriteStrings appends a slice of strings to a file and creates the file if it doesn't exist
-func WriteStrings(lines []string, filepath string, perm fs.FileMode) error {
+func WriteStrings(lines []string, filepath string, perm fs.FileMode, print bool) error {
+	if print {
+		PrintAndLogInfo("\n=== Writing to the file " + filepath + " ===")
+	}
+
 	file, err := os.OpenFile(filepath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, perm)
 	if err != nil {
 		return fmt.Errorf("failed to open file: %w", err)

diff --git a/internal/workbench/config.go b/internal/workbench/config.go
@@ -21,8 +21,7 @@ func WriteRepoConfig(url string, source string) error {
 				"CRAN=" + url,
 			}
 
-			system.PrintAndLogInfo("\n=== Writing to the file " + filepath + ":")
-			err := system.WriteStrings(writeLines, filepath, 0644)
+			err := system.WriteStrings(writeLines, filepath, 0644, true)
 			if err != nil {
 				return fmt.Errorf("failed to write config: %w", err)
 			}
@@ -43,8 +42,7 @@ func WriteRepoConfig(url string, source string) error {
 				"index-url=" + url,
 			}
 
-			system.PrintAndLogInfo("\n=== Writing to the file " + filepath + ":")
-			err := system.WriteStrings(writeLines, filepath, 0644)
+			err := system.WriteStrings(writeLines, filepath, 0644, true)
 			if err != nil {
 				return fmt.Errorf("failed to write config: %w", err)
 			}
@@ -109,8 +107,7 @@ func WriteSSLConfig(certPath string, keyPath string, serverURL string) error {
 			"ssl-certificate-key=" + keyPath,
 		}
 
-		system.PrintAndLogInfo("\n=== Writing to the file " + filepath + ":")
-		err = system.WriteStrings(writeLines, filepath, 0644)
+		err = system.WriteStrings(writeLines, filepath, 0644, true)
 		if err != nil {
 			return fmt.Errorf("failed to write config: %w", err)
 		}
@@ -135,8 +132,7 @@ func WriteConnectURLConfig(url string) error {
 			"default-rsconnect-server=" + url,
 		}
 
-		system.PrintAndLogInfo("\n=== Writing to the file " + filepath + ":")
-		err := system.WriteStrings(writeLines, filepath, 0644)
+		err := system.WriteStrings(writeLines, filepath, 0644, true)
 		if err != nil {
 			return fmt.Errorf("failed to write config: %w", err)
 		}
@@ -154,8 +150,7 @@ func WriteJupyterConfig(jupyterPath string) error {
 	}
 	filepath := "/etc/rstudio/jupyter.conf"
 
-	system.PrintAndLogInfo("\n=== Writing to the file " + filepath + ":")
-	err := system.WriteStrings(writeLines, filepath, 0644)
+	err := system.WriteStrings(writeLines, filepath, 0644, true)
 	if err != nil {
 		return fmt.Errorf("failed to write config: %w", err)
 	}