Merge 91e2929 into 9563cfe

pulumi · Sep 15, 2023 · cedcc65 · cedcc65
2 parents 9563cfe + 91e2929
commit cedcc65
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/pf/internal/convert/convert_test.go b/pf/internal/convert/convert_test.go
@@ -49,7 +49,35 @@ func TestConvertTurnaround(t *testing.T) {
 			panic(err)
 		}
 		return resource.NewNumberProperty(v)
-	}, "0", "8.3").withNormProp(func(p resource.PropertyValue) any { return fmt.Sprintf("%v", p.V) })...)
+	}, "0", "8.3", "601234567890").withNormProp(func(p resource.PropertyValue) any {
+		switch {
+		case p.IsOutput():
+			v := p.OutputValue()
+			if !v.Known {
+				return "unknown"
+			}
+			p = v.Element
+			fallthrough
+
+		// When converting back from a number, we specify that we have the same
+		// visual representation.
+		case p.IsNumber():
+			switch p.NumberValue() {
+			case 0:
+				return "0"
+			case 8.3:
+				return "8.3"
+			case 601234567890:
+				return "601234567890"
+			default:
+				panic("unexpected test input")
+			}
+		case p.IsNull():
+			return ""
+		default:
+			return p.StringValue()
+		}
+	})...)
 	cases = append(cases, convertTurnaroundTestCases(tftypes.Bool, resource.NewBoolProperty, false, true)...)
 	cases = append(cases, convertTurnaroundTestCases(tftypes.Number, resource.NewNumberProperty, float64(0), 42, 3.12)...)
 

diff --git a/pf/internal/convert/string.go b/pf/internal/convert/string.go
@@ -16,6 +16,7 @@ package convert
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
 
@@ -74,7 +75,7 @@ func (*stringEncoder) fromPropertyValue(p resource.PropertyValue) (tftypes.Value
 	case p.IsBool():
 		return tftypes.NewValue(tftypes.String, fmt.Sprintf("%v", p.BoolValue())), nil
 	case p.IsNumber():
-		return tftypes.NewValue(tftypes.String, fmt.Sprintf("%v", p.NumberValue())), nil
+		return tftypes.NewValue(tftypes.String, strconv.FormatFloat(p.NumberValue(), 'f', -1, 64)), nil
 
 	case p.IsString():
 		return tftypes.NewValue(tftypes.String, p.StringValue()), nil