diff --git a/providers-sdk/v1/util/zerologadapter/adapter.go b/logger/zerologadapter/adapter.go similarity index 96% rename from providers-sdk/v1/util/zerologadapter/adapter.go rename to logger/zerologadapter/adapter.go index 2f7623d25..2c0ec4982 100644 --- a/providers-sdk/v1/util/zerologadapter/adapter.go +++ b/logger/zerologadapter/adapter.go @@ -48,7 +48,7 @@ func convertToFields(keysAndValues ...interface{}) map[string]interface{} { for i := 0; i < len(keysAndValues); i += 2 { if i+1 < len(keysAndValues) { keyString, ok := keysAndValues[i].(string) - if ok { // safelty first, eventhough we always expect a string + if ok { // safety first, eventhough we always expect a string fields[keyString] = keysAndValues[i+1] } } diff --git a/providers-sdk/v1/util/zerologadapter/adapter_internal_test.go b/logger/zerologadapter/adapter_internal_test.go similarity index 100% rename from providers-sdk/v1/util/zerologadapter/adapter_internal_test.go rename to logger/zerologadapter/adapter_internal_test.go diff --git a/providers-sdk/v1/util/zerologadapter/adapter_test.go b/logger/zerologadapter/adapter_test.go similarity index 97% rename from providers-sdk/v1/util/zerologadapter/adapter_test.go rename to logger/zerologadapter/adapter_test.go index 1b005c48d..e550a3c24 100644 --- a/providers-sdk/v1/util/zerologadapter/adapter_test.go +++ b/logger/zerologadapter/adapter_test.go @@ -7,7 +7,7 @@ import ( "bytes" "testing" - subject "go.mondoo.com/cnquery/v11/providers-sdk/v1/util/zerologadapter" + subject "go.mondoo.com/cnquery/v11/logger/zerologadapter" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" diff --git a/providers/aws/connection/connection.go b/providers/aws/connection/connection.go index b58ce7e25..583cbbd8d 100644 --- a/providers/aws/connection/connection.go +++ b/providers/aws/connection/connection.go @@ -19,9 +19,9 @@ import ( "github.com/hashicorp/go-retryablehttp" "github.com/rs/zerolog/log" "github.com/spf13/afero" + "go.mondoo.com/cnquery/v11/logger/zerologadapter" "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" "go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin" - "go.mondoo.com/cnquery/v11/providers-sdk/v1/util/zerologadapter" "go.mondoo.com/cnquery/v11/providers-sdk/v1/vault" "go.mondoo.com/cnquery/v11/providers/os/connection/shared" ) diff --git a/providers/github/connection/connection.go b/providers/github/connection/connection.go index 154da1cc2..5a71e6af1 100644 --- a/providers/github/connection/connection.go +++ b/providers/github/connection/connection.go @@ -17,9 +17,9 @@ import ( "github.com/hashicorp/go-retryablehttp" "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "go.mondoo.com/cnquery/v11/logger/zerologadapter" "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" "go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin" - "go.mondoo.com/cnquery/v11/providers-sdk/v1/util/zerologadapter" "go.mondoo.com/cnquery/v11/providers-sdk/v1/vault" "golang.org/x/oauth2" ) diff --git a/providers/providers.go b/providers/providers.go index 9d2213284..1575c32aa 100644 --- a/providers/providers.go +++ b/providers/providers.go @@ -24,10 +24,10 @@ import ( "github.com/spf13/afero" "github.com/ulikunitz/xz" "go.mondoo.com/cnquery/v11/cli/config" + "go.mondoo.com/cnquery/v11/logger/zerologadapter" "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" "go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin" "go.mondoo.com/cnquery/v11/providers-sdk/v1/resources" - "go.mondoo.com/cnquery/v11/providers-sdk/v1/util/zerologadapter" "go.mondoo.com/cnquery/v11/providers/core/resources/versions/semver" "golang.org/x/exp/slices" ) diff --git a/providers/slack/connection/connection.go b/providers/slack/connection/connection.go index 136ebdaac..565562061 100644 --- a/providers/slack/connection/connection.go +++ b/providers/slack/connection/connection.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/go-retryablehttp" "github.com/rs/zerolog/log" "github.com/slack-go/slack" + "go.mondoo.com/cnquery/v11/logger/zerologadapter" "go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory" "go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin" - "go.mondoo.com/cnquery/v11/providers-sdk/v1/util/zerologadapter" "go.mondoo.com/cnquery/v11/providers-sdk/v1/vault" )