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

update sharing test to req aws account id

This commit is contained in:
Rae Krantz 2020-09-02 11:44:38 -04:00
parent a70164f489
commit ab23e839c8
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ package ebs
import ( import (
"fmt" "fmt"
"os"
"testing" "testing"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
@ -104,10 +105,10 @@ func checkSnapshotsDeleted(snapshotIds []*string) builderT.TestCheckFunc {
func TestBuilderAcc_amiSharing(t *testing.T) { func TestBuilderAcc_amiSharing(t *testing.T) {
builderT.Test(t, builderT.TestCase{ builderT.Test(t, builderT.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccSharingPreCheck(t) },
Builder: &Builder{}, Builder: &Builder{},
Template: testBuilderAccSharing, Template: buildSharingConfig(os.Getenv("TESTACC_AWS_ACCOUNT_ID")),
Check: checkAMISharing(2, "932021504756", "all"), Check: checkAMISharing(2, os.Getenv("TESTACC_AWS_ACCOUNT_ID"), "all"),
}) })
} }
@ -248,6 +249,12 @@ func checkBootEncrypted() builderT.TestCheckFunc {
func testAccPreCheck(t *testing.T) { func testAccPreCheck(t *testing.T) {
} }
func testAccSharingPreCheck(t *testing.T) {
if v := os.Getenv("TESTACC_AWS_ACCOUNT_ID"); v == "" {
t.Fatal(fmt.Sprintf("TESTACC_AWS_ACCOUNT_ID must be set for acceptance tests"))
}
}
func testEC2Conn() (*ec2.EC2, error) { func testEC2Conn() (*ec2.EC2, error) {
access := &common.AccessConfig{RawRegion: "us-east-1"} access := &common.AccessConfig{RawRegion: "us-east-1"}
session, err := access.Session() session, err := access.Session()
@ -324,7 +331,7 @@ const testBuilderAccSharing = `
"source_ami": "ami-76b2a71e", "source_ami": "ami-76b2a71e",
"ssh_username": "ubuntu", "ssh_username": "ubuntu",
"ami_name": "packer-test {{timestamp}}", "ami_name": "packer-test {{timestamp}}",
"ami_users":["932021504756"], "ami_users":["%s"],
"ami_groups":["all"] "ami_groups":["all"]
}] }]
} }
@ -351,3 +358,7 @@ func buildForceDeregisterConfig(val, name string) string {
func buildForceDeleteSnapshotConfig(val, name string) string { func buildForceDeleteSnapshotConfig(val, name string) string {
return fmt.Sprintf(testBuilderAccForceDeleteSnapshot, val, val, name) return fmt.Sprintf(testBuilderAccForceDeleteSnapshot, val, val, name)
} }
func buildSharingConfig(val string) string {
return fmt.Sprintf(testBuilderAccSharing, val)
}