add resource identity for resource user_cf

Author: ANUGRAHG

cloudfoundry/provider/resource_user_cf.go

@@ -9,17 +9,20 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/resource/identityschema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 )
 
 var (
 	_ resource.Resource                = &UserResource{}
 	_ resource.ResourceWithConfigure   = &UserResource{}
 	_ resource.ResourceWithImportState = &UserResource{}
+	_ resource.ResourceWithIdentity    = &UserResource{}
 )
 
 // Instantiates a user resource.
@@ -32,6 +35,10 @@ type UserCFResource struct {
 	cfClient *cfv3client.Client
 }
 
+type userCfResourceIdentityModel struct {
+	UserGUID types.String `tfsdk:"user_guid"`
+}
+
 func (r *UserCFResource) Metadata(ctx context.Context, req resource.MetadataRequest, resp *resource.MetadataResponse) {
 	resp.TypeName = req.ProviderTypeName + "_user_cf"
 }
@@ -94,6 +101,16 @@ func (r *UserCFResource) Schema(ctx context.Context, req resource.SchemaRequest,
 	}
 }
 
+func (rs *UserCFResource) IdentitySchema(_ context.Context, _ resource.IdentitySchemaRequest, resp *resource.IdentitySchemaResponse) {
+	resp.IdentitySchema = identityschema.Schema{
+		Attributes: map[string]identityschema.Attribute{
+			"user_guid": identityschema.StringAttribute{
+				RequiredForImport: true,
+			},
+		},
+	}
+}
+
 func (r *UserCFResource) Configure(ctx context.Context, req resource.ConfigureRequest, resp *resource.ConfigureResponse) {
 	if req.ProviderData == nil {
 		return
@@ -155,6 +172,13 @@ func (r *UserCFResource) Create(ctx context.Context, req resource.CreateRequest,
 
 	tflog.Trace(ctx, "created a cf user resource")
 	resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...)
+
+	identity := userCfResourceIdentityModel{
+		UserGUID: types.StringValue(plan.Id.ValueString()),
+	}
+
+	diags = resp.Identity.Set(ctx, identity)
+	resp.Diagnostics.Append(diags...)
 }
 
 func (rs *UserCFResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
@@ -177,6 +201,19 @@ func (rs *UserCFResource) Read(ctx context.Context, req resource.ReadRequest, re
 
 	tflog.Trace(ctx, "read a cf user resource")
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
+
+	var identity userCfResourceIdentityModel
+
+	diags = req.Identity.Get(ctx, &identity)
+	if diags.HasError() {
+		identity = userCfResourceIdentityModel{
+			UserGUID: types.StringValue(data.Id.ValueString()),
+		}
+
+		diags = resp.Identity.Set(ctx, identity)
+		resp.Diagnostics.Append(diags...)
+	}
+
 }
 
 func (rs *UserCFResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
@@ -237,5 +274,9 @@ func (rs *UserCFResource) Delete(ctx context.Context, req resource.DeleteRequest
 }
 
 func (rs *UserCFResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
-	resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp)
+	if req.ID != "" {
+		resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp)
+		return
+	}
+	resource.ImportStatePassthroughWithIdentity(ctx, path.Root("id"), path.Root("user_guid"), req, resp)
 }

docs/resources/user_cf.md

@@ -51,4 +51,20 @@ Import is supported using the following syntax:
 # terraform import cloudfoundry_user_cf.<resource_name> <user_guid>
 
 terraform import cloudfoundry_user_cf.my_user 283f59d2-d660-45fb-9d96-b3e1aa92cfc7
+
+#terraform import using id attribute in import block
+
+import {
+  to = cloudfoundry_user_cf.<resource_name>
+  id = "<user_guid>"
+}
+
+# this resource supports import using identity attribute from Terraform version 1.12 or higher
+
+import {
+to = cloudfoundry_user_cf.<resource_name>
+identity = {
+  user_guid = "<user_guid>"
+  }
+}
 ```

examples/resources/cloudfoundry_user_cf/import.sh

@@ -1,3 +1,19 @@
 # terraform import cloudfoundry_user_cf.<resource_name> <user_guid>
 
-terraform import cloudfoundry_user_cf.my_user 283f59d2-d660-45fb-9d96-b3e1aa92cfc7
+terraform import cloudfoundry_user_cf.my_user 283f59d2-d660-45fb-9d96-b3e1aa92cfc7
+
+#terraform import using id attribute in import block
+
+import {
+  to = cloudfoundry_user_cf.<resource_name>
+  id = "<user_guid>"
+}
+
+# this resource supports import using identity attribute from Terraform version 1.12 or higher
+
+import {
+to = cloudfoundry_user_cf.<resource_name>
+identity = {
+  user_guid = "<user_guid>"
+  }
+}