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

Merge pull request #10328 from hashicorp/sdk_testing 

move builder/testing framework into sdk; it imports the core but I th…
This commit is contained in:
Megan Marsh 2020-12-03 10:11:28 -08:00 committed by GitHub
parent 2667bf3d3b 863e20ad65
commit a0e81806d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/alicloud/ecs/builder_acc_test.go
View File

@ -8,7 +8,7 @@ import (
"testing" "testing"
"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
) )

2
builder/amazon/ebs/builder_acc_test.go
View File

@ -12,7 +12,7 @@ import (
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2"
"github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/builder/amazon/common"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
) )

2
builder/amazon/ebs/tags_acc_test.go
View File

@ -8,7 +8,7 @@ import (
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2"
"github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/builder/amazon/common"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
) )

2
builder/azure/arm/builder_acc_test.go
View File

@ -25,7 +25,7 @@ import (
"fmt" "fmt"
"os" "os"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
) )
const DeviceLoginAcceptanceTest = "DEVICELOGIN_TEST" const DeviceLoginAcceptanceTest = "DEVICELOGIN_TEST"

6
builder/azure/dtl/builder_acc_test.go
View File

@ -28,7 +28,7 @@ package dtl
import ( import (
"testing" "testing"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
) )
const DeviceLoginAcceptanceTest = "DEVICELOGIN_TEST" const DeviceLoginAcceptanceTest = "DEVICELOGIN_TEST"
@ -83,7 +83,7 @@ const testBuilderAccManagedDiskWindows = `
"winrm_insecure": "true", "winrm_insecure": "true",
"winrm_timeout": "3m", "winrm_timeout": "3m",
"winrm_username": "packer", "winrm_username": "packer",
"location": "South Central US", "location": "South Central US",
"vm_size": "Standard_DS2_v2" "vm_size": "Standard_DS2_v2"
}] }]
@ -120,7 +120,7 @@ const testBuilderAccManagedDiskLinux = `
"location": "South Central US", "location": "South Central US",
"vm_size": "Standard_DS2_v2", "vm_size": "Standard_DS2_v2",
"dtl_artifacts": [{ "dtl_artifacts": [{
"artifact_name": "linux-apt-package", "artifact_name": "linux-apt-package",
"parameters" : [{ "parameters" : [{

2
builder/digitalocean/builder_acc_test.go
View File

@ -7,7 +7,7 @@ import (
"testing" "testing"
"github.com/digitalocean/godo" "github.com/digitalocean/godo"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
"golang.org/x/oauth2" "golang.org/x/oauth2"
) )

2
builder/file/builder_test.go
View File

@ -5,7 +5,7 @@ import (
"io/ioutil" "io/ioutil"
"testing" "testing"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
) )

2
builder/hcloud/builder_acc_test.go
View File

@ -4,7 +4,7 @@ import (
"os" "os"
"testing" "testing"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
) )
func TestBuilderAcc_basic(t *testing.T) { func TestBuilderAcc_basic(t *testing.T) {

2
builder/hyperone/builder_acc_test.go
View File

@ -4,7 +4,7 @@ import (
"os" "os"
"testing" "testing"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
) )
func TestBuilderAcc_basic(t *testing.T) { func TestBuilderAcc_basic(t *testing.T) {

2
builder/linode/builder_acc_test.go
View File

@ -4,7 +4,7 @@ import (
"os" "os"
"testing" "testing"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
) )
func TestBuilderAcc_basic(t *testing.T) { func TestBuilderAcc_basic(t *testing.T) {

2
builder/oneandone/builder_acc_test.go
View File

@ -4,7 +4,7 @@ import (
"os" "os"
"testing" "testing"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
) )
func TestBuilderAcc_basic(t *testing.T) { func TestBuilderAcc_basic(t *testing.T) {

2
builder/osc/bsu/builder_acc_test.go
View File

@ -4,7 +4,7 @@ package bsu
import ( import (
"testing" "testing"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
) )
func TestBuilderAcc_basic(t *testing.T) { func TestBuilderAcc_basic(t *testing.T) {

2
builder/osc/bsusurrogate/builder_acc_test.go
View File

@ -3,7 +3,7 @@ package bsusurrogate
import ( import (
"testing" "testing"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
) )
func TestBuilderAcc_basic(t *testing.T) { func TestBuilderAcc_basic(t *testing.T) {

2
builder/osc/bsuvolume/builder_acc_test.go
View File

@ -4,7 +4,7 @@ package bsuvolume
import ( import (
"testing" "testing"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
) )
func TestBuilderAcc_basic(t *testing.T) { func TestBuilderAcc_basic(t *testing.T) {

2
builder/profitbricks/builder_acc_test.go
View File

@ -4,7 +4,7 @@ import (
"os" "os"
"testing" "testing"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
) )
func TestBuilderAcc_basic(t *testing.T) { func TestBuilderAcc_basic(t *testing.T) {

2
builder/ucloud/uhost/builder_acc_test.go
View File

@ -9,7 +9,7 @@ import (
packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
) )
func TestBuilderAcc_validateRegion(t *testing.T) { func TestBuilderAcc_validateRegion(t *testing.T) {

2
builder/virtualbox/iso/builder_acc_test.go
View File

@ -5,7 +5,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
) )
func TestBuilderAcc_basic(t *testing.T) { func TestBuilderAcc_basic(t *testing.T) {

2
builder/vmware/iso/builder_acc_test.go
View File

@ -5,7 +5,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
) )
func TestBuilderAcc_basic(t *testing.T) { func TestBuilderAcc_basic(t *testing.T) {

2
builder/vsphere/clone/builder_acc_test.go
View File

@ -6,7 +6,7 @@ import (
"github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/common"
commonT "github.com/hashicorp/packer/builder/vsphere/common/testing" commonT "github.com/hashicorp/packer/builder/vsphere/common/testing"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
"github.com/vmware/govmomi/vim25/types" "github.com/vmware/govmomi/vim25/types"
) )

2
builder/vsphere/iso/builder_acc_test.go
View File

@ -7,7 +7,7 @@ import (
"testing" "testing"
commonT "github.com/hashicorp/packer/builder/vsphere/common/testing" commonT "github.com/hashicorp/packer/builder/vsphere/common/testing"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
"github.com/vmware/govmomi/vim25/types" "github.com/vmware/govmomi/vim25/types"
) )

2
builder/yandex/builder_acc_test.go
View File

@ -7,7 +7,7 @@ import (
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
builderT "github.com/hashicorp/packer/helper/builder/testing" builderT "github.com/hashicorp/packer/packer-plugin-sdk/builder/testing"
) )
const InstanceMetadataAddr = "169.254.169.254" const InstanceMetadataAddr = "169.254.169.254"

1
go.mod
View File

@ -94,6 +94,7 @@ require (
github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/go-homedir v1.1.0
github.com/mitchellh/go-testing-interface v1.0.3 // indirect github.com/mitchellh/go-testing-interface v1.0.3 // indirect
github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed
github.com/mitchellh/gox v1.0.1 // indirect
github.com/mitchellh/iochan v1.0.0 github.com/mitchellh/iochan v1.0.0
github.com/mitchellh/mapstructure v1.2.3 github.com/mitchellh/mapstructure v1.2.3
github.com/mitchellh/panicwrap v1.0.0 github.com/mitchellh/panicwrap v1.0.0

3
go.sum
View File

@ -376,6 +376,7 @@ github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1
github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0= github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0=
github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E= github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
@ -510,6 +511,8 @@ github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZX
github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
github.com/mitchellh/gox v1.0.1 h1:x0jD3dcHk9a9xPSDN6YEL4xL6Qz0dvNYm8yZqui5chI=
github.com/mitchellh/gox v1.0.1/go.mod h1:ED6BioOGXMswlXa2zxfh/xdd5QhwYliBFn9V18Ap4z4=
github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY= github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY=
github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=

0
helper/builder/testing/testing.go → packer-plugin-sdk/builder/testing/testing.go
View File

0
helper/builder/testing/testing_test.go → packer-plugin-sdk/builder/testing/testing_test.go
View File