depsolve: add modules support

Since the modularity PR landed in `osbuild` the depsolve result now
contains a `modules` key with data if modules were resolved.

Add the appropriate structures to the depsolve result, without
propagating them into rpmmd for now.

Also adds a quick test for the internal `depsolveResult` type
deserialization to ensure it understands some JSON serialized data that
contains a `modules` key.

Signed-off-by: Simon de Vlieger <[email protected]>

pkg/dnfjson/dnfjson.go

@@ -722,10 +722,12 @@ type transactionArgs struct {
 }
 
 type packageSpecs []PackageSpec
+type moduleSpecs map[string]ModuleSpec
 
 type depsolveResult struct {
 	Packages packageSpecs          `json:"packages"`
 	Repos    map[string]repoConfig `json:"repos"`
+	Modules  moduleSpecs           `json:"modules"`
 
 	// (optional) contains the solver used, e.g. "dnf5"
 	Solver string `json:"solver,omitempty"`
@@ -748,6 +750,29 @@ type PackageSpec struct {
 	Secrets        string `json:"secrets,omitempty"`
 }
 
+// Module specification
+type ModuleSpec struct {
+	ModuleConfigFile ModuleConfigFile   `json:"module-file"`
+	FailsafeFile     ModuleFailsafeFile `json:"failsafe-file"`
+}
+
+type ModuleConfigFile struct {
+	Path string           `json:"path"`
+	Data ModuleConfigData `json:"data"`
+}
+
+type ModuleConfigData struct {
+	Name     string   `json:"name"`
+	Stream   string   `json:"stream"`
+	Profiles []string `json:"profiles"`
+	State    string   `json:"state"`
+}
+
+type ModuleFailsafeFile struct {
+	Path string `json:"path"`
+	Data string `json:"string"`
+}
+
 // dnf-json error structure
 type Error struct {
 	Kind   string `json:"kind"`

pkg/dnfjson/dnfjson_test.go

@@ -1,6 +1,7 @@
 package dnfjson
 
 import (
+	"bytes"
 	"encoding/json"
 	"flag"
 	"fmt"
@@ -887,3 +888,17 @@ echo '{"solver": "zypper"}'
 	assert.Equal(t, 0, len(res.Packages))
 	assert.Equal(t, 0, len(res.Repos))
 }
+
+func TestDepsolveResultWithModulesKey(t *testing.T) {
+	// quick test that verifies that `depsolveResult` understands JSON that contains
+	// a `modules` key
+	data := []byte(`{"modules": {}}`)
+
+	var result depsolveResult
+	dec := json.NewDecoder(bytes.NewReader(data))
+	dec.DisallowUnknownFields()
+
+	err := dec.Decode(&result)
+
+	assert.NoError(t, err)
+}