actually sudo and sudo_user are mutually exclusive

mschuchard · Apr 15, 2024 · 4c39b9e · 4c39b9e
1 parent b97ba7d
commit 4c39b9e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/provisioner/testinfra.go b/provisioner/testinfra.go
@@ -150,14 +150,16 @@ func (provisioner *Provisioner) Prepare(raws ...interface{}) error {
 	if provisioner.config.Sudo {
 		log.Print("testinfra will execute with sudo")
 
+		// warn if sudo_user also specified
 		if len(provisioner.config.SudoUser) > 0 {
-			log.Printf("testinfra will execute as user: %s", provisioner.config.SudoUser)
+			log.Print("the 'sudo_user' parameter is ignored when sudo is enabled")
 		}
 	} else {
 		log.Print("testinfra will not execute with sudo")
 
+		// sudo_user mutually exclusive with sudo
 		if len(provisioner.config.SudoUser) > 0 {
-			log.Print("the 'sudo_user' parameter is ignored when sudo is not enabled")
+			log.Printf("testinfra will execute as user: %s", provisioner.config.SudoUser)
 		}
 	}
 

diff --git a/provisioner/testinfra_command.go b/provisioner/testinfra_command.go
@@ -182,12 +182,13 @@ func (provisioner *Provisioner) determineExecCmd() (*exec.Cmd, *packer.RemoteCmd
 	// sudo
 	if provisioner.config.Sudo {
 		args = append(args, "--sudo")
-
+	} else {
 		// sudo_user
 		if len(provisioner.config.SudoUser) > 0 {
 			args = append(args, fmt.Sprintf("\"--sudo-user=%s\"", provisioner.config.SudoUser))
 		}
 	}
+
 	// verbose
 	if provisioner.config.Verbose {
 		args = append(args, "-v")

diff --git a/provisioner/testinfra_command_test.go b/provisioner/testinfra_command_test.go
@@ -56,7 +56,7 @@ func TestProvisionerDetermineExecCmd(test *testing.T) {
 		test.Errorf("actual: %s, expected: %s", execCmd.Dir, basicConfig.Chdir)
 	}
 	// 1.22 slices.Concat( , provisioner.config.TestFiles)
-	if !slices.Equal(execCmd.Args, append([]string{provisioner.config.PytestPath, fmt.Sprintf("--hosts=ssh://%s@%s:%d", generatedData["User"], generatedData["Host"], generatedData["Port"]), fmt.Sprintf("--ssh-identity-file=%s", generatedData["SSHPrivateKeyFile"]), "--ssh-extra-args=\"-o StrictHostKeyChecking=no\"", "-k", fmt.Sprintf("\"%s\"", provisioner.config.Keyword), "-m", fmt.Sprintf("\"%s\"", provisioner.config.Marker), "-n", fmt.Sprint(provisioner.config.Processes), "--sudo", fmt.Sprintf("\"--sudo-user=%s\"", provisioner.config.SudoUser), "-v"}, provisioner.config.TestFiles...)) {
+	if !slices.Equal(execCmd.Args, append([]string{provisioner.config.PytestPath, fmt.Sprintf("--hosts=ssh://%s@%s:%d", generatedData["User"], generatedData["Host"], generatedData["Port"]), fmt.Sprintf("--ssh-identity-file=%s", generatedData["SSHPrivateKeyFile"]), "--ssh-extra-args=\"-o StrictHostKeyChecking=no\"", "-k", fmt.Sprintf("\"%s\"", provisioner.config.Keyword), "-m", fmt.Sprintf("\"%s\"", provisioner.config.Marker), "-n", fmt.Sprint(provisioner.config.Processes), "--sudo", "-v"}, provisioner.config.TestFiles...)) {
 		test.Errorf("determineExecCmd function failed to properly determine remote execution command for basic config with SSH communicator: %s", execCmd.String())
 	}
 	if localCmd != nil {