Update to go 1.23

nyaruka · Sep 16, 2024 · 825ca73 · 825ca73
1 parent 3a616ad
commit 825ca73
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 23 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
 	"name": "GoFlow",
-	"image": "mcr.microsoft.com/devcontainers/go:1-1.22-bullseye",
+	"image": "mcr.microsoft.com/devcontainers/go:1-1.23-bullseye",
 	"features": {
 		"ghcr.io/devcontainers-contrib/features/pandoc:1": {
 			"version": "latest"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,7 +1,7 @@
 name: CI
 on: [push, pull_request]
 env:
-  go-version: "1.22.x"
+  go-version: "1.23.x"
 jobs:
   test:
     name: Test

diff --git a/contactql/inspect.go b/contactql/inspect.go
@@ -1,6 +1,9 @@
 package contactql
 
 import (
+	"maps"
+	"slices"
+
 	"github.com/nyaruka/goflow/assets"
 	"github.com/nyaruka/goflow/utils"
 )
@@ -69,8 +72,8 @@ func Inspect(query *ContactQuery) *Inspection {
 	allowAsGroup := !(attributes[AttributeID] || attributes[AttributeStatus] || attributes[AttributeGroup] || attributes[AttributeFlow] || attributes[AttributeHistory])
 
 	return &Inspection{
-		Attributes:   utils.SortedKeys(attributes),
-		Schemes:      utils.SortedKeys(schemes),
+		Attributes:   utils.EnsureNonNil(slices.Sorted(maps.Keys(attributes))),
+		Schemes:      utils.EnsureNonNil(slices.Sorted(maps.Keys(schemes))),
 		Fields:       fieldRefs,
 		Groups:       groupRefs,
 		AllowAsGroup: allowAsGroup,

diff --git a/flows/definition/flow.go b/flows/definition/flow.go
@@ -3,6 +3,8 @@ package definition
 import (
 	"encoding/json"
 	"fmt"
+	"maps"
+	"slices"
 
 	"github.com/Masterminds/semver"
 	"github.com/nyaruka/gocommon/i18n"
@@ -268,7 +270,7 @@ func (f *flow) extract() ([]flows.ExtractedTemplate, []flows.ExtractedReference,
 		})
 	}
 
-	return templates, assetRefs, utils.SortedKeys(parentRefs)
+	return templates, assetRefs, utils.EnsureNonNil(slices.Sorted(maps.Keys(parentRefs)))
 }
 
 // extracts all result specs

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/nyaruka/goflow
 
-go 1.22
+go 1.23
 
 require (
 	github.com/Masterminds/semver v1.5.0
@@ -9,7 +9,7 @@ require (
 	github.com/blevesearch/segment v0.9.1
 	github.com/buger/jsonparser v1.1.1
 	github.com/go-playground/validator/v10 v10.22.0
-	github.com/nyaruka/gocommon v1.57.1
+	github.com/nyaruka/gocommon v1.59.0
 	github.com/sergi/go-diff v1.3.1
 	github.com/shopspring/decimal v1.4.0
 	github.com/stretchr/testify v1.9.0

diff --git a/go.sum b/go.sum
@@ -40,8 +40,8 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/nyaruka/gocommon v1.57.1 h1:s/9WLZAOUNg0dQHZkgpx8qQMUtNJ2mqzxQhdk1+UBn4=
-github.com/nyaruka/gocommon v1.57.1/go.mod h1:wa++Yu/8PEP/HwfvXZrGlKZUCPSJAtSJHeuVsWtLOPM=
+github.com/nyaruka/gocommon v1.59.0 h1:XC//IVSOWawBXEZqDiYhqxrIHWo2QPPeCIkAm4n4sY0=
+github.com/nyaruka/gocommon v1.59.0/go.mod h1:Upj2DG1iL55YcfF7rve8CRrKGjMaEn0jWUIWbQQgTFQ=
 github.com/nyaruka/null/v2 v2.0.3 h1:rdmMRQyVzrOF3Jff/gpU/7BDR9mQX0lcLl4yImsA3kw=
 github.com/nyaruka/null/v2 v2.0.3/go.mod h1:OCVeCkCXwrg5/qE6RU0c1oUVZBy+ZDrT+xYg1XSaIWA=
 github.com/nyaruka/phonenumbers v1.4.0 h1:ddhWiHnHCIX3n6ETDA58Zq5dkxkjlvgrDWM2OHHPCzU=

diff --git a/utils/misc.go b/utils/misc.go
@@ -1,10 +1,7 @@
 package utils
 
 import (
-	"slices"
-
 	"golang.org/x/exp/constraints"
-	"golang.org/x/exp/maps"
 )
 
 // Set converts a slice to a set (a K > bool map)
@@ -16,11 +13,13 @@ func Set[K constraints.Ordered](s []K) map[K]bool {
 	return m
 }
 
-// SortedKeys returns the keys of a set in lexical order
-func SortedKeys[K constraints.Ordered, V any](m map[K]V) []K {
-	keys := maps.Keys(m)
-	slices.Sort(keys)
-	return keys
+// Until encoding/json/v2 there's no easy way to ensure nil slices are marshalled as empty arrays
+// see https://github.com/golang/go/discussions/63397
+func EnsureNonNil[T any](s []T) []T {
+	if s == nil {
+		return []T{}
+	}
+	return s
 }
 
 // Typed is an interface of objects that are marshalled as typed envelopes

diff --git a/utils/misc_test.go b/utils/misc_test.go
@@ -8,12 +8,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestSortedKeys(t *testing.T) {
-	assert.Equal(t, []string{}, utils.SortedKeys(map[string]bool{}))
-	assert.Equal(t, []string{"a", "x", "y"}, utils.SortedKeys(map[string]bool{"x": true, "y": true, "a": true}))
-	assert.Equal(t, []int{3, 5, 6}, utils.SortedKeys(map[int]bool{6: true, 3: true, 5: true}))
-}
-
 func TestSet(t *testing.T) {
 	assert.Equal(t, map[string]bool{}, utils.Set[string](nil))
 	assert.Equal(t, map[string]bool{}, utils.Set([]string{}))