Skip to content

Commit 4841c5e

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

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
@@ -76,6 +76,9 @@ formatters:
7676
replacement: diag.Errorf(a)
7777
- pattern: wrapErrors([]error{fmt.Errorf(a, b)})
7878
replacement: diag.Errorf(a, b)
79+
- pattern: diag.FromErr(fmt.Errorf(a))
80+
replacement: diag.Errorf(a)
81+
7982
gofumpt:
8083
module-path: github.com/integrations/terraform-provider-github
8184
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"
@@ -442,13 +441,13 @@ func providerConfigure(p *schema.Provider) schema.ConfigureContextFunc {
442441

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

449448
maxRetries := d.Get("max_retries").(int)
450449
if maxRetries < 0 {
451-
return nil, diag.FromErr(fmt.Errorf("max_retries must be greater than or equal to 0"))
450+
return nil, diag.Errorf("max_retries must be greater than or equal to 0")
452451
}
453452
log.Printf("[DEBUG] Setting max_retries to %d", maxRetries)
454453
retryableErrors := make(map[int]bool)
@@ -467,7 +466,7 @@ func providerConfigure(p *schema.Provider) schema.ConfigureContextFunc {
467466

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

0 commit comments

Comments
 (0)