diff --git a/digitalocean/resource_digitalocean_record_test.go b/digitalocean/resource_digitalocean_record_test.go index 6aca5529..7c708677 100644 --- a/digitalocean/resource_digitalocean_record_test.go +++ b/digitalocean/resource_digitalocean_record_test.go @@ -260,6 +260,39 @@ func TestAccDigitalOceanRecord_MX_at(t *testing.T) { }) } +func TestAccDigitalOceanRecord_SRV_zero_weight(t *testing.T) { + var record godo.DomainRecord + domain := fmt.Sprintf("foobar-test-terraform-%s.com", acctest.RandString(10)) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckDigitalOceanRecordDestroy, + Steps: []resource.TestStep{ + { + Config: fmt.Sprintf( + testAccCheckDigitalOceanRecordConfig_srv_zero_weight, domain), + Check: resource.ComposeTestCheckFunc( + testAccCheckDigitalOceanRecordExists("digitalocean_record.foo_record", &record), + testAccCheckDigitalOceanRecordAttributesHostname("foobar."+domain, &record), + resource.TestCheckResourceAttr( + "digitalocean_record.foo_record", "name", "_service._protocol"), + resource.TestCheckResourceAttr( + "digitalocean_record.foo_record", "domain", domain), + resource.TestCheckResourceAttr( + "digitalocean_record.foo_record", "value", "foobar."+domain+"."), + resource.TestCheckResourceAttr( + "digitalocean_record.foo_record", "type", "SRV"), + resource.TestCheckResourceAttr( + "digitalocean_record.foo_record", "port", "443"), + resource.TestCheckResourceAttr( + "digitalocean_record.foo_record", "weight", "0"), + ), + }, + }, + }) +} + func TestAccDigitalOceanRecord_UpdateBasic(t *testing.T) { var record godo.DomainRecord domain := fmt.Sprintf("foobar-test-terraform-%s.com", acctest.RandString(10)) @@ -659,6 +692,23 @@ resource "digitalocean_record" "foobar" { tag = "issue" }` +const testAccCheckDigitalOceanRecordConfig_srv_zero_weight = ` +resource "digitalocean_domain" "foobar" { + name = "%s" + ip_address = "192.168.0.10" +} + +resource "digitalocean_record" "foo_record" { + domain = "${digitalocean_domain.foobar.name}" + + name = "_service._protocol" + value = "foobar.${digitalocean_domain.foobar.name}." + type = "SRV" + priority = "10" + port = "443" + weight = "0" +}` + const testAccCheckDigitalOceanRecordConfig_updated_basic = ` resource "digitalocean_domain" "foobar" { name = "%s" diff --git a/vendor/github.com/digitalocean/godo/CHANGELOG.md b/vendor/github.com/digitalocean/godo/CHANGELOG.md index b2ca55b3..f8c64dfc 100644 --- a/vendor/github.com/digitalocean/godo/CHANGELOG.md +++ b/vendor/github.com/digitalocean/godo/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## [v1.4.2] - 2018-08-30 + +- #178 Allowing creating domain records with weight of 0 - @TFaga +- #177 Adding `VolumeLimit` to account - @lxfontes + ## [v1.4.1] - 2018-08-23 - #176 Fix cdn flush cache API endpoint - @sunny-b diff --git a/vendor/github.com/digitalocean/godo/account.go b/vendor/github.com/digitalocean/godo/account.go index 8dce7098..7d3e105d 100644 --- a/vendor/github.com/digitalocean/godo/account.go +++ b/vendor/github.com/digitalocean/godo/account.go @@ -24,6 +24,7 @@ var _ AccountService = &AccountServiceOp{} type Account struct { DropletLimit int `json:"droplet_limit,omitempty"` FloatingIPLimit int `json:"floating_ip_limit,omitempty"` + VolumeLimit int `json:"volume_limit,omitempty"` Email string `json:"email,omitempty"` UUID string `json:"uuid,omitempty"` EmailVerified bool `json:"email_verified,omitempty"` diff --git a/vendor/github.com/digitalocean/godo/domains.go b/vendor/github.com/digitalocean/godo/domains.go index 843335be..cbcd4605 100644 --- a/vendor/github.com/digitalocean/godo/domains.go +++ b/vendor/github.com/digitalocean/godo/domains.go @@ -75,7 +75,7 @@ type DomainRecord struct { Priority int `json:"priority"` Port int `json:"port,omitempty"` TTL int `json:"ttl,omitempty"` - Weight int `json:"weight,omitempty"` + Weight int `json:"weight"` Flags int `json:"flags"` Tag string `json:"tag,omitempty"` } @@ -88,7 +88,7 @@ type DomainRecordEditRequest struct { Priority int `json:"priority"` Port int `json:"port,omitempty"` TTL int `json:"ttl,omitempty"` - Weight int `json:"weight,omitempty"` + Weight int `json:"weight"` Flags int `json:"flags"` Tag string `json:"tag,omitempty"` } diff --git a/vendor/github.com/digitalocean/godo/godo.go b/vendor/github.com/digitalocean/godo/godo.go index f288995a..72f50086 100644 --- a/vendor/github.com/digitalocean/godo/godo.go +++ b/vendor/github.com/digitalocean/godo/godo.go @@ -18,7 +18,7 @@ import ( ) const ( - libraryVersion = "1.4.1" + libraryVersion = "1.4.2" defaultBaseURL = "https://api.digitalocean.com/" userAgent = "godo/" + libraryVersion mediaType = "application/json" diff --git a/vendor/vendor.json b/vendor/vendor.json index 7c663fce..020916d5 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -251,13 +251,13 @@ "revisionTime": "2016-10-29T20:57:26Z" }, { - "checksumSHA1": "YkfXtYXa+nInWIOfBeHVCXWvXQs=", + "checksumSHA1": "aiCBBVRj3GySoe6VRkpitpVQYdU=", "comment": "v0.9.0-20-gf75d769", "path": "github.com/digitalocean/godo", - "revision": "ddc940d8ef8b736b5cdfc47f24cdf95b9a4b73f6", - "revisionTime": "2018-08-23T18:38:25Z", - "version": "v1.4.1", - "versionExact": "v1.4.1" + "revision": "6a6ce62154ba780ecbb97bbbb13a4e9e0b157070", + "revisionTime": "2018-08-30T17:48:58Z", + "version": "v1.4.2", + "versionExact": "v1.4.2" }, { "checksumSHA1": "HbOJxa+FsQ1TTsF+BkHAvzqqZv4=",