adding wrappers for state change funcs

jkroepke · Apr 21, 2021 · acb6400 · acb6400
1 parent cb110f3
commit acb6400
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/azurerm/internal/tf/pluginsdk/resource.go b/azurerm/internal/tf/pluginsdk/resource.go
@@ -1,6 +1,9 @@
 package pluginsdk
 
-import "github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+)
 
 // This file is intended to provide a transition from Plugin SDKv1 to Plugin SDKv2
 // without introducing a merge conflict into every PR.
@@ -20,6 +23,9 @@ func ImportStatePassthrough(d *schema.ResourceData, m interface{}) ([]*schema.Re
 	return schema.ImportStatePassthrough(d, m)
 }
 
+type StateChangeConf = resource.StateChangeConf
+type StateRefreshFunc = resource.StateRefreshFunc
+
 type CreateFunc = schema.CreateFunc
 type DeleteFunc = schema.DeleteFunc
 type ExistsFunc = schema.ExistsFunc

diff --git a/azurerm/internal/timeouts/determine.go b/azurerm/internal/timeouts/determine.go
@@ -4,22 +4,22 @@ import (
 	"context"
 	"time"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk"
 )
 
 // ForCreate returns the context wrapped with the timeout for an Create operation
 //
 // If the 'SupportsCustomTimeouts' feature toggle is enabled - this is wrapped with a context
 // Otherwise this returns the default context
-func ForCreate(ctx context.Context, d *schema.ResourceData) (context.Context, context.CancelFunc) {
-	return buildWithTimeout(ctx, d.Timeout(schema.TimeoutCreate))
+func ForCreate(ctx context.Context, d *pluginsdk.ResourceData) (context.Context, context.CancelFunc) {
+	return buildWithTimeout(ctx, d.Timeout(pluginsdk.TimeoutCreate))
 }
 
 // ForCreateUpdate returns the context wrapped with the timeout for an combined Create/Update operation
 //
 // If the 'SupportsCustomTimeouts' feature toggle is enabled - this is wrapped with a context
 // Otherwise this returns the default context
-func ForCreateUpdate(ctx context.Context, d *schema.ResourceData) (context.Context, context.CancelFunc) {
+func ForCreateUpdate(ctx context.Context, d *pluginsdk.ResourceData) (context.Context, context.CancelFunc) {
 	if d.IsNewResource() {
 		return ForCreate(ctx, d)
 	}
@@ -31,24 +31,24 @@ func ForCreateUpdate(ctx context.Context, d *schema.ResourceData) (context.Conte
 //
 // If the 'SupportsCustomTimeouts' feature toggle is enabled - this is wrapped with a context
 // Otherwise this returns the default context
-func ForDelete(ctx context.Context, d *schema.ResourceData) (context.Context, context.CancelFunc) {
-	return buildWithTimeout(ctx, d.Timeout(schema.TimeoutDelete))
+func ForDelete(ctx context.Context, d *pluginsdk.ResourceData) (context.Context, context.CancelFunc) {
+	return buildWithTimeout(ctx, d.Timeout(pluginsdk.TimeoutDelete))
 }
 
 // ForRead returns the context wrapped with the timeout for an Read operation
 //
 // If the 'SupportsCustomTimeouts' feature toggle is enabled - this is wrapped with a context
 // Otherwise this returns the default context
-func ForRead(ctx context.Context, d *schema.ResourceData) (context.Context, context.CancelFunc) {
-	return buildWithTimeout(ctx, d.Timeout(schema.TimeoutRead))
+func ForRead(ctx context.Context, d *pluginsdk.ResourceData) (context.Context, context.CancelFunc) {
+	return buildWithTimeout(ctx, d.Timeout(pluginsdk.TimeoutRead))
 }
 
 // ForUpdate returns the context wrapped with the timeout for an Update operation
 //
 // If the 'SupportsCustomTimeouts' feature toggle is enabled - this is wrapped with a context
 // Otherwise this returns the default context
-func ForUpdate(ctx context.Context, d *schema.ResourceData) (context.Context, context.CancelFunc) {
-	return buildWithTimeout(ctx, d.Timeout(schema.TimeoutUpdate))
+func ForUpdate(ctx context.Context, d *pluginsdk.ResourceData) (context.Context, context.CancelFunc) {
+	return buildWithTimeout(ctx, d.Timeout(pluginsdk.TimeoutUpdate))
 }
 
 func buildWithTimeout(ctx context.Context, timeout time.Duration) (context.Context, context.CancelFunc) {

diff --git a/scripts/plugin-sdk-fixerupper.sh b/scripts/plugin-sdk-fixerupper.sh
@@ -27,6 +27,10 @@ function updateCode {
 
   # update the import for validation, the alised/unaliased part can remain the same
   find "$SERVICE_DIRECTORY" -type f -iname "*.go"  -exec sed -i '' -e 's/github\.com\/hashicorp\/terraform-plugin-sdk\/helper\/validation/github\.com\/terraform-providers\/terraform-provider-azurerm\/azurerm\/internal\/tf\/validation/g' {} \;
+
+  # `resource.` can become `pluginsdk`.
+  find "$SERVICE_DIRECTORY" -type f -iname "*.go"  -exec sed -i '' -e 's/github\.com\/hashicorp\/terraform-plugin-sdk\/helper\/resource/github\.com\/terraform-providers\/terraform-provider-azurerm\/azurerm\/internal\/tf\/pluginsdk/g' {} \;
+  find "$SERVICE_DIRECTORY" -type f -iname "*.go"  -exec sed -i '' -e 's/schema\./pluginsdk\./g' {} \;
 }
 
 function revertValidationFuncs {
@@ -39,6 +43,8 @@ function revertValidationFuncs {
 }
 
 function format {
+  echo "Running fmt.."
+  gofmt -w "$SERVICE_DIRECTORY"
   echo "Running goimports.."
   goimports -w "$SERVICE_DIRECTORY"
 }