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

Linode: remove unused StateTimeout field

This commit is contained in:
Adrien Delorme 2019-10-31 15:53:03 +01:00
parent 819329228a
commit 1efd86e809
2 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
builder/linode/builder_test.go
View File

@ -151,43 +151,6 @@ func TestBuilderPrepare_Image(t *testing.T) {
} }
} }
func TestBuilderPrepare_StateTimeout(t *testing.T) {
var b Builder
config := testConfig()
// Test default
warnings, err := b.Prepare(config)
if len(warnings) > 0 {
t.Fatalf("bad: %#v", warnings)
}
if err != nil {
t.Fatalf("should not have error: %s", err)
}
// Test set
config["state_timeout"] = "5m"
b = Builder{}
warnings, err = b.Prepare(config)
if len(warnings) > 0 {
t.Fatalf("bad: %#v", warnings)
}
if err != nil {
t.Fatalf("should not have error: %s", err)
}
// Test bad
config["state_timeout"] = "tubes"
b = Builder{}
warnings, err = b.Prepare(config)
if len(warnings) > 0 {
t.Fatalf("bad: %#v", warnings)
}
if err == nil {
t.Fatal("should have error")
}
}
func TestBuilderPrepare_ImageLabel(t *testing.T) { func TestBuilderPrepare_ImageLabel(t *testing.T) {
var b Builder var b Builder
config := testConfig() config := testConfig()

7
builder/linode/config.go
View File

@ -9,7 +9,6 @@ import (
"fmt" "fmt"
"os" "os"
"regexp" "regexp"
"time"
"github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common"
"github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/communicator"
@ -36,8 +35,6 @@ type Config struct {
ImageLabel string `mapstructure:"image_label"` ImageLabel string `mapstructure:"image_label"`
Description string `mapstructure:"image_description"` Description string `mapstructure:"image_description"`
StateTimeout time.Duration `mapstructure:"state_timeout"`
interCtx interpolate.Context interCtx interpolate.Context
} }
@ -100,10 +97,6 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
} }
} }
if c.StateTimeout == 0 {
c.StateTimeout = 5 * time.Minute
}
if es := c.Comm.Prepare(&c.ctx); len(es) > 0 { if es := c.Comm.Prepare(&c.ctx); len(es) > 0 {
errs = packer.MultiErrorAppend(errs, es...) errs = packer.MultiErrorAppend(errs, es...)
} }