ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provider/azurerm: `azurerm_dns_zone` now returns `name_servers` (#7434) 

Fixes #7374

The introduction of the AzureRM SDK 3.0.0-beta means that the
`name_servers` for the DNS Zone are returned from the API

This PR has a dependency on #7420 being merged first

```
make testacc TEST=./builtin/providers/azurerm TESTARGS='-run=TestAccAzureRMDnsZone_'
==> Checking that code complies with gofmt requirements...
/Users/stacko/Code/go/bin/stringer
go generate $(go list ./... | grep -v /vendor/)
2016/06/30 15:20:01 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/azurerm -v
-run=TestAccAzureRMDnsZone_ -timeout 120m
=== RUN   TestAccAzureRMDnsZone_basic
--- PASS: TestAccAzureRMDnsZone_basic (92.42s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/azurerm
92.444s
```
This commit is contained in:
Paul Stack 2016-07-01 10:26:01 +01:00 committed by GitHub
parent 54c0022d38
commit 7f948f0ca7
4 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/providers/azurerm/resource_arm_dns_zone.go
View File

@ -39,6 +39,13 @@ func resourceArmDnsZone() *schema.Resource {
Optional: true, Optional: true,
Computed: true, Computed: true,
}, },
"name_servers": &schema.Schema{
Type: schema.TypeSet,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: schema.HashString,
},
}, },
} }
} }
@ -104,6 +111,14 @@ func resourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error {
d.Set("number_of_record_sets", resp.NumberOfRecordSets) d.Set("number_of_record_sets", resp.NumberOfRecordSets)
d.Set("max_number_of_record_sets", resp.MaxNumberOfRecordSets) d.Set("max_number_of_record_sets", resp.MaxNumberOfRecordSets)
nameServers := make([]string, 0, len(resp.NameServers))
for _, ns := range resp.NameServers {
nameServers = append(nameServers, *ns)
}
if err := d.Set("name_servers", nameServers); err != nil {
return err
}
return nil return nil
} }

12
vendor/github.com/jen20/riviera/dns/get_dns_cname_recordset.go generated vendored
View File

@ -3,12 +3,12 @@ package dns
import "github.com/jen20/riviera/azure" import "github.com/jen20/riviera/azure"
type GetCNAMERecordSetResponse struct { type GetCNAMERecordSetResponse struct {
ID string `mapstructure:"id"` ID string `mapstructure:"id"`
Name string `mapstructure:"name"` Name string `mapstructure:"name"`
Location string `mapstructure:"location"` Location string `mapstructure:"location"`
Tags map[string]*string `mapstructure:"tags"` Tags map[string]*string `mapstructure:"tags"`
TTL *int `mapstructure:"TTL"` TTL *int `mapstructure:"TTL"`
CNAMERecord CNAMERecord `mapstructure:"CNAMERecord"` CNAMERecord CNAMERecord `mapstructure:"CNAMERecord"`
} }
type GetCNAMERecordSet struct { type GetCNAMERecordSet struct {

1
vendor/github.com/jen20/riviera/dns/get_dns_zone.go generated vendored
View File

@ -9,6 +9,7 @@ type GetDNSZoneResponse struct {
Tags *map[string]*string `mapstructure:"tags"` Tags *map[string]*string `mapstructure:"tags"`
NumberOfRecordSets *string `mapstructure:"numberOfRecordSets"` NumberOfRecordSets *string `mapstructure:"numberOfRecordSets"`
MaxNumberOfRecordSets *string `mapstructure:"maxNumberOfRecordSets"` MaxNumberOfRecordSets *string `mapstructure:"maxNumberOfRecordSets"`
NameServers []*string `mapstructure:"nameServers"`
} }
type GetDNSZone struct { type GetDNSZone struct {

22
vendor/vendor.json vendored
View File

@ -951,32 +951,32 @@
{ {
"checksumSHA1": "oPpOfZn11Ef6DWOoETxSW9Venzs=", "checksumSHA1": "oPpOfZn11Ef6DWOoETxSW9Venzs=",
"path": "github.com/jen20/riviera/azure", "path": "github.com/jen20/riviera/azure",
"revision": "2f01b8f5b09bbc20a591b1dc4b48af0665106b3f", "revision": "1159d86fc8144abafeb29ee7c5a3e2e85af336ba",
"revisionTime": "2016-06-10T12:18:12Z" "revisionTime": "2016-06-30T14:11:29Z"
}, },
{ {
"checksumSHA1": "A2Ycn6MySifUKTHOnsG9oLwjitE=", "checksumSHA1": "ncdT+1PFEF5ly0niXuQc9/pKzT0=",
"path": "github.com/jen20/riviera/dns", "path": "github.com/jen20/riviera/dns",
"revision": "2f01b8f5b09bbc20a591b1dc4b48af0665106b3f", "revision": "1159d86fc8144abafeb29ee7c5a3e2e85af336ba",
"revisionTime": "2016-06-10T12:18:12Z" "revisionTime": "2016-06-30T14:11:29Z"
}, },
{ {
"checksumSHA1": "zVXx6ha3bt0N4ukRbRHXjSl91S4=", "checksumSHA1": "zVXx6ha3bt0N4ukRbRHXjSl91S4=",
"path": "github.com/jen20/riviera/search", "path": "github.com/jen20/riviera/search",
"revision": "2f01b8f5b09bbc20a591b1dc4b48af0665106b3f", "revision": "1159d86fc8144abafeb29ee7c5a3e2e85af336ba",
"revisionTime": "2016-06-10T12:18:12Z" "revisionTime": "2016-06-30T14:11:29Z"
}, },
{ {
"checksumSHA1": "KfquDaeBPGchw92QnojlJFsJKgk=", "checksumSHA1": "KfquDaeBPGchw92QnojlJFsJKgk=",
"path": "github.com/jen20/riviera/sql", "path": "github.com/jen20/riviera/sql",
"revision": "2f01b8f5b09bbc20a591b1dc4b48af0665106b3f", "revision": "1159d86fc8144abafeb29ee7c5a3e2e85af336ba",
"revisionTime": "2016-06-10T12:18:12Z" "revisionTime": "2016-06-30T14:11:29Z"
}, },
{ {
"checksumSHA1": "nKUCquNpJ9ifHgkXoT4K3Xar6R8=", "checksumSHA1": "nKUCquNpJ9ifHgkXoT4K3Xar6R8=",
"path": "github.com/jen20/riviera/storage", "path": "github.com/jen20/riviera/storage",
"revision": "64de55fa8cdd0c52f7d59494c1b03c1b583c52b4", "revision": "1159d86fc8144abafeb29ee7c5a3e2e85af336ba",
"revisionTime": "2016-02-18T23:50:40Z" "revisionTime": "2016-06-30T14:11:29Z"
}, },
{ {
"comment": "0.2.2-2-gc01cf91", "comment": "0.2.2-2-gc01cf91",