fix: handle nil pointers in deepcopy (#1195)

Previously a deepcopy involving nil pointers would end up with a pointer to a zero value. Needed as part of #1155
block · Apr 8, 2024 · 3a0415f · 3a0415f
1 parent c1cb72d
commit 3a0415f
Show file tree

Hide file tree

Showing 25 changed files with 432 additions and 31 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -104,6 +104,8 @@ linters-settings:
             desc: "use fmt.Errorf or errors.New"
           - pkg: os/exec
             desc: "use github.com/TBD54566975/ftl/internal/exec"
+          - pkg: golang.design/x/reflect
+            desc: "use github.com/TBD54566975/ftl/internal/reflect"
   # wrapcheck:
   #   ignorePackageGlobs:
   #     - github.com/TBD54566975/ftl/*

diff --git a/backend/schema/builtin.go b/backend/schema/builtin.go
@@ -1,6 +1,6 @@
 package schema
 
-import "golang.design/x/reflect"
+import "github.com/TBD54566975/ftl/internal/reflect"
 
 // BuiltinsSource is the schema source code for built-in types.
 const BuiltinsSource = `

diff --git a/backend/schema/data.go b/backend/schema/data.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"golang.design/x/reflect"
+	"github.com/TBD54566975/ftl/internal/reflect"
 	"google.golang.org/protobuf/proto"
 
 	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"

diff --git a/backend/schema/normalise.go b/backend/schema/normalise.go
@@ -1,6 +1,6 @@
 package schema
 
-import "golang.design/x/reflect"
+import "github.com/TBD54566975/ftl/internal/reflect"
 
 // Normalise clones and normalises (zeroes) positional information in schema Nodes.
 func Normalise[T Node](n T) T {

diff --git a/backend/schema/validate.go b/backend/schema/validate.go
@@ -9,9 +9,9 @@ import (
 	"sort"
 	"strings"
 
+	dc "github.com/TBD54566975/ftl/internal/reflect"
 	"github.com/alecthomas/participle/v2"
 	"github.com/alecthomas/types/optional"
-	xreflect "golang.design/x/reflect"
 	"golang.org/x/exp/maps"
 
 	"github.com/TBD54566975/ftl/internal/errors"
@@ -47,7 +47,7 @@ func MustValidate(schema *Schema) *Schema {
 
 // Validate clones, normalises and semantically valies a schema.
 func Validate(schema *Schema) (*Schema, error) {
-	schema = xreflect.DeepCopy(schema)
+	schema = dc.DeepCopy(schema)
 	modules := map[string]bool{}
 	merr := []error{}
 	ingress := map[string]*Verb{}

diff --git a/buildengine/project.go b/buildengine/project.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"golang.design/x/reflect"
+	"github.com/TBD54566975/ftl/internal/reflect"
 
 	"github.com/TBD54566975/ftl/common/moduleconfig"
 )

diff --git a/buildengine/testdata/projects/alpha/go.mod b/buildengine/testdata/projects/alpha/go.mod
@@ -32,7 +32,6 @@ require (
 	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.design/x/reflect v0.0.0-20220504060917-02c43be63f3b // indirect
 	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
 	golang.org/x/mod v0.16.0 // indirect

diff --git a/buildengine/testdata/projects/alpha/go.sum b/buildengine/testdata/projects/alpha/go.sum
diff --git a/buildengine/testdata/projects/another/go.mod b/buildengine/testdata/projects/another/go.mod
@@ -32,7 +32,6 @@ require (
 	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.design/x/reflect v0.0.0-20220504060917-02c43be63f3b // indirect
 	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
 	golang.org/x/mod v0.16.0 // indirect

diff --git a/buildengine/testdata/projects/another/go.sum b/buildengine/testdata/projects/another/go.sum
diff --git a/buildengine/testdata/projects/other/go.mod b/buildengine/testdata/projects/other/go.mod
@@ -32,7 +32,6 @@ require (
 	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.design/x/reflect v0.0.0-20220504060917-02c43be63f3b // indirect
 	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
 	golang.org/x/mod v0.16.0 // indirect

diff --git a/buildengine/testdata/projects/other/go.sum b/buildengine/testdata/projects/other/go.sum
diff --git a/examples/go/echo/go.mod b/examples/go/echo/go.mod
@@ -34,7 +34,6 @@ require (
 	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.design/x/reflect v0.0.0-20220504060917-02c43be63f3b // indirect
 	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
 	golang.org/x/mod v0.16.0 // indirect

diff --git a/examples/go/echo/go.sum b/examples/go/echo/go.sum
diff --git a/go-runtime/compile/build.go b/go-runtime/compile/build.go
@@ -12,8 +12,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/TBD54566975/ftl/internal/reflect"
 	"github.com/TBD54566975/scaffolder"
-	"golang.design/x/reflect"
 	"golang.org/x/mod/modfile"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/protobuf/proto"

diff --git a/go-runtime/compile/testdata/failing/go.mod b/go-runtime/compile/testdata/failing/go.mod
@@ -34,7 +34,6 @@ require (
 	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.design/x/reflect v0.0.0-20220504060917-02c43be63f3b // indirect
 	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
 	golang.org/x/mod v0.16.0 // indirect

diff --git a/go-runtime/compile/testdata/failing/go.sum b/go-runtime/compile/testdata/failing/go.sum
diff --git a/go-runtime/compile/testdata/one/go.mod b/go-runtime/compile/testdata/one/go.mod
@@ -34,7 +34,6 @@ require (
 	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.design/x/reflect v0.0.0-20220504060917-02c43be63f3b // indirect
 	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
 	golang.org/x/mod v0.16.0 // indirect

diff --git a/go-runtime/compile/testdata/one/go.sum b/go-runtime/compile/testdata/one/go.sum
diff --git a/go-runtime/compile/testdata/two/go.mod b/go-runtime/compile/testdata/two/go.mod
@@ -34,7 +34,6 @@ require (
 	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.design/x/reflect v0.0.0-20220504060917-02c43be63f3b // indirect
 	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
 	golang.org/x/mod v0.16.0 // indirect

diff --git a/go-runtime/compile/testdata/two/go.sum b/go-runtime/compile/testdata/two/go.sum
diff --git a/go.mod b/go.mod
@@ -104,7 +104,6 @@ require (
 	github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b
 	github.com/swaggest/refl v1.3.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
-	golang.design/x/reflect v0.0.0-20220504060917-02c43be63f3b
 	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect

diff --git a/go.sum b/go.sum