Skip to content

Commit 19a50e1

Browse files
author
Renier Morales
committed
Use Grab when getting nested MaxSpeed to avoid null pointer panic
1 parent 9eb45c6 commit 19a50e1

File tree

4 files changed

+107
-34
lines changed

4 files changed

+107
-34
lines changed

softlayer/resource_softlayer_lb_vpx_ha.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ package softlayer
22

33
import (
44
"fmt"
5+
"log"
6+
"strconv"
7+
"strings"
8+
"time"
9+
510
"github.com/hashicorp/terraform/helper/schema"
611
"github.com/minsikl/netscaler-nitro-go/client"
712
dt "github.com/minsikl/netscaler-nitro-go/datatypes"
813
"github.com/minsikl/netscaler-nitro-go/op"
914
"github.com/softlayer/softlayer-go/session"
10-
"log"
11-
"strconv"
12-
"strings"
13-
"time"
1415
)
1516

1617
func resourceSoftLayerLbVpxHa() *schema.Resource {
@@ -137,7 +138,7 @@ func configureHA(nClient1 *client.NitroClient, nClient2 *client.NitroClient, sta
137138
// 7. VPX1 : Sync files
138139
hafiles := dt.HafilesReq{
139140
Hafiles: &dt.Hafiles{
140-
[]string{"all"},
141+
Mode: []string{"all"},
141142
},
142143
}
143144
err = nClient1.Add(&hafiles, "action=sync")

softlayer/resource_softlayer_virtual_guest.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -540,8 +540,9 @@ func resourceSoftLayerVirtualGuestRead(d *schema.ResourceData, meta interface{})
540540

541541
d.Set(
542542
"network_speed",
543-
sl.Get(
544-
result.PrimaryNetworkComponent.MaxSpeed,
543+
sl.Grab(
544+
result,
545+
"PrimaryNetworkComponent.MaxSpeed",
545546
d.Get("network_speed").(int),
546547
),
547548
)

vendor/github.com/softlayer/softlayer-go/sl/helpers.go

Lines changed: 71 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/vendor.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -39,80 +39,80 @@
3939
{
4040
"checksumSHA1": "KeNIYJQUdE6o196SaYuLMmjEPZM=",
4141
"path": "github.com/softlayer/softlayer-go/config",
42-
"revision": "b916637c357676dd73de892c4e51db494e5c407c",
43-
"revisionTime": "2016-10-25T15:10:44Z"
42+
"revision": "7b0d5dcf966fa8d383989312c4127ea214e84c08",
43+
"revisionTime": "2016-11-14T15:40:38Z"
4444
},
4545
{
4646
"checksumSHA1": "YFRxGJKFs1KJVMCimD2v5Lck/HU=",
4747
"path": "github.com/softlayer/softlayer-go/datatypes",
48-
"revision": "b916637c357676dd73de892c4e51db494e5c407c",
49-
"revisionTime": "2016-10-25T15:10:44Z"
48+
"revision": "7b0d5dcf966fa8d383989312c4127ea214e84c08",
49+
"revisionTime": "2016-11-14T15:40:38Z"
5050
},
5151
{
5252
"checksumSHA1": "nmqOPqyvDmGdvAntqvg/e0VfdbY=",
5353
"path": "github.com/softlayer/softlayer-go/examples",
54-
"revision": "b916637c357676dd73de892c4e51db494e5c407c",
55-
"revisionTime": "2016-10-25T15:10:44Z"
54+
"revision": "7b0d5dcf966fa8d383989312c4127ea214e84c08",
55+
"revisionTime": "2016-11-14T15:40:38Z"
5656
},
5757
{
5858
"checksumSHA1": "tZ3W1bwC/B9lAGW7007CwaZl6C4=",
5959
"path": "github.com/softlayer/softlayer-go/filter",
60-
"revision": "b916637c357676dd73de892c4e51db494e5c407c",
61-
"revisionTime": "2016-10-25T15:10:44Z"
60+
"revision": "7b0d5dcf966fa8d383989312c4127ea214e84c08",
61+
"revisionTime": "2016-11-14T15:40:38Z"
6262
},
6363
{
6464
"checksumSHA1": "8w7mbrWkcP0yCAdX3BpPr1vndrY=",
6565
"path": "github.com/softlayer/softlayer-go/helpers/hardware",
66-
"revision": "b916637c357676dd73de892c4e51db494e5c407c",
67-
"revisionTime": "2016-10-25T15:10:44Z"
66+
"revision": "7b0d5dcf966fa8d383989312c4127ea214e84c08",
67+
"revisionTime": "2016-11-14T15:40:38Z"
6868
},
6969
{
7070
"checksumSHA1": "iIil9KYj6J7ZEK4dG9UirsFuq1Y=",
7171
"path": "github.com/softlayer/softlayer-go/helpers/location",
72-
"revision": "b916637c357676dd73de892c4e51db494e5c407c",
73-
"revisionTime": "2016-10-25T15:10:44Z"
72+
"revision": "7b0d5dcf966fa8d383989312c4127ea214e84c08",
73+
"revisionTime": "2016-11-14T15:40:38Z"
7474
},
7575
{
7676
"checksumSHA1": "G3kKx93f2BtEvrApz/xB3yy1BuQ=",
7777
"path": "github.com/softlayer/softlayer-go/helpers/network",
78-
"revision": "b916637c357676dd73de892c4e51db494e5c407c",
79-
"revisionTime": "2016-10-25T15:10:44Z"
78+
"revision": "7b0d5dcf966fa8d383989312c4127ea214e84c08",
79+
"revisionTime": "2016-11-14T15:40:38Z"
8080
},
8181
{
8282
"checksumSHA1": "bGG9wihg55FY7q/kHVE5KQV8XmE=",
8383
"path": "github.com/softlayer/softlayer-go/helpers/order",
84-
"revision": "b916637c357676dd73de892c4e51db494e5c407c",
85-
"revisionTime": "2016-10-25T15:10:44Z"
84+
"revision": "7b0d5dcf966fa8d383989312c4127ea214e84c08",
85+
"revisionTime": "2016-11-14T15:40:38Z"
8686
},
8787
{
8888
"checksumSHA1": "P/4mxQUWq3TBfriw7yZF3IuNdOs=",
8989
"path": "github.com/softlayer/softlayer-go/helpers/product",
90-
"revision": "b916637c357676dd73de892c4e51db494e5c407c",
91-
"revisionTime": "2016-10-25T15:10:44Z"
90+
"revision": "7b0d5dcf966fa8d383989312c4127ea214e84c08",
91+
"revisionTime": "2016-11-14T15:40:38Z"
9292
},
9393
{
9494
"checksumSHA1": "AE7CLBIxLRpDneGO0RiDAifDMoM=",
9595
"path": "github.com/softlayer/softlayer-go/helpers/virtual",
96-
"revision": "b916637c357676dd73de892c4e51db494e5c407c",
97-
"revisionTime": "2016-10-25T15:10:44Z"
96+
"revision": "7b0d5dcf966fa8d383989312c4127ea214e84c08",
97+
"revisionTime": "2016-11-14T15:40:38Z"
9898
},
9999
{
100100
"checksumSHA1": "65dzedbCq23p7rADD3Ehvv4oxGs=",
101101
"path": "github.com/softlayer/softlayer-go/services",
102-
"revision": "b916637c357676dd73de892c4e51db494e5c407c",
103-
"revisionTime": "2016-10-25T15:10:44Z"
102+
"revision": "7b0d5dcf966fa8d383989312c4127ea214e84c08",
103+
"revisionTime": "2016-11-14T15:40:38Z"
104104
},
105105
{
106106
"checksumSHA1": "sNorXGAP6WIpphnKbmfsgaRAp34=",
107107
"path": "github.com/softlayer/softlayer-go/session",
108-
"revision": "b916637c357676dd73de892c4e51db494e5c407c",
109-
"revisionTime": "2016-10-25T15:10:44Z"
108+
"revision": "7b0d5dcf966fa8d383989312c4127ea214e84c08",
109+
"revisionTime": "2016-11-14T15:40:38Z"
110110
},
111111
{
112-
"checksumSHA1": "IwQnOvXL7IpCVwOHxyI7HgGD9gE=",
112+
"checksumSHA1": "ftAY+Gacd77mJM7mhcVkUbtAqQ8=",
113113
"path": "github.com/softlayer/softlayer-go/sl",
114-
"revision": "b916637c357676dd73de892c4e51db494e5c407c",
115-
"revisionTime": "2016-10-25T15:10:44Z"
114+
"revision": "7b0d5dcf966fa8d383989312c4127ea214e84c08",
115+
"revisionTime": "2016-11-14T15:40:38Z"
116116
},
117117
{
118118
"checksumSHA1": "Mr4ur60bgQJnQFfJY0dGtwWwMPE=",

0 commit comments

Comments
 (0)