Fix Go codegen for string values that contain quotes (#423)

* Fix Go codegen for string values that contain quotes

* Remove dbg

* Handle escaped characters correctly for both gen and sync

Author: DavidSGK

pkg/gen/golang.go

@@ -478,7 +478,7 @@ func (c *LekkoClient) {{$.FuncName}}({{$.ArgumentString}}) {{$.RetType}} {
 }`,
 		private: `// {{$.Description}}
 func {{$.PrivateFunc}}({{$.ArgumentString}}) {{$.RetType}} {
-{{range  $.NaturalLanguage}}{{ . }}
+{{range  $.NativeLanguage}}{{ . }}
 {{end}}}`,
 	}
 }
@@ -498,7 +498,7 @@ func (c *LekkoClient) {{$.FuncName}}({{$.ArgumentString}}) *{{$.RetType}} {
 }`,
 		private: `// {{$.Description}}
 func {{$.PrivateFunc}}({{$.ArgumentString}}) *{{$.RetType}} {
-{{range  $.NaturalLanguage}}{{ . }}
+{{range  $.NativeLanguage}}{{ . }}
 {{end}}}`,
 	}
 }
@@ -531,7 +531,7 @@ const (
 
 // {{$.Description}}
 func {{$.PrivateFunc}}({{$.ArgumentString}}) {{$.RetType}} {
-{{range  $.NaturalLanguage}}{{ . }}
+{{range  $.NativeLanguage}}{{ . }}
 {{end}}}`,
 	}
 }
@@ -613,19 +613,19 @@ func (g *goGenerator) genGoForFeature(ctx context.Context, r repo.ConfigurationR
 	}
 
 	data := struct {
-		Description     string
-		FuncName        string
-		PrivateFunc     string
-		GetFunction     string
-		RetType         string
-		Namespace       string
-		Key             string
-		NaturalLanguage []string
-		ArgumentString  string
-		CallString      string
-		EnumTypeName    string
-		EnumFields      []EnumField
-		CtxStuff        string
+		Description    string
+		FuncName       string
+		PrivateFunc    string
+		GetFunction    string
+		RetType        string
+		Namespace      string
+		Key            string
+		NativeLanguage []string
+		ArgumentString string
+		CallString     string
+		EnumTypeName   string
+		EnumFields     []EnumField
+		CtxStuff       string
 	}{
 		f.Description,
 		funcName,
@@ -644,7 +644,7 @@ func (g *goGenerator) genGoForFeature(ctx context.Context, r repo.ConfigurationR
 	generated := &generatedConfigCode{}
 	usedVariables := make(map[string]string)
 	if staticCtxType != nil {
-		data.NaturalLanguage = g.translateFeature(f, protoType, true, usedVariables, &generated.usedStrings, &generated.usedSlices)
+		data.NativeLanguage = g.translateFeature(f, protoType, true, usedVariables, &generated.usedStrings, &generated.usedSlices)
 		if staticCtxType.PackageAlias != "" {
 			data.ArgumentString = fmt.Sprintf("args *%s.%s", staticCtxType.PackageAlias, staticCtxType.Type)
 		} else {
@@ -653,7 +653,7 @@ func (g *goGenerator) genGoForFeature(ctx context.Context, r repo.ConfigurationR
 		data.CallString = "args"
 	} else {
 		data.CtxStuff = "args := context.Background()\n"
-		data.NaturalLanguage = g.translateFeature(f, protoType, false, usedVariables, &generated.usedStrings, &generated.usedSlices)
+		data.NativeLanguage = g.translateFeature(f, protoType, false, usedVariables, &generated.usedStrings, &generated.usedSlices)
 		var arguments []string
 		var ctxAddLines []string
 		for f, t := range usedVariables {
@@ -896,13 +896,7 @@ func (g *goGenerator) translateProtoNonRepeatedValue(parent protoreflect.Message
 		// TODO: Actually handle enums, right now they're just numbers
 		return val.String()
 	case protoreflect.StringKind:
-		// If the string value is multiline, transform to raw literal instead
-		valString := val.String()
-		quote := "\""
-		if strings.Count(valString, "\n") > 0 {
-			quote = "`"
-		}
-		return fmt.Sprintf("%s%s%s", quote, val.String(), quote)
+		return g.toQuoted(val.String())
 	case protoreflect.BoolKind:
 		return val.String()
 	case protoreflect.BytesKind:
@@ -945,12 +939,7 @@ func (g *goGenerator) translateAnyValue(val *anypb.Any, protoType *ProtoImport)
 		if val.MessageIs((*wrapperspb.StringValue)(nil)) {
 			var s wrapperspb.StringValue
 			try.To(val.UnmarshalTo(&s))
-			// If multiline string value, gen as raw string literal instead
-			quote := "\""
-			if strings.Count(s.Value, "\n") > 0 {
-				quote = "`"
-			}
-			return fmt.Sprintf("%s%s%s", quote, s.Value, quote)
+			return g.toQuoted(s.Value)
 		}
 		return string(try.To1(protojson.Marshal(msg)))
 	}
@@ -977,6 +966,16 @@ func (g *goGenerator) translateProtoValue(parent protoreflect.Message, val proto
 	}
 }
 
+// Takes a string and returns a double-quoted literal with applicable internal characters escaped, etc.
+// For strings with newlines, returns a raw string literal instead.
+func (g *goGenerator) toQuoted(s string) string {
+	if strings.Count(s, "\n") > 0 {
+		return fmt.Sprintf("`%s`", s)
+	}
+	// Quote automatically handles escaping, etc.
+	return strconv.Quote(s)
+}
+
 // Handles getting import & type literal information for both top-level and nested messages.
 // TODO: Consider moving logic into UnpackProtoType directly which is shared with TS codegen as well
 // TODO: This can definitely be cached, and doesn't need values, just descriptors

pkg/sync/golang.go

@@ -578,7 +578,13 @@ func (g *goSyncer) primitiveToProtoValue(expr ast.Expr) any {
 	case *ast.BasicLit:
 		switch x.Kind {
 		case token.STRING:
-			return strings.Trim(x.Value, "\"`")
+			// Need to unescape escaped - Unquote also handles escaped chars in middle
+			// and is fine with alternate quotes like ' or `
+			if unescaped, err := strconv.Unquote(x.Value); err == nil {
+				return unescaped
+			} else {
+				panic(errors.Wrapf(err, "unescape string literal %s", x.Value))
+			}
 		case token.INT:
 			// TODO - parse/validate based on field Kind, because this breaks for
 			// int32, etc. fields