Skip to content

Commit b3fad6a

Browse files
committed
Add "assembly_platforms" field to manifest
1 parent d1a3140 commit b3fad6a

File tree

3 files changed

+22
-17
lines changed

3 files changed

+22
-17
lines changed

manifest/manifest.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ import (
1313
const DownloadedManifestPrefix = "downloaded-manifest"
1414

1515
type Manifest struct {
16-
Modules []ManifestModule `json:"modules"`
17-
Includes []string `json:"includes,omitempty"`
18-
DefaultApply ManifestApply `json:"default_apply,omitempty"`
16+
Modules []ManifestModule `json:"modules"`
17+
Includes []string `json:"includes,omitempty"`
18+
DefaultApply ManifestApply `json:"default_apply,omitempty"`
19+
AssemblyPlatforms []string `json:"assembly_platforms,omitempty"`
1920
}
2021

2122
type ManifestModule struct {

project/project.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ import (
1515
)
1616

1717
type Project struct {
18-
config config.Config
19-
Server Module
20-
Modules []Module
18+
config config.Config
19+
Server Module
20+
Modules []Module
21+
AssemblyPlatforms []string
2122
}
2223

2324
type Apply struct {
@@ -265,9 +266,10 @@ func New(config config.Config, manifestFiles []string, options ...projectOption)
265266
}
266267

267268
project := Project{
268-
config: config,
269-
Server: server,
270-
Modules: projectModules,
269+
config: config,
270+
Server: server,
271+
Modules: projectModules,
272+
AssemblyPlatforms: readManifest.AssemblyPlatforms,
271273
}
272274

273275
return project

xmltemplate/xmltemplate.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ import (
1111
)
1212

1313
type TemplateInventory struct {
14-
Server p.Module
15-
Modules []p.Module
16-
Dependencies []p.Module
17-
Assemblies map[string][]Assembly
14+
Server p.Module
15+
Modules []p.Module
16+
Dependencies []p.Module
17+
Assemblies map[string][]Assembly
18+
AssemblyPlatforms []string
1819
}
1920

2021
type Assembly struct {
@@ -59,10 +60,11 @@ func WriteXmlFile(config config.Config, project p.Project, templateFile string,
5960
}
6061

6162
inventory := TemplateInventory{
62-
Server: project.Server,
63-
Modules: project.Modules,
64-
Dependencies: p.MavenDependencies(project),
65-
Assemblies: mavenAssemblies(project),
63+
Server: project.Server,
64+
Modules: project.Modules,
65+
Dependencies: p.MavenDependencies(project),
66+
Assemblies: mavenAssemblies(project),
67+
AssemblyPlatforms: project.AssemblyPlatforms,
6668
}
6769

6870
var buf bytes.Buffer

0 commit comments

Comments
 (0)