[codegen] Fix bug in provider schema where default int properties could not be int

changelog/pending/20230726--sdkgen--fix-bug-binding-provider-schema-where-type-default-int-values-could-not-take-integers.yaml

@@ -0,0 +1,4 @@
+changes:
+- type: fix
+  scope: sdkgen
+  description: Fix bug binding provider schema where type default int values could not take integers.

pkg/codegen/schema/bind.go

@@ -958,35 +958,46 @@ func bindConstValue(path, kind string, value interface{}, typ Type) (interface{}
 
 	switch typ = plainType(typ); typ {
 	case BoolType:
-		if _, ok := value.(bool); !ok {
+		v, ok := value.(bool)
+		if !ok {
 			return false, typeError("boolean")
 		}
+		return v, nil
 	case IntType:
-		v, ok := value.(float64)
+		v, ok := value.(int)
 		if !ok {
-			return 0, typeError("integer")
+			v, ok := value.(float64)
+			if !ok {
+				return 0, typeError("integer")
+			}
+			if math.Trunc(v) != v || v < math.MinInt32 || v > math.MaxInt32 {
+				return 0, typeError("integer")
+			}
+			return int32(v), nil
 		}
-		if math.Trunc(v) != v || v < math.MinInt32 || v > math.MaxInt32 {
+		if v < math.MinInt32 || v > math.MaxInt32 {
 			return 0, typeError("integer")
 		}
-		value = int32(v)
+		return int32(v), nil
 	case NumberType:
-		if _, ok := value.(float64); !ok {
+		v, ok := value.(float64)
+		if !ok {
 			return 0.0, typeError("number")
 		}
+		return v, nil
 	case StringType:
-		if _, ok := value.(string); !ok {
+		v, ok := value.(string)
+		if !ok {
 			return 0.0, typeError("string")
 		}
+		return v, nil
 	default:
 		if _, isInvalid := typ.(*InvalidType); isInvalid {
 			return nil, nil
 		}
 		return nil, hcl.Diagnostics{errorf(path, "type %v cannot have a constant value; only booleans, integers, "+
 			"numbers and strings may have constant values", typ)}
 	}
-
-	return value, nil
 }
 
 func bindDefaultValue(path string, value interface{}, spec *DefaultSpec, typ Type) (*DefaultValue, hcl.Diagnostics) {

pkg/codegen/schema/schema_test.go

@@ -18,6 +18,7 @@ package schema
 import (
 	"encoding/json"
 	"fmt"
+	"math"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -957,3 +958,21 @@ func TestPackageIdentity(t *testing.T) {
 		})
 	}
 }
+
+func TestBindDefaultInt(t *testing.T) {
+	t.Parallel()
+	dv, diag := bindDefaultValue("fake-path", int(32), nil, IntType)
+	if diag.HasErrors() {
+		t.Fail()
+	}
+	assert.Equal(t, int32(32), dv.Value)
+
+	// Check that we error on overflow/underflow when casting int to int32.
+	if _, diag := bindDefaultValue("fake-path", int(math.MaxInt64), nil, IntType); !diag.HasErrors() {
+		assert.Fail(t, "did not catch oveflow")
+		t.Fail()
+	}
+	if _, diag := bindDefaultValue("fake-path", int(math.MinInt64), nil, IntType); !diag.HasErrors() {
+		assert.Fail(t, "did not catch underflow")
+	}
+}