Add optional assembly descriptor to manifests

Author: bernd

cmd/dump_project.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"fmt"
 	"github.com/Graylog2/graylog-project-cli/config"
 	"github.com/Graylog2/graylog-project-cli/logger"
 	"github.com/Graylog2/graylog-project-cli/project"
@@ -32,11 +33,23 @@ var parseManifestCmd = &cobra.Command{
 		logger.Println(spew.Sdump(project.MavenDependencies(projectData)))
 		logger.Println("")
 		logger.Println("#### Maven Assemblies ####")
-		logger.Println(spew.Sdump(project.MavenAssemblies(projectData)))
+		logger.Println(spew.Sdump(dumpMavenAssemblies(projectData)))
 		logger.Println("")
 	},
 }
 
+func dumpMavenAssemblies(p project.Project) []string {
+	dependencies := make([]string, 0)
+
+	project.ForEachModuleOrSubmodules(p, func(module project.Module) {
+		if module.IsMavenModule() && module.Assembly {
+			dependencies = append(dependencies, fmt.Sprintf("%s:%s", module.GroupId(), module.ArtifactId()))
+		}
+	})
+
+	return dependencies
+}
+
 func init() {
 	RootCmd.AddCommand(parseManifestCmd)
 }

manifest/manifest.go

@@ -19,14 +19,15 @@ type Manifest struct {
 }
 
 type ManifestModule struct {
-	Repository string           `json:"repository,omitempty"`
-	Revision   string           `json:"revision,omitempty"`
-	Maven      string           `json:"maven,omitempty"`
-	Path       string           `json:"path,omitempty"`
-	Assembly   bool             `json:"assembly,omitempty"`
-	Server     bool             `json:"server,omitempty"`
-	SubModules []ManifestModule `json:"submodules,omitempty"`
-	Apply      ManifestApply    `json:"apply,omitempty"`
+	Repository         string           `json:"repository,omitempty"`
+	Revision           string           `json:"revision,omitempty"`
+	Maven              string           `json:"maven,omitempty"`
+	Path               string           `json:"path,omitempty"`
+	Assembly           bool             `json:"assembly,omitempty"`
+	AssemblyDescriptor string           `json:"assembly_descriptor,omitempty"`
+	Server             bool             `json:"server,omitempty"`
+	SubModules         []ManifestModule `json:"submodules,omitempty"`
+	Apply              ManifestApply    `json:"apply,omitempty"`
 }
 
 func (mod ManifestModule) HasSubmodules() bool {

project/project.go

@@ -1,7 +1,6 @@
 package project
 
 import (
-	"fmt"
 	"path/filepath"
 	"strings"
 
@@ -26,15 +25,16 @@ type Apply struct {
 }
 
 type Module struct {
-	Name         string
-	Path         string
-	Repository   string
-	Revision     string
-	Assembly     bool
-	Server       bool
-	Submodules   []Module
-	apply        Apply
-	ApplyExecute bool
+	Name               string
+	Path               string
+	Repository         string
+	Revision           string
+	Assembly           bool
+	AssemblyDescriptor string
+	Server             bool
+	Submodules         []Module
+	apply              Apply
+	ApplyExecute       bool
 }
 
 func (module *Module) IsMavenModule() bool {
@@ -155,11 +155,12 @@ func New(config config.Config, manifestFiles []string, options ...projectOption)
 				}
 
 				submodules = append(submodules, Module{
-					Name:       name,
-					Path:       path,
-					Repository: moduleRepository,
-					Revision:   module.Revision,
-					Assembly:   submodule.Assembly,
+					Name:               name,
+					Path:               path,
+					Repository:         moduleRepository,
+					Revision:           module.Revision,
+					Assembly:           submodule.Assembly,
+					AssemblyDescriptor: module.AssemblyDescriptor,
 				})
 			}
 		}
@@ -181,14 +182,15 @@ func New(config config.Config, manifestFiles []string, options ...projectOption)
 		mergo.Merge(&moduleApply, defaultApply)
 
 		newModule := Module{
-			Name:       name,
-			Path:       path,
-			Repository: moduleRepository,
-			Revision:   module.Revision,
-			Assembly:   module.Assembly,
-			Server:     module.Server,
-			Submodules: submodules,
-			apply:      moduleApply,
+			Name:               name,
+			Path:               path,
+			Repository:         moduleRepository,
+			Revision:           module.Revision,
+			Assembly:           module.Assembly,
+			AssemblyDescriptor: module.AssemblyDescriptor,
+			Server:             module.Server,
+			Submodules:         submodules,
+			apply:              moduleApply,
 		}
 
 		// Set execute flag if the manifest should be applied if it contains apply config
@@ -291,18 +293,6 @@ func MavenDependencies(project Project) []Module {
 	return dependencies
 }
 
-func MavenAssemblies(project Project) []string {
-	dependencies := make([]string, 0)
-
-	ForEachModuleOrSubmodules(project, func(module Module) {
-		if module.IsMavenModule() && module.Assembly {
-			dependencies = append(dependencies, fmt.Sprintf("%s:%s", module.GroupId(), module.ArtifactId()))
-		}
-	})
-
-	return dependencies
-}
-
 func forEachModule(modules []Module, callback func(Module)) {
 	for _, module := range modules {
 		callback(module)

xmltemplate/xmltemplate.go

@@ -2,6 +2,7 @@ package xmltemplate
 
 import (
 	"bytes"
+	"fmt"
 	"github.com/Graylog2/graylog-project-cli/config"
 	"github.com/Graylog2/graylog-project-cli/logger"
 	p "github.com/Graylog2/graylog-project-cli/project"
@@ -13,7 +14,33 @@ type TemplateInventory struct {
 	Server       p.Module
 	Modules      []p.Module
 	Dependencies []p.Module
-	Assemblies   []string
+	Assemblies   []Assembly
+}
+
+type Assembly struct {
+	GroupId    string
+	ArtifactId string
+	Descriptor string
+}
+
+func (a Assembly) String() string {
+	return fmt.Sprintf("%s:%s", a.GroupId, a.ArtifactId)
+}
+
+func mavenAssemblies(project p.Project) []Assembly {
+	dependencies := make([]Assembly, 0)
+
+	p.ForEachModuleOrSubmodules(project, func(module p.Module) {
+		if module.IsMavenModule() && module.Assembly {
+			dependencies = append(dependencies, Assembly{
+				GroupId:    module.GroupId(),
+				ArtifactId: module.ArtifactId(),
+				Descriptor: module.AssemblyDescriptor,
+			})
+		}
+	})
+
+	return dependencies
 }
 
 func WriteXmlFile(config config.Config, project p.Project, templateFile string, outputFile string) {
@@ -32,7 +59,7 @@ func WriteXmlFile(config config.Config, project p.Project, templateFile string,
 		Server:       project.Server,
 		Modules:      project.Modules,
 		Dependencies: p.MavenDependencies(project),
-		Assemblies:   p.MavenAssemblies(project),
+		Assemblies:   mavenAssemblies(project),
 	}
 
 	var buf bytes.Buffer