From ad03bca3c52765c6ccf917e1a024bd203d95ddc0 Mon Sep 17 00:00:00 2001 From: Tadayuki Onishi Date: Sat, 24 Aug 2024 23:10:24 +0900 Subject: [PATCH] fix phone user resource Signed-off-by: Tadayuki Onishi --- internal/provider/provider.go | 2 +- .../null_to_empty_string.go | 32 ------------------- internal/services/phone/user/user_resource.go | 5 +-- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 internal/schema/customplanmodifier/null_to_empty_string.go diff --git a/internal/provider/provider.go b/internal/provider/provider.go index a1c9389..cc7d917 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -214,7 +214,7 @@ func (p *zoomProvider) Resources(_ context.Context) []func() resource.Resource { sharedlinegroupgroup.NewPhoneSharedLineGroupResource, sharedlinegroupgroupmembers.NewPhoneSharedLineGroupMembersResource, sharedlinegroupgroupphonenumbers.NewPhoneSharedLineGroupPhoneNumbersResource, - phoneuser.NewUserResource, + phoneuser.NewPhoneUserResource, userphonenumber.NewPhoneUserPhoneNumbersResource, } } diff --git a/internal/schema/customplanmodifier/null_to_empty_string.go b/internal/schema/customplanmodifier/null_to_empty_string.go deleted file mode 100644 index 542643f..0000000 --- a/internal/schema/customplanmodifier/null_to_empty_string.go +++ /dev/null @@ -1,32 +0,0 @@ -package customplanmodifier - -import ( - "context" - - "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" - "github.com/hashicorp/terraform-plugin-framework/types" -) - -type nullToEmptyStringPlanModifier struct{} - -var _ planmodifier.String = (*nullToEmptyStringPlanModifier)(nil) - -func EmptyIfNull() planmodifier.String { - return &nullToEmptyStringPlanModifier{} -} - -func (m *nullToEmptyStringPlanModifier) Description(_ context.Context) string { - return "Ensures a null string does not trigger diffs on planned values with different cases." -} - -func (m *nullToEmptyStringPlanModifier) MarkdownDescription(ctx context.Context) string { - return m.Description(ctx) -} - -func (m *nullToEmptyStringPlanModifier) PlanModifyString(_ context.Context, req planmodifier.StringRequest, resp *planmodifier.StringResponse) { - if !req.ConfigValue.IsNull() { - return - } - - resp.PlanValue = types.StringValue("") -} diff --git a/internal/services/phone/user/user_resource.go b/internal/services/phone/user/user_resource.go index 0f6d478..95955f6 100644 --- a/internal/services/phone/user/user_resource.go +++ b/internal/services/phone/user/user_resource.go @@ -9,7 +9,6 @@ import ( "github.com/folio-sec/terraform-provider-zoom/generated/api/zoomphone" "github.com/folio-sec/terraform-provider-zoom/internal/provider/shared" - "github.com/folio-sec/terraform-provider-zoom/internal/schema/customplanmodifier" "github.com/folio-sec/terraform-provider-zoom/internal/schema/customvalidator" "github.com/folio-sec/terraform-provider-zoom/internal/util" "github.com/hashicorp/terraform-plugin-framework/path" @@ -41,7 +40,7 @@ type resourceModel struct { TemplateID types.String `tfsdk:"template_id"` } -func NewUserResource() resource.Resource { +func NewPhoneUserResource() resource.Resource { return &tfResource{} } @@ -94,7 +93,6 @@ This resource requires the ` + strings.Join([]string{ "cost_center": schema.StringAttribute{ Computed: true, PlanModifiers: []planmodifier.String{ - customplanmodifier.EmptyIfNull(), stringplanmodifier.UseStateForUnknown(), }, MarkdownDescription: "The cost center name.", @@ -136,7 +134,6 @@ This resource requires the ` + strings.Join([]string{ Optional: true, Computed: true, PlanModifiers: []planmodifier.String{ - customplanmodifier.EmptyIfNull(), stringplanmodifier.UseStateForUnknown(), }, MarkdownDescription: "The unique identifier of the [site](https://support.zoom.us/hc/en-us/articles/360020809672z) where the user should be moved or assigned.",