Skip to content

Commit a731c7e

Browse files
committed
Replace unnecessary diag.FromErr(fmt.Errof( calls
Signed-off-by: Timo Sand <[email protected]>
1 parent 2670ca0 commit a731c7e

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

.golangci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ formatters:
7373
replacement: diag.Errorf(a)
7474
- pattern: wrapErrors([]error{fmt.Errorf(a, b)})
7575
replacement: diag.Errorf(a, b)
76+
- pattern: diag.FromErr(fmt.Errorf(a))
77+
replacement: diag.Errorf(a)
78+
7679
gofumpt:
7780
module-path: github.com/integrations/terraform-provider-github
7881
extra-rules: true

github/provider.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package github
22

33
import (
44
"context"
5-
"fmt"
65
"log"
76
"net/url"
87
"os"
@@ -440,13 +439,13 @@ func providerConfigure(p *schema.Provider) schema.ConfigureContextFunc {
440439

441440
retryDelay := d.Get("read_delay_ms").(int)
442441
if retryDelay < 0 {
443-
return nil, diag.FromErr(fmt.Errorf("retry_delay_ms must be greater than or equal to 0ms"))
442+
return nil, diag.Errorf("retry_delay_ms must be greater than or equal to 0ms")
444443
}
445444
log.Printf("[DEBUG] Setting retry_delay_ms to %d", retryDelay)
446445

447446
maxRetries := d.Get("max_retries").(int)
448447
if maxRetries < 0 {
449-
return nil, diag.FromErr(fmt.Errorf("max_retries must be greater than or equal to 0"))
448+
return nil, diag.Errorf("max_retries must be greater than or equal to 0")
450449
}
451450
log.Printf("[DEBUG] Setting max_retries to %d", maxRetries)
452451
retryableErrors := make(map[int]bool)
@@ -465,7 +464,7 @@ func providerConfigure(p *schema.Provider) schema.ConfigureContextFunc {
465464

466465
_maxPerPage := d.Get("max_per_page").(int)
467466
if _maxPerPage <= 0 {
468-
return nil, diag.FromErr(fmt.Errorf("max_per_page must be greater than than 0"))
467+
return nil, diag.Errorf("max_per_page must be greater than than 0")
469468
}
470469
log.Printf("[DEBUG] Setting max_per_page to %d", _maxPerPage)
471470
maxPerPage = _maxPerPage

0 commit comments

Comments
 (0)