Simplify Spaces bucket importing and test error case when importing non-existent resource.
This commit is contained in:
parent
6b3a641ed9
commit
f03e5252c3
|
@ -2,6 +2,7 @@ package digitalocean
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"regexp"
|
||||
"testing"
|
||||
|
||||
"github.com/hashicorp/terraform/helper/acctest"
|
||||
|
@ -25,9 +26,17 @@ func TestAccDigitalOceanBucket_importBasic(t *testing.T) {
|
|||
ResourceName: resourceName,
|
||||
ImportState: true,
|
||||
ImportStateVerify: true,
|
||||
ImportStateIdPrefix: fmt.Sprintf("%s,", "nyc3"),
|
||||
ImportStateIdPrefix: fmt.Sprintf("%s,", "sfo2"),
|
||||
ImportStateVerifyIgnore: []string{"acl", "force_destroy"},
|
||||
},
|
||||
// Test importing non-existent resource provides expected error.
|
||||
{
|
||||
ResourceName: resourceName,
|
||||
ImportState: true,
|
||||
ImportStateVerify: false,
|
||||
ImportStateId: "sfo2,nonexistent-bucket",
|
||||
ExpectError: regexp.MustCompile(`(Please verify the ID is correct|Cannot import non-existent remote object)`),
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
|
|
|
@ -295,15 +295,7 @@ func resourceDigitalOceanBucketImport(d *schema.ResourceData, meta interface{})
|
|||
d.Set("region", s[0])
|
||||
}
|
||||
|
||||
err := resourceDigitalOceanBucketRead(d, meta)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("unable to import bucket: %v", err)
|
||||
}
|
||||
|
||||
results := make([]*schema.ResourceData, 0)
|
||||
results = append(results, d)
|
||||
|
||||
return results, nil
|
||||
return []*schema.ResourceData{d}, nil
|
||||
}
|
||||
|
||||
func bucketDomainName(bucket string, region string) string {
|
||||
|
|
|
@ -276,7 +276,8 @@ resource "digitalocean_spaces_bucket" "bucket" {
|
|||
func testAccDigitalOceanBucketConfigImport(randInt int) string {
|
||||
return fmt.Sprintf(`
|
||||
resource "digitalocean_spaces_bucket" "bucket" {
|
||||
name = "tf-test-bucket-%d"
|
||||
name = "tf-test-bucket-%d"
|
||||
region = "sfo2"
|
||||
}
|
||||
`, randInt)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue