Skip to content

Commit 7e8d480

Browse files
committed
move multierror and multierrorappend into sdk
1 parent f4c61ef commit 7e8d480

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

builder/tencentcloud/cvm/artifact.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"sort"
88
"strings"
99

10-
"github.com/hashicorp/packer/packer"
10+
packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
1111
cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
1212
)
1313

@@ -133,7 +133,7 @@ func (a *Artifact) Destroy() error {
133133
if len(errors) == 1 {
134134
return errors[0]
135135
} else if len(errors) > 1 {
136-
return &packer.MultiError{Errors: errors}
136+
return &packersdk.MultiError{Errors: errors}
137137
} else {
138138
return nil
139139
}

builder/tencentcloud/cvm/builder.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
5252
}
5353

5454
// Accumulate any errors
55-
var errs *packer.MultiError
56-
errs = packer.MultiErrorAppend(errs, b.config.TencentCloudAccessConfig.Prepare(&b.config.ctx)...)
57-
errs = packer.MultiErrorAppend(errs, b.config.TencentCloudImageConfig.Prepare(&b.config.ctx)...)
58-
errs = packer.MultiErrorAppend(errs, b.config.TencentCloudRunConfig.Prepare(&b.config.ctx)...)
55+
var errs *packersdk.MultiError
56+
errs = packersdk.MultiErrorAppend(errs, b.config.TencentCloudAccessConfig.Prepare(&b.config.ctx)...)
57+
errs = packersdk.MultiErrorAppend(errs, b.config.TencentCloudImageConfig.Prepare(&b.config.ctx)...)
58+
errs = packersdk.MultiErrorAppend(errs, b.config.TencentCloudRunConfig.Prepare(&b.config.ctx)...)
5959
if errs != nil && len(errs.Errors) > 0 {
6060
return nil, nil, errs
6161
}

0 commit comments

Comments
 (0)