Renaming DeleteContext func to RemoveResourceFromState (#230)

hashicorp · Apr 13, 2022 · 5ed4718 · 5ed4718
1 parent c83c891
commit 5ed4718
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -27,7 +27,7 @@ func New() *schema.Provider {
 	}
 }
 
-func DeleteContext(_ context.Context, d *schema.ResourceData, _ interface{}) diag.Diagnostics {
+func RemoveResourceFromState(_ context.Context, d *schema.ResourceData, _ interface{}) diag.Diagnostics {
 	d.SetId("")
 	return nil
 }
diff --git a/internal/provider/resource_id.go b/internal/provider/resource_id.go
@@ -31,7 +31,7 @@ exist concurrently.
 `,
 		CreateContext: CreateID,
 		ReadContext:   RepopulateEncodings,
-		DeleteContext: DeleteContext,
+		DeleteContext: RemoveResourceFromState,
 		Importer: &schema.ResourceImporter{
 			StateContext: ImportID,
 		},

diff --git a/internal/provider/resource_integer.go b/internal/provider/resource_integer.go
@@ -21,7 +21,7 @@ func resourceInteger() *schema.Resource {
 			"old and new resources exist concurrently.",
 		CreateContext: CreateInteger,
 		ReadContext:   schema.NoopContext,
-		DeleteContext: DeleteContext,
+		DeleteContext: RemoveResourceFromState,
 		Importer: &schema.ResourceImporter{
 			StateContext: ImportInteger,
 		},

diff --git a/internal/provider/resource_password.go b/internal/provider/resource_password.go
@@ -13,7 +13,7 @@ func resourcePassword() *schema.Resource {
 			"This resource *does* use a cryptographic random number generator.",
 		CreateContext: createStringFunc(true),
 		ReadContext:   readNil,
-		DeleteContext: DeleteContext,
+		DeleteContext: RemoveResourceFromState,
 		Schema:        stringSchemaV1(true),
 		Importer: &schema.ResourceImporter{
 			StateContext: importStringFunc(true),

diff --git a/internal/provider/resource_pet.go b/internal/provider/resource_pet.go
@@ -25,7 +25,7 @@ func resourcePet() *schema.Resource {
 			"and new resources exist concurrently.",
 		CreateContext: CreatePet,
 		ReadContext:   schema.NoopContext,
-		DeleteContext: DeleteContext,
+		DeleteContext: RemoveResourceFromState,
 
 		Schema: map[string]*schema.Schema{
 			"keepers": {

diff --git a/internal/provider/resource_shuffle.go b/internal/provider/resource_shuffle.go
@@ -13,7 +13,7 @@ func resourceShuffle() *schema.Resource {
 			"given as an argument.",
 		CreateContext: CreateShuffle,
 		ReadContext:   schema.NoopContext,
-		DeleteContext: DeleteContext,
+		DeleteContext: RemoveResourceFromState,
 
 		Schema: map[string]*schema.Schema{
 			"keepers": {

diff --git a/internal/provider/resource_string.go b/internal/provider/resource_string.go
@@ -16,7 +16,7 @@ func resourceString() *schema.Resource {
 			"use [random_id](id.html), for sensitive random values please use [random_password](password.html).",
 		CreateContext: createStringFunc(false),
 		ReadContext:   readNil,
-		DeleteContext: DeleteContext,
+		DeleteContext: RemoveResourceFromState,
 		// MigrateState is deprecated but the implementation is being left in place as per the
 		// [SDK documentation](https://github.com/hashicorp/terraform-plugin-sdk/blob/main/helper/schema/resource.go#L91).
 		MigrateState:  resourceRandomStringMigrateState,

diff --git a/internal/provider/resource_uuid.go b/internal/provider/resource_uuid.go
@@ -18,7 +18,7 @@ func resourceUuid() *schema.Resource {
 			"UUID-formatted string for use with services needed a unique string identifier.",
 		CreateContext: CreateUuid,
 		ReadContext:   schema.NoopContext,
-		DeleteContext: DeleteContext,
+		DeleteContext: RemoveResourceFromState,
 		Importer: &schema.ResourceImporter{
 			StateContext: ImportUuid,
 		},