Skip to content

Commit 1446542

Browse files
committed
Remove unused ctx parameter
1 parent 0b62690 commit 1446542

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

builder/tencentcloud/cvm/access_config.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"strconv"
1717
"strings"
1818

19-
"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
2019
"github.com/mitchellh/go-homedir"
2120
cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
2221
vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
@@ -174,7 +173,7 @@ func (cf *TencentCloudAccessConfig) Client() (*cvm.Client, *vpc.Client, error) {
174173
return nil, nil, fmt.Errorf("unknown zone: %s", cf.Zone)
175174
}
176175

177-
func (cf *TencentCloudAccessConfig) Prepare(ctx *interpolate.Context) []error {
176+
func (cf *TencentCloudAccessConfig) Prepare() []error {
178177
var errs []error
179178

180179
if err := cf.Config(); err != nil {

builder/tencentcloud/cvm/access_config_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ func TestTencentCloudAccessConfig_Prepare(t *testing.T) {
1313
SecretKey: "secret-key",
1414
}
1515

16-
if err := cf.Prepare(nil); err == nil {
16+
if err := cf.Prepare(); err == nil {
1717
t.Fatal("should raise error: region not set")
1818
}
1919

2020
cf.Region = "ap-guangzhou"
21-
if err := cf.Prepare(nil); err != nil {
21+
if err := cf.Prepare(); err != nil {
2222
t.Fatalf("shouldn't raise error: %v", err)
2323
}
2424

2525
cf.Region = "unknown-region"
26-
if err := cf.Prepare(nil); err == nil {
26+
if err := cf.Prepare(); err == nil {
2727
t.Fatal("should raise error: unknown region")
2828
}
2929

3030
cf.skipValidation = true
31-
if err := cf.Prepare(nil); err != nil {
31+
if err := cf.Prepare(); err != nil {
3232
t.Fatalf("shouldn't raise error: %v", err)
3333
}
3434
}

builder/tencentcloud/cvm/builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
6262

6363
// Accumulate any errors
6464
var errs *packersdk.MultiError
65-
errs = packersdk.MultiErrorAppend(errs, b.config.TencentCloudAccessConfig.Prepare(&b.config.ctx)...)
65+
errs = packersdk.MultiErrorAppend(errs, b.config.TencentCloudAccessConfig.Prepare()...)
6666
errs = packersdk.MultiErrorAppend(errs, b.config.TencentCloudImageConfig.Prepare(&b.config.ctx)...)
6767
errs = packersdk.MultiErrorAppend(errs, b.config.TencentCloudRunConfig.Prepare(&b.config.ctx)...)
6868
if errs != nil && len(errs.Errors) > 0 {

0 commit comments

Comments
 (0)