sdk: updating to handle deprecations in the plugin sdk

hashicorp · Dec 14, 2021 · 8ae537f · 8ae537f
1 parent fb12bc0
commit 8ae537f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/internal/provider/provider_test.go b/internal/provider/provider_test.go
@@ -69,7 +69,7 @@ func TestResourcesSupportCustomTimeouts(t *testing.T) {
 			if resource.Timeouts.Create == nil && resource.Create != nil { //nolint:staticcheck
 				t.Fatalf("Resource %q defines a Create method but no Create Timeout", resourceName)
 			}
-			if resource.Timeouts.Delete == nil && resource.Delete != nil {
+			if resource.Timeouts.Delete == nil && resource.Delete != nil { //nolint:staticcheck
 				t.Fatalf("Resource %q defines a Delete method but no Delete Timeout", resourceName)
 			}
 			if resource.Timeouts.Read == nil {
@@ -79,7 +79,7 @@ func TestResourcesSupportCustomTimeouts(t *testing.T) {
 			}
 
 			// Optional
-			if resource.Timeouts.Update == nil && resource.Update != nil {
+			if resource.Timeouts.Update == nil && resource.Update != nil { //nolint:staticcheck
 				t.Fatalf("Resource %q defines a Update method but no Update Timeout", resourceName)
 			}
 		})

diff --git a/internal/sdk/plugin_sdk_test.go b/internal/sdk/plugin_sdk_test.go
@@ -178,7 +178,7 @@ func TestAccPluginSDKAndDecoder(t *testing.T) {
 								})
 								return nil
 							},
-							Read: func(d *schema.ResourceData, _ interface{}) error {
+							Read: func(d *schema.ResourceData, _ interface{}) error { //nolint:SA1019
 								wrapper := ResourceMetaData{
 									ResourceData:             d,
 									Logger:                   ConsoleLogger{},
@@ -196,7 +196,7 @@ func TestAccPluginSDKAndDecoder(t *testing.T) {
 
 								return nil
 							},
-							Delete: func(_ *schema.ResourceData, _ interface{}) error {
+							Delete: func(_ *schema.ResourceData, _ interface{}) error { //nolint:SA1019
 								return nil
 							},
 						},

diff --git a/internal/tf/pluginsdk/resource.go b/internal/tf/pluginsdk/resource.go
@@ -29,8 +29,8 @@ type (
 type (
 	// lint:ignore SA1019 SDKv2 migration - staticcheck's own linter directives are currently being ignored under golanci-lint
 	CreateFunc = schema.CreateFunc //nolint:staticcheck
-	DeleteFunc = schema.DeleteFunc
-	ExistsFunc = schema.ExistsFunc
-	ReadFunc   = schema.ReadFunc
-	UpdateFunc = schema.UpdateFunc
+	DeleteFunc = schema.DeleteFunc //nolint:staticcheck
+	ExistsFunc = schema.ExistsFunc //nolint:staticcheck
+	ReadFunc   = schema.ReadFunc   //nolint:staticcheck
+	UpdateFunc = schema.UpdateFunc //nolint:staticcheck
 )