prepare 2.2.1 release (#15)

Author: LaunchDarklyCI

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  win: circleci/windows@1.0.0
+  win: circleci/windows@2.4.0
 
 workflows:
   workflow:
@@ -87,14 +87,23 @@ jobs:
 
   go-test-windows:
     executor:
-      name: win/vs2019
+      name: win/default
       shell: powershell.exe
 
     environment:
       GOPATH: C:\Users\VssAdministrator\go
 
     steps:
       - checkout
+      - run: 
+          name: download Go 1.14.13
+          command: |
+            $ErrorActionPreference = "Stop"
+            $installerUrl = "https://golang.org/dl/go1.14.13.windows-amd64.msi"
+            (New-Object System.Net.WebClient).DownloadFile($installerUrl, "go1.14.13.windows-amd64.msi")
+      - run:
+          name: install Go 1.14.13
+          command: Start-Process msiexec.exe -Wait -ArgumentList "/I go1.14.13.windows-amd64.msi /quiet"
       - run: go version
       - run:
           name: build and test

lduser/user_serialization.go

@@ -91,7 +91,7 @@ func (u *User) ReadFromJSONReader(r *jreader.Reader) {
 		case "custom":
 			parsed.custom.ReadFromJSONReader(r)
 		case "privateAttributeNames":
-			for arr := r.Array(); arr.Next(); {
+			for arr := r.ArrayOrNull(); arr.Next(); {
 				s := r.String()
 				if r.Error() == nil {
 					if parsed.privateAttributes == nil {

lduser/user_serialization_test.go

@@ -164,6 +164,12 @@ func TestJSONUnmarshalPrivateAttributes(t *testing.T) {
 	assert.True(t, user2.IsPrivateAttribute("name"))
 }
 
+func TestJSONUnmarshalNullsAreAllowedForArraysAndObjects(t *testing.T) {
+	user := unmarshalUser(t, map[string]interface{}{"key": "some-key", "custom": nil, "privateAttributeNames": nil})
+	assert.Equal(t, ldvalue.ValueMap{}, user.custom)
+	assert.Nil(t, user.privateAttributes)
+}
+
 func TestJSONUnmarshalDataWithWrongFieldType(t *testing.T) {
 	var user User
 	err := json.Unmarshal([]byte(`{"key":[1,2,3]}`), &user)