azd env set un-escapes special characters in values

cli/azd/pkg/environment/environment.go

@@ -14,10 +14,15 @@ import (
 
 	"maps"
 
+	"sort"
+	"strconv"
+
 	"github.com/azure/azure-dev/cli/azd/pkg/config"
-	"github.com/joho/godotenv"
 )
 
+// DoubleQuoteSpecialChars defines the characters that need to be escaped.
+const doubleQuoteSpecialChars = "\\\n\r\""
+
 // EnvNameEnvVarName is the name of the key used to store the envname property in the environment.
 const EnvNameEnvVarName = "AZURE_ENV_NAME"
 
@@ -281,10 +286,42 @@ func fixupUnquotedDotenv(values map[string]string, dotenv string) string {
 // Instead of calling `godotenv.Write` directly, we need to save the file ourselves, so we can fixup any numeric values
 // that were incorrectly unquoted.
 func marshallDotEnv(env *Environment) (string, error) {
-	marshalled, err := godotenv.Marshal(env.dotenv)
+	marshalled, err := Marshal(env.dotenv)
 	if err != nil {
 		return "", fmt.Errorf("marshalling .env: %w", err)
 	}
 
 	return fixupUnquotedDotenv(env.dotenv, marshalled), nil
 }
+
+// Marshal outputs the given environment as a dotenv-formatted environment file.
+// Each line is in the format: KEY="VALUE" where VALUE is backslash-escaped.
+func Marshal(envMap map[string]string) (string, error) {
+	lines := make([]string, 0, len(envMap))
+	for k, v := range envMap {
+		if d, err := strconv.Atoi(v); err == nil {
+			lines = append(lines, fmt.Sprintf(`%s=%d`, k, d))
+		} else {
+			lines = append(lines, fmt.Sprintf(`%s="%s"`, k, doubleQuoteEscape(v)))
+		}
+	}
+	sort.Strings(lines)
+	return strings.Join(lines, "\n"), nil
+}
+
+// DoubleQuoteEscape escapes special characters in the string to ensure it is safely quoted
+// for a dotenv file. It escapes characters like newlines, carriage returns,
+// and any other special characters defined in `doubleQuoteSpecialChars`
+func doubleQuoteEscape(line string) string {
+	for _, c := range doubleQuoteSpecialChars {
+		toReplace := "\\" + string(c)
+		if c == '\n' {
+			toReplace = `\n`
+		}
+		if c == '\r' {
+			toReplace = `\r`
+		}
+		line = strings.Replace(line, string(c), toReplace, -1)
+	}
+	return line
+}

cli/azd/pkg/environment/environment_test.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 
 	"github.com/azure/azure-dev/cli/azd/pkg/config"
@@ -184,6 +185,47 @@ func TestCleanName(t *testing.T) {
 	require.Equal(t, "was-CLEANED-with--bad--things-(123)", CleanName("was CLEANED with *bad* things (123)"))
 }
 
+func TestMarshal_NoEscapeForSpecialChars(t *testing.T) {
+	envMap := map[string]string{
+		"EXAMPLE1": "Hello!World",
+		"EXAMPLE2": "Price=100$",
+		"EXAMPLE3": "Text`WithBacktick",
+		"EXAMPLE4": "NormalText",
+	}
+
+	result, err := Marshal(envMap)
+	if err != nil {
+		t.Fatalf("Marshal failed: %v", err)
+	}
+
+	tests := []struct {
+		key      string
+		expected string
+	}{
+		{"EXAMPLE1", `EXAMPLE1="Hello!World"`},
+		{"EXAMPLE2", `EXAMPLE2="Price=100$"`},
+		{"EXAMPLE3", `EXAMPLE3="Text` + "`" + `WithBacktick"`},
+		{"EXAMPLE4", `EXAMPLE4="NormalText"`},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.key, func(t *testing.T) {
+			if !containsLine(result, tt.expected) {
+				t.Errorf("Expected line %q to be in result, but got %q", tt.expected, result)
+			}
+		})
+	}
+}
+
+func containsLine(result, expected string) bool {
+	for _, line := range strings.Split(result, "\n") {
+		if line == expected {
+			return true
+		}
+	}
+	return false
+}
+
 func TestRoundTripNumberWithLeadingZeros(t *testing.T) {
 	mockContext := mocks.NewMockContext(context.Background())
 	envManager, _ := createEnvManager(mockContext, t.TempDir())