diff --git a/.changelog/2123.txt b/.changelog/2123.txt new file mode 100644 index 0000000000..64472d4d47 --- /dev/null +++ b/.changelog/2123.txt @@ -0,0 +1,7 @@ +```release-note:enhancement +provider: use inbuilt cloudflare-go logger for HTTP interactions +``` + +```release-note:enhancement +provider: `X-Auth-Email`, `X-Auth-Key`, `X-Auth-User-Service-Key` and `Authorization` values are now automatically redacted from debug logs +``` diff --git a/internal/provider/provider.go b/internal/provider/provider.go index 9cac8d64b1..346a00a243 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -4,13 +4,10 @@ import ( "bytes" "context" "fmt" - "log" - "os" "regexp" "strings" cloudflare "github.com/cloudflare/cloudflare-go" - cleanhttp "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging" @@ -296,7 +293,6 @@ func New(version string) func() *schema.Provider { } func configure(version string, p *schema.Provider) func(context.Context, *schema.ResourceData) (interface{}, diag.Diagnostics) { - return func(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) { var diags diag.Diagnostics @@ -307,13 +303,7 @@ func configure(version string, p *schema.Provider) func(context.Context, *schema retryOpt := cloudflare.UsingRetryPolicy(d.Get("retries").(int), d.Get("min_backoff").(int), d.Get("max_backoff").(int)) options := []cloudflare.Option{limitOpt, retryOpt, baseURL} - if d.Get("api_client_logging").(bool) { - options = append(options, cloudflare.UsingLogger(log.New(os.Stderr, "", log.LstdFlags))) - } - - c := cleanhttp.DefaultClient() - c.Transport = logging.NewTransport("Cloudflare", c.Transport) - options = append(options, cloudflare.HTTPClient(c)) + options = append(options, cloudflare.Debug(logging.IsDebugOrHigher())) ua := fmt.Sprintf("terraform/%s terraform-plugin-sdk/%s terraform-provider-cloudflare/%s", p.TerraformVersion, meta.SDKVersionString(), version) options = append(options, cloudflare.UserAgent(ua)) diff --git a/main.go b/main.go index efd4a7b2bc..34913f8f79 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,6 @@ package main import ( "flag" - "log" "github.com/cloudflare/terraform-provider-cloudflare/internal/provider" "github.com/hashicorp/terraform-plugin-sdk/v2/plugin" @@ -25,9 +24,5 @@ func main() { Debug: debugMode, } - logFlags := log.Flags() - logFlags = logFlags &^ (log.Ldate | log.Ltime) - log.SetFlags(logFlags) - plugin.Serve(opts) }