adjust code to work with provider types

Signed-off-by: Ivan Milchev <[email protected]>
mondoohq · Oct 2, 2023 · e39794d · e39794d
1 parent 20acc75
commit e39794d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/providers-sdk/v1/inventory/inventory.go b/providers-sdk/v1/inventory/inventory.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"github.com/cockroachdb/errors"
+	"github.com/rs/zerolog/log"
 	"github.com/segmentio/ksuid"
 	"go.mondoo.com/cnquery/providers-sdk/v1/vault"
 	"google.golang.org/protobuf/proto"
@@ -56,7 +57,8 @@ func InventoryFromYAML(data []byte) (*Inventory, error) {
 		for _, asset := range res.Spec.Assets {
 			for _, conn := range asset.Connections {
 				if conn.Type == "" {
-					conn.Type = connBackendToType(conn.Backend)
+					log.Warn().Msg("no connection type provided, falling back to deprecated option backend")
+					conn.Type = ConnBackendToType(conn.Backend)
 				}
 			}
 		}

diff --git a/providers-sdk/v1/inventory/v8_inventory.go b/providers-sdk/v1/inventory/v8_inventory.go
@@ -114,7 +114,7 @@ func (s *ProviderType) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
-func connBackendToType(backend ProviderType) string {
+func ConnBackendToType(backend ProviderType) string {
 	switch backend {
 	case ProviderType_LOCAL_OS:
 		return "os"

diff --git a/providers/runtime.go b/providers/runtime.go
@@ -160,11 +160,8 @@ func (r *Runtime) DetectProvider(asset *inventory.Asset) error {
 	for i := range asset.Connections {
 		conn := asset.Connections[i]
 		if conn.Type == "" {
-			if conn.Backend != "" {
-				conn.Type = conn.Backend
-			} else {
-				continue
-			}
+			log.Warn().Msg("no connection type provided, falling back to deprecated option backend")
+			conn.Type = inventory.ConnBackendToType(conn.Backend)
 		}
 
 		provider, err := EnsureProvider("", conn.Type, true, r.coordinator.Providers)