From e111a4b764798b5ff611462f5b3c7dd5d5831ad0 Mon Sep 17 00:00:00 2001 From: Jacob Bednarz Date: Thu, 29 Aug 2024 14:40:39 +1000 Subject: [PATCH] test(record): swap `value` for `content` --- internal/app/cf-terraforming/cmd/generate.go | 7 ------- testdata/terraform/cloudflare_record/test.tf | 2 +- testdata/terraform/cloudflare_record_ptr/test.tf | 2 +- testdata/terraform/cloudflare_record_subdomain/test.tf | 2 +- testdata/terraform/cloudflare_record_txt_spf/test.tf | 2 +- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/internal/app/cf-terraforming/cmd/generate.go b/internal/app/cf-terraforming/cmd/generate.go index 5f3ca77c3..4cdd71d8b 100644 --- a/internal/app/cf-terraforming/cmd/generate.go +++ b/internal/app/cf-terraforming/cmd/generate.go @@ -699,7 +699,6 @@ func generateResources() func(cmd *cobra.Command, args []string) { } case "cloudflare_record": - simpleDNSTypes := []string{"A", "AAAA", "CNAME", "TXT", "MX", "NS", "PTR"} jsonPayload, _, err := api.ListDNSRecords(context.Background(), identifier, cloudflare.ListDNSRecordsParams{}) if err != nil { log.Fatal(err) @@ -719,12 +718,6 @@ func generateResources() func(cmd *cobra.Command, args []string) { if jsonStructData[i].(map[string]interface{})["name"].(string) != jsonStructData[i].(map[string]interface{})["zone_name"].(string) { jsonStructData[i].(map[string]interface{})["name"] = strings.ReplaceAll(jsonStructData[i].(map[string]interface{})["name"].(string), "."+jsonStructData[i].(map[string]interface{})["zone_name"].(string), "") } - - // We only want to remap the "value" to the "content" value for simple - // DNS types as the aggregate types use `data` for the structure. - if contains(simpleDNSTypes, jsonStructData[i].(map[string]interface{})["type"].(string)) { - jsonStructData[i].(map[string]interface{})["value"] = jsonStructData[i].(map[string]interface{})["content"] - } } case "cloudflare_ruleset": jsonPayload, err := api.ListRulesets(context.Background(), identifier, cloudflare.ListRulesetsParams{}) diff --git a/testdata/terraform/cloudflare_record/test.tf b/testdata/terraform/cloudflare_record/test.tf index 25e52d576..5e08b9256 100644 --- a/testdata/terraform/cloudflare_record/test.tf +++ b/testdata/terraform/cloudflare_record/test.tf @@ -1,8 +1,8 @@ resource "cloudflare_record" "terraform_managed_resource" { + content = "198.51.100.4" name = "example.com" proxied = false ttl = 120 type = "A" - value = "198.51.100.4" zone_id = "0da42c8d2132a9ddaf714f9e7c920711" } diff --git a/testdata/terraform/cloudflare_record_ptr/test.tf b/testdata/terraform/cloudflare_record_ptr/test.tf index f141749e8..e82e7d654 100644 --- a/testdata/terraform/cloudflare_record_ptr/test.tf +++ b/testdata/terraform/cloudflare_record_ptr/test.tf @@ -1,8 +1,8 @@ resource "cloudflare_record" "terraform_managed_resource" { + content = "255.2.0.192.in-addr.arpa" name = "example.com" proxied = false ttl = 1 type = "PTR" - value = "255.2.0.192.in-addr.arpa" zone_id = "0da42c8d2132a9ddaf714f9e7c920711" } diff --git a/testdata/terraform/cloudflare_record_subdomain/test.tf b/testdata/terraform/cloudflare_record_subdomain/test.tf index 48bad3653..5acd90e53 100644 --- a/testdata/terraform/cloudflare_record_subdomain/test.tf +++ b/testdata/terraform/cloudflare_record_subdomain/test.tf @@ -1,8 +1,8 @@ resource "cloudflare_record" "terraform_managed_resource" { + content = "198.51.100.4" name = "subdomain" proxied = false ttl = 120 type = "A" - value = "198.51.100.4" zone_id = "0da42c8d2132a9ddaf714f9e7c920711" } diff --git a/testdata/terraform/cloudflare_record_txt_spf/test.tf b/testdata/terraform/cloudflare_record_txt_spf/test.tf index 1333c1c99..bf7eb2f10 100644 --- a/testdata/terraform/cloudflare_record_txt_spf/test.tf +++ b/testdata/terraform/cloudflare_record_txt_spf/test.tf @@ -1,8 +1,8 @@ resource "cloudflare_record" "terraform_managed_resource" { + content = "\"v=spf1 include:%%{ir}.%%{v}.%%{d}.spf.has.pphosted.com include:amazonses.com ~all\"" name = "txtspf" proxied = false ttl = 1 type = "TXT" - value = "\"v=spf1 include:%%{ir}.%%{v}.%%{d}.spf.has.pphosted.com include:amazonses.com ~all\"" zone_id = "0da42c8d2132a9ddaf714f9e7c920711" }