bij1
/
terraform-provider-greenhost
19
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Making all function names consistent 

Before all providers were using the helper.Schema approach the helper
function had these names. Now they all use names consistent with the Go
naming conventions except for these last few…
This commit is contained in:
Sander van Harmelen 2014-12-15 15:26:17 +01:00
parent ea7e35e385
commit a8144bbb9e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resource_digitalocean_droplet.go
View File

@ -229,7 +229,7 @@ func resourceDigitalOceanDropletUpdate(d *schema.ResourceData, meta interface{})
err = client.Resize(d.Id(), newSize.(string))
if err != nil {
newErr := power_on_and_wait(d, meta)
newErr := powerOnAndWait(d, meta)
if newErr != nil {
return fmt.Errorf(
"Error powering on droplet (%s) after failed resize: %s", d.Id(), err)
@ -243,7 +243,7 @@ func resourceDigitalOceanDropletUpdate(d *schema.ResourceData, meta interface{})
d, newSize.(string), []string{"", oldSize.(string)}, "size", meta)
if err != nil {
newErr := power_on_and_wait(d, meta)
newErr := powerOnAndWait(d, meta)
if newErr != nil {
return fmt.Errorf(
"Error powering on droplet (%s) after waiting for resize to finish: %s", d.Id(), err)
@ -359,7 +359,7 @@ func WaitForDropletAttribute(
stateConf := &resource.StateChangeConf{
Pending: pending,
Target: target,
Refresh: new_droplet_state_refresh_func(d, attribute, meta),
Refresh: newDropletStateRefreshFunc(d, attribute, meta),
Timeout: 10 * time.Minute,
Delay: 10 * time.Second,
MinTimeout: 3 * time.Second,
@ -370,7 +370,7 @@ func WaitForDropletAttribute(
// TODO This function still needs a little more refactoring to make it
// cleaner and more efficient
func new_droplet_state_refresh_func(
func newDropletStateRefreshFunc(
d *schema.ResourceData, attribute string, meta interface{}) resource.StateRefreshFunc {
client := meta.(*digitalocean.Client)
return func() (interface{}, string, error) {
@ -405,7 +405,7 @@ func new_droplet_state_refresh_func(
}
// Powers on the droplet and waits for it to be active
func power_on_and_wait(d *schema.ResourceData, meta interface{}) error {
func powerOnAndWait(d *schema.ResourceData, meta interface{}) error {
client := meta.(*digitalocean.Client)
err := client.PowerOn(d.Id())