From 1d75638a8b2238b9d51d278721e18e9acd981f3d Mon Sep 17 00:00:00 2001
From: Kyle Carberry <kyle@carberry.com>
Date: Mon, 9 Oct 2023 19:11:04 +0000
Subject: [PATCH] fix: properly trim spaces so multi-line shebang executes

---
 agent/agentssh/agentssh.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go
index ad45b5bd5aaca..19831c0d7caa8 100644
--- a/agent/agentssh/agentssh.go
+++ b/agent/agentssh/agentssh.go
@@ -519,13 +519,16 @@ func (s *Server) CreateCommand(ctx context.Context, script string, env []string)
 	name := shell
 	args := []string{caller, script}
 
+	// A preceding space is generally not idiomatic for a shebang,
+	// but in Terraform it's quite standard to use <<EOF for a multi-line
+	// string which would indent with spaces, so we accept it for user-ease.
 	if strings.HasPrefix(strings.TrimSpace(script), "#!") {
 		// If the script starts with a shebang, we should
 		// execute it directly. This is useful for running
 		// scripts that aren't executable.
-		shebang := strings.SplitN(script, "\n", 2)[0]
-		shebang = strings.TrimPrefix(shebang, "#!")
+		shebang := strings.SplitN(strings.TrimSpace(script), "\n", 2)[0]
 		shebang = strings.TrimSpace(shebang)
+		shebang = strings.TrimPrefix(shebang, "#!")
 		words, err := shellquote.Split(shebang)
 		if err != nil {
 			return nil, xerrors.Errorf("split shebang: %w", err)