bij1
/
terraform-provider-greenhost
19
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sweeper: Ensure names used in tests match pattern to be destroyed.

This commit is contained in:
Andrew Starr-Bochicchio 2018-11-28 17:09:44 -05:00
parent de83c2fa61
commit 42a19a1b07
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
digitalocean/datasource_digitalocean_droplet_snapshot_test.go
View File

@ -128,7 +128,7 @@ data "digitalocean_droplet_snapshot" "foobar" {
const testAccCheckDataSourceDigitalOceanDropletSnapshot_regex = `
resource "digitalocean_droplet" "foo" {
region = "nyc1"
name = "droplet-%d"
name = "foo-%d"
size = "512mb"
image = "centos-7-x64"
ipv6 = true
@ -147,7 +147,7 @@ data "digitalocean_droplet_snapshot" "foobar" {
const testAccCheckDataSourceDigitalOceanDropletSnapshot_region = `
resource "digitalocean_droplet" "foo" {
region = "nyc1"
name = "droplet-nyc-%d"
name = "foo-nyc-%d"
size = "512mb"
image = "centos-7-x64"
ipv6 = true
@ -155,7 +155,7 @@ resource "digitalocean_droplet" "foo" {
resource "digitalocean_droplet" "bar" {
region = "lon1"
name = "droplet-lon-%d"
name = "bar-lon-%d"
size = "512mb"
image = "centos-7-x64"
ipv6 = true

2
digitalocean/datasource_digitalocean_droplet_test.go
View File

@ -14,7 +14,7 @@ import (
func TestAccDataSourceDigitalOceanDroplet_Basic(t *testing.T) {
var droplet godo.Droplet
name := fmt.Sprintf("droplet-%s", acctest.RandString(10))
name := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },

2
digitalocean/datasource_digitalocean_loadbalancer_test.go
View File

@ -90,7 +90,7 @@ resource "digitalocean_tag" "foo" {
resource "digitalocean_droplet" "foo" {
count = 2
image = "ubuntu-18-04-x64"
name = "droplet-%d-${count.index}"
name = "foo-%d-${count.index}"
region = "nyc3"
size = "512mb"
private_networking = true

6
digitalocean/resource_digitalocean_droplet_snapshot_test.go
View File

@ -35,7 +35,7 @@ func testSweepDropletSnapshots(region string) error {
}
for _, s := range snapshots {
if strings.HasPrefix(s.Name, "snapshot-") {
if strings.HasPrefix(s.Name, "snapshot-") || strings.HasPrefix(s.Name, "snap-") {
log.Printf("Destroying Droplet Snapshot %s", s.Name)
if _, err := client.Snapshots.Delete(context.Background(), s.ID); err != nil {
@ -62,7 +62,7 @@ func TestAccDigitalOceanDropletSnapshot_Basic(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckDigitalOceanDropletSnapshotExists("digitalocean_droplet_snapshot.foobar", &snapshot),
resource.TestCheckResourceAttr(
"digitalocean_droplet_snapshot.foobar", "name", fmt.Sprintf("snapshotone-%d", rInt2)),
"digitalocean_droplet_snapshot.foobar", "name", fmt.Sprintf("snapshot-one-%d", rInt2)),
),
},
},
@ -127,6 +127,6 @@ resource "digitalocean_droplet" "foo" {
}
resource "digitalocean_droplet_snapshot" "foobar" {
droplet_id = "${digitalocean_droplet.foo.id}"
name = "snapshotone-%d"
name = "snapshot-one-%d"
}
`

2
digitalocean/resource_digitalocean_droplet_test.go
View File

@ -37,7 +37,7 @@ func testSweepDroplets(region string) error {
log.Printf("[DEBUG] Found %d droplets to sweep", len(droplets))
for _, d := range droplets {
if strings.HasPrefix(d.Name, "foo-") || strings.HasPrefix(d.Name, "bar-") || strings.HasPrefix(d.Name, "baz-") {
if strings.HasPrefix(d.Name, "foo-") || strings.HasPrefix(d.Name, "bar-") || strings.HasPrefix(d.Name, "baz-") || strings.HasPrefix(d.Name, "tf-acc-test-") || strings.HasPrefix(d.Name, "foobar-") {
log.Printf("Destroying Droplet %s", d.Name)
if _, err := client.Droplets.Delete(context.Background(), d.ID); err != nil {