ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provider/google: Ensure we don't assert on nil 

This commit tests whether an interface is nil before type asserting it
to string - this should fix the panic reported in #8609.

We also clean up the schema definition to the newer style without
redundant type declarations.
This commit is contained in:
James Nugent 2016-09-03 16:20:56 -07:00
parent 74e5fe9fc5
commit 0459d86b93
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
builtin/providers/google/resource_compute_target_pool.go
View File

@ -21,38 +21,38 @@ func resourceComputeTargetPool() *schema.Resource {
}, },
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"name": &schema.Schema{ "name": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
ForceNew: true, ForceNew: true,
}, },
"backup_pool": &schema.Schema{ "backup_pool": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
ForceNew: false, ForceNew: false,
}, },
"description": &schema.Schema{ "description": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
ForceNew: true, ForceNew: true,
}, },
"failover_ratio": &schema.Schema{ "failover_ratio": {
Type: schema.TypeFloat, Type: schema.TypeFloat,
Optional: true, Optional: true,
ForceNew: true, ForceNew: true,
}, },
"health_checks": &schema.Schema{ "health_checks": {
Type: schema.TypeList, Type: schema.TypeList,
Optional: true, Optional: true,
ForceNew: false, ForceNew: false,
Elem: &schema.Schema{Type: schema.TypeString}, Elem: &schema.Schema{Type: schema.TypeString},
}, },
"instances": &schema.Schema{ "instances": {
Type: schema.TypeList, Type: schema.TypeList,
Optional: true, Optional: true,
Computed: true, Computed: true,
@ -60,26 +60,26 @@ func resourceComputeTargetPool() *schema.Resource {
Elem: &schema.Schema{Type: schema.TypeString}, Elem: &schema.Schema{Type: schema.TypeString},
}, },
"project": &schema.Schema{ "project": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
ForceNew: true, ForceNew: true,
Computed: true, Computed: true,
}, },
"region": &schema.Schema{ "region": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
ForceNew: true, ForceNew: true,
Computed: true, Computed: true,
}, },
"self_link": &schema.Schema{ "self_link": {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
}, },
"session_affinity": &schema.Schema{ "session_affinity": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
ForceNew: true, ForceNew: true,
@ -91,7 +91,7 @@ func resourceComputeTargetPool() *schema.Resource {
func convertStringArr(ifaceArr []interface{}) []string { func convertStringArr(ifaceArr []interface{}) []string {
arr := make([]string, len(ifaceArr)) arr := make([]string, len(ifaceArr))
for i, v := range ifaceArr { for i, v := range ifaceArr {
arr[i] = v.(string) arr[i], _ = v.(string)
} }
return arr return arr
} }