diff --git a/go.mod b/go.mod index 768121120dac47..ad4d52e9c04ab3 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/VividCortex/ewma v1.2.0 // indirect github.com/aws/aws-lambda-go v1.23.0 - github.com/cloudquery/cq-provider-sdk v0.7.4 + github.com/cloudquery/cq-provider-sdk v0.7.7 github.com/fatih/color v1.13.0 github.com/fsnotify/fsnotify v1.4.9 github.com/golang-migrate/migrate/v4 v4.15.0 diff --git a/go.sum b/go.sum index 18592c45aaef38..f3f67f19f6676e 100644 --- a/go.sum +++ b/go.sum @@ -207,8 +207,8 @@ github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJ github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80= -github.com/cloudquery/cq-provider-sdk v0.7.4 h1:WPsoRB2O3zrHq2dKNFkm7g5ghZiAnp5YuMmKsWGtXCo= -github.com/cloudquery/cq-provider-sdk v0.7.4/go.mod h1:3XIx9D1zpx/IS2MQcbyBTxpvpUDI0xyBwPT3reKo/4k= +github.com/cloudquery/cq-provider-sdk v0.7.7 h1:pvurkIfsg+IKp25ZnBV8aYwakqYJA5ZLnqIJVAG+t7I= +github.com/cloudquery/cq-provider-sdk v0.7.7/go.mod h1:3XIx9D1zpx/IS2MQcbyBTxpvpUDI0xyBwPT3reKo/4k= github.com/cloudquery/faker/v3 v3.7.4 h1:cCcU3r0yHpS0gqKj9rRKAGS0/hY33fBxbqCNFtDD4ec= github.com/cloudquery/faker/v3 v3.7.4/go.mod h1:1b8WVG9Gh0T2hVo1a8dWeXfu0AhqSB6J/mmJaesqOeo= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= diff --git a/pkg/client/client.go b/pkg/client/client.go index a5cdd097415eb0..7cc53659e844ee 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -1083,7 +1083,7 @@ func reportFetchSummaryErrors(span trace.Span, fetchSummaries map[string]Provide ) span.SetAttributes(telemetry.MapToAttributes(ps.Metrics())...) - for _, e := range ps.Diagnostics() { + for _, e := range ps.Diagnostics().Squash() { if rd, ok := e.(diag.Redactable); ok { if r := rd.Redacted(); r != nil { e = r diff --git a/pkg/ui/console/fetch.go b/pkg/ui/console/fetch.go index 72cc1c7e1eec4b..faa0c1cb52c4ff 100644 --- a/pkg/ui/console/fetch.go +++ b/pkg/ui/console/fetch.go @@ -14,7 +14,7 @@ func printFetchResponse(summary *client.FetchResponse, redactDiags bool) { } for _, pfs := range summary.ProviderFetchSummary { if len(pfs.Diagnostics()) > 0 { - printDiagnostics(pfs.ProviderName, pfs.Diagnostics(), redactDiags) + printDiagnostics(pfs.ProviderName, pfs.Diagnostics().Squash(), redactDiags) continue } if len(pfs.PartialFetchErrors) == 0 { @@ -74,7 +74,7 @@ func printDiagnostics(providerName string, diags diag.Diagnostics, redactDiags b ui.ColorErrorBold.Sprintf("%s", desc.Summary)) } if desc.Detail != "" { - ui.ColorizedOutput(ui.ColorInfo, "\tRemediation: %s\n", desc.Detail) + ui.ColorizedOutput(ui.ColorInfo, "\tDetail: %s\n", desc.Detail) } } ui.ColorizedOutput(ui.ColorInfo, "\n")