Snap for 7493919 from 1602226f23181b8c3fbfcaf3358f0297e839d7d3 to sdk-release
Change-Id: I29fd38571a47930f8927b151dbcd8e926e5cbf66
diff --git a/context.go b/context.go
index e891c23..cc6e8e1 100644
--- a/context.go
+++ b/context.go
@@ -2281,11 +2281,12 @@
Tag string
}
-type jsonModule struct {
+type JsonModule struct {
jsonModuleName
Deps []jsonDep
Type string
Blueprint string
+ Module map[string]interface{}
}
func toJsonVariationMap(vm variationMap) jsonVariationMap {
@@ -2300,17 +2301,33 @@
}
}
-func jsonModuleFromModuleInfo(m *moduleInfo) *jsonModule {
- return &jsonModule{
+type JSONDataSupplier interface {
+ AddJSONData(d *map[string]interface{})
+}
+
+func jsonModuleFromModuleInfo(m *moduleInfo) *JsonModule {
+ result := &JsonModule{
jsonModuleName: *jsonModuleNameFromModuleInfo(m),
Deps: make([]jsonDep, 0),
Type: m.typeName,
Blueprint: m.relBlueprintsFile,
+ Module: make(map[string]interface{}),
}
+
+ if j, ok := m.logicModule.(JSONDataSupplier); ok {
+ j.AddJSONData(&result.Module)
+ }
+
+ for _, p := range m.providers {
+ if j, ok := p.(JSONDataSupplier); ok {
+ j.AddJSONData(&result.Module)
+ }
+ }
+ return result
}
func (c *Context) PrintJSONGraph(w io.Writer) {
- modules := make([]*jsonModule, 0)
+ modules := make([]*JsonModule, 0)
for _, m := range c.modulesSorted {
jm := jsonModuleFromModuleInfo(m)
for _, d := range m.directDeps {
