-
Notifications
You must be signed in to change notification settings - Fork 9.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
provider/digitalocean: Support disk only resize #13059
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -144,6 +144,56 @@ func TestAccDigitalOceanDroplet_ResizeWithOutDisk(t *testing.T) { | |
}) | ||
} | ||
|
||
func TestAccDigitalOceanDroplet_ResizeOnlyDisk(t *testing.T) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's possible to merge this test into |
||
var droplet godo.Droplet | ||
rInt := acctest.RandInt() | ||
|
||
resource.Test(t, resource.TestCase{ | ||
PreCheck: func() { testAccPreCheck(t) }, | ||
Providers: testAccProviders, | ||
CheckDestroy: testAccCheckDigitalOceanDropletDestroy, | ||
Steps: []resource.TestStep{ | ||
{ | ||
Config: testAccCheckDigitalOceanDropletConfig_basic(rInt), | ||
Check: resource.ComposeTestCheckFunc( | ||
testAccCheckDigitalOceanDropletExists("digitalocean_droplet.foobar", &droplet), | ||
testAccCheckDigitalOceanDropletAttributes(&droplet), | ||
resource.TestCheckResourceAttr( | ||
"digitalocean_droplet.foobar", "name", fmt.Sprintf("foo-%d", rInt)), | ||
), | ||
}, | ||
|
||
{ | ||
Config: testAccCheckDigitalOceanDropletConfig_resize_without_disk(rInt), | ||
Check: resource.ComposeTestCheckFunc( | ||
testAccCheckDigitalOceanDropletExists("digitalocean_droplet.foobar", &droplet), | ||
testAccCheckDigitalOceanDropletResizeWithOutDisk(&droplet), | ||
resource.TestCheckResourceAttr( | ||
"digitalocean_droplet.foobar", "name", fmt.Sprintf("foo-%d", rInt)), | ||
resource.TestCheckResourceAttr( | ||
"digitalocean_droplet.foobar", "size", "1gb"), | ||
resource.TestCheckResourceAttr( | ||
"digitalocean_droplet.foobar", "disk", "20"), | ||
), | ||
}, | ||
|
||
{ | ||
Config: testAccCheckDigitalOceanDropletConfig_resize_only_disk(rInt), | ||
Check: resource.ComposeTestCheckFunc( | ||
testAccCheckDigitalOceanDropletExists("digitalocean_droplet.foobar", &droplet), | ||
testAccCheckDigitalOceanDropletResizeOnlyDisk(&droplet), | ||
resource.TestCheckResourceAttr( | ||
"digitalocean_droplet.foobar", "name", fmt.Sprintf("foo-%d", rInt)), | ||
resource.TestCheckResourceAttr( | ||
"digitalocean_droplet.foobar", "size", "1gb"), | ||
resource.TestCheckResourceAttr( | ||
"digitalocean_droplet.foobar", "disk", "30"), | ||
), | ||
}, | ||
}, | ||
}) | ||
} | ||
|
||
func TestAccDigitalOceanDroplet_UpdateUserData(t *testing.T) { | ||
var afterCreate, afterUpdate godo.Droplet | ||
rInt := acctest.RandInt() | ||
|
@@ -321,6 +371,21 @@ func testAccCheckDigitalOceanDropletResizeWithOutDisk(droplet *godo.Droplet) res | |
} | ||
} | ||
|
||
func testAccCheckDigitalOceanDropletResizeOnlyDisk(droplet *godo.Droplet) resource.TestCheckFunc { | ||
return func(s *terraform.State) error { | ||
|
||
if droplet.Size.Slug != "1gb" { | ||
return fmt.Errorf("Bad size_slug: %s", droplet.SizeSlug) | ||
} | ||
|
||
if droplet.Disk != 30 { | ||
return fmt.Errorf("Bad disk: %d", droplet.Disk) | ||
} | ||
|
||
return nil | ||
} | ||
} | ||
|
||
func testAccCheckDigitalOceanDropletAttributes_PrivateNetworkingIpv6(droplet *godo.Droplet) resource.TestCheckFunc { | ||
return func(s *terraform.State) error { | ||
|
||
|
@@ -492,6 +557,19 @@ resource "digitalocean_droplet" "foobar" { | |
`, rInt) | ||
} | ||
|
||
func testAccCheckDigitalOceanDropletConfig_resize_only_disk(rInt int) string { | ||
return fmt.Sprintf(` | ||
resource "digitalocean_droplet" "foobar" { | ||
name = "foo-%d" | ||
size = "1gb" | ||
image = "centos-7-x64" | ||
region = "nyc3" | ||
user_data = "foobar" | ||
resize_disk = true | ||
} | ||
`, rInt) | ||
} | ||
|
||
// IPV6 only in singapore | ||
func testAccCheckDigitalOceanDropletConfig_PrivateNetworkingIpv6(rInt int) string { | ||
return fmt.Sprintf(` | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I changed
WaitForDropletAttribute
towaitForAction
, because we don't know what disk size value to wait for, as it's not available from a resource configuration – all we've got is asize
value, but it represents RAM size, not disk size.So the only way is to wait for a resize action to complete.