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

Fix instance attributes

This commit is contained in:
Jake Champlin 2017-04-05 18:14:11 -04:00
parent 9062ddded3
commit 871d33d90d
No known key found for this signature in database
GPG Key ID: DC31F41958EF4AC2
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/providers/opc/resource_instance.go
View File

@ -51,12 +51,10 @@ func resourceInstance() *schema.Resource {
// Optional Attributes //
/////////////////////////
"instance_attributes": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
return true
},
Type: schema.TypeString,
Optional: true,
ForceNew: true,
ValidateFunc: validation.ValidateJsonString,
},
"boot_order": {
@ -367,7 +365,12 @@ func resourceInstanceCreate(d *schema.ResourceData, meta interface{}) error {
}
// Get optional instance attributes
if attributes, err := getInstanceAttributes(d); err != nil && attributes != nil {
attributes, attrErr := getInstanceAttributes(d)
if attrErr != nil {
return attrErr
}
if attributes != nil {
input.Attributes = attributes
}