Skip to content

Commit 4ace486

Browse files
author
Sander van Harmelen
committed
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…
1 parent 69b2c24 commit 4ace486

5 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎builtin/providers/consul/resource_consul_keys.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func resourceConsulKeysCreate(d *schema.ResourceData, meta interface{}) error {
9696
} else {
9797
log.Printf("[DEBUG] Resolving Consul datacenter...")
9898
var err error
99-
dc, err = get_dc(client)
99+
dc, err = getDC(client)
100100
if err != nil {
101101
return err
102102
}
@@ -116,7 +116,7 @@ func resourceConsulKeysCreate(d *schema.ResourceData, meta interface{}) error {
116116
// Extract the keys
117117
keys := d.Get("key").(*schema.Set).List()
118118
for _, raw := range keys {
119-
key, path, sub, err := parse_key(raw)
119+
key, path, sub, err := parseKey(raw)
120120
if err != nil {
121121
return err
122122
}
@@ -137,7 +137,7 @@ func resourceConsulKeysCreate(d *schema.ResourceData, meta interface{}) error {
137137
if err != nil {
138138
return fmt.Errorf("Failed to get Consul key '%s': %v", path, err)
139139
}
140-
value := attribute_value(sub, key, pair)
140+
value := attributeValue(sub, key, pair)
141141
vars[key] = value
142142
}
143143
}
@@ -176,7 +176,7 @@ func resourceConsulKeysRead(d *schema.ResourceData, meta interface{}) error {
176176
// Extract the keys
177177
keys := d.Get("key").(*schema.Set).List()
178178
for _, raw := range keys {
179-
key, path, sub, err := parse_key(raw)
179+
key, path, sub, err := parseKey(raw)
180180
if err != nil {
181181
return err
182182
}
@@ -187,7 +187,7 @@ func resourceConsulKeysRead(d *schema.ResourceData, meta interface{}) error {
187187
return fmt.Errorf("Failed to get value for path '%s' from Consul: %v", path, err)
188188
}
189189

190-
value := attribute_value(sub, key, pair)
190+
value := attributeValue(sub, key, pair)
191191
vars[key] = value
192192
sub["value"] = value
193193
}
@@ -221,7 +221,7 @@ func resourceConsulKeysDelete(d *schema.ResourceData, meta interface{}) error {
221221
// Extract the keys
222222
keys := d.Get("key").(*schema.Set).List()
223223
for _, raw := range keys {
224-
_, path, sub, err := parse_key(raw)
224+
_, path, sub, err := parseKey(raw)
225225
if err != nil {
226226
return err
227227
}
@@ -243,8 +243,8 @@ func resourceConsulKeysDelete(d *schema.ResourceData, meta interface{}) error {
243243
return nil
244244
}
245245

246-
// parse_key is used to parse a key into a name, path, config or error
247-
func parse_key(raw interface{}) (string, string, map[string]interface{}, error) {
246+
// parseKey is used to parse a key into a name, path, config or error
247+
func parseKey(raw interface{}) (string, string, map[string]interface{}, error) {
248248
sub, ok := raw.(map[string]interface{})
249249
if !ok {
250250
return "", "", nil, fmt.Errorf("Failed to unroll: %#v", raw)
@@ -262,9 +262,9 @@ func parse_key(raw interface{}) (string, string, map[string]interface{}, error)
262262
return key, path, sub, nil
263263
}
264264

265-
// attribute_value determines the value for a key, potentially
265+
// attributeValue determines the value for a key, potentially
266266
// using a default value if provided.
267-
func attribute_value(sub map[string]interface{}, key string, pair *consulapi.KVPair) string {
267+
func attributeValue(sub map[string]interface{}, key string, pair *consulapi.KVPair) string {
268268
// Use the value if given
269269
if pair != nil {
270270
return string(pair.Value)
@@ -284,8 +284,8 @@ func attribute_value(sub map[string]interface{}, key string, pair *consulapi.KVP
284284
return ""
285285
}
286286

287-
// get_dc is used to get the datacenter of the local agent
288-
func get_dc(client *consulapi.Client) (string, error) {
287+
// getDC is used to get the datacenter of the local agent
288+
func getDC(client *consulapi.Client) (string, error) {
289289
info, err := client.Agent().Self()
290290
if err != nil {
291291
return "", fmt.Errorf("Failed to get datacenter from Consul agent: %v", err)

‎builtin/providers/digitalocean/resource_digitalocean_droplet.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ func resourceDigitalOceanDropletUpdate(d *schema.ResourceData, meta interface{})
229229
err = client.Resize(d.Id(), newSize.(string))
230230

231231
if err != nil {
232-
newErr := power_on_and_wait(d, meta)
232+
newErr := powerOnAndWait(d, meta)
233233
if newErr != nil {
234234
return fmt.Errorf(
235235
"Error powering on droplet (%s) after failed resize: %s", d.Id(), err)
@@ -243,7 +243,7 @@ func resourceDigitalOceanDropletUpdate(d *schema.ResourceData, meta interface{})
243243
d, newSize.(string), []string{"", oldSize.(string)}, "size", meta)
244244

245245
if err != nil {
246-
newErr := power_on_and_wait(d, meta)
246+
newErr := powerOnAndWait(d, meta)
247247
if newErr != nil {
248248
return fmt.Errorf(
249249
"Error powering on droplet (%s) after waiting for resize to finish: %s", d.Id(), err)
@@ -359,7 +359,7 @@ func WaitForDropletAttribute(
359359
stateConf := &resource.StateChangeConf{
360360
Pending: pending,
361361
Target: target,
362-
Refresh: new_droplet_state_refresh_func(d, attribute, meta),
362+
Refresh: newDropletStateRefreshFunc(d, attribute, meta),
363363
Timeout: 10 * time.Minute,
364364
Delay: 10 * time.Second,
365365
MinTimeout: 3 * time.Second,
@@ -370,7 +370,7 @@ func WaitForDropletAttribute(
370370

371371
// TODO This function still needs a little more refactoring to make it
372372
// cleaner and more efficient
373-
func new_droplet_state_refresh_func(
373+
func newDropletStateRefreshFunc(
374374
d *schema.ResourceData, attribute string, meta interface{}) resource.StateRefreshFunc {
375375
client := meta.(*digitalocean.Client)
376376
return func() (interface{}, string, error) {
@@ -405,7 +405,7 @@ func new_droplet_state_refresh_func(
405405
}
406406

407407
// Powers on the droplet and waits for it to be active
408-
func power_on_and_wait(d *schema.ResourceData, meta interface{}) error {
408+
func powerOnAndWait(d *schema.ResourceData, meta interface{}) error {
409409
client := meta.(*digitalocean.Client)
410410
err := client.PowerOn(d.Id())
411411

‎builtin/providers/heroku/resource_heroku_addon.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func resourceHerokuAddonCreate(d *schema.ResourceData, meta interface{}) error {
9292
func resourceHerokuAddonRead(d *schema.ResourceData, meta interface{}) error {
9393
client := meta.(*heroku.Service)
9494

95-
addon, err := resource_heroku_addon_retrieve(
95+
addon, err := resourceHerokuAddonRetrieve(
9696
d.Get("app").(string), d.Id(), client)
9797
if err != nil {
9898
return err
@@ -153,7 +153,7 @@ func resourceHerokuAddonDelete(d *schema.ResourceData, meta interface{}) error {
153153
return nil
154154
}
155155

156-
func resource_heroku_addon_retrieve(app string, id string, client *heroku.Service) (*heroku.Addon, error) {
156+
func resourceHerokuAddonRetrieve(app string, id string, client *heroku.Service) (*heroku.Addon, error) {
157157
addon, err := client.AddonInfo(app, id)
158158

159159
if err != nil {

‎builtin/providers/heroku/resource_heroku_app.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func (a *application) Update() error {
2828
errs = append(errs, err)
2929
}
3030

31-
a.Vars, err = retrieve_config_vars(a.Id, a.Client)
31+
a.Vars, err = retrieveConfigVars(a.Id, a.Client)
3232
if err != nil {
3333
errs = append(errs, err)
3434
}
@@ -167,7 +167,7 @@ func resourceHerokuAppCreate(d *schema.ResourceData, meta interface{}) error {
167167
log.Printf("[INFO] App ID: %s", d.Id())
168168

169169
if v, ok := d.GetOk("config_vars"); ok {
170-
err = update_config_vars(d.Id(), client, nil, v.([]interface{}))
170+
err = updateConfigVars(d.Id(), client, nil, v.([]interface{}))
171171
if err != nil {
172172
return err
173173
}
@@ -225,7 +225,7 @@ func resourceHerokuOrgAppCreate(d *schema.ResourceData, meta interface{}) error
225225
log.Printf("[INFO] App ID: %s", d.Id())
226226

227227
if v, ok := d.GetOk("config_vars"); ok {
228-
err = update_config_vars(d.Id(), client, nil, v.([]interface{}))
228+
err = updateConfigVars(d.Id(), client, nil, v.([]interface{}))
229229
if err != nil {
230230
return err
231231
}
@@ -236,7 +236,7 @@ func resourceHerokuOrgAppCreate(d *schema.ResourceData, meta interface{}) error
236236

237237
func resourceHerokuAppRead(d *schema.ResourceData, meta interface{}) error {
238238
client := meta.(*heroku.Service)
239-
app, err := resource_heroku_app_retrieve(d.Id(), client)
239+
app, err := resourceHerokuAppRetrieve(d.Id(), client)
240240
if err != nil {
241241
return err
242242
}
@@ -304,7 +304,7 @@ func resourceHerokuAppUpdate(d *schema.ResourceData, meta interface{}) error {
304304
n = []interface{}{}
305305
}
306306

307-
err := update_config_vars(
307+
err := updateConfigVars(
308308
d.Id(), client, o.([]interface{}), n.([]interface{}))
309309
if err != nil {
310310
return err
@@ -327,7 +327,7 @@ func resourceHerokuAppDelete(d *schema.ResourceData, meta interface{}) error {
327327
return nil
328328
}
329329

330-
func resource_heroku_app_retrieve(id string, client *heroku.Service) (*application, error) {
330+
func resourceHerokuAppRetrieve(id string, client *heroku.Service) (*application, error) {
331331
app := application{Id: id, Client: client}
332332

333333
err := app.Update()
@@ -339,7 +339,7 @@ func resource_heroku_app_retrieve(id string, client *heroku.Service) (*applicati
339339
return &app, nil
340340
}
341341

342-
func retrieve_config_vars(id string, client *heroku.Service) (map[string]string, error) {
342+
func retrieveConfigVars(id string, client *heroku.Service) (map[string]string, error) {
343343
vars, err := client.ConfigVarInfo(id)
344344

345345
if err != nil {
@@ -350,7 +350,7 @@ func retrieve_config_vars(id string, client *heroku.Service) (map[string]string,
350350
}
351351

352352
// Updates the config vars for from an expanded configuration.
353-
func update_config_vars(
353+
func updateConfigVars(
354354
id string,
355355
client *heroku.Service,
356356
o []interface{},

‎builtin/providers/mailgun/resource_mailgun_domain.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func resourceMailgunDomainCreate(d *schema.ResourceData, meta interface{}) error
123123
log.Printf("[INFO] Domain ID: %s", d.Id())
124124

125125
// Retrieve and update state of domain
126-
_, err = resource_mailgin_domain_retrieve(d.Id(), client, d)
126+
_, err = resourceMailginDomainRetrieve(d.Id(), client, d)
127127

128128
if err != nil {
129129
return err
@@ -149,7 +149,7 @@ func resourceMailgunDomainDelete(d *schema.ResourceData, meta interface{}) error
149149
func resourceMailgunDomainRead(d *schema.ResourceData, meta interface{}) error {
150150
client := meta.(*mailgun.Client)
151151

152-
_, err := resource_mailgin_domain_retrieve(d.Id(), client, d)
152+
_, err := resourceMailginDomainRetrieve(d.Id(), client, d)
153153

154154
if err != nil {
155155
return err
@@ -158,7 +158,7 @@ func resourceMailgunDomainRead(d *schema.ResourceData, meta interface{}) error {
158158
return nil
159159
}
160160

161-
func resource_mailgin_domain_retrieve(id string, client *mailgun.Client, d *schema.ResourceData) (*mailgun.DomainResponse, error) {
161+
func resourceMailginDomainRetrieve(id string, client *mailgun.Client, d *schema.ResourceData) (*mailgun.DomainResponse, error) {
162162
resp, err := client.RetrieveDomain(id)
163163

164164
if err != nil {

0 commit comments

Comments
 (0)