mirror of
https://github.com/StackExchange/dnscontrol.git
synced 2024-09-20 14:56:20 +08:00
NEW: convertzone/ Read BIND zone files, output records as DSL, TSV, o… (#49)
* NEW: convertzone/ Read BIND zone files, output records as DSL, TSV, or pretty-print. * Refactored to be more gostyle. * Fix buffering issue. * Delete the hacky awk script. * Linting.
This commit is contained in:
Tom Limoncelli
Craig Peterson
parent
4fef4a8550
commit
9817c284d7
27
misc/convertzone/README.md
Normal file
27
misc/convertzone/README.md
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
# convertzone -- Converts a standard DNS zonefile into tsv, pretty, or DSL
|
||||
|
||||
convertzone converts an old-style DNS zone file into one of three formats:
|
||||
|
||||
* -mode=pretty Output the zone pretty-printed.
|
||||
* -mode=tsv Output the zone recoreds as tab-separated values
|
||||
* -mode=dsl Output the zone records as the DNSControl DSL language.
|
||||
|
||||
|
||||
NOTE: mode=dsl is not perfect. The result is something you'll want
|
||||
to fine-tune. However it is better than manually converting big
|
||||
zones.
|
||||
|
||||
You must give the script both the zone name (i.e. "stackoverflow.com")
|
||||
and the filename of the zonefile to read.
|
||||
|
||||
Output is sent to stdout.
|
||||
|
||||
Example:
|
||||
|
||||
"""
|
||||
./convertzone stackoverflow.com zone.stackoverflow.com >new/stackoverflow.com
|
||||
"""
|
||||
|
||||
Caveats:
|
||||
|
||||
* `$INCLUDE` may not be handled correctly if you are not in the right directory.
|
||||
156
misc/convertzone/main.go
Normal file
156
misc/convertzone/main.go
Normal file
|
|
@ -0,0 +1,156 @@
|
|||
package main
|
||||
|
||||
/*
|
||||
convertzone: Read BIND-style zonefile and output.
|
||||
|
||||
convertzone [-mode=MODE] zonename [filename]
|
||||
|
||||
-mode=tsv TAB-separated values (default)
|
||||
-mode=dsl DNSControl DSL
|
||||
-mode=pretty Sort and pretty-print records.
|
||||
|
||||
zonename The FQDN of the zone name.
|
||||
filename File to read (default: stdin)
|
||||
*/
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"flag"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/StackExchange/dnscontrol/providers/bind"
|
||||
"github.com/miekg/dns"
|
||||
"github.com/miekg/dns/dnsutil"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
var flagMode = flag.String("mode", "tsv", "tsv|dsl|pretty")
|
||||
var flagDefaultTTL = flag.Uint("ttl", 300, "Default TTL")
|
||||
var flagRegText = flag.String("registrar", "REG_FILL_IN", "registrar text")
|
||||
var flagProviderText = flag.String("provider", "DNS_FILL_IN", "provider text")
|
||||
|
||||
// parseargs parses the non-flag arguments.
|
||||
func parseargs(args []string) (zonename string, filename string, r io.Reader, err error) {
|
||||
// 1 args: first arg is the zonename. Read stdin.
|
||||
// 2 args: first arg is the zonename. 2nd is the filename.
|
||||
// Anything else returns an error.
|
||||
|
||||
if len(args) < 1 {
|
||||
return "", "", nil, fmt.Errorf("no command line parameters. Zone name required")
|
||||
}
|
||||
|
||||
zonename = args[0]
|
||||
|
||||
if len(args) == 1 {
|
||||
filename = "stdin"
|
||||
r = bufio.NewReader(os.Stdin)
|
||||
} else if len(args) == 2 {
|
||||
filename = flag.Arg(1)
|
||||
r, err = os.Open(filename)
|
||||
if err != nil {
|
||||
return "", "", nil, errors.Wrapf(err, "Could not open file: %s", filename)
|
||||
}
|
||||
} else {
|
||||
return "", "", nil, fmt.Errorf("too many command line parameters")
|
||||
}
|
||||
|
||||
return zonename, filename, r, nil
|
||||
}
|
||||
|
||||
// pretty outputs the zonefile using the prettyprinter.
|
||||
func pretty(zonename string, filename string, r io.Reader, defaultTTL uint32) {
|
||||
var l []dns.RR
|
||||
for x := range dns.ParseZone(r, zonename, filename) {
|
||||
if x.Error == nil {
|
||||
l = append(l, x.RR)
|
||||
}
|
||||
}
|
||||
bind.WriteZoneFile(os.Stdout, l, zonename, defaultTTL)
|
||||
}
|
||||
|
||||
// rrFormat outputs the zonefile in either DSL or TSV format.
|
||||
func rrFormat(zonename string, filename string, r io.Reader, defaultTTL uint32, dsl bool) {
|
||||
zonenamedot := zonename + "."
|
||||
|
||||
for x := range dns.ParseZone(r, zonename, filename) {
|
||||
if x.Error != nil {
|
||||
continue
|
||||
}
|
||||
|
||||
// Skip comments. Parse the formatted version.
|
||||
line := x.String()
|
||||
if line[0] == ';' {
|
||||
continue
|
||||
}
|
||||
items := strings.SplitN(line, "\t", 5)
|
||||
if len(items) < 5 {
|
||||
log.Fatalf("Too few items in: %v", line)
|
||||
}
|
||||
|
||||
target := items[4]
|
||||
|
||||
hdr := x.Header()
|
||||
nameFqdn := hdr.Name
|
||||
name := dnsutil.TrimDomainName(nameFqdn, zonenamedot)
|
||||
ttl := strconv.FormatUint(uint64(hdr.Ttl), 10)
|
||||
classStr := dns.ClassToString[hdr.Class]
|
||||
typeStr := dns.TypeToString[hdr.Rrtype]
|
||||
|
||||
// MX records should split out the prio vs. target.
|
||||
if hdr.Rrtype == dns.TypeMX {
|
||||
target = strings.Replace(target, " ", "\t", 1)
|
||||
}
|
||||
|
||||
if !dsl { // TSV format:
|
||||
fmt.Printf("%s\t%s\t%s\t%s\t%s\n", name, ttl, classStr, typeStr, target)
|
||||
} else { // DSL format:
|
||||
switch hdr.Rrtype {
|
||||
case dns.TypeMX:
|
||||
m := strings.SplitN(target, "\t", 2)
|
||||
target = m[0] + ", '" + m[1] + "'"
|
||||
case dns.TypeSOA:
|
||||
continue
|
||||
case dns.TypeTXT:
|
||||
// Leave target as-is.
|
||||
default:
|
||||
target = "'" + target + "'"
|
||||
}
|
||||
if hdr.Ttl == defaultTTL {
|
||||
ttl = ""
|
||||
} else {
|
||||
ttl = fmt.Sprintf(", TTL(%d)", hdr.Ttl)
|
||||
}
|
||||
fmt.Printf(",\n\t%s('%s', %s%s)", typeStr, name, target, ttl)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func main() {
|
||||
flag.Parse()
|
||||
zonename, filename, reader, err := parseargs(flag.Args())
|
||||
if err != nil {
|
||||
flag.Usage()
|
||||
}
|
||||
|
||||
defTTL := uint32(*flagDefaultTTL)
|
||||
|
||||
switch *flagMode {
|
||||
case "pretty":
|
||||
pretty(zonename, filename, reader, defTTL)
|
||||
case "dsl":
|
||||
fmt.Printf(`D("%s", %s, DnsProvider(%s)`, zonename, *flagRegText, *flagProviderText)
|
||||
rrFormat(zonename, filename, reader, defTTL, true)
|
||||
fmt.Println("\n)")
|
||||
case "tsv":
|
||||
rrFormat(zonename, filename, reader, defTTL, false)
|
||||
default:
|
||||
flag.Usage()
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
# zone2dnscontrol -- Converts a standard DNS zonefile into a DNS zone.
|
||||
|
||||
This script helps convert an old-style DNS zone file into the
|
||||
DNSControl language. It isn't perfect but it will do 99 percent
|
||||
of the work so you can focus on just fine-tuning it.
|
||||
|
||||
You must give the script both the zone name (i.e. "stackoverflow.com")
|
||||
and the filename of the zonefile to read.
|
||||
|
||||
Output is sent to stdout.
|
||||
|
||||
Example:
|
||||
|
||||
"""
|
||||
./zone2dnscontrol stackoverflow.com zone.stackoverflow.com
|
||||
"""
|
||||
|
||||
Caveats:
|
||||
|
||||
* TTLs are stripped out and/or ignored.
|
||||
* Comments must start on the beginning of the line.
|
||||
* `$INCLUDE` may not be handled correctly if you are not in the right directory.
|
||||
* `$GENERATE` is not handled at all.
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
BEGIN {
|
||||
print ""
|
||||
print "D('" domain ", FILL_IN_REGISTRAR, DnsProvider(FILL_IN_PROVIDER),"
|
||||
}
|
||||
|
||||
END {
|
||||
print "END)"
|
||||
}
|
||||
|
||||
$3 == "SOA" || $4 == "SOA" {
|
||||
next
|
||||
}
|
||||
|
||||
$3 == "A" || $3 == "CNAME" || $3 == "NS" {
|
||||
name = $1
|
||||
if (name == domain".") { name = "@" }
|
||||
print "\t" $3 "('" name "', '" $4 "')," ;
|
||||
next
|
||||
}
|
||||
|
||||
$3 == "MX" {
|
||||
name = $1
|
||||
if (name == domain".") { name = "@" }
|
||||
print "\tMX('" name "', " $4 ", '" $5 "')," ;
|
||||
next
|
||||
}
|
||||
|
||||
$3 == "TXT" {
|
||||
name = $1
|
||||
if (name == domain".") { name = "@" }
|
||||
$1 = "";
|
||||
$2 = "";
|
||||
$3 = "";
|
||||
print "\tTXT('" name "', " $0 ")," ;
|
||||
next
|
||||
}
|
||||
|
||||
{ print "UNKNOWN:" $0 }
|
||||
|
|
@ -1,147 +0,0 @@
|
|||
#!/usr/bin/perl
|
||||
# Copyright 2005 Thomas A. Limoncelli
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
|
||||
# canonzone [domain]
|
||||
# Purpose: Cannonicalize a zone file so that dumber scripts can have
|
||||
# an easier time parsing it.
|
||||
# Input: A real zone file with many formatting nasties.
|
||||
# Output: The zone file with one RR per line
|
||||
# $ORIGIN's removed
|
||||
# $TTL's removed
|
||||
# $INCLUDE's replaced with the file's contents
|
||||
# Lines that include TTL's have TTL's removed.
|
||||
# Lines that begin with whitespace turning into regular RR's
|
||||
# All hostnames turned into FQDN's (with exception listed below)
|
||||
# If a FQDN ends with [domain], it is removed.
|
||||
# Output in a strict format of:
|
||||
# HOSTNAME.domain.<TABS>IN<SPACE>TYPE<TAB>DATA\n
|
||||
# or for hosts in the [domain]:
|
||||
# HOSTNAME<TABS>IN<SPACE>TYPE<TAB>DATA\n
|
||||
#
|
||||
# Defaults:
|
||||
# If "domain" is left off the command line, we assume "bell-labs.com."
|
||||
|
||||
#
|
||||
# TODO:
|
||||
# Handle $GENERATE better. Include an option that expands the hosts.
|
||||
#
|
||||
|
||||
if ($ARGV[0] =~ /-n/) {
|
||||
shift @ARGV;
|
||||
$nostripend = 1;
|
||||
}
|
||||
|
||||
# our defaults
|
||||
$origin = 'cibernet.com.';
|
||||
$origin = shift @ARGV if defined($ARGV[0]);
|
||||
|
||||
$stripend = $origin; $stripend =~ s/(\.)/\\$1/g;
|
||||
#print STDERR "; $origin $stripend\n";
|
||||
|
||||
die "ARGV[1] $stripend does not end in ." unless $stripend =~ /\.$/;
|
||||
die "ARGV[1] $origin does not end in ." unless $origin =~ /\.$/;
|
||||
|
||||
# intialize things
|
||||
$defname = '';
|
||||
$host = '';
|
||||
#$noprevioushost = 1;
|
||||
|
||||
&doit(STDIN);
|
||||
|
||||
sub doit {
|
||||
local(*FILE) = @_;
|
||||
while (<FILE>) {
|
||||
|
||||
# process whitespace, comments, and continuations:
|
||||
chomp;
|
||||
# the order of the next three lines is very important
|
||||
s/^;.*//; # toss lines that start with a comment.
|
||||
next if /^\s*$/; # skip blank lines
|
||||
redo if ( /\(/ && ! /\)/ ) && ($_ .= <>); # handle continuations
|
||||
# BUG: This doesn't handle comments that start in the middle of the line.
|
||||
# Doing this would require handling quoted strings that include semicolons,
|
||||
# which is difficult.
|
||||
|
||||
# Handle the meta stuff:
|
||||
if (/^\$ORIGIN\s+/) { # handle the $ORIGIN statements
|
||||
($junk, $origin, @junk) = split;
|
||||
# $noprevioushost = 1;
|
||||
die "ORIGIN $origin does not end in ." unless $origin =~ /\.$/;
|
||||
chomp;
|
||||
next;
|
||||
} elsif (/^\$GENERATE\s+/) { # handle the $GENERATE statement
|
||||
s/\s+/ /g; # change whitespace to a single space
|
||||
print; print "\n";
|
||||
next;
|
||||
} elsif (/^\$TTL\s+/) { # handle the $TTL statement
|
||||
# do nothing
|
||||
next;
|
||||
} elsif (/^\$INCLUDE\s+/) { # handle the $INCLUDE statements
|
||||
($junk, $filename, @junk) = split;
|
||||
die "INCLUDE file doesn't exist" unless -f $filename;
|
||||
print "; INCLUDE BEGIN $filename\n";
|
||||
open(INCFILE, "<" . $filename) || die "Can not read $filename: $!";
|
||||
&doit(INCFILE);
|
||||
close INCFILE;
|
||||
print "; INCLUDE END $filename\n";
|
||||
next;
|
||||
} elsif (/^\$/) {
|
||||
die "ERROR1: I don't understand this \$ line: $_\n";
|
||||
}
|
||||
|
||||
# ASSERTION at this point we know the line is just a RR.
|
||||
|
||||
# if the line begins with whitespace, prepend the last host.
|
||||
# BUG: this may not handle "last host" across $INCLUDEs properly
|
||||
if (/^\s/) { # line begins with whitespace
|
||||
$_ = $defname . " " . $_;
|
||||
}
|
||||
|
||||
# Extract the host, type, and data from the RR:
|
||||
if (/(\S+)\s+(\d*)\s+IN\s+(\S+)\s+(.*)/i) { # host ttl IN rrtype data
|
||||
($h, $junk, $TYPE, $data) = ($1, $2, $3, $4);
|
||||
#print "readA: HOST:$h JUNK:$junk TYPE:$TYPE DATA:$data\n";
|
||||
} elsif (/(\S+)\s+IN\s+(\S+)\s+(.*)/i) { # host IN rrtype data
|
||||
($h, $TYPE, $data) = ($1, $2, $3);
|
||||
#print "readB: HOST:$h TYPE:$TYPE DATA:$data\n";
|
||||
} elsif (/(\S+)\s+(\S+)\s+(.*)/i) { # host IN rrtype data
|
||||
($h, $TYPE, $data) = ($1, $2, $3);
|
||||
#print "readC: HOST:$h TYPE:$TYPE DATA:$data\n";
|
||||
} else {
|
||||
die "ERROR2: I don't understand this line:\n$_\n";
|
||||
}
|
||||
|
||||
$h = $origin if $h eq '@'; # "@" is shorthand for the origin
|
||||
|
||||
# if the hostname is not a FQDN, append the $origin
|
||||
if ( $h =~ /\.$/ ) {
|
||||
$host = $h;
|
||||
} else {
|
||||
$host = $h . "." . $origin;
|
||||
}
|
||||
|
||||
$defname = $host; # record what will be the next line's default hostname
|
||||
|
||||
# remove the domain if we are stripping the zone:
|
||||
$host =~ s/\.$stripend$//i unless $nostripend;
|
||||
|
||||
# Format and print the RR:
|
||||
$TAB = ''; $TAB = "\t" if length($host) < 8;
|
||||
print "${host}\t${TAB}IN ${TYPE}\t$data\n";
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
#! /usr/bin/env bash
|
||||
|
||||
if [[ $# != 2 ]]; then
|
||||
echo "Usage: $0 zonename filename"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
./canonzone $1"." <$2 | awk -v domain="$1" -f ./awkfile.awk
|
||||
23
vendor/github.com/pkg/errors/LICENSE
generated
vendored
Normal file
23
vendor/github.com/pkg/errors/LICENSE
generated
vendored
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
Copyright (c) 2015, Dave Cheney <dave@cheney.net>
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
|
||||
* Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
52
vendor/github.com/pkg/errors/README.md
generated
vendored
Normal file
52
vendor/github.com/pkg/errors/README.md
generated
vendored
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
# errors [](https://travis-ci.org/pkg/errors) [](https://ci.appveyor.com/project/davecheney/errors/branch/master) [](http://godoc.org/github.com/pkg/errors) [](https://goreportcard.com/report/github.com/pkg/errors)
|
||||
|
||||
Package errors provides simple error handling primitives.
|
||||
|
||||
`go get github.com/pkg/errors`
|
||||
|
||||
The traditional error handling idiom in Go is roughly akin to
|
||||
```go
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
```
|
||||
which applied recursively up the call stack results in error reports without context or debugging information. The errors package allows programmers to add context to the failure path in their code in a way that does not destroy the original value of the error.
|
||||
|
||||
## Adding context to an error
|
||||
|
||||
The errors.Wrap function returns a new error that adds context to the original error. For example
|
||||
```go
|
||||
_, err := ioutil.ReadAll(r)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "read failed")
|
||||
}
|
||||
```
|
||||
## Retrieving the cause of an error
|
||||
|
||||
Using `errors.Wrap` constructs a stack of errors, adding context to the preceding error. Depending on the nature of the error it may be necessary to reverse the operation of errors.Wrap to retrieve the original error for inspection. Any error value which implements this interface can be inspected by `errors.Cause`.
|
||||
```go
|
||||
type causer interface {
|
||||
Cause() error
|
||||
}
|
||||
```
|
||||
`errors.Cause` will recursively retrieve the topmost error which does not implement `causer`, which is assumed to be the original cause. For example:
|
||||
```go
|
||||
switch err := errors.Cause(err).(type) {
|
||||
case *MyError:
|
||||
// handle specifically
|
||||
default:
|
||||
// unknown error
|
||||
}
|
||||
```
|
||||
|
||||
[Read the package documentation for more information](https://godoc.org/github.com/pkg/errors).
|
||||
|
||||
## Contributing
|
||||
|
||||
We welcome pull requests, bug fixes and issue reports. With that said, the bar for adding new symbols to this package is intentionally set high.
|
||||
|
||||
Before proposing a change, please discuss your change by raising an issue.
|
||||
|
||||
## Licence
|
||||
|
||||
BSD-2-Clause
|
||||
32
vendor/github.com/pkg/errors/appveyor.yml
generated
vendored
Normal file
32
vendor/github.com/pkg/errors/appveyor.yml
generated
vendored
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
version: build-{build}.{branch}
|
||||
|
||||
clone_folder: C:\gopath\src\github.com\pkg\errors
|
||||
shallow_clone: true # for startup speed
|
||||
|
||||
environment:
|
||||
GOPATH: C:\gopath
|
||||
|
||||
platform:
|
||||
- x64
|
||||
|
||||
# http://www.appveyor.com/docs/installed-software
|
||||
install:
|
||||
# some helpful output for debugging builds
|
||||
- go version
|
||||
- go env
|
||||
# pre-installed MinGW at C:\MinGW is 32bit only
|
||||
# but MSYS2 at C:\msys64 has mingw64
|
||||
- set PATH=C:\msys64\mingw64\bin;%PATH%
|
||||
- gcc --version
|
||||
- g++ --version
|
||||
|
||||
build_script:
|
||||
- go install -v ./...
|
||||
|
||||
test_script:
|
||||
- set PATH=C:\gopath\bin;%PATH%
|
||||
- go test -v ./...
|
||||
|
||||
#artifacts:
|
||||
# - path: '%GOPATH%\bin\*.exe'
|
||||
deploy: off
|
||||
269
vendor/github.com/pkg/errors/errors.go
generated
vendored
Normal file
269
vendor/github.com/pkg/errors/errors.go
generated
vendored
Normal file
|
|
@ -0,0 +1,269 @@
|
|||
// Package errors provides simple error handling primitives.
|
||||
//
|
||||
// The traditional error handling idiom in Go is roughly akin to
|
||||
//
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
//
|
||||
// which applied recursively up the call stack results in error reports
|
||||
// without context or debugging information. The errors package allows
|
||||
// programmers to add context to the failure path in their code in a way
|
||||
// that does not destroy the original value of the error.
|
||||
//
|
||||
// Adding context to an error
|
||||
//
|
||||
// The errors.Wrap function returns a new error that adds context to the
|
||||
// original error by recording a stack trace at the point Wrap is called,
|
||||
// and the supplied message. For example
|
||||
//
|
||||
// _, err := ioutil.ReadAll(r)
|
||||
// if err != nil {
|
||||
// return errors.Wrap(err, "read failed")
|
||||
// }
|
||||
//
|
||||
// If additional control is required the errors.WithStack and errors.WithMessage
|
||||
// functions destructure errors.Wrap into its component operations of annotating
|
||||
// an error with a stack trace and an a message, respectively.
|
||||
//
|
||||
// Retrieving the cause of an error
|
||||
//
|
||||
// Using errors.Wrap constructs a stack of errors, adding context to the
|
||||
// preceding error. Depending on the nature of the error it may be necessary
|
||||
// to reverse the operation of errors.Wrap to retrieve the original error
|
||||
// for inspection. Any error value which implements this interface
|
||||
//
|
||||
// type causer interface {
|
||||
// Cause() error
|
||||
// }
|
||||
//
|
||||
// can be inspected by errors.Cause. errors.Cause will recursively retrieve
|
||||
// the topmost error which does not implement causer, which is assumed to be
|
||||
// the original cause. For example:
|
||||
//
|
||||
// switch err := errors.Cause(err).(type) {
|
||||
// case *MyError:
|
||||
// // handle specifically
|
||||
// default:
|
||||
// // unknown error
|
||||
// }
|
||||
//
|
||||
// causer interface is not exported by this package, but is considered a part
|
||||
// of stable public API.
|
||||
//
|
||||
// Formatted printing of errors
|
||||
//
|
||||
// All error values returned from this package implement fmt.Formatter and can
|
||||
// be formatted by the fmt package. The following verbs are supported
|
||||
//
|
||||
// %s print the error. If the error has a Cause it will be
|
||||
// printed recursively
|
||||
// %v see %s
|
||||
// %+v extended format. Each Frame of the error's StackTrace will
|
||||
// be printed in detail.
|
||||
//
|
||||
// Retrieving the stack trace of an error or wrapper
|
||||
//
|
||||
// New, Errorf, Wrap, and Wrapf record a stack trace at the point they are
|
||||
// invoked. This information can be retrieved with the following interface.
|
||||
//
|
||||
// type stackTracer interface {
|
||||
// StackTrace() errors.StackTrace
|
||||
// }
|
||||
//
|
||||
// Where errors.StackTrace is defined as
|
||||
//
|
||||
// type StackTrace []Frame
|
||||
//
|
||||
// The Frame type represents a call site in the stack trace. Frame supports
|
||||
// the fmt.Formatter interface that can be used for printing information about
|
||||
// the stack trace of this error. For example:
|
||||
//
|
||||
// if err, ok := err.(stackTracer); ok {
|
||||
// for _, f := range err.StackTrace() {
|
||||
// fmt.Printf("%+s:%d", f)
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// stackTracer interface is not exported by this package, but is considered a part
|
||||
// of stable public API.
|
||||
//
|
||||
// See the documentation for Frame.Format for more details.
|
||||
package errors
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
)
|
||||
|
||||
// New returns an error with the supplied message.
|
||||
// New also records the stack trace at the point it was called.
|
||||
func New(message string) error {
|
||||
return &fundamental{
|
||||
msg: message,
|
||||
stack: callers(),
|
||||
}
|
||||
}
|
||||
|
||||
// Errorf formats according to a format specifier and returns the string
|
||||
// as a value that satisfies error.
|
||||
// Errorf also records the stack trace at the point it was called.
|
||||
func Errorf(format string, args ...interface{}) error {
|
||||
return &fundamental{
|
||||
msg: fmt.Sprintf(format, args...),
|
||||
stack: callers(),
|
||||
}
|
||||
}
|
||||
|
||||
// fundamental is an error that has a message and a stack, but no caller.
|
||||
type fundamental struct {
|
||||
msg string
|
||||
*stack
|
||||
}
|
||||
|
||||
func (f *fundamental) Error() string { return f.msg }
|
||||
|
||||
func (f *fundamental) Format(s fmt.State, verb rune) {
|
||||
switch verb {
|
||||
case 'v':
|
||||
if s.Flag('+') {
|
||||
io.WriteString(s, f.msg)
|
||||
f.stack.Format(s, verb)
|
||||
return
|
||||
}
|
||||
fallthrough
|
||||
case 's':
|
||||
io.WriteString(s, f.msg)
|
||||
case 'q':
|
||||
fmt.Fprintf(s, "%q", f.msg)
|
||||
}
|
||||
}
|
||||
|
||||
// WithStack annotates err with a stack trace at the point WithStack was called.
|
||||
// If err is nil, WithStack returns nil.
|
||||
func WithStack(err error) error {
|
||||
if err == nil {
|
||||
return nil
|
||||
}
|
||||
return &withStack{
|
||||
err,
|
||||
callers(),
|
||||
}
|
||||
}
|
||||
|
||||
type withStack struct {
|
||||
error
|
||||
*stack
|
||||
}
|
||||
|
||||
func (w *withStack) Cause() error { return w.error }
|
||||
|
||||
func (w *withStack) Format(s fmt.State, verb rune) {
|
||||
switch verb {
|
||||
case 'v':
|
||||
if s.Flag('+') {
|
||||
fmt.Fprintf(s, "%+v", w.Cause())
|
||||
w.stack.Format(s, verb)
|
||||
return
|
||||
}
|
||||
fallthrough
|
||||
case 's':
|
||||
io.WriteString(s, w.Error())
|
||||
case 'q':
|
||||
fmt.Fprintf(s, "%q", w.Error())
|
||||
}
|
||||
}
|
||||
|
||||
// Wrap returns an error annotating err with a stack trace
|
||||
// at the point Wrap is called, and the supplied message.
|
||||
// If err is nil, Wrap returns nil.
|
||||
func Wrap(err error, message string) error {
|
||||
if err == nil {
|
||||
return nil
|
||||
}
|
||||
err = &withMessage{
|
||||
cause: err,
|
||||
msg: message,
|
||||
}
|
||||
return &withStack{
|
||||
err,
|
||||
callers(),
|
||||
}
|
||||
}
|
||||
|
||||
// Wrapf returns an error annotating err with a stack trace
|
||||
// at the point Wrapf is call, and the format specifier.
|
||||
// If err is nil, Wrapf returns nil.
|
||||
func Wrapf(err error, format string, args ...interface{}) error {
|
||||
if err == nil {
|
||||
return nil
|
||||
}
|
||||
err = &withMessage{
|
||||
cause: err,
|
||||
msg: fmt.Sprintf(format, args...),
|
||||
}
|
||||
return &withStack{
|
||||
err,
|
||||
callers(),
|
||||
}
|
||||
}
|
||||
|
||||
// WithMessage annotates err with a new message.
|
||||
// If err is nil, WithMessage returns nil.
|
||||
func WithMessage(err error, message string) error {
|
||||
if err == nil {
|
||||
return nil
|
||||
}
|
||||
return &withMessage{
|
||||
cause: err,
|
||||
msg: message,
|
||||
}
|
||||
}
|
||||
|
||||
type withMessage struct {
|
||||
cause error
|
||||
msg string
|
||||
}
|
||||
|
||||
func (w *withMessage) Error() string { return w.msg + ": " + w.cause.Error() }
|
||||
func (w *withMessage) Cause() error { return w.cause }
|
||||
|
||||
func (w *withMessage) Format(s fmt.State, verb rune) {
|
||||
switch verb {
|
||||
case 'v':
|
||||
if s.Flag('+') {
|
||||
fmt.Fprintf(s, "%+v\n", w.Cause())
|
||||
io.WriteString(s, w.msg)
|
||||
return
|
||||
}
|
||||
fallthrough
|
||||
case 's', 'q':
|
||||
io.WriteString(s, w.Error())
|
||||
}
|
||||
}
|
||||
|
||||
// Cause returns the underlying cause of the error, if possible.
|
||||
// An error value has a cause if it implements the following
|
||||
// interface:
|
||||
//
|
||||
// type causer interface {
|
||||
// Cause() error
|
||||
// }
|
||||
//
|
||||
// If the error does not implement Cause, the original error will
|
||||
// be returned. If the error is nil, nil will be returned without further
|
||||
// investigation.
|
||||
func Cause(err error) error {
|
||||
type causer interface {
|
||||
Cause() error
|
||||
}
|
||||
|
||||
for err != nil {
|
||||
cause, ok := err.(causer)
|
||||
if !ok {
|
||||
break
|
||||
}
|
||||
err = cause.Cause()
|
||||
}
|
||||
return err
|
||||
}
|
||||
178
vendor/github.com/pkg/errors/stack.go
generated
vendored
Normal file
178
vendor/github.com/pkg/errors/stack.go
generated
vendored
Normal file
|
|
@ -0,0 +1,178 @@
|
|||
package errors
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"path"
|
||||
"runtime"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// Frame represents a program counter inside a stack frame.
|
||||
type Frame uintptr
|
||||
|
||||
// pc returns the program counter for this frame;
|
||||
// multiple frames may have the same PC value.
|
||||
func (f Frame) pc() uintptr { return uintptr(f) - 1 }
|
||||
|
||||
// file returns the full path to the file that contains the
|
||||
// function for this Frame's pc.
|
||||
func (f Frame) file() string {
|
||||
fn := runtime.FuncForPC(f.pc())
|
||||
if fn == nil {
|
||||
return "unknown"
|
||||
}
|
||||
file, _ := fn.FileLine(f.pc())
|
||||
return file
|
||||
}
|
||||
|
||||
// line returns the line number of source code of the
|
||||
// function for this Frame's pc.
|
||||
func (f Frame) line() int {
|
||||
fn := runtime.FuncForPC(f.pc())
|
||||
if fn == nil {
|
||||
return 0
|
||||
}
|
||||
_, line := fn.FileLine(f.pc())
|
||||
return line
|
||||
}
|
||||
|
||||
// Format formats the frame according to the fmt.Formatter interface.
|
||||
//
|
||||
// %s source file
|
||||
// %d source line
|
||||
// %n function name
|
||||
// %v equivalent to %s:%d
|
||||
//
|
||||
// Format accepts flags that alter the printing of some verbs, as follows:
|
||||
//
|
||||
// %+s path of source file relative to the compile time GOPATH
|
||||
// %+v equivalent to %+s:%d
|
||||
func (f Frame) Format(s fmt.State, verb rune) {
|
||||
switch verb {
|
||||
case 's':
|
||||
switch {
|
||||
case s.Flag('+'):
|
||||
pc := f.pc()
|
||||
fn := runtime.FuncForPC(pc)
|
||||
if fn == nil {
|
||||
io.WriteString(s, "unknown")
|
||||
} else {
|
||||
file, _ := fn.FileLine(pc)
|
||||
fmt.Fprintf(s, "%s\n\t%s", fn.Name(), file)
|
||||
}
|
||||
default:
|
||||
io.WriteString(s, path.Base(f.file()))
|
||||
}
|
||||
case 'd':
|
||||
fmt.Fprintf(s, "%d", f.line())
|
||||
case 'n':
|
||||
name := runtime.FuncForPC(f.pc()).Name()
|
||||
io.WriteString(s, funcname(name))
|
||||
case 'v':
|
||||
f.Format(s, 's')
|
||||
io.WriteString(s, ":")
|
||||
f.Format(s, 'd')
|
||||
}
|
||||
}
|
||||
|
||||
// StackTrace is stack of Frames from innermost (newest) to outermost (oldest).
|
||||
type StackTrace []Frame
|
||||
|
||||
func (st StackTrace) Format(s fmt.State, verb rune) {
|
||||
switch verb {
|
||||
case 'v':
|
||||
switch {
|
||||
case s.Flag('+'):
|
||||
for _, f := range st {
|
||||
fmt.Fprintf(s, "\n%+v", f)
|
||||
}
|
||||
case s.Flag('#'):
|
||||
fmt.Fprintf(s, "%#v", []Frame(st))
|
||||
default:
|
||||
fmt.Fprintf(s, "%v", []Frame(st))
|
||||
}
|
||||
case 's':
|
||||
fmt.Fprintf(s, "%s", []Frame(st))
|
||||
}
|
||||
}
|
||||
|
||||
// stack represents a stack of program counters.
|
||||
type stack []uintptr
|
||||
|
||||
func (s *stack) Format(st fmt.State, verb rune) {
|
||||
switch verb {
|
||||
case 'v':
|
||||
switch {
|
||||
case st.Flag('+'):
|
||||
for _, pc := range *s {
|
||||
f := Frame(pc)
|
||||
fmt.Fprintf(st, "\n%+v", f)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (s *stack) StackTrace() StackTrace {
|
||||
f := make([]Frame, len(*s))
|
||||
for i := 0; i < len(f); i++ {
|
||||
f[i] = Frame((*s)[i])
|
||||
}
|
||||
return f
|
||||
}
|
||||
|
||||
func callers() *stack {
|
||||
const depth = 32
|
||||
var pcs [depth]uintptr
|
||||
n := runtime.Callers(3, pcs[:])
|
||||
var st stack = pcs[0:n]
|
||||
return &st
|
||||
}
|
||||
|
||||
// funcname removes the path prefix component of a function's name reported by func.Name().
|
||||
func funcname(name string) string {
|
||||
i := strings.LastIndex(name, "/")
|
||||
name = name[i+1:]
|
||||
i = strings.Index(name, ".")
|
||||
return name[i+1:]
|
||||
}
|
||||
|
||||
func trimGOPATH(name, file string) string {
|
||||
// Here we want to get the source file path relative to the compile time
|
||||
// GOPATH. As of Go 1.6.x there is no direct way to know the compiled
|
||||
// GOPATH at runtime, but we can infer the number of path segments in the
|
||||
// GOPATH. We note that fn.Name() returns the function name qualified by
|
||||
// the import path, which does not include the GOPATH. Thus we can trim
|
||||
// segments from the beginning of the file path until the number of path
|
||||
// separators remaining is one more than the number of path separators in
|
||||
// the function name. For example, given:
|
||||
//
|
||||
// GOPATH /home/user
|
||||
// file /home/user/src/pkg/sub/file.go
|
||||
// fn.Name() pkg/sub.Type.Method
|
||||
//
|
||||
// We want to produce:
|
||||
//
|
||||
// pkg/sub/file.go
|
||||
//
|
||||
// From this we can easily see that fn.Name() has one less path separator
|
||||
// than our desired output. We count separators from the end of the file
|
||||
// path until it finds two more than in the function name and then move
|
||||
// one character forward to preserve the initial path segment without a
|
||||
// leading separator.
|
||||
const sep = "/"
|
||||
goal := strings.Count(name, sep) + 2
|
||||
i := len(file)
|
||||
for n := 0; n < goal; n++ {
|
||||
i = strings.LastIndex(file[:i], sep)
|
||||
if i == -1 {
|
||||
// not enough separators found, set i so that the slice expression
|
||||
// below leaves file unmodified
|
||||
i = -len(sep)
|
||||
break
|
||||
}
|
||||
}
|
||||
// get back to 0 or trim the leading separator
|
||||
file = file[i+len(sep):]
|
||||
return file
|
||||
}
|
||||
6
vendor/vendor.json
vendored
6
vendor/vendor.json
vendored
|
|
@ -248,6 +248,12 @@
|
|||
"revision": "703e8aee0a5417c480f8d6a3f072c9eb4f8904ea",
|
||||
"revisionTime": "2017-01-12T13:50:19Z"
|
||||
},
|
||||
{
|
||||
"checksumSHA1": "ynJSWoF6v+3zMnh9R0QmmG6iGV8=",
|
||||
"path": "github.com/pkg/errors",
|
||||
"revision": "ff09b135c25aae272398c51a07235b90a75aa4f0",
|
||||
"revisionTime": "2017-03-16T20:15:38Z"
|
||||
},
|
||||
{
|
||||
"checksumSHA1": "nS4kKHjMlJpQg3sixqelpCg1jyk=",
|
||||
"path": "github.com/prasmussen/gandi-api/client",
|
||||
|
|
|
|||
Loading…
Reference in a new issue