fix: no longer projecting int64 to FTL Int (#1935)

fixes #1920

`int64` no longer projected to the FTL Int data type; `int` must be used
instead.

backend/controller/dal/testdata/go/fsm/go.mod

@@ -21,11 +21,11 @@ require (
 	github.com/alecthomas/repr v0.4.0 // indirect
 	github.com/alecthomas/types v0.16.0 // indirect
 	github.com/alessio/shellescape v1.4.2 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.30.0 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1 // indirect
-	github.com/aws/smithy-go v1.20.2 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.30.1 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.1 // indirect
+	github.com/aws/smithy-go v1.20.3 // indirect
 	github.com/benbjohnson/clock v1.3.5 // indirect
 	github.com/danieljoos/wincred v1.2.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect

backend/controller/leases/testdata/go/leases/go.mod

@@ -22,11 +22,11 @@ require (
 	github.com/alecthomas/repr v0.4.0 // indirect
 	github.com/alecthomas/types v0.16.0 // indirect
 	github.com/alessio/shellescape v1.4.2 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.30.0 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1 // indirect
-	github.com/aws/smithy-go v1.20.2 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.30.1 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.1 // indirect
+	github.com/aws/smithy-go v1.20.3 // indirect
 	github.com/benbjohnson/clock v1.3.5 // indirect
 	github.com/danieljoos/wincred v1.2.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect

buildengine/discover_test.go

@@ -146,6 +146,19 @@ func TestDiscoverModules(t *testing.T) {
 				Watch:     []string{"**/*.go", "go.mod", "go.sum", "../../../go-runtime/ftl/**/*.go"},
 			},
 		},
+		{
+			Config: moduleconfig.ModuleConfig{
+				Dir:       "testdata/integer",
+				Language:  "go",
+				Realm:     "home",
+				Module:    "integer",
+				Deploy:    []string{"main"},
+				DeployDir: ".ftl",
+				Schema:    "schema.pb",
+				Errors:    "errors.pb",
+				Watch:     []string{"**/*.go", "go.mod", "go.sum"},
+			},
+		},
 		{
 			Config: moduleconfig.ModuleConfig{
 				Dir:       "testdata/other",

buildengine/engine_test.go

@@ -73,3 +73,19 @@ func TestCycleDetection(t *testing.T) {
 	assert.Error(t, err)
 	assert.Contains(t, err.Error(), "detected a module dependency cycle that impacts these modules:")
 }
+
+func TestInt64BuildError(t *testing.T) {
+	if testing.Short() {
+		t.SkipNow()
+	}
+	ctx := log.ContextWithNewDefaultLogger(context.Background())
+	engine, err := buildengine.New(ctx, nil, t.TempDir(), []string{"testdata/integer"})
+	assert.NoError(t, err)
+
+	defer engine.Close()
+
+	err = engine.Build(ctx)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), `unsupported type "int64" for field "Input"`)
+	assert.Contains(t, err.Error(), `unsupported type "int64" for field "Output"`)
+}

buildengine/testdata/integer/ftl.toml

@@ -0,0 +1,2 @@
+module = "integer"
+language = "go"

buildengine/testdata/integer/go.mod

@@ -0,0 +1,7 @@
+module ftl/integer
+
+go 1.22.2
+
+toolchain go1.22.4
+
+replace github.com/TBD54566975/ftl => /Users/jonathanj/dev/ftl

buildengine/testdata/integer/integer.go

@@ -0,0 +1,18 @@
+package integer
+
+import (
+	"context"
+)
+
+type EchoRequest struct {
+	Input int64 `json:"value"`
+}
+
+type EchoResponse struct {
+	Output int64 `json:"value"`
+}
+
+//ftl:verb
+func Echo(ctx context.Context, req EchoRequest) (EchoResponse, error) {
+	return EchoResponse{Output: req.Input}, nil
+}

go-runtime/compile/schema.go

@@ -1240,13 +1240,14 @@ func visitConst(pctx *parseContext, cnode *types.Const) optional.Option[schema.V
 			}
 			return optional.Some[schema.Value](&schema.StringValue{Pos: goPosToSchemaPos(cnode.Pos()), Value: value})
 
-		case types.Int, types.Int64:
+		case types.Int:
 			value, err := strconv.ParseInt(cnode.Val().String(), 10, 64)
 			if err != nil {
 				pctx.errors.add(tokenWrapf(cnode.Pos(), cnode.Val().String(), err, "unsupported int constant"))
 				return optional.None[schema.Value]()
 			}
 			return optional.Some[schema.Value](&schema.IntValue{Pos: goPosToSchemaPos(cnode.Pos()), Value: int(value)})
+
 		default:
 			return optional.None[schema.Value]()
 		}
@@ -1284,7 +1285,7 @@ func visitType(pctx *parseContext, pos token.Pos, tnode types.Type, isExported b
 		case types.String:
 			return optional.Some[schema.Type](&schema.String{Pos: goPosToSchemaPos(pos)})
 
-		case types.Int, types.Int64:
+		case types.Int:
 			return optional.Some[schema.Type](&schema.Int{Pos: goPosToSchemaPos(pos)})
 
 		case types.Bool:

go-runtime/compile/schema_test.go

@@ -134,7 +134,6 @@ func TestExtractModuleSchema(t *testing.T) {
 
   export data Req {
     int Int
-    int64 Int
     float Float
     string String
     slice [String]

go-runtime/compile/testdata/one/one.go

@@ -106,7 +106,6 @@ func (WithoutDirectiveStruct) privateEnum() {}
 
 type Req struct {
 	Int                  int
-	Int64                int64
 	Float                float64
 	String               string
 	Slice                []string

go-runtime/ftl/ftltest/testdata/go/pubsub/go.mod

@@ -21,11 +21,11 @@ require (
 	github.com/alecthomas/repr v0.4.0 // indirect
 	github.com/alecthomas/types v0.16.0 // indirect
 	github.com/alessio/shellescape v1.4.2 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.30.0 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1 // indirect
-	github.com/aws/smithy-go v1.20.2 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.30.1 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.1 // indirect
+	github.com/aws/smithy-go v1.20.3 // indirect
 	github.com/benbjohnson/clock v1.3.5 // indirect
 	github.com/danieljoos/wincred v1.2.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect

go-runtime/ftl/ftltest/testdata/go/subscriber/go.mod

@@ -21,11 +21,11 @@ require (
 	github.com/alecthomas/repr v0.4.0 // indirect
 	github.com/alecthomas/types v0.16.0 // indirect
 	github.com/alessio/shellescape v1.4.2 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.30.0 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1 // indirect
-	github.com/aws/smithy-go v1.20.2 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.30.1 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.1 // indirect
+	github.com/aws/smithy-go v1.20.3 // indirect
 	github.com/benbjohnson/clock v1.3.5 // indirect
 	github.com/danieljoos/wincred v1.2.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect