Add sweeper for custom images and fix acceptance tests. (#941)

digitalocean/image/resource_custom_image.go

@@ -330,5 +330,6 @@ func validImageDistributions() []string {
  "RancherOS",
  "Ubuntu",
  "Unknown",
+ "Unknown OS",
  }
 }

digitalocean/image/resource_custom_image_test.go

@@ -3,6 +3,7 @@ package image_test
 import (
  "context"
  "fmt"
+ "net/http"
  "strconv"
  "testing"
 
@@ -25,11 +26,11 @@ func TestAccDigitalOceanCustomImageFull(t *testing.T) {
  CheckDestroy: testAccCheckDigitalOceanCustomImageDestroy,
  Steps: []resource.TestStep{
  {
- Config: testAccCheckDigitalOceanCustomImageConfig(rString, rString, regions, "Unknown"),
+ Config: testAccCheckDigitalOceanCustomImageConfig(rString, rString, regions, "Unknown OS"),
  Check: resource.ComposeTestCheckFunc(
- resource.TestCheckResourceAttr(name, "name", fmt.Sprintf("%s-name", rString)),
+ resource.TestCheckResourceAttr(name, "name", rString),
  resource.TestCheckResourceAttr(name, "description", fmt.Sprintf("%s-description", rString)),
- resource.TestCheckResourceAttr(name, "distribution", "Unknown"),
+ resource.TestCheckResourceAttr(name, "distribution", "Unknown OS"),
  resource.TestCheckResourceAttr(name, "public", "false"),
  resource.TestCheckResourceAttr(name, "regions.0", "nyc3"),
  resource.TestCheckResourceAttr(name, "status", "available"),
@@ -45,7 +46,7 @@ func TestAccDigitalOceanCustomImageFull(t *testing.T) {
  {
  Config: testAccCheckDigitalOceanCustomImageConfig(rString, updatedString, regions, "CoreOS"),
  Check: resource.ComposeTestCheckFunc(
- resource.TestCheckResourceAttr(name, "name", fmt.Sprintf("%s-name", updatedString)),
+ resource.TestCheckResourceAttr(name, "name", updatedString),
  resource.TestCheckResourceAttr(name, "description", fmt.Sprintf("%s-description", updatedString)),
  resource.TestCheckResourceAttr(name, "distribution", "CoreOS"),
  ),
@@ -66,26 +67,26 @@ func TestAccDigitalOceanCustomImageMultiRegion(t *testing.T) {
  CheckDestroy: testAccCheckDigitalOceanCustomImageDestroy,
  Steps: []resource.TestStep{
  {
- Config: testAccCheckDigitalOceanCustomImageConfig(rString, rString, regions, "Unknown"),
+ Config: testAccCheckDigitalOceanCustomImageConfig(rString, rString, regions, "Unknown OS"),
  Check: resource.ComposeTestCheckFunc(
- resource.TestCheckResourceAttr(name, "name", fmt.Sprintf("%s-name", rString)),
+ resource.TestCheckResourceAttr(name, "name", rString),
  resource.TestCheckTypeSetElemAttr(name, "regions.*", "nyc2"),
  resource.TestCheckTypeSetElemAttr(name, "regions.*", "nyc3"),
  ),
  },
  {
- Config: testAccCheckDigitalOceanCustomImageConfig(rString, rString, regionsUpdated, "Unknown"),
+ Config: testAccCheckDigitalOceanCustomImageConfig(rString, rString, regionsUpdated, "Unknown OS"),
  Check: resource.ComposeTestCheckFunc(
- resource.TestCheckResourceAttr(name, "name", fmt.Sprintf("%s-name", rString)),
+ resource.TestCheckResourceAttr(name, "name", rString),
  resource.TestCheckTypeSetElemAttr(name, "regions.*", "nyc2"),
  resource.TestCheckTypeSetElemAttr(name, "regions.*", "nyc3"),
  resource.TestCheckTypeSetElemAttr(name, "regions.*", "tor1"),
  ),
  },
  {
- Config: testAccCheckDigitalOceanCustomImageConfig(rString, rString, regions, "Unknown"),
+ Config: testAccCheckDigitalOceanCustomImageConfig(rString, rString, regions, "Unknown OS"),
  Check: resource.ComposeTestCheckFunc(
- resource.TestCheckResourceAttr(name, "name", fmt.Sprintf("%s-name", rString)),
+ resource.TestCheckResourceAttr(name, "name", rString),
  resource.TestCheckTypeSetElemAttr(name, "regions.*", "nyc2"),
  resource.TestCheckTypeSetElemAttr(name, "regions.*", "nyc3"),
  ),
@@ -97,7 +98,7 @@ func TestAccDigitalOceanCustomImageMultiRegion(t *testing.T) {
 func testAccCheckDigitalOceanCustomImageConfig(rName string, name string, regions string, distro string) string {
  return fmt.Sprintf(`
 resource "digitalocean_custom_image" "%s" {
- name = "%s-name"
+ name = "%s"
  url = "https://stable.release.flatcar-linux.net/amd64-usr/2605.7.0/flatcar_production_digitalocean_image.bin.bz2"
  regions = %s
  description = "%s-description"
@@ -123,12 +124,16 @@ func testAccCheckDigitalOceanCustomImageDestroy(s *terraform.State) error {
  }
 
  // Try to find the Image by ID
- resp, _, err := client.Images.GetByID(context.Background(), id)
+ i, resp, err := client.Images.GetByID(context.Background(), id)
  if err != nil {
+ if resp.StatusCode == http.StatusNotFound {
+ return nil
+ }
+
  return err
  }
 
- if resp.Status != image.ImageDeletedStatus {
+ if i.Status != image.ImageDeletedStatus {
  return fmt.Errorf("Image %d not destroyed", id)
  }
  }

digitalocean/image/sweep.go

@@ -0,0 +1,47 @@
+package image
+
+import (
+ "context"
+ "log"
+ "strings"
+
+ "github.com/digitalocean/godo"
+ "github.com/digitalocean/terraform-provider-digitalocean/digitalocean/config"
+ "github.com/digitalocean/terraform-provider-digitalocean/digitalocean/sweep"
+ "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func init() {
+ resource.AddTestSweepers("digitalocean_custom_image", &resource.Sweeper{
+ Name: "digitalocean_custom_image",
+ F: sweepCustomImage,
+ })
+
+}
+
+func sweepCustomImage(region string) error {
+ meta, err := sweep.SharedConfigForRegion(region)
+ if err != nil {
+ return err
+ }
+
+ client := meta.(*config.CombinedConfig).GodoClient()
+
+ opt := &godo.ListOptions{PerPage: 200}
+ images, _, err := client.Images.ListUser(context.Background(), opt)
+ if err != nil {
+ return err
+ }
+
+ for _, i := range images {
+ if strings.HasPrefix(i.Name, sweep.TestNamePrefix) {
+ log.Printf("Destroying image %s", i.Name)
+
+ if _, err := client.Images.Delete(context.Background(), i.ID); err != nil {
+ return err
+ }
+ }
+ }
+
+ return nil
+}

digitalocean/sweep/sweep_test.go

@@ -9,6 +9,7 @@ import (
  _ "github.com/digitalocean/terraform-provider-digitalocean/digitalocean/domain"
  _ "github.com/digitalocean/terraform-provider-digitalocean/digitalocean/droplet"
  _ "github.com/digitalocean/terraform-provider-digitalocean/digitalocean/firewall"
+ _ "github.com/digitalocean/terraform-provider-digitalocean/digitalocean/image"
  _ "github.com/digitalocean/terraform-provider-digitalocean/digitalocean/kubernetes"
  _ "github.com/digitalocean/terraform-provider-digitalocean/digitalocean/loadbalancer"
  _ "github.com/digitalocean/terraform-provider-digitalocean/digitalocean/reservedip"