Use schema.ImportStatePassthroughContext. (#101)

confluentinc · Nov 3, 2021 · 26f79b5 · 26f79b5
1 parent 61c15b1
commit 26f79b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/internal/provider/resource_environment.go b/internal/provider/resource_environment.go
@@ -32,7 +32,7 @@ func environmentResource() *schema.Resource {
 		UpdateContext: environmentUpdate,
 		DeleteContext: environmentDelete,
 		Importer: &schema.ResourceImporter{
-			StateContext: environmentImport,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			paramDisplayName: {
@@ -104,10 +104,6 @@ func environmentDelete(ctx context.Context, d *schema.ResourceData, meta interfa
 	return nil
 }
 
-func environmentImport(_ context.Context, d *schema.ResourceData, _ interface{}) ([]*schema.ResourceData, error) {
-	return []*schema.ResourceData{d}, nil
-}
-
 func executeEnvironmentRead(ctx context.Context, c *Client, environmentId string) (org.V2Environment, *http.Response, error) {
 	req := c.orgClient.EnvironmentsV2Api.GetV2Environment(c.orgApiContext(ctx), environmentId)
 	return req.Execute()

diff --git a/internal/provider/resource_service_account.go b/internal/provider/resource_service_account.go
@@ -32,7 +32,7 @@ func serviceAccountResource() *schema.Resource {
 		UpdateContext: serviceAccountUpdate,
 		DeleteContext: serviceAccountDelete,
 		Importer: &schema.ResourceImporter{
-			StateContext: serviceAccountImport,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			paramDisplayName: {
@@ -115,10 +115,6 @@ func serviceAccountDelete(ctx context.Context, d *schema.ResourceData, meta inte
 	return nil
 }
 
-func serviceAccountImport(_ context.Context, d *schema.ResourceData, _ interface{}) ([]*schema.ResourceData, error) {
-	return []*schema.ResourceData{d}, nil
-}
-
 func executeServiceAccountRead(ctx context.Context, c *Client, serviceAccountId string) (iam.V2ServiceAccount, *http.Response, error) {
 	req := c.iamClient.ServiceAccountsV2Api.GetV2ServiceAccount(c.iamApiContext(ctx), serviceAccountId)
 	return req.Execute()