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

Fix govet errors (#13774)

This commit is contained in:
Christoph Blecker 2017-04-19 10:21:31 -07:00 committed by Paul Stack
parent 03b82191bf
commit 596f05b881
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/providers/digitalocean/resource_digitalocean_droplet_test.go
View File

@ -334,11 +334,11 @@ func testAccCheckDigitalOceanDropletAttributes(droplet *godo.Droplet) resource.T
} }
if droplet.Size.PriceHourly != 0.00744 { if droplet.Size.PriceHourly != 0.00744 {
return fmt.Errorf("Bad price_hourly: %s", droplet.Size.PriceHourly) return fmt.Errorf("Bad price_hourly: %v", droplet.Size.PriceHourly)
} }
if droplet.Size.PriceMonthly != 5.0 { if droplet.Size.PriceMonthly != 5.0 {
return fmt.Errorf("Bad price_monthly: %s", droplet.Size.PriceMonthly) return fmt.Errorf("Bad price_monthly: %v", droplet.Size.PriceMonthly)
} }
if droplet.Region.Slug != "nyc3" { if droplet.Region.Slug != "nyc3" {

32
builtin/providers/fastly/resource_fastly_service_v1.go
View File

@ -1664,7 +1664,7 @@ func resourceServiceV1Update(d *schema.ResourceData, meta interface{}) error {
} }
// validate version // validate version
log.Printf("[DEBUG] Validating Fastly Service (%s), Version (%s)", d.Id(), latestVersion) log.Printf("[DEBUG] Validating Fastly Service (%s), Version (%v)", d.Id(), latestVersion)
valid, msg, err := conn.ValidateVersion(&gofastly.ValidateVersionInput{ valid, msg, err := conn.ValidateVersion(&gofastly.ValidateVersionInput{
Service: d.Id(), Service: d.Id(),
Version: latestVersion, Version: latestVersion,
@ -1678,7 +1678,7 @@ func resourceServiceV1Update(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("[ERR] Invalid configuration for Fastly Service (%s): %s", d.Id(), msg) return fmt.Errorf("[ERR] Invalid configuration for Fastly Service (%s): %s", d.Id(), msg)
} }
log.Printf("[DEBUG] Activating Fastly Service (%s), Version (%s)", d.Id(), latestVersion) log.Printf("[DEBUG] Activating Fastly Service (%s), Version (%v)", d.Id(), latestVersion)
_, err = conn.ActivateVersion(&gofastly.ActivateVersionInput{ _, err = conn.ActivateVersion(&gofastly.ActivateVersionInput{
Service: d.Id(), Service: d.Id(),
Version: latestVersion, Version: latestVersion,
@ -1735,7 +1735,7 @@ func resourceServiceV1Read(d *schema.ResourceData, meta interface{}) error {
d.Set("default_host", settings.DefaultHost) d.Set("default_host", settings.DefaultHost)
d.Set("default_ttl", settings.DefaultTTL) d.Set("default_ttl", settings.DefaultTTL)
} else { } else {
return fmt.Errorf("[ERR] Error looking up Version settings for (%s), version (%d): %s", d.Id(), s.ActiveVersion.Number, err) return fmt.Errorf("[ERR] Error looking up Version settings for (%s), version (%v): %s", d.Id(), s.ActiveVersion.Number, err)
} }
// TODO: update go-fastly to support an ActiveVersion struct, which contains // TODO: update go-fastly to support an ActiveVersion struct, which contains
@ -1748,7 +1748,7 @@ func resourceServiceV1Read(d *schema.ResourceData, meta interface{}) error {
}) })
if err != nil { if err != nil {
return fmt.Errorf("[ERR] Error looking up Domains for (%s), version (%d): %s", d.Id(), s.ActiveVersion.Number, err) return fmt.Errorf("[ERR] Error looking up Domains for (%s), version (%v): %s", d.Id(), s.ActiveVersion.Number, err)
} }
// Refresh Domains // Refresh Domains
@ -1766,7 +1766,7 @@ func resourceServiceV1Read(d *schema.ResourceData, meta interface{}) error {
}) })
if err != nil { if err != nil {
return fmt.Errorf("[ERR] Error looking up Backends for (%s), version (%d): %s", d.Id(), s.ActiveVersion.Number, err) return fmt.Errorf("[ERR] Error looking up Backends for (%s), version (%v): %s", d.Id(), s.ActiveVersion.Number, err)
} }
bl := flattenBackends(backendList) bl := flattenBackends(backendList)
@ -1783,7 +1783,7 @@ func resourceServiceV1Read(d *schema.ResourceData, meta interface{}) error {
}) })
if err != nil { if err != nil {
return fmt.Errorf("[ERR] Error looking up Headers for (%s), version (%d): %s", d.Id(), s.ActiveVersion.Number, err) return fmt.Errorf("[ERR] Error looking up Headers for (%s), version (%v): %s", d.Id(), s.ActiveVersion.Number, err)
} }
hl := flattenHeaders(headerList) hl := flattenHeaders(headerList)
@ -1800,7 +1800,7 @@ func resourceServiceV1Read(d *schema.ResourceData, meta interface{}) error {
}) })
if err != nil { if err != nil {
return fmt.Errorf("[ERR] Error looking up Gzips for (%s), version (%d): %s", d.Id(), s.ActiveVersion.Number, err) return fmt.Errorf("[ERR] Error looking up Gzips for (%s), version (%v): %s", d.Id(), s.ActiveVersion.Number, err)
} }
gl := flattenGzips(gzipsList) gl := flattenGzips(gzipsList)
@ -1817,7 +1817,7 @@ func resourceServiceV1Read(d *schema.ResourceData, meta interface{}) error {
}) })
if err != nil { if err != nil {
return fmt.Errorf("[ERR] Error looking up Healthcheck for (%s), version (%d): %s", d.Id(), s.ActiveVersion.Number, err) return fmt.Errorf("[ERR] Error looking up Healthcheck for (%s), version (%v): %s", d.Id(), s.ActiveVersion.Number, err)
} }
hcl := flattenHealthchecks(healthcheckList) hcl := flattenHealthchecks(healthcheckList)
@ -1834,7 +1834,7 @@ func resourceServiceV1Read(d *schema.ResourceData, meta interface{}) error {
}) })
if err != nil { if err != nil {
return fmt.Errorf("[ERR] Error looking up S3 Logging for (%s), version (%d): %s", d.Id(), s.ActiveVersion.Number, err) return fmt.Errorf("[ERR] Error looking up S3 Logging for (%s), version (%v): %s", d.Id(), s.ActiveVersion.Number, err)
} }
sl := flattenS3s(s3List) sl := flattenS3s(s3List)
@ -1851,7 +1851,7 @@ func resourceServiceV1Read(d *schema.ResourceData, meta interface{}) error {
}) })
if err != nil { if err != nil {
return fmt.Errorf("[ERR] Error looking up Papertrail for (%s), version (%d): %s", d.Id(), s.ActiveVersion.Number, err) return fmt.Errorf("[ERR] Error looking up Papertrail for (%s), version (%v): %s", d.Id(), s.ActiveVersion.Number, err)
} }
pl := flattenPapertrails(papertrailList) pl := flattenPapertrails(papertrailList)
@ -1868,7 +1868,7 @@ func resourceServiceV1Read(d *schema.ResourceData, meta interface{}) error {
}) })
if err != nil { if err != nil {
return fmt.Errorf("[ERR] Error looking up Sumologic for (%s), version (%d): %s", d.Id(), s.ActiveVersion.Number, err) return fmt.Errorf("[ERR] Error looking up Sumologic for (%s), version (%v): %s", d.Id(), s.ActiveVersion.Number, err)
} }
sul := flattenSumologics(sumologicList) sul := flattenSumologics(sumologicList)
@ -1884,7 +1884,7 @@ func resourceServiceV1Read(d *schema.ResourceData, meta interface{}) error {
}) })
if err != nil { if err != nil {
return fmt.Errorf("[ERR] Error looking up Response Object for (%s), version (%d): %s", d.Id(), s.ActiveVersion.Number, err) return fmt.Errorf("[ERR] Error looking up Response Object for (%s), version (%v): %s", d.Id(), s.ActiveVersion.Number, err)
} }
rol := flattenResponseObjects(responseObjectList) rol := flattenResponseObjects(responseObjectList)
@ -1901,7 +1901,7 @@ func resourceServiceV1Read(d *schema.ResourceData, meta interface{}) error {
}) })
if err != nil { if err != nil {
return fmt.Errorf("[ERR] Error looking up Conditions for (%s), version (%d): %s", d.Id(), s.ActiveVersion.Number, err) return fmt.Errorf("[ERR] Error looking up Conditions for (%s), version (%v): %s", d.Id(), s.ActiveVersion.Number, err)
} }
cl := flattenConditions(conditionList) cl := flattenConditions(conditionList)
@ -1918,7 +1918,7 @@ func resourceServiceV1Read(d *schema.ResourceData, meta interface{}) error {
}) })
if err != nil { if err != nil {
return fmt.Errorf("[ERR] Error looking up Request Settings for (%s), version (%d): %s", d.Id(), s.ActiveVersion.Number, err) return fmt.Errorf("[ERR] Error looking up Request Settings for (%s), version (%v): %s", d.Id(), s.ActiveVersion.Number, err)
} }
rl := flattenRequestSettings(rsList) rl := flattenRequestSettings(rsList)
@ -1934,7 +1934,7 @@ func resourceServiceV1Read(d *schema.ResourceData, meta interface{}) error {
Version: s.ActiveVersion.Number, Version: s.ActiveVersion.Number,
}) })
if err != nil { if err != nil {
return fmt.Errorf("[ERR] Error looking up VCLs for (%s), version (%d): %s", d.Id(), s.ActiveVersion.Number, err) return fmt.Errorf("[ERR] Error looking up VCLs for (%s), version (%v): %s", d.Id(), s.ActiveVersion.Number, err)
} }
vl := flattenVCLs(vclList) vl := flattenVCLs(vclList)
@ -1950,7 +1950,7 @@ func resourceServiceV1Read(d *schema.ResourceData, meta interface{}) error {
Version: s.ActiveVersion.Number, Version: s.ActiveVersion.Number,
}) })
if err != nil { if err != nil {
return fmt.Errorf("[ERR] Error looking up Cache Settings for (%s), version (%d): %s", d.Id(), s.ActiveVersion.Number, err) return fmt.Errorf("[ERR] Error looking up Cache Settings for (%s), version (%v): %s", d.Id(), s.ActiveVersion.Number, err)
} }
csl := flattenCacheSettings(cslList) csl := flattenCacheSettings(cslList)