Updates semgrep rules

hashicorp · Aug 4, 2023 · f80f4c1 · f80f4c1
1 parent f4e0159
commit f80f4c1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.ci/semgrep/pluginsdk/diags.yml b/.ci/semgrep/pluginsdk/diags.yml
@@ -4,9 +4,8 @@ rules:
  languages: [go]
  message: Prefer `sdkdiag.AppendFromErr` to `diag.FromErr`
  paths:
- include:
- - internal/conns
- - internal/provider
+ exclude:
+ - internal/service
  patterns:
  - pattern: diag.FromErr($ERR)
  severity: WARNING

diff --git a/internal/acctest/vcr.go b/internal/acctest/vcr.go
@@ -31,6 +31,7 @@ import (
  "github.com/hashicorp/terraform-plugin-testing/helper/resource"
  "github.com/hashicorp/terraform-provider-aws/internal/conns"
  "github.com/hashicorp/terraform-provider-aws/internal/errs"
+ "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
  "github.com/hashicorp/terraform-provider-aws/internal/provider"
  "gopkg.in/dnaeon/go-vcr.v3/cassette"
  "gopkg.in/dnaeon/go-vcr.v3/recorder"
@@ -133,6 +134,8 @@ func vcrEnabledProtoV5ProviderFactories(t *testing.T, input map[string]func() (t
 // VCR requires a single HTTP client to handle all interactions.
 func vcrProviderConfigureContextFunc(provider *schema.Provider, configureContextFunc schema.ConfigureContextFunc, testName string) schema.ConfigureContextFunc {
  return func(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
+ var diags diag.Diagnostics
+
  providerMetas.Lock()
  meta, ok := providerMetas[testName]
  defer providerMetas.Unlock()
@@ -144,7 +147,7 @@ func vcrProviderConfigureContextFunc(provider *schema.Provider, configureContext
  vcrMode, err := vcrMode()
 
  if err != nil {
- return nil, diag.FromErr(err)
+ return nil, sdkdiag.AppendFromErr(diags, err)
  }
 
  // Cribbed from aws-sdk-go-base.
@@ -168,7 +171,7 @@ func vcrProviderConfigureContextFunc(provider *schema.Provider, configureContext
  })
 
  if err != nil {
- return nil, diag.FromErr(err)
+ return nil, sdkdiag.AppendFromErr(diags, err)
  }
 
  // Remove sensitive HTTP headers.
@@ -263,8 +266,8 @@ func vcrProviderConfigureContextFunc(provider *schema.Provider, configureContext
  meta.SetHTTPClient(httpClient)
  provider.SetMeta(meta)
 
- if v, diags := configureContextFunc(ctx, d); diags.HasError() {
- return nil, diags
+ if v, ds := configureContextFunc(ctx, d); ds.HasError() {
+ return nil, append(diags, ds...)
  } else {
  meta = v.(*conns.AWSClient)
  }
@@ -282,7 +285,7 @@ func vcrProviderConfigureContextFunc(provider *schema.Provider, configureContext
 
  providerMetas[testName] = meta
 
- return meta, nil
+ return meta, diags
  }
 }
 

diff --git a/internal/errs/sdkdiag/append.go b/internal/errs/sdkdiag/append.go
@@ -25,7 +25,7 @@ func AppendFromErr(diags diag.Diagnostics, err error) diag.Diagnostics {
  if err == nil {
  return diags
  }
- return append(diags, diag.FromErr(err)...)
+ return append(diags, diag.FromErr(err)...) // nosemgrep:ci.semgrep.pluginsdk.avoid-diag_FromErr
 }
 
 func WrapDiagsf(orig diag.Diagnostics, format string, a ...any) diag.Diagnostics {