From a7451bfab32cd3eb93dced95113814d159a68c73 Mon Sep 17 00:00:00 2001
From: James Nugent <james@jen20.com>
Date: Sun, 6 Nov 2016 10:07:38 -0600
Subject: [PATCH] provider/random: Use schema Noop functions

---
 builtin/providers/random/provider.go         | 13 -------------
 builtin/providers/random/resource_shuffle.go | 16 ++++++++--------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/builtin/providers/random/provider.go b/builtin/providers/random/provider.go
index 309c50d6c2..c0741dc3c4 100644
--- a/builtin/providers/random/provider.go
+++ b/builtin/providers/random/provider.go
@@ -16,16 +16,3 @@ func Provider() terraform.ResourceProvider {
 		},
 	}
 }
-
-// stubRead is a do-nothing Read implementation used for our resources,
-// which don't actually need to do anything on read.
-func stubRead(d *schema.ResourceData, meta interface{}) error {
-	return nil
-}
-
-// stubDelete is a do-nothing Dete implementation used for our resources,
-// which don't actually need to do anything unusual on delete.
-func stubDelete(d *schema.ResourceData, meta interface{}) error {
-	d.SetId("")
-	return nil
-}
diff --git a/builtin/providers/random/resource_shuffle.go b/builtin/providers/random/resource_shuffle.go
index 31108aeee1..fcec308a73 100644
--- a/builtin/providers/random/resource_shuffle.go
+++ b/builtin/providers/random/resource_shuffle.go
@@ -7,23 +7,23 @@ import (
 func resourceShuffle() *schema.Resource {
 	return &schema.Resource{
 		Create: CreateShuffle,
-		Read:   stubRead,
-		Delete: stubDelete,
+		Read:   schema.Noop,
+		Delete: schema.RemoveFromState,
 
 		Schema: map[string]*schema.Schema{
-			"keepers": &schema.Schema{
+			"keepers": {
 				Type:     schema.TypeMap,
 				Optional: true,
 				ForceNew: true,
 			},
 
-			"seed": &schema.Schema{
+			"seed": {
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
 			},
 
-			"input": &schema.Schema{
+			"input": {
 				Type:     schema.TypeList,
 				Required: true,
 				ForceNew: true,
@@ -32,7 +32,7 @@ func resourceShuffle() *schema.Resource {
 				},
 			},
 
-			"result": &schema.Schema{
+			"result": {
 				Type:     schema.TypeList,
 				Computed: true,
 				Elem: &schema.Schema{
@@ -40,7 +40,7 @@ func resourceShuffle() *schema.Resource {
 				},
 			},
 
-			"result_count": &schema.Schema{
+			"result_count": {
 				Type:     schema.TypeInt,
 				Optional: true,
 				ForceNew: true,
@@ -49,7 +49,7 @@ func resourceShuffle() *schema.Resource {
 	}
 }
 
-func CreateShuffle(d *schema.ResourceData, meta interface{}) error {
+func CreateShuffle(d *schema.ResourceData, _ interface{}) error {
 	input := d.Get("input").([]interface{})
 	seed := d.Get("seed").(string)