🐛 Add dependencies to ResourceSchema interface (#5580)

We use the `ResourcesSchema` interface to interact with the `resources` package. However, when we introduced provider dependencies into `resource.Schema`, we didn't update or extend this interface accordingly.

A few additional issues were observed:
* When loading providers, we only read the `{provider}.json` file, but not the corresponding `{provider}.resources.json` metadata file.
* For built-in providers, we intentionally skip loading files—but we also forgot to pass the schema. This omission results in errors like:
```
x provider without schema, unable to look up dependencies provider=core
```
* While `ResourcesSchema` is used consistently throughout the codebase, it’s not used within `providers.Provider.Schema`.

This change addresses all of the issues mentioned above.

Signed-off-by: Salim Afiune Maya <afiune@mondoo.com>

Author: afiune

providers-sdk/v1/resources/schema.go

@@ -12,6 +12,7 @@ type ResourcesSchema interface {
 	LookupField(resource string, field string) (*ResourceInfo, *Field)
 	FindField(resource *ResourceInfo, field string) (FieldPath, []*Field, bool)
 	AllResources() map[string]*ResourceInfo
+	AllDependencies() map[string]*ProviderInfo
 }
 
 // Add another schema and return yourself. other may be nil.
@@ -101,6 +102,20 @@ func (s *Schema) Add(other ResourcesSchema) ResourcesSchema {
 		}
 	}
 
+	for k, v := range other.AllDependencies() {
+		if existing, ok := s.Dependencies[k]; ok {
+			if v.Name != "" {
+				existing.Name = v.Name
+			}
+		} else {
+			pi := &ProviderInfo{
+				Id:   v.Id,
+				Name: v.Name,
+			}
+			s.Dependencies[k] = pi
+		}
+	}
+
 	return s
 }
 
@@ -163,3 +178,7 @@ func (s *Schema) FindField(resource *ResourceInfo, field string) (FieldPath, []*
 func (s *Schema) AllResources() map[string]*ResourceInfo {
 	return s.Resources
 }
+
+func (s *Schema) AllDependencies() map[string]*ProviderInfo {
+	return s.Dependencies
+}

providers/extensible_schema.go

@@ -70,6 +70,18 @@ func (x *extensibleSchema) AllResources() map[string]*resources.ResourceInfo {
 	return x.roAggregate.Resources
 }
 
+func (x *extensibleSchema) AllDependencies() map[string]*resources.ProviderInfo {
+	x.sync.Lock()
+	defer x.sync.Unlock()
+
+	if x.lastRefreshed < LastProviderInstall {
+		x.unsafeLoadAll()
+		x.unsafeRefresh()
+	}
+
+	return x.roAggregate.Dependencies
+}
+
 func (x *extensibleSchema) Close() {
 	x.sync.Lock()
 	x.loaded = map[string]resources.ResourcesSchema{}
@@ -189,7 +201,8 @@ func (x *extensibleSchema) unsafeAdd(name string, schema resources.ResourcesSche
 
 func (x *extensibleSchema) unsafeRefresh() {
 	res := resources.Schema{
-		Resources: map[string]*resources.ResourceInfo{},
+		Resources:    map[string]*resources.ResourceInfo{},
+		Dependencies: map[string]*resources.ProviderInfo{},
 	}
 
 	for _, schema := range x.loaded {
@@ -199,6 +212,7 @@ func (x *extensibleSchema) unsafeRefresh() {
 	// Note: This object is read-only and thus must be re-created to
 	// prevent concurrency issues with access outside this struct
 	x.roAggregate = resources.Schema{
-		Resources: res.Resources,
+		Resources:    res.Resources,
+		Dependencies: res.Dependencies,
 	}
 }

providers/extensible_schema_test.go

@@ -64,4 +64,37 @@ func TestExtensibleSchema(t *testing.T) {
 	require.Equal(t, resources.FieldPath{"v"}, filePath)
 	require.Len(t, fieldinfos, 1)
 	require.Equal(t, "first", fieldinfos[0].Provider)
+
+	// Check no dependencies
+	require.Lenf(t, s.AllDependencies(), 0, "should not have dependencies")
+
+	t.Run("with dependencies", func(t *testing.T) {
+		s.Add("third", &resources.Schema{
+			Resources: map[string]*resources.ResourceInfo{
+				"eternity": {
+					Fields: map[string]*resources.Field{
+						"iii": {Provider: "third"},
+						"x":   {Provider: "third"},
+					},
+					Provider: "third",
+				},
+			},
+			Dependencies: map[string]*resources.ProviderInfo{
+				"core": {
+					Id:   "go.mondoo.com/cnquery/v9/providers/core",
+					Name: "core",
+				},
+			},
+		})
+		info := s.Lookup("eternity")
+		require.NotNil(t, info)
+		require.Len(t, info.Others, 2)
+		providers := []string{info.Provider, info.Others[0].Provider, info.Others[1].Provider}
+		assert.ElementsMatch(t, []string{"first", "second", "third"}, providers)
+
+		// Check dependencies
+		deps := s.AllDependencies()
+		require.Len(t, deps, 1)
+		assert.Equal(t, "go.mondoo.com/cnquery/v9/providers/core", deps["core"].Id)
+	})
 }

providers/providers.go

@@ -166,7 +166,7 @@ func (p Providers) Add(nu *Provider) {
 
 type Provider struct {
 	*plugin.Provider
-	Schema    *resources.Schema
+	Schema    resources.ResourcesSchema
 	Path      string
 	HasBinary bool
 }
@@ -289,6 +289,7 @@ func ListAll() ([]*Provider, error) {
 	for _, x := range builtinProviders {
 		all = append(all, &Provider{
 			Provider: x.Config,
+			Schema:   x.Runtime.Schema,
 		})
 	}
 
@@ -309,9 +310,18 @@ func ListAll() ([]*Provider, error) {
 				Str("provider", provider.Name).
 				Str("path", provider.Path).
 				Msg("failed to load provider")
-		} else {
-			res = append(res, provider)
+			continue
+		}
+
+		if err := provider.LoadResources(); err != nil {
+			log.Error().Err(err).
+				Str("provider", provider.Name).
+				Str("path", provider.Path).
+				Msg("failed to load provider resources")
+			continue
 		}
+
+		res = append(res, provider)
 	}
 
 	CachedProviders = res
@@ -485,7 +495,7 @@ func installDependencies(provider *Provider, existing Providers) error {
 		return nil
 	}
 
-	for _, dependency := range provider.Schema.Dependencies {
+	for _, dependency := range provider.Schema.AllDependencies() {
 		dependencyLookup := ProviderLookup{
 			ID:           dependency.Id,
 			ProviderName: dependency.Name,
@@ -748,6 +758,11 @@ func InstallIO(reader io.ReadCloser, conf InstallConf) ([]*Provider, error) {
 			continue
 		}
 
+		if err := provider.LoadResources(); err != nil {
+			log.Error().Err(err).Str("path", pdir).Msg("failed to read provider resources, please remove or fix it")
+			continue
+		}
+
 		res = append(res, provider)
 	}