Skip to content

Commit a7451bf

Browse files
committed
provider/random: Use schema Noop functions
1 parent 314a56e commit a7451bf

2 files changed

Lines changed: 8 additions & 21 deletions

File tree

builtin/providers/random/provider.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,3 @@ func Provider() terraform.ResourceProvider {
1616
},
1717
}
1818
}
19-
20-
// stubRead is a do-nothing Read implementation used for our resources,
21-
// which don't actually need to do anything on read.
22-
func stubRead(d *schema.ResourceData, meta interface{}) error {
23-
return nil
24-
}
25-
26-
// stubDelete is a do-nothing Dete implementation used for our resources,
27-
// which don't actually need to do anything unusual on delete.
28-
func stubDelete(d *schema.ResourceData, meta interface{}) error {
29-
d.SetId("")
30-
return nil
31-
}

builtin/providers/random/resource_shuffle.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ import (
77
func resourceShuffle() *schema.Resource {
88
return &schema.Resource{
99
Create: CreateShuffle,
10-
Read: stubRead,
11-
Delete: stubDelete,
10+
Read: schema.Noop,
11+
Delete: schema.RemoveFromState,
1212

1313
Schema: map[string]*schema.Schema{
14-
"keepers": &schema.Schema{
14+
"keepers": {
1515
Type: schema.TypeMap,
1616
Optional: true,
1717
ForceNew: true,
1818
},
1919

20-
"seed": &schema.Schema{
20+
"seed": {
2121
Type: schema.TypeString,
2222
Optional: true,
2323
ForceNew: true,
2424
},
2525

26-
"input": &schema.Schema{
26+
"input": {
2727
Type: schema.TypeList,
2828
Required: true,
2929
ForceNew: true,
@@ -32,15 +32,15 @@ func resourceShuffle() *schema.Resource {
3232
},
3333
},
3434

35-
"result": &schema.Schema{
35+
"result": {
3636
Type: schema.TypeList,
3737
Computed: true,
3838
Elem: &schema.Schema{
3939
Type: schema.TypeString,
4040
},
4141
},
4242

43-
"result_count": &schema.Schema{
43+
"result_count": {
4444
Type: schema.TypeInt,
4545
Optional: true,
4646
ForceNew: true,
@@ -49,7 +49,7 @@ func resourceShuffle() *schema.Resource {
4949
}
5050
}
5151

52-
func CreateShuffle(d *schema.ResourceData, meta interface{}) error {
52+
func CreateShuffle(d *schema.ResourceData, _ interface{}) error {
5353
input := d.Get("input").([]interface{})
5454
seed := d.Get("seed").(string)
5555

0 commit comments

Comments
 (0)