IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14271 from sbfaulkner/fix-data_dns_txt_record_set

Browse Source 
Fix data dns txt record set
This commit is contained in:
Jake Champlin 2017-05-09 10:01:09 -04:00 committed by GitHub
commit 930832d5eb
6 changed files with 143 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
builtin/providers/dns/data_dns_a_record_set_test.go
View File

@ -12,6 +12,7 @@ func TestAccDataDnsARecordSet_Basic(t *testing.T) {
DataSourceBlock string
DataSourceName string
Expected []string
Host string
}{
{
`
@ -23,6 +24,7 @@ func TestAccDataDnsARecordSet_Basic(t *testing.T) {
[]string{
"127.0.0.1",
},
"127.0.0.1.nip.io",
},
{
`
@ -34,23 +36,30 @@ func TestAccDataDnsARecordSet_Basic(t *testing.T) {
[]string{
"129.6.15.30",
},
"time-c.nist.gov",
},
}
var steps []resource.TestStep
for _, test := range tests {
ts := resource.TestStep{
Config: test.DataSourceBlock,
Check: resource.ComposeTestCheckFunc(
testCheckAttrStringArray(fmt.Sprintf("data.dns_a_record_set.%s", test.DataSourceName), "addrs", test.Expected),
),
}
steps = append(steps, ts)
recordName := fmt.Sprintf("data.dns_a_record_set.%s", test.DataSourceName)
resource.UnitTest(t, resource.TestCase{
Providers: testAccProviders,
Steps: []resource.TestStep{
resource.TestStep{
Config: test.DataSourceBlock,
Check: resource.ComposeTestCheckFunc(
testCheckAttrStringArray(recordName, "addrs", test.Expected),
),
},
resource.TestStep{
Config: test.DataSourceBlock,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(recordName, "id", test.Host),
),
},
},
})
}
resource.Test(t, resource.TestCase{
Providers: testAccProviders,
Steps: steps,
})
}

8
builtin/providers/dns/data_dns_cname_record_set_test.go
View File

@ -10,6 +10,7 @@ func TestAccDnsCnameRecordSet_Basic(t *testing.T) {
tests := []struct {
DataSourceBlock string
Expected string
Host string
}{
{
`
@ -18,6 +19,7 @@ func TestAccDnsCnameRecordSet_Basic(t *testing.T) {
}
`,
"dualstack.s.shared.global.fastly.net.",
"www.hashicorp.com",
},
}
@ -31,6 +33,12 @@ func TestAccDnsCnameRecordSet_Basic(t *testing.T) {
r.TestCheckResourceAttr("data.dns_cname_record_set.foo", "cname", test.Expected),
),
},
r.TestStep{
Config: test.DataSourceBlock,
Check: r.ComposeTestCheckFunc(
r.TestCheckResourceAttr("data.dns_cname_record_set.foo", "id", test.Host),
),
},
},
})
}

3
builtin/providers/dns/data_dns_txt_record_set.go
View File

@ -34,6 +34,7 @@ func dataSourceDnsTxtRecordSet() *schema.Resource {
func dataSourceDnsTxtRecordSetRead(d *schema.ResourceData, meta interface{}) error {
host := d.Get("host").(string)
records, err := net.LookupTXT(host)
if err != nil {
return fmt.Errorf("error looking up TXT records for %q: %s", host, err)
@ -45,5 +46,7 @@ func dataSourceDnsTxtRecordSetRead(d *schema.ResourceData, meta interface{}) err
d.Set("record", "")
}
d.Set("records", records)
d.SetId(host)
return nil
}

59
builtin/providers/dns/data_dns_txt_record_set_test.go Normal file
View File

@ -0,0 +1,59 @@
package dns
import (
"fmt"
"testing"
"github.com/hashicorp/terraform/helper/resource"
)
func TestAccDataDnsTxtRecordSet_Basic(t *testing.T) {
tests := []struct {
DataSourceBlock string
DataSourceName string
Expected []string
Host string
}{
{
`
data "dns_txt_record_set" "foo" {
host = "hashicorp.com"
}
`,
"foo",
[]string{
"google-site-verification=oqoe6Z7OB_726BNm33g4OdKK57KDtCfH266f8wAvLBo",
"v=spf1 include:_spf.google.com include:spf.mail.intercom.io include:stspg-customer.com include:mail.zendesk.com ~all",
"status-page-domain-verification=dgtdvzlp8tfn",
},
"hashicorp.com",
},
}
for _, test := range tests {
recordName := fmt.Sprintf("data.dns_txt_record_set.%s", test.DataSourceName)
resource.UnitTest(t, resource.TestCase{
Providers: testAccProviders,
Steps: []resource.TestStep{
resource.TestStep{
Config: test.DataSourceBlock,
Check: resource.ComposeTestCheckFunc(
testCheckAttrStringArray(recordName, "records", test.Expected),
),
},
resource.TestStep{
Config: test.DataSourceBlock,
Check: resource.ComposeTestCheckFunc(
testCheckAttrStringArrayMember(recordName, "record", test.Expected),
),
},
resource.TestStep{
Config: test.DataSourceBlock,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(recordName, "id", test.Host),
),
},
},
})
}
}

21
builtin/providers/dns/test_check_attr_string_array.go
View File

@ -27,24 +27,27 @@ func testCheckAttrStringArray(name, key string, value []string) r.TestCheckFunc
return fmt.Errorf("Attributes not found for %s", attrKey)
}
got, _ := strconv.Atoi(count)
if got != len(value) {
gotCount, _ := strconv.Atoi(count)
if gotCount != len(value) {
return fmt.Errorf("Mismatch array count for %s: got %s, wanted %d", key, count, len(value))
}
for i, want := range value {
Next:
for i := 0; i < gotCount; i++ {
attrKey = fmt.Sprintf("%s.%d", key, i)
got, ok := is.Attributes[attrKey]
if !ok {
return fmt.Errorf("Missing array item for %s", attrKey)
}
if got != want {
return fmt.Errorf(
"Mismatched array item for %s: got %s, want %s",
attrKey,
got,
want)
for _, want := range value {
if got == want {
continue Next
}
}
return fmt.Errorf(
"Unexpected array item for %s: got %s",
attrKey,
got)
}
return nil

39
builtin/providers/dns/test_check_attr_string_array_member.go Normal file
View File

@ -0,0 +1,39 @@
package dns
import (
"fmt"
r "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
)
func testCheckAttrStringArrayMember(name, key string, value []string) r.TestCheckFunc {
return func(s *terraform.State) error {
ms := s.RootModule()
rs, ok := ms.Resources[name]
if !ok {
return fmt.Errorf("Not found: %s", name)
}
is := rs.Primary
if is == nil {
return fmt.Errorf("No primary instance: %s", name)
}
got, ok := is.Attributes[key]
if !ok {
return fmt.Errorf("Attributes not found for %s", key)
}
for _, want := range value {
if got == want {
return nil
}
}
return fmt.Errorf(
"Unexpected value for %s: got %s",
key,
got)
}
}