Skip to content

Commit 2edb361

Browse files
jremy42jremy42
committed
fix lint
1 parent 15e9035 commit 2edb361

File tree

4 files changed

+34
-11
lines changed

4 files changed

+34
-11
lines changed

‎internal/services/domain/domains_registration.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,7 @@ func resourceDomainsRegistrationsRead(ctx context.Context, d *schema.ResourceDat
471471
}
472472
if len(domainNames) == 0 {
473473
d.SetId("")
474+
474475
return nil
475476
}
476477

@@ -481,8 +482,10 @@ func resourceDomainsRegistrationsRead(ctx context.Context, d *schema.ResourceDat
481482
if err != nil {
482483
if httperrors.Is404(err) {
483484
d.SetId("")
485+
484486
return nil
485487
}
488+
486489
return diag.FromErr(err)
487490
}
488491

@@ -538,6 +541,7 @@ func resourceDomainsRegistrationUpdate(ctx context.Context, d *schema.ResourceDa
538541
}
539542
if len(domainNames) == 0 {
540543
d.SetId("")
544+
541545
return nil
542546
}
543547

@@ -641,6 +645,7 @@ func resourceDomainsRegistrationDelete(ctx context.Context, d *schema.ResourceDa
641645
if httperrors.Is404(err) {
642646
continue
643647
}
648+
644649
return diag.FromErr(fmt.Errorf("failed to get domain details for %s: %w", domainName, err))
645650
}
646651

‎internal/services/domain/domains_registration_test.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,12 @@ func testAccCheckDomainStatus(tt *acctest.TestTools, expectedAutoRenew, expected
185185
return fmt.Errorf("domain %s has auto_renew status %s, expected %s", domainName, domainResp.AutoRenewStatus, expectedAutoRenew)
186186
}
187187
if domainResp.Dnssec.Status.String() != expectedDNSSEC {
188+
188189
return fmt.Errorf("domain %s has dnssec status %s, expected %s", domainName, domainResp.Dnssec.Status.String(), expectedDNSSEC)
189190
}
190191
}
191192
}
193+
192194
return nil
193195
}
194196
}
@@ -204,7 +206,7 @@ func testAccCheckDomainDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
204206

205207
domainNames, err := domain.ExtractDomainsFromTaskID(nil, rs.Primary.ID, registrarAPI)
206208
if err != nil {
207-
return nil
209+
return err
208210
}
209211

210212
for _, domainName := range domainNames {
@@ -215,10 +217,12 @@ func testAccCheckDomainDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
215217
if httperrors.Is404(getErr) {
216218
continue
217219
}
220+
218221
return fmt.Errorf("failed to get domain details for %s: %w", domainName, getErr)
219222
}
220223

221224
if domainResp.AutoRenewStatus != domainSDK.DomainFeatureStatusDisabled {
225+
222226
return fmt.Errorf(
223227
"domain %s still exists, and auto-renew is not disabled (current: %s)",
224228
domainName,
@@ -227,6 +231,7 @@ func testAccCheckDomainDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
227231
}
228232
}
229233
}
234+
230235
return nil
231236
}
232237
}

‎internal/services/domain/helpers.go‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,14 @@ func ExpandContact(contactMap map[string]interface{}) *domain.Contact {
134134
}
135135

