iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip

This commit is contained in:
Adrien Delorme 2020-03-16 12:35:25 +01:00
parent a9ed8eac2a
commit ce8d3d3747
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builder/amazon/chroot/builder.go
View File

@ -260,12 +260,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
var warns []string var warns []string
errs = packer.MultiErrorAppend(errs, b.config.RootVolumeTag.CopyOn(b.config.RootVolumeTags)...) errs = packer.MultiErrorAppend(errs, b.config.RootVolumeTag.CopyOn(b.config.RootVolumeTags)...)
errs = packer.MultiErrorAppend(errs, b.config.SourceAmiFilter.Prepare()...)
for _, preparer := range []interface{ Prepare() []error }{
&b.config.SourceAmiFilter,
} {
errs = packer.MultiErrorAppend(errs, preparer.Prepare()...)
}
errs = packer.MultiErrorAppend(errs, b.config.AccessConfig.Prepare(&b.config.ctx)...) errs = packer.MultiErrorAppend(errs, b.config.AccessConfig.Prepare(&b.config.ctx)...)
errs = packer.MultiErrorAppend(errs, errs = packer.MultiErrorAppend(errs,

11
builder/amazon/common/ami_config.go
View File

@ -151,15 +151,8 @@ func stringInSlice(s []string, searchstr string) bool {
func (c *AMIConfig) Prepare(accessConfig *AccessConfig, ctx *interpolate.Context) []error { func (c *AMIConfig) Prepare(accessConfig *AccessConfig, ctx *interpolate.Context) []error {
var errs []error var errs []error
for _, s := range []struct { errs = append(errs, c.SnapshotTag.CopyOn(c.SnapshotTags)...)
tagMap TagMap errs = append(errs, c.AMITag.CopyOn(c.AMITags)...)
kvs hcl2template.KeyValues
}{
{c.SnapshotTags, c.SnapshotTag},
{c.AMITags, c.AMITag},
} {
errs = append(errs, s.kvs.CopyOn(s.tagMap)...)
}
if c.AMIName == "" { if c.AMIName == "" {
errs = append(errs, fmt.Errorf("ami_name must be specified")) errs = append(errs, fmt.Errorf("ami_name must be specified"))