From 4ad32adfa9490a9f9f329e162689293dcc25cb63 Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Sun, 14 Jan 2024 18:54:22 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20use=20list=20of=20cross-connecti?= =?UTF-8?q?on=20provider?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- providers/runtime.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/providers/runtime.go b/providers/runtime.go index 5e9297bf88..80677a1186 100644 --- a/providers/runtime.go +++ b/providers/runtime.go @@ -17,6 +17,7 @@ import ( "go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream" "go.mondoo.com/cnquery/v10/types" "go.mondoo.com/cnquery/v10/utils/multierr" + "go.mondoo.com/cnquery/v10/utils/stringx" "google.golang.org/grpc/status" ) @@ -576,8 +577,15 @@ func (r *Runtime) lookupResourceProvider(resource string) (*ConnectedProvider, * } providerConn := r.Provider.Instance.ID - if info.Provider != providerConn && info.Provider != "go.mondoo.com/cnquery/providers/core" && info.Provider != "go.mondoo.com/cnquery/providers/network" { - return nil, nil, errors.New("incorrect provider for asset, not adding") + crossProviderList := []string{ + "go.mondoo.com/cnquery/providers/core", + "go.mondoo.com/cnquery/v9/providers/core", // for backwards compatibility + "go.mondoo.com/cnquery/providers/network", + "go.mondoo.com/cnquery/v9/providers/network", // for backwards compatibility + } + + if info.Provider != providerConn && !stringx.Contains(crossProviderList, info.Provider) { + return nil, nil, errors.New("incorrect provider for asset, not adding " + info.Provider) } res, err := r.addProvider(info.Provider, false)