136136
func expandContactExtension(extensionMap map[string]interface{}, extensionType string) interface{} {
137-
if extensionMap == nil || len(extensionMap) == 0 {
137+
if len(extensionMap) == 0 {
138138
return nil
139139
}
140140

141141
switch extensionType {
142142
case "fr":
143143
return &domain.ContactExtensionFR{
144-
Mode: parseEnum[domain.ContactExtensionFRMode](extensionMap, "mode", domain.ContactExtensionFRModeModeUnknown),
144+
Mode: domain.ContactExtensionFRMode(parseEnum[domain.ContactExtensionFRMode](extensionMap, "mode", domain.ContactExtensionFRModeModeUnknown.String())),
145145
IndividualInfo: parseStruct[domain.ContactExtensionFRIndividualInfo](extensionMap, "individual_info"),
146146
DunsInfo: parseStruct[domain.ContactExtensionFRDunsInfo](extensionMap, "duns_info"),
147147
AssociationInfo: parseStruct[domain.ContactExtensionFRAssociationInfo](extensionMap, "association_info"),
@@ -157,7 +157,7 @@ func expandContactExtension(extensionMap map[string]interface{}, extensionType s
157157
}
158158

159159
return &domain.ContactExtensionNL{
160-
LegalForm: parseEnum[domain.ContactExtensionNLLegalForm](extensionMap, "legal_form", domain.ContactExtensionNLLegalFormLegalFormUnknown),
160+
LegalForm: domain.ContactExtensionNLLegalForm(parseEnum[domain.ContactExtensionNLLegalForm](extensionMap, "legal_form", domain.ContactExtensionNLLegalFormLegalFormUnknown.String())),
161161
LegalFormRegistrationNumber: legalFormRegistrationNumber,
162162
}
163163
case "eu":
@@ -167,6 +167,7 @@ func expandContactExtension(extensionMap map[string]interface{}, extensionType s
167167
europeanCitizenship = str
168168
}
169169
}
170+
170171
return &domain.ContactExtensionEU{
171172
EuropeanCitizenship: europeanCitizenship,
172173
}
@@ -249,17 +250,19 @@ func ExpandNewContact(contactMap map[string]interface{}) *domain.NewContact {
249250
return contact
250251
}
251252

252-
func parseEnum[T ~string](data map[string]interface{}, key string, defaultValue T) T {
253+
func parseEnum(data map[string]interface{}, key string, defaultValue string) string {
253254
if value, ok := data[key].(string); ok {
254-
return T(value)
255+
return value
255256
}
257+
256258
return defaultValue
257259
}
258260

259261
func parseStruct[T any](data map[string]interface{}, key string) *T {
260262
if nested, ok := data[key].(map[string]interface{}); ok {
261263
var result T
262264
mapToStruct(nested, &result)
265+
263266
return &result
264267
}
265268
return nil
@@ -344,6 +347,7 @@ func SplitDomains(input *string) []string {
344347
if len(result) == 0 {
345348
return nil
346349
}
350+
347351
return result
348352
}
349353

@@ -364,6 +368,7 @@ func ExtractDomainsFromTaskID(ctx context.Context, id string, registrarAPI *doma
364368
return SplitDomains(task.Domain), nil
365369
}
366370
}
371+
367372
return nil, fmt.Errorf("task with ID '%s' not found", taskID)
368373
}
369374

@@ -428,6 +433,7 @@ func flattenContactExtensionFRIndividualInfo(info *domain.ContactExtensionFRIndi
428433
if info == nil {
429434
return nil
430435
}
436+
431437
return []map[string]interface{}{
432438
{
433439
"whois_opt_in": info.WhoisOptIn,
@@ -439,6 +445,7 @@ func flattenContactExtensionFRDunsInfo(info *domain.ContactExtensionFRDunsInfo)
439445
if info == nil {
440446
return nil
441447
}
448+
442449
return []map[string]interface{}{
443450
{
444451
"duns_id": info.DunsID,
@@ -451,6 +458,7 @@ func flattenContactExtensionFRAssociationInfo(info *domain.ContactExtensionFRAss
451458
if info == nil {
452459
return nil
453460
}
461+
454462
return []map[string]interface{}{
455463
{
456464
"publication_jo": info.PublicationJo.Format(time.RFC3339),
@@ -463,6 +471,7 @@ func flattenContactExtensionFRTrademarkInfo(info *domain.ContactExtensionFRTrade
463471
if info == nil {
464472
return nil
465473
}
474+
466475
return []map[string]interface{}{
467476
{
468477
"trademark_inpi": info.TrademarkInpi,
@@ -474,6 +483,7 @@ func flattenContactExtensionFRCodeAuthAfnicInfo(info *domain.ContactExtensionFRC
474483
if info == nil {
475484
return nil
476485
}
486+
477487
return []map[string]interface{}{
478488
{
479489
"code_auth_afnic": info.CodeAuthAfnic,
@@ -506,7 +516,7 @@ func flattenContactExtensionNL(ext *domain.ContactExtensionNL) []map[string]inte
506516
}
507517
}
508518

509-
//func flattenTLD(tld *domain.Tld) []map[string]interface{} {
519+
// func flattenTLD(tld *domain.Tld) []map[string]interface{} {
510520
// if tld == nil {
511521
// return []map[string]interface{}{}
512522
// }
@@ -527,9 +537,9 @@ func flattenContactExtensionNL(ext *domain.ContactExtensionNL) []map[string]inte
527537
// }
528538
//
529539
// return []map[string]interface{}{tldMap}
530-
//}
540+
// }
531541

532-
//func flattenTldOffers(offers map[string]*domain.TldOffer) []map[string]interface{} {
542+
// func flattenTldOffers(offers map[string]*domain.TldOffer) []map[string]interface{} {
533543
// if offers == nil {
534544
// return nil
535545
// }
@@ -548,7 +558,7 @@ func flattenContactExtensionNL(ext *domain.ContactExtensionNL) []map[string]inte
548558
// }
549559
//
550560
// return flattenedOffers
551-
//}
561+
// }
552562

553563
func waitForTaskCompletion(ctx context.Context, registrarAPI *domain.RegistrarAPI, taskID string, duration int) error {
554564
timeout := time.Duration(duration) * time.Second
@@ -611,7 +621,7 @@ func ExpandDSRecord(dsRecordList []interface{}) *domain.DSRecord {
611621
}
612622

613623
func FlattenDSRecord(dsRecords []*domain.DSRecord) []interface{} {
614-
if dsRecords == nil || len(dsRecords) == 0 {
624+
if len(dsRecords) == 0 {
615625
return []interface{}{}
616626
}
617627

‎internal/services/domain/waiters.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ func waitForDomainsRegistration(ctx context.Context, api *domain.RegistrarAPI, d
4949
if transport.DefaultWaitRetryInterval != nil {
5050
retryInterval = *transport.DefaultWaitRetryInterval
5151
}
52+
5253
return api.WaitForOrderDomain(&domain.WaitForOrderDomainRequest{
5354
Domain: domainName,
5455
Timeout: scw.TimeDurationPtr(timeout),
@@ -61,6 +62,7 @@ func waitForAutoRenewStatus(ctx context.Context, api *domain.RegistrarAPI, domai
6162
if transport.DefaultWaitRetryInterval != nil {
6263
retryInterval = *transport.DefaultWaitRetryInterval
6364
}
65+
6466
return api.WaitForAutoRenewStatus(&domain.WaitForAutoRenewStatusRequest{
6567
Domain: domainName,
6668
Timeout: scw.TimeDurationPtr(timeout),
@@ -73,6 +75,7 @@ func waitForDNSSECStatus(ctx context.Context, api *domain.RegistrarAPI, domainNa
7375
if transport.DefaultWaitRetryInterval != nil {
7476
retryInterval = *transport.DefaultWaitRetryInterval
7577
}
78+
7679
return api.WaitForDNSSECStatus(&domain.WaitForDNSSECStatusRequest{
7780
Domain: domainName,
7881
Timeout: scw.TimeDurationPtr(timeout),

0 commit comments

Comments
 (0)