ignore nil pointer deref

hashicorp · Sep 18, 2023 · 24ef5e8 · 24ef5e8
1 parent 82d84dd
commit 24ef5e8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/internal/mesh/internal/types/upstreams.go b/internal/mesh/internal/types/upstreams.go
@@ -47,6 +47,9 @@ func MutateUpstreams(res *pbresource.Resource) error {
 	changed := false
 
 	for _, dest := range destinations.Upstreams {
+		if dest.DestinationRef == nil {
+			continue // skip; let the validation hook error out instead
+		}
 		if dest.DestinationRef.Tenancy != nil && !isLocalPeer(dest.DestinationRef.Tenancy.PeerName) {
 			// TODO(peering/v2): remove this bypass when we know what to do with
 			// non-local peer references.

diff --git a/internal/mesh/internal/types/upstreams_test.go b/internal/mesh/internal/types/upstreams_test.go
@@ -48,6 +48,18 @@ func TestMutateUpstreams(t *testing.T) {
 			data:   &pbmesh.Upstreams{},
 			expect: &pbmesh.Upstreams{},
 		},
+		"invalid/nil dest ref": {
+			data: &pbmesh.Upstreams{
+				Upstreams: []*pbmesh.Upstream{
+					{DestinationRef: nil},
+				},
+			},
+			expect: &pbmesh.Upstreams{ // untouched
+				Upstreams: []*pbmesh.Upstream{
+					{DestinationRef: nil},
+				},
+			},
+		},
 		"dest ref tenancy defaulting": {
 			tenancy: newTestTenancy("foo.bar"),
 			data: &pbmesh.Upstreams{