blueprint: add enabled modules to blueprint

internal/blueprint/blueprint.go

@@ -14,11 +14,14 @@ import (
 
 // A Blueprint is a high-level description of an image.
 type Blueprint struct {
-	Name           string          `json:"name" toml:"name"`
+	Name        string    `json:"name" toml:"name"`
-	Description    string          `json:"description" toml:"description"`
+	Description string    `json:"description" toml:"description"`
-	Version        string          `json:"version,omitempty" toml:"version,omitempty"`
+	Version     string    `json:"version,omitempty" toml:"version,omitempty"`
-	Packages       []Package       `json:"packages" toml:"packages"`
+	Packages    []Package `json:"packages" toml:"packages"`
-	Modules        []Package       `json:"modules" toml:"modules"`
+	Modules     []Package `json:"modules" toml:"modules"`
+	// Note, this is called "enabled modules" because we already have "modules" except
+	// the "modules" refers to packages and "enabled modules" refers to modularity modules.
+	EnabledModules []EnabledModule `json:"enabled_modules" toml:"enabled_modules"`
 	Groups         []Group         `json:"groups" toml:"groups"`
 	Containers     []Container     `json:"containers,omitempty" toml:"containers,omitempty"`
 	Customizations *Customizations `json:"customizations,omitempty" toml:"customizations"`
@@ -40,6 +43,12 @@ type Package struct {
 	Version string `json:"version,omitempty" toml:"version,omitempty"`
 }
 
+// A module specifies a modularity stream.
+type EnabledModule struct {
+	Name   string `json:"name" toml:"name"`
+	Stream string `json:"stream,omitempty" toml:"stream,omitempty"`
+}
+
 // A group specifies an package group.
 type Group struct {
 	Name string `json:"name" toml:"name"`
@@ -81,6 +90,9 @@ func (b *Blueprint) Initialize() error {
 	if b.Modules == nil {
 		b.Modules = []Package{}
 	}
+	if b.EnabledModules == nil {
+		b.EnabledModules = []EnabledModule{}
+	}
 	if b.Groups == nil {
 		b.Groups = []Group{}
 	}
@@ -166,6 +178,20 @@ func (p Package) ToNameVersion() string {
 	return p.Name + "-" + p.Version
 }
 
+func (b *Blueprint) GetEnabledModules() []string {
+	modules := []string{}
+
+	for _, mod := range b.EnabledModules {
+		modules = append(modules, mod.ToNameStream())
+	}
+
+	return modules
+}
+
+func (p EnabledModule) ToNameStream() string {
+	return p.Name + ":" + p.Stream
+}
+
 // CryptPasswords ensures that all blueprint passwords are hashed
 func (b *Blueprint) CryptPasswords() error {
 	if b.Customizations == nil {
@@ -216,6 +242,14 @@ func Convert(bp Blueprint) iblueprint.Blueprint {
 		}
 	}
 
+	var enabledModules []iblueprint.EnabledModule
+	if len(bp.EnabledModules) > 0 {
+		enabledModules = make([]iblueprint.EnabledModule, len(bp.EnabledModules))
+		for idx := range bp.EnabledModules {
+			enabledModules[idx] = iblueprint.EnabledModule(bp.EnabledModules[idx])
+		}
+	}
+
 	var groups []iblueprint.Group
 	if len(bp.Groups) > 0 {
 		groups = make([]iblueprint.Group, len(bp.Groups))
@@ -459,6 +493,7 @@ func Convert(bp Blueprint) iblueprint.Blueprint {
 		Version:        bp.Version,
 		Packages:       pkgs,
 		Modules:        modules,
+		EnabledModules: enabledModules,
 		Groups:         groups,
 		Containers:     containers,
 		Customizations: customizations,