Skip to content

Commit 32232e3

Browse files
authored
Merge pull request #319 from SumoLogic/emichaeli-fix-unexpected-end-of-json-input-for-folder-resource
Fix unexpected end of JSON input in folder and dashboard resources
2 parents a661a3e + bab0f9a commit 32232e3

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## 2.12.0 (Unreleased)
22

3+
## 2.11.4 (November 19, 2021)
4+
5+
BUG FIXES:
6+
7+
* Fix unexpected end of JSON input error in folder and dashboard resources (GH-319)
8+
39
## 2.11.3 (November 17, 2021)
410

511
BUG FIXES:

sumologic/sumologic_dashboard.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ func (s *Client) GetDashboard(id string) (*Dashboard, error) {
1111
if err != nil {
1212
return nil, err
1313
}
14+
if data == nil {
15+
return nil, nil
16+
}
1417

1518
var dashboard Dashboard
1619
err = json.Unmarshal(data, &dashboard)

sumologic/sumologic_folder.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ func (s *Client) GetFolder(id string) (*Folder, error) {
1414
if err != nil {
1515
return nil, err
1616
}
17+
if rawFolder == nil {
18+
return nil, nil
19+
}
1720

1821
var folder Folder
1922
err = json.Unmarshal(rawFolder, &folder)

0 commit comments

Comments
 (0)