providers/digitalocean: alphabetize all the things

This commit is contained in:
Jack Pearkes 2014-07-18 20:41:02 -04:00
parent 98fd49fccd
commit 5dcd453db8
1 changed files with 15 additions and 15 deletions

View File

@ -27,13 +27,13 @@ func resource_digitalocean_droplet_create(
// Build up our creation options // Build up our creation options
opts := digitalocean.CreateDroplet{ opts := digitalocean.CreateDroplet{
Name: rs.Attributes["name"],
Region: rs.Attributes["region"],
Image: rs.Attributes["image"],
Size: rs.Attributes["size"],
Backups: rs.Attributes["backups"], Backups: rs.Attributes["backups"],
Image: rs.Attributes["image"],
IPV6: rs.Attributes["ipv6"], IPV6: rs.Attributes["ipv6"],
Name: rs.Attributes["name"],
PrivateNetworking: rs.Attributes["private_networking"], PrivateNetworking: rs.Attributes["private_networking"],
Region: rs.Attributes["region"],
Size: rs.Attributes["size"],
} }
// Only expand ssh_keys if we have them // Only expand ssh_keys if we have them
@ -146,24 +146,24 @@ func resource_digitalocean_droplet_diff(
b := &diff.ResourceBuilder{ b := &diff.ResourceBuilder{
Attrs: map[string]diff.AttrType{ Attrs: map[string]diff.AttrType{
"name": diff.AttrTypeUpdate,
"backups": diff.AttrTypeUpdate, "backups": diff.AttrTypeUpdate,
"image": diff.AttrTypeCreate,
"ipv6": diff.AttrTypeUpdate, "ipv6": diff.AttrTypeUpdate,
"name": diff.AttrTypeUpdate,
"private_networking": diff.AttrTypeUpdate, "private_networking": diff.AttrTypeUpdate,
"region": diff.AttrTypeCreate, "region": diff.AttrTypeCreate,
"image": diff.AttrTypeCreate,
"size": diff.AttrTypeCreate, "size": diff.AttrTypeCreate,
"ssh_keys": diff.AttrTypeCreate, "ssh_keys": diff.AttrTypeCreate,
}, },
ComputedAttrs: []string{ ComputedAttrs: []string{
"backups",
"ipv4_address", "ipv4_address",
"ipv6",
"ipv6_address", "ipv6_address",
"status",
"locked", "locked",
"private_networking", "private_networking",
"ipv6", "status",
"backups",
}, },
} }
@ -183,12 +183,12 @@ func resource_digitalocean_droplet_update_state(
s.Attributes["image"] = droplet.ImageSlug() s.Attributes["image"] = droplet.ImageSlug()
} }
s.Attributes["size"] = droplet.SizeSlug()
s.Attributes["private_networking"] = droplet.NetworkingType()
s.Attributes["locked"] = droplet.IsLocked()
s.Attributes["status"] = droplet.Status
s.Attributes["ipv4_address"] = droplet.IPV4Address() s.Attributes["ipv4_address"] = droplet.IPV4Address()
s.Attributes["ipv6_address"] = droplet.IPV6Address() s.Attributes["ipv6_address"] = droplet.IPV6Address()
s.Attributes["locked"] = droplet.IsLocked()
s.Attributes["private_networking"] = droplet.NetworkingType()
s.Attributes["size"] = droplet.SizeSlug()
s.Attributes["status"] = droplet.Status
return s, nil return s, nil
} }
@ -208,16 +208,16 @@ func resource_digitalocean_droplet_retrieve(id string, client *digitalocean.Clie
func resource_digitalocean_droplet_validation() *config.Validator { func resource_digitalocean_droplet_validation() *config.Validator {
return &config.Validator{ return &config.Validator{
Required: []string{ Required: []string{
"image",
"name", "name",
"region", "region",
"size", "size",
"image",
}, },
Optional: []string{ Optional: []string{
"ssh_keys.*",
"backups", "backups",
"ipv6", "ipv6",
"private_networking", "private_networking",
"ssh_keys.*",
}, },
} }
} }