mirror/stackexchange-dnscontrol
1
0
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00
Code Issues Releases Activity

CLOUDFLARE: get-zones now outputs "orange cloud" status (#952)

Browse Source 
* CLOUDFLARE: get-zones now outputs "orange cloud" status
This commit is contained in:
Tom Limoncelli
2020-11-24 10:30:21 -05:00
committed by GitHub
parent 6fe4ca6996
commit d6b191bae4
4 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
commands/getZones.go
View File

@ -50,6 +50,7 @@ The columns in --format=tsv are:
TTL TTL
Record Type (A, AAAA, CNAME, etc.) Record Type (A, AAAA, CNAME, etc.)
Target and arguments (quoted like in a zonefile) Target and arguments (quoted like in a zonefile)
Either empty or a comma-separated list of properties like "cloudflare_proxy=true"
The --ttl flag only applies to zone/js/djs formats. The --ttl flag only applies to zone/js/djs formats.
@ -93,7 +94,7 @@ ARGUMENTS:
provider: The name of the provider (second parameter to NewDnsProvider() in dnsconfig.js) provider: The name of the provider (second parameter to NewDnsProvider() in dnsconfig.js)
EXAMPLES: EXAMPLES:
dnscontrol get-zones myr53 ROUTE53 dnscontrol get-zones myr53 ROUTE53
dnscontrol get-zones --out=/dev/null myr53 ROUTE53`, dnscontrol get-zones --out=/dev/null myr53 ROUTE53`,
} }
}()) }())
@ -229,8 +230,16 @@ func GetZone(args GetZoneArgs) error {
case "tsv": case "tsv":
for _, rec := range recs { for _, rec := range recs {
fmt.Fprintf(w, "%s\t%s\t%d\tIN\t%s\t%s\n",
rec.NameFQDN, rec.Name, rec.TTL, rec.Type, rec.GetTargetCombined()) cfproxy := ""
if cp, ok := rec.Metadata["cloudflare_proxy"]; ok {
if cp == "true" {
cfproxy = "\tcloudflare_proxy=true"
}
}
fmt.Fprintf(w, "%s\t%s\t%d\tIN\t%s\t%s%s\n",
rec.NameFQDN, rec.Name, rec.TTL, rec.Type, rec.GetTargetCombined(), cfproxy)
} }
default: default:
@ -251,6 +260,13 @@ func formatDsl(zonename string, rec *models.RecordConfig, defaultTTL uint32) str
ttlop = fmt.Sprintf(", TTL(%d)", ttl) ttlop = fmt.Sprintf(", TTL(%d)", ttl)
} }
cfproxy := ""
if cp, ok := rec.Metadata["cloudflare_proxy"]; ok {
if cp == "true" {
cfproxy = ", CF_PROXY_ON"
}
}
switch rec.Type { // #rtype_variations switch rec.Type { // #rtype_variations
case "CAA": case "CAA":
return makeCaa(rec, ttlop) return makeCaa(rec, ttlop)
@ -286,7 +302,7 @@ func formatDsl(zonename string, rec *models.RecordConfig, defaultTTL uint32) str
target = "'" + target + "'" target = "'" + target + "'"
} }
return fmt.Sprintf("%s('%s', %s%s)", rec.Type, rec.Name, target, ttlop) return fmt.Sprintf("%s('%s', %s%s%s)", rec.Type, rec.Name, target, cfproxy, ttlop)
} }
func makeCaa(rec *models.RecordConfig, ttlop string) string { func makeCaa(rec *models.RecordConfig, ttlop string) string {

1
docs/get-zones.md
View File

@ -82,6 +82,7 @@ The columns in `--format=tsv` are:
TTL TTL
Record Type (A, AAAA, CNAME, etc.) Record Type (A, AAAA, CNAME, etc.)
Target and arguments (quoted like in a zonefile) Target and arguments (quoted like in a zonefile)
Either empty or a comma-separated list of properties like "cloudflare_proxy=true"
The `--ttl` flag only applies to zone/js/djs formats. The `--ttl` flag only applies to zone/js/djs formats.

12
pkg/prettyzone/prettyzone.go
View File

@ -134,8 +134,16 @@ func (z *ZoneGenData) generateZoneFileHelper(w io.Writer) error {
// the remaining line // the remaining line
target := rr.GetTargetCombined() target := rr.GetTargetCombined()
fmt.Fprintf(w, "%s%s\n", // comment
prefix, formatLine([]int{10, 5, 2, 5, 0}, []string{name, ttl, "IN", typeStr, target})) comment := ""
if cp, ok := rr.Metadata["cloudflare_proxy"]; ok {
if cp == "true" {
comment = " ; CF_PROXY_ON"
}
}
fmt.Fprintf(w, "%s%s%s\n",
prefix, formatLine([]int{10, 5, 2, 5, 0}, []string{name, ttl, "IN", typeStr, target}), comment)
} }
return nil return nil
} }

8
providers/cloudflare/cloudflareProvider.go
View File

@ -121,6 +121,14 @@ func (c *cloudflareProvider) GetZoneRecords(domain string) (models.Records, erro
if rec.TTL == 1 { if rec.TTL == 1 {
rec.TTL = 0 rec.TTL = 0
} }
// Store the proxy status ("orange cloud") for use by get-zones:
m := getProxyMetadata(rec)
if p, ok := m["proxy"]; ok {
if rec.Metadata == nil {
rec.Metadata = map[string]string{}
}
rec.Metadata["cloudflare_proxy"] = p
}
} }
return records, nil return records, nil
} }