Skip to content

Commit 74ac2bc

Browse files
levivannoortlevivannoort
committed
chore: lint issues
1 parent c503bee commit 74ac2bc

3 files changed

Lines changed: 63 additions & 70 deletions

File tree

‎internal/services/column/resource.go‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -210,19 +210,15 @@ func (r *columnResource) Create(ctx context.Context, req resource.CreateRequest,
210210

211211
switch columnType {
212212
case "string":
213-
if plan.Size.IsNull() {
214-
resp.Diagnostics.AddError("Missing attribute", "size is required for string columns")
215-
return
216-
}
217-
var opts []tablesdb.CreateStringColumnOption
213+
var opts []tablesdb.CreateTextColumnOption
218214
if !plan.DefaultStr.IsNull() {
219-
opts = append(opts, tablesdbClient.WithCreateStringColumnDefault(plan.DefaultStr.ValueString()))
215+
opts = append(opts, tablesdbClient.WithCreateTextColumnDefault(plan.DefaultStr.ValueString()))
220216
}
221-
opts = append(opts, tablesdbClient.WithCreateStringColumnArray(array))
217+
opts = append(opts, tablesdbClient.WithCreateTextColumnArray(array))
222218
if !plan.Encrypt.IsNull() && !plan.Encrypt.IsUnknown() {
223-
opts = append(opts, tablesdbClient.WithCreateStringColumnEncrypt(plan.Encrypt.ValueBool()))
219+
opts = append(opts, tablesdbClient.WithCreateTextColumnEncrypt(plan.Encrypt.ValueBool()))
224220
}
225-
col, e := tablesdbClient.CreateStringColumn(databaseId, tableId, key, int(plan.Size.ValueInt64()), required, opts...)
221+
col, e := tablesdbClient.CreateTextColumn(databaseId, tableId, key, required, opts...)
226222
err = e
227223
if col != nil {
228224
responseJSON, _ = json.Marshal(col)
@@ -539,11 +535,8 @@ func (r *columnResource) Update(ctx context.Context, req resource.UpdateRequest,
539535

540536
switch columnType {
541537
case "string":
542-
var opts []tablesdb.UpdateStringColumnOption
543-
if !plan.Size.IsNull() {
544-
opts = append(opts, tablesdbClient.WithUpdateStringColumnSize(int(plan.Size.ValueInt64())))
545-
}
546-
col, e := tablesdbClient.UpdateStringColumn(databaseId, tableId, key, required, defaultStr, opts...)
538+
var opts []tablesdb.UpdateTextColumnOption
539+
col, e := tablesdbClient.UpdateTextColumn(databaseId, tableId, key, required, defaultStr, opts...)
547540
err = e
548541
if col != nil {
549542
responseJSON, _ = json.Marshal(col)

‎internal/services/provider/resource.go‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -320,38 +320,38 @@ func (r *providerResource) Create(ctx context.Context, req resource.CreateReques
320320
resp.Diagnostics.AddError("Missing attribute", "host is required for smtp providers")
321321
return
322322
}
323-
var opts []messaging.CreateSmtpProviderOption
323+
var opts []messaging.CreateSMTPProviderOption
324324
if v := plan.Port; !v.IsNull() {
325-
opts = append(opts, messagingClient.WithCreateSmtpProviderPort(int(v.ValueInt64())))
325+
opts = append(opts, messagingClient.WithCreateSMTPProviderPort(int(v.ValueInt64())))
326326
}
327327
if v := plan.Username; !v.IsNull() {
328-
opts = append(opts, messagingClient.WithCreateSmtpProviderUsername(v.ValueString()))
328+
opts = append(opts, messagingClient.WithCreateSMTPProviderUsername(v.ValueString()))
329329
}
330330
if v := plan.Password; !v.IsNull() {
331-
opts = append(opts, messagingClient.WithCreateSmtpProviderPassword(v.ValueString()))
331+
opts = append(opts, messagingClient.WithCreateSMTPProviderPassword(v.ValueString()))
332332
}
333333
if v := plan.Encryption; !v.IsNull() {
334-
opts = append(opts, messagingClient.WithCreateSmtpProviderEncryption(v.ValueString()))
334+
opts = append(opts, messagingClient.WithCreateSMTPProviderEncryption(v.ValueString()))
335335
}
336336
if v := plan.AutoTLS; !v.IsNull() {
337-
opts = append(opts, messagingClient.WithCreateSmtpProviderAutoTLS(v.ValueBool()))
337+
opts = append(opts, messagingClient.WithCreateSMTPProviderAutoTLS(v.ValueBool()))
338338
}
339339
if v := plan.FromEmail; !v.IsNull() {
340-
opts = append(opts, messagingClient.WithCreateSmtpProviderFromEmail(v.ValueString()))
340+
opts = append(opts, messagingClient.WithCreateSMTPProviderFromEmail(v.ValueString()))
341341
}
342342
if v := plan.FromName; !v.IsNull() {
343-
opts = append(opts, messagingClient.WithCreateSmtpProviderFromName(v.ValueString()))
343+
opts = append(opts, messagingClient.WithCreateSMTPProviderFromName(v.ValueString()))
344344
}
345345
if v := plan.ReplyToEmail; !v.IsNull() {
346-
opts = append(opts, messagingClient.WithCreateSmtpProviderReplyToEmail(v.ValueString()))
346+
opts = append(opts, messagingClient.WithCreateSMTPProviderReplyToEmail(v.ValueString()))
347347
}
348348
if v := plan.ReplyToName; !v.IsNull() {
349-
opts = append(opts, messagingClient.WithCreateSmtpProviderReplyToName(v.ValueString()))
349+
opts = append(opts, messagingClient.WithCreateSMTPProviderReplyToName(v.ValueString()))
350350
}
351351
if v := plan.Enabled; !v.IsNull() && !v.IsUnknown() {
352-
opts = append(opts, messagingClient.WithCreateSmtpProviderEnabled(v.ValueBool()))
352+
opts = append(opts, messagingClient.WithCreateSMTPProviderEnabled(v.ValueBool()))
353353
}
354-
prov, err = messagingClient.CreateSmtpProvider(provID, name, plan.Host.ValueString(), opts...)
354+
prov, err = messagingClient.CreateSMTPProvider(provID, name, plan.Host.ValueString(), opts...)
355355

356356
case "resend":
357357
var opts []messaging.CreateResendProviderOption
@@ -456,36 +456,36 @@ func (r *providerResource) Create(ctx context.Context, req resource.CreateReques
456456
prov, err = messagingClient.CreateTextmagicProvider(provID, name, opts...)
457457

458458
case "apns":
459-
var opts []messaging.CreateApnsProviderOption
459+
var opts []messaging.CreateAPNSProviderOption
460460
if v := plan.AuthKey; !v.IsNull() {
461-
opts = append(opts, messagingClient.WithCreateApnsProviderAuthKey(v.ValueString()))
461+
opts = append(opts, messagingClient.WithCreateAPNSProviderAuthKey(v.ValueString()))
462462
}
463463
if v := plan.AuthKeyId; !v.IsNull() {
464-
opts = append(opts, messagingClient.WithCreateApnsProviderAuthKeyId(v.ValueString()))
464+
opts = append(opts, messagingClient.WithCreateAPNSProviderAuthKeyId(v.ValueString()))
465465
}
466466
if v := plan.TeamId; !v.IsNull() {
467-
opts = append(opts, messagingClient.WithCreateApnsProviderTeamId(v.ValueString()))
467+
opts = append(opts, messagingClient.WithCreateAPNSProviderTeamId(v.ValueString()))
468468
}
469469
if v := plan.BundleId; !v.IsNull() {
470-
opts = append(opts, messagingClient.WithCreateApnsProviderBundleId(v.ValueString()))
470+
opts = append(opts, messagingClient.WithCreateAPNSProviderBundleId(v.ValueString()))
471471
}
472472
if v := plan.Sandbox; !v.IsNull() {
473-
opts = append(opts, messagingClient.WithCreateApnsProviderSandbox(v.ValueBool()))
473+
opts = append(opts, messagingClient.WithCreateAPNSProviderSandbox(v.ValueBool()))
474474
}
475475
if v := plan.Enabled; !v.IsNull() && !v.IsUnknown() {
476-
opts = append(opts, messagingClient.WithCreateApnsProviderEnabled(v.ValueBool()))
476+
opts = append(opts, messagingClient.WithCreateAPNSProviderEnabled(v.ValueBool()))
477477
}
478-
prov, err = messagingClient.CreateApnsProvider(provID, name, opts...)
478+
prov, err = messagingClient.CreateAPNSProvider(provID, name, opts...)
479479

480480
case "fcm":
481-
var opts []messaging.CreateFcmProviderOption
481+
var opts []messaging.CreateFCMProviderOption
482482
if v := plan.ServiceAccount; !v.IsNull() {
483-
opts = append(opts, messagingClient.WithCreateFcmProviderServiceAccountJSON(v.ValueString()))
483+
opts = append(opts, messagingClient.WithCreateFCMProviderServiceAccountJSON(v.ValueString()))
484484
}
485485
if v := plan.Enabled; !v.IsNull() && !v.IsUnknown() {
486-
opts = append(opts, messagingClient.WithCreateFcmProviderEnabled(v.ValueBool()))
486+
opts = append(opts, messagingClient.WithCreateFCMProviderEnabled(v.ValueBool()))
487487
}
488-
prov, err = messagingClient.CreateFcmProvider(provID, name, opts...)
488+
prov, err = messagingClient.CreateFCMProvider(provID, name, opts...)
489489

490490
default:
491491
resp.Diagnostics.AddError("Unsupported provider type", fmt.Sprintf("Provider type %q is not supported.", providerType))
@@ -610,44 +610,44 @@ func (r *providerResource) Update(ctx context.Context, req resource.UpdateReques
610610
prov, err = messagingClient.UpdateMailgunProvider(id, opts...)
611611

612612
case "smtp":
613-
var opts []messaging.UpdateSmtpProviderOption
613+
var opts []messaging.UpdateSMTPProviderOption
614614
if v := plan.Name; !v.IsNull() {
615-
opts = append(opts, messagingClient.WithUpdateSmtpProviderName(v.ValueString()))
615+
opts = append(opts, messagingClient.WithUpdateSMTPProviderName(v.ValueString()))
616616
}
617617
if v := plan.Host; !v.IsNull() {
618-
opts = append(opts, messagingClient.WithUpdateSmtpProviderHost(v.ValueString()))
618+
opts = append(opts, messagingClient.WithUpdateSMTPProviderHost(v.ValueString()))
619619
}
620620
if v := plan.Port; !v.IsNull() {
621-
opts = append(opts, messagingClient.WithUpdateSmtpProviderPort(int(v.ValueInt64())))
621+
opts = append(opts, messagingClient.WithUpdateSMTPProviderPort(int(v.ValueInt64())))
622622
}
623623
if v := plan.Username; !v.IsNull() {
624-
opts = append(opts, messagingClient.WithUpdateSmtpProviderUsername(v.ValueString()))
624+
opts = append(opts, messagingClient.WithUpdateSMTPProviderUsername(v.ValueString()))
625625
}
626626
if v := plan.Password; !v.IsNull() {
627-
opts = append(opts, messagingClient.WithUpdateSmtpProviderPassword(v.ValueString()))
627+
opts = append(opts, messagingClient.WithUpdateSMTPProviderPassword(v.ValueString()))
628628
}
629629
if v := plan.Encryption; !v.IsNull() {
630-
opts = append(opts, messagingClient.WithUpdateSmtpProviderEncryption(v.ValueString()))
630+
opts = append(opts, messagingClient.WithUpdateSMTPProviderEncryption(v.ValueString()))
631631
}
632632
if v := plan.AutoTLS; !v.IsNull() {
633-
opts = append(opts, messagingClient.WithUpdateSmtpProviderAutoTLS(v.ValueBool()))
633+
opts = append(opts, messagingClient.WithUpdateSMTPProviderAutoTLS(v.ValueBool()))
634634
}
635635
if v := plan.FromEmail; !v.IsNull() {
636-
opts = append(opts, messagingClient.WithUpdateSmtpProviderFromEmail(v.ValueString()))
636+
opts = append(opts, messagingClient.WithUpdateSMTPProviderFromEmail(v.ValueString()))
637637
}
638638
if v := plan.FromName; !v.IsNull() {
639-
opts = append(opts, messagingClient.WithUpdateSmtpProviderFromName(v.ValueString()))
639+
opts = append(opts, messagingClient.WithUpdateSMTPProviderFromName(v.ValueString()))
640640
}
641641
if v := plan.ReplyToEmail; !v.IsNull() {
642-
opts = append(opts, messagingClient.WithUpdateSmtpProviderReplyToEmail(v.ValueString()))
642+
opts = append(opts, messagingClient.WithUpdateSMTPProviderReplyToEmail(v.ValueString()))
643643
}
644644
if v := plan.ReplyToName; !v.IsNull() {
645-
opts = append(opts, messagingClient.WithUpdateSmtpProviderReplyToName(v.ValueString()))
645+
opts = append(opts, messagingClient.WithUpdateSMTPProviderReplyToName(v.ValueString()))
646646
}
647647
if v := plan.Enabled; !v.IsNull() && !v.IsUnknown() {
648-
opts = append(opts, messagingClient.WithUpdateSmtpProviderEnabled(v.ValueBool()))
648+
opts = append(opts, messagingClient.WithUpdateSMTPProviderEnabled(v.ValueBool()))
649649
}
650-
prov, err = messagingClient.UpdateSmtpProvider(id, opts...)
650+
prov, err = messagingClient.UpdateSMTPProvider(id, opts...)
651651

652652
case "resend":
653653
var opts []messaging.UpdateResendProviderOption
@@ -770,42 +770,42 @@ func (r *providerResource) Update(ctx context.Context, req resource.UpdateReques
770770
prov, err = messagingClient.UpdateTextmagicProvider(id, opts...)
771771

772772
case "apns":
773-
var opts []messaging.UpdateApnsProviderOption
773+
var opts []messaging.UpdateAPNSProviderOption
774774
if v := plan.Name; !v.IsNull() {
775-
opts = append(opts, messagingClient.WithUpdateApnsProviderName(v.ValueString()))
775+
opts = append(opts, messagingClient.WithUpdateAPNSProviderName(v.ValueString()))
776776
}
777777
if v := plan.AuthKey; !v.IsNull() {
778-
opts = append(opts, messagingClient.WithUpdateApnsProviderAuthKey(v.ValueString()))
778+
opts = append(opts, messagingClient.WithUpdateAPNSProviderAuthKey(v.ValueString()))
779779
}
780780
if v := plan.AuthKeyId; !v.IsNull() {
781-
opts = append(opts, messagingClient.WithUpdateApnsProviderAuthKeyId(v.ValueString()))
781+
opts = append(opts, messagingClient.WithUpdateAPNSProviderAuthKeyId(v.ValueString()))
782782
}
783783
if v := plan.TeamId; !v.IsNull() {
784-
opts = append(opts, messagingClient.WithUpdateApnsProviderTeamId(v.ValueString()))
784+
opts = append(opts, messagingClient.WithUpdateAPNSProviderTeamId(v.ValueString()))
785785
}
786786
if v := plan.BundleId; !v.IsNull() {
787-
opts = append(opts, messagingClient.WithUpdateApnsProviderBundleId(v.ValueString()))
787+
opts = append(opts, messagingClient.WithUpdateAPNSProviderBundleId(v.ValueString()))
788788
}
789789
if v := plan.Sandbox; !v.IsNull() {
790-
opts = append(opts, messagingClient.WithUpdateApnsProviderSandbox(v.ValueBool()))
790+
opts = append(opts, messagingClient.WithUpdateAPNSProviderSandbox(v.ValueBool()))
791791
}
792792
if v := plan.Enabled; !v.IsNull() && !v.IsUnknown() {
793-
opts = append(opts, messagingClient.WithUpdateApnsProviderEnabled(v.ValueBool()))
793+
opts = append(opts, messagingClient.WithUpdateAPNSProviderEnabled(v.ValueBool()))
794794
}
795-
prov, err = messagingClient.UpdateApnsProvider(id, opts...)
795+
prov, err = messagingClient.UpdateAPNSProvider(id, opts...)
796796

797797
case "fcm":
798-
var opts []messaging.UpdateFcmProviderOption
798+
var opts []messaging.UpdateFCMProviderOption
799799
if v := plan.Name; !v.IsNull() {
800-
opts = append(opts, messagingClient.WithUpdateFcmProviderName(v.ValueString()))
800+
opts = append(opts, messagingClient.WithUpdateFCMProviderName(v.ValueString()))
801801
}
802802
if v := plan.ServiceAccount; !v.IsNull() {
803-
opts = append(opts, messagingClient.WithUpdateFcmProviderServiceAccountJSON(v.ValueString()))
803+
opts = append(opts, messagingClient.WithUpdateFCMProviderServiceAccountJSON(v.ValueString()))
804804
}
805805
if v := plan.Enabled; !v.IsNull() && !v.IsUnknown() {
806-
opts = append(opts, messagingClient.WithUpdateFcmProviderEnabled(v.ValueBool()))
806+
opts = append(opts, messagingClient.WithUpdateFCMProviderEnabled(v.ValueBool()))
807807
}
808-
prov, err = messagingClient.UpdateFcmProvider(id, opts...)
808+
prov, err = messagingClient.UpdateFCMProvider(id, opts...)
809809
}
810810

811811
if err != nil {

‎internal/services/user/resource.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ func (r *userResource) Create(ctx context.Context, req resource.CreateRequest, r
170170
userID = user.Id
171171

172172
if !plan.Status.IsNull() && !plan.Status.IsUnknown() && !plan.Status.ValueBool() {
173-
user, err = usersClient.UpdateStatus(userID, false)
173+
_, err = usersClient.UpdateStatus(userID, false)
174174
if err != nil {
175175
resp.Diagnostics.AddError("Error setting user status", common.FormatError(err))
176176
return
@@ -182,21 +182,21 @@ func (r *userResource) Create(ctx context.Context, req resource.CreateRequest, r
182182
if resp.Diagnostics.HasError() {
183183
return
184184
}
185-
user, err = usersClient.UpdateLabels(userID, labels)
185+
_, err = usersClient.UpdateLabels(userID, labels)
186186
if err != nil {
187187
resp.Diagnostics.AddError("Error setting user labels", common.FormatError(err))
188188
return
189189
}
190190
}
191191
if !plan.EmailVerification.IsNull() && !plan.EmailVerification.IsUnknown() && plan.EmailVerification.ValueBool() {
192-
user, err = usersClient.UpdateEmailVerification(userID, true)
192+
_, err = usersClient.UpdateEmailVerification(userID, true)
193193
if err != nil {
194194
resp.Diagnostics.AddError("Error setting email verification", common.FormatError(err))
195195
return
196196
}
197197
}
198198
if !plan.PhoneVerification.IsNull() && !plan.PhoneVerification.IsUnknown() && plan.PhoneVerification.ValueBool() {
199-
user, err = usersClient.UpdatePhoneVerification(userID, true)
199+
_, err = usersClient.UpdatePhoneVerification(userID, true)
200200
if err != nil {
201201
resp.Diagnostics.AddError("Error setting phone verification", common.FormatError(err))
202202
return

0 commit comments

Comments
 (0)