fix: enable failing gosimple check

Signed-off-by: Ruihua Wen <[email protected]>

.golangci.yml

@@ -6,10 +6,6 @@ issues:
   max-per-linter: 0
   max-same-issues: 0
   exclude-rules:
-    #TODO: Enable failing gosimple checks
-    - linters:
-        - gosimple
-      text: "S(1007|1034|1039|1009)"
     # TODO: Enable failing staticchecks
     - linters:
         - staticcheck

digitalocean/droplet/resource_droplet.go

@@ -809,9 +809,9 @@ func dropletStateRefreshFunc(
 
 		// See if we can access our attribute
 		if attr, ok := d.GetOkExists(attribute); ok {
-			switch attr.(type) {
+			switch attr := attr.(type) {
 			case bool:
-				return &droplet, strconv.FormatBool(attr.(bool)), nil
+				return &droplet, strconv.FormatBool(attr), nil
 			default:
 				return &droplet, attr.(string), nil
 			}

digitalocean/tag/resource_tag_test.go

@@ -102,7 +102,7 @@ func testAccCheckDigitalOceanTagExists(n string, tag *godo.Tag) resource.TestChe
 	}
 }
 
-var testAccCheckDigitalOceanTagConfig_basic = fmt.Sprintf(`
+var testAccCheckDigitalOceanTagConfig_basic = `
 resource "digitalocean_tag" "foobar" {
   name = "foobar"
-}`)
+}`

digitalocean/tag/tags.go

@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-var tagNameRe = regexp.MustCompile("^[a-zA-Z0-9:\\-_]{1,255}$")
+var tagNameRe = regexp.MustCompile(`^[a-zA-Z0-9:\-_]{1,255}$`)
 
 func TagsSchema() *schema.Schema {
 	return &schema.Schema{

digitalocean/util/hash.go

@@ -23,9 +23,9 @@ func HashStringIgnoreCase(v interface{}) int {
 // HashStringStateFunc implements a schema.SchemaStateFunc with HashString
 func HashStringStateFunc() schema.SchemaStateFunc {
 	return func(v interface{}) string {
-		switch v.(type) {
+		switch v := v.(type) {
 		case string:
-			return HashString(v.(string))
+			return HashString(v)
 		default:
 			return ""
 		}

digitalocean/volume/resource_volume_attachment.go

@@ -49,7 +49,7 @@ func resourceDigitalOceanVolumeAttachmentCreate(ctx context.Context, d *schema.R
 		return diag.Errorf("Error retrieving volume: %s", err)
 	}
 
-	if volume.DropletIDs == nil || len(volume.DropletIDs) == 0 || volume.DropletIDs[0] != dropletId {
+	if len(volume.DropletIDs) == 0 || volume.DropletIDs[0] != dropletId {
 
 		// Only one volume can be attached at one time to a single droplet.
 		err := resource.RetryContext(ctx, 5*time.Minute, func() *resource.RetryError {
@@ -103,7 +103,7 @@ func resourceDigitalOceanVolumeAttachmentRead(ctx context.Context, d *schema.Res
 		return diag.Errorf("Error retrieving volume: %s", err)
 	}
 
-	if volume.DropletIDs == nil || len(volume.DropletIDs) == 0 || volume.DropletIDs[0] != dropletId {
+	if len(volume.DropletIDs) == 0 || volume.DropletIDs[0] != dropletId {
 		log.Printf("[DEBUG] Volume Attachment (%s) not found, removing from state", d.Id())
 		d.SetId("")
 	}

digitalocean/volume/resource_volume_attachment_test.go

@@ -197,7 +197,7 @@ func testAccCheckDigitalOceanVolumeAttachmentExists(rn string) resource.TestChec
 			return err
 		}
 
-		if got.DropletIDs == nil || len(got.DropletIDs) == 0 || got.DropletIDs[0] != dropletId {
+		if len(got.DropletIDs) == 0 || got.DropletIDs[0] != dropletId {
 			return fmt.Errorf("wrong volume attachment found for volume %s, got %q wanted %q", volumeId, got.DropletIDs[0], dropletId)
 		}