merge prerelease branch

eli-darkly · eli-darkly · commit 9d010a12cf89 · 2022-08-29T13:26:26.000-07:00
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/launchdarkly/go-sdk-common/v3
 go 1.18
 
 require (
-	github.com/launchdarkly/go-jsonstream/v2 v2.0.0
+	github.com/launchdarkly/go-jsonstream/v3 v3.0.0
 	github.com/launchdarkly/go-test-helpers/v3 v3.0.1
 	github.com/mailru/easyjson v0.7.6
 	github.com/stretchr/testify v1.6.1
diff --git a/go.sum b/go.sum
@@ -3,8 +3,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/launchdarkly/go-jsonstream/v2 v2.0.0 h1:5NBbJmQAiUVVfAGR6tPuMITGO2+8mxLD0Azyeqgq5Yw=
-github.com/launchdarkly/go-jsonstream/v2 v2.0.0/go.mod h1:8WhgeCtJdsc7VXg7tSzQmCYnw+nRAo5ReOLhVYcLiJk=
+github.com/launchdarkly/go-jsonstream/v3 v3.0.0 h1:qJF/WI09EUJ7kSpmP5d1Rhc81NQdYUhP17McKfUq17E=
+github.com/launchdarkly/go-jsonstream/v3 v3.0.0/go.mod h1:/1Gyml6fnD309JOvunOSfyysWbZ/ZzcA120gF/cQtC4=
 github.com/launchdarkly/go-test-helpers/v3 v3.0.1 h1:Z4lUVrh7+hIvL47KVjEBE/owbqqjKUEYTp4aBX/5OZM=
 github.com/launchdarkly/go-test-helpers/v3 v3.0.1/go.mod h1:u2ZvJlc/DDJTFrshWW50tWMZHLVYXofuSHUfTU/eIwM=
 github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
diff --git a/ldattr/ref.go b/ldattr/ref.go
@@ -8,7 +8,7 @@ import (
 	"github.com/launchdarkly/go-sdk-common/v3/lderrors"
 	"github.com/launchdarkly/go-sdk-common/v3/ldvalue"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
 )
 
 // Ref is an attribute name or path expression identifying a value within a Context.
diff --git a/ldcontext/context_easyjson.go b/ldcontext/context_easyjson.go
@@ -8,7 +8,7 @@ import (
 	"github.com/launchdarkly/go-sdk-common/v3/lderrors"
 	"github.com/launchdarkly/go-sdk-common/v3/ldvalue"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 
 	"github.com/mailru/easyjson/jlexer"
 	ej_jwriter "github.com/mailru/easyjson/jwriter"
@@ -36,7 +36,7 @@ import (
 // update both context_unmarshaling.go and context_easyjson.go. Our unit tests run the same test
 // data against both implementations to verify that they are in sync.
 //
-// For more information, see: https://github.com/launchdarkly/go-jsonstream/v2
+// For more information, see: https://github.com/launchdarkly/go-jsonstream/v3
 
 // Arbitrary preallocation size that's likely to be longer than we will need for private/redacted
 // attribute lists, to minimize reallocations during unmarshaling.
diff --git a/ldcontext/context_marshaling.go b/ldcontext/context_marshaling.go
@@ -3,7 +3,7 @@ package ldcontext
 import (
 	"github.com/launchdarkly/go-sdk-common/v3/ldattr"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 )
 
 // MarshalJSON provides JSON serialization for Context when using json.MarshalJSON.
diff --git a/ldcontext/context_marshaling_test.go b/ldcontext/context_marshaling_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/launchdarkly/go-sdk-common/v3/ldvalue"
 	"github.com/launchdarkly/go-test-helpers/v3/jsonhelpers"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/ldcontext/context_serialization.go b/ldcontext/context_serialization.go
@@ -1,8 +1,8 @@
 package ldcontext
 
 import (
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 )
 
 // Note: other ContextSerialization methods are in the conditionally-compiled file
diff --git a/ldcontext/context_unmarshaling.go b/ldcontext/context_unmarshaling.go
@@ -5,7 +5,7 @@ import (
 	"github.com/launchdarkly/go-sdk-common/v3/lderrors"
 	"github.com/launchdarkly/go-sdk-common/v3/ldvalue"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
 )
 
 // See internAttributeNameIfPossible().
diff --git a/ldcontext/context_unmarshaling_test.go b/ldcontext/context_unmarshaling_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/launchdarkly/go-sdk-common/v3/ldvalue"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/ldreason/reason.go b/ldreason/reason.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/launchdarkly/go-sdk-common/v3/ldvalue"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 )
 
 // EvalReasonKind defines the possible values of EvaluationReason.GetKind().
diff --git a/ldreason/reason_serialization_easyjson.go b/ldreason/reason_serialization_easyjson.go
@@ -4,8 +4,8 @@
 package ldreason
 
 import (
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 
 	"github.com/mailru/easyjson/jlexer"
 	ej_jwriter "github.com/mailru/easyjson/jwriter"
@@ -21,7 +21,7 @@ import (
 // and read from the EasyJSON Writer/Lexer directly. Our go-jsonstream library provides methods for
 // doing this, if the launchdarkly_easyjson build tag is set.package ldmodel
 //
-// For more information, see: https://github.com/launchdarkly/go-jsonstream/v2
+// For more information, see: https://github.com/launchdarkly/go-jsonstream/v3
 
 func (r EvaluationReason) MarshalEasyJSON(writer *ej_jwriter.Writer) {
 	wrappedWriter := jwriter.NewWriterFromEasyJSONWriter(writer)
diff --git a/ldreason/reason_test.go b/ldreason/reason_test.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/ldvalue/optional_bool.go b/ldvalue/optional_bool.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"reflect"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 )
 
 // OptionalBool represents a bool that may or may not have a value. This is similar to using a
diff --git a/ldvalue/optional_bool_test.go b/ldvalue/optional_bool_test.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/ldvalue/optional_int.go b/ldvalue/optional_int.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"strconv"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 )
 
 // OptionalInt represents an int that may or may not have a value. This is similar to using an
diff --git a/ldvalue/optional_int_test.go b/ldvalue/optional_int_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/ldvalue/optional_string.go b/ldvalue/optional_string.go
@@ -3,8 +3,8 @@ package ldvalue
 import (
 	"encoding/json"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 )
 
 // OptionalString represents a string that may or may not have a value. This is similar to using a
diff --git a/ldvalue/optional_string_test.go b/ldvalue/optional_string_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/ldvalue/value_array.go b/ldvalue/value_array.go
@@ -3,8 +3,8 @@ package ldvalue
 import (
 	"encoding/json"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 
 	"golang.org/x/exp/slices"
 )
diff --git a/ldvalue/value_array_test.go b/ldvalue/value_array_test.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/ldvalue/value_map.go b/ldvalue/value_map.go
@@ -1,8 +1,8 @@
 package ldvalue
 
 import (
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 
 	"golang.org/x/exp/maps"
 )
diff --git a/ldvalue/value_map_test.go b/ldvalue/value_map_test.go
@@ -6,8 +6,8 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/ldvalue/value_serialization.go b/ldvalue/value_serialization.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 )
 
 // This file contains methods for converting Value to and from JSON.
diff --git a/ldvalue/value_serialization_easyjson.go b/ldvalue/value_serialization_easyjson.go
@@ -19,7 +19,7 @@ import (
 // path in some LaunchDarkly code on the service side, the extra overhead of the go-jsonstream
 // abstraction is undesirable.
 
-// For more information, see: https://github.com/launchdarkly/go-jsonstream/v2
+// For more information, see: https://github.com/launchdarkly/go-jsonstream/v3
 
 func (v Value) MarshalEasyJSON(writer *ej_jwriter.Writer) {
 	switch v.valueType {
diff --git a/ldvalue/value_serialization_test.go b/ldvalue/value_serialization_test.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/launchdarkly/go-jsonstream/v2/jreader"
-	"github.com/launchdarkly/go-jsonstream/v2/jwriter"
+	"github.com/launchdarkly/go-jsonstream/v3/jreader"
+	"github.com/launchdarkly/go-jsonstream/v3/jwriter"
 
 	"github.com/stretchr/testify/assert"
 )

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"github.com/launchdarkly/go-sdk-common/v3/lderrors"`
`9`	`9`	`"github.com/launchdarkly/go-sdk-common/v3/ldvalue"`
`10`	`10`
`11`		`- "github.com/launchdarkly/go-jsonstream/v2/jreader"`
	`11`	`+ "github.com/launchdarkly/go-jsonstream/v3/jreader"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// Ref is an attribute name or path expression identifying a value within a Context.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package ldcontext`
`3`	`3`	`import (`
`4`	`4`	`"github.com/launchdarkly/go-sdk-common/v3/ldattr"`
`5`	`5`
`6`		`- "github.com/launchdarkly/go-jsonstream/v2/jwriter"`
	`6`	`+ "github.com/launchdarkly/go-jsonstream/v3/jwriter"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// MarshalJSON provides JSON serialization for Context when using json.MarshalJSON.`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package ldcontext`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/launchdarkly/go-jsonstream/v2/jreader"`
`5`		`- "github.com/launchdarkly/go-jsonstream/v2/jwriter"`
	`4`	`+ "github.com/launchdarkly/go-jsonstream/v3/jreader"`
	`5`	`+ "github.com/launchdarkly/go-jsonstream/v3/jwriter"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`// Note: other ContextSerialization methods are in the conditionally-compiled file`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"github.com/launchdarkly/go-sdk-common/v3/lderrors"`
`6`	`6`	`"github.com/launchdarkly/go-sdk-common/v3/ldvalue"`
`7`	`7`
`8`		`- "github.com/launchdarkly/go-jsonstream/v2/jreader"`
	`8`	`+ "github.com/launchdarkly/go-jsonstream/v3/jreader"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`// See internAttributeNameIfPossible().`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`
`6`	`6`	`"github.com/launchdarkly/go-sdk-common/v3/ldvalue"`
`7`	`7`
`8`		`- "github.com/launchdarkly/go-jsonstream/v2/jreader"`
`9`		`- "github.com/launchdarkly/go-jsonstream/v2/jwriter"`
	`8`	`+ "github.com/launchdarkly/go-jsonstream/v3/jreader"`
	`9`	`+ "github.com/launchdarkly/go-jsonstream/v3/jwriter"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// EvalReasonKind defines the possible values of EvaluationReason.GetKind().`