Clean up util package.

digitalocean/util/errors.go

@@ -0,0 +1,17 @@
+package util
+
+import (
+ "strings"
+
+ "github.com/digitalocean/godo"
+)
+
+// IsDigitalOceanError detects if a given error is a *godo.ErrorResponse for
+// the specified code and message.
+func IsDigitalOceanError(err error, code int, message string) bool {
+ if err, ok := err.(*godo.ErrorResponse); ok {
+ return err.Response.StatusCode == code &&
+ strings.Contains(strings.ToLower(err.Message), strings.ToLower(message))
+ }
+ return false
+}

digitalocean/util/hash.go

@@ -4,15 +4,23 @@ import (
  "crypto/sha1"
  "encoding/hex"
  "hash/crc32"
+ "strings"
 
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
+// HashString produces a hash of a string.
 func HashString(s string) string {
  hash := sha1.Sum([]byte(s))
  return hex.EncodeToString(hash[:])
 }
 
+// HashStringIgnoreCase is a helper function for sets of strings that are case insensitive
+func HashStringIgnoreCase(v interface{}) int {
+ return SDKHashString(strings.ToLower(v.(string)))
+}
+
+// HashStringStateFunc implements a schema.SchemaStateFunc with HashString
 func HashStringStateFunc() schema.SchemaStateFunc {
  return func(v interface{}) string {
  switch v.(type) {
@@ -24,9 +32,10 @@ func HashStringStateFunc() schema.SchemaStateFunc {
  }
 }
 
-// hashcode.String in the terraform-plugin-sdk was made internal to the SDK in v2.
-// Embed the implementation here to allow same hash function to continue to be used
-// by the code in this provider that used it for hash computation.
+// SDKHashString implements hashcode.String from the terraform-plugin-sdk which
+// was made internal to the SDK in v2. Embed the implementation here to allow
+// same hash function to continue to be used by the code in this provider that
+// used it for hash computation.
 func SDKHashString(s string) int {
  v := int(crc32.ChecksumIEEE([]byte(s)))
  if v >= 0 {

digitalocean/util/schema.go

@@ -6,6 +6,7 @@ import (
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
+// SetResourceDataFromMap sets a *schema.ResourceData from a map.
 func SetResourceDataFromMap(d *schema.ResourceData, m map[string]interface{}) error {
  for key, value := range m {
  if err := d.Set(key, value); err != nil {

digitalocean/util/set.go

@@ -1,16 +1,9 @@
 package util
 
 import (
- "strings"
-
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-// Helper function for sets of strings that are case insensitive
-func HashStringIgnoreCase(v interface{}) int {
- return SDKHashString(strings.ToLower(v.(string)))
-}
-
 // GetSetChanges compares two *schema.Set, "old" and "new." It returns one
 // *schema.Set only containing items not found in the "new" set and another
 // containing items not found in the "old" set.

digitalocean/util/suppress.go

@@ -6,6 +6,7 @@ import (
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
+// CaseSensitive implements a schema.SchemaDiffSuppressFunc that ignores case
 func CaseSensitive(_, old, new string, _ *schema.ResourceData) bool {
  return strings.ToLower(old) == strings.ToLower(new)
 }

digitalocean/util/wait.go

@@ -2,7 +2,6 @@ package util
 
 import (
  "context"
- "strings"
  "time"
 
  "github.com/digitalocean/godo"
@@ -44,11 +43,3 @@ func WaitForAction(client *godo.Client, action *godo.Action) error {
  }).WaitForState()
  return err
 }
-
-func IsDigitalOceanError(err error, code int, message string) bool {
- if err, ok := err.(*godo.ErrorResponse); ok {
- return err.Response.StatusCode == code &&
- strings.Contains(strings.ToLower(err.Message), strings.ToLower(message))
- }
- return false
-}