all: gometalinter (#843)

* kubernetes/reverse: remove deadcode
* deadcode in errors and kubernetes removed
* unnecessary conversion
* constants
* proxy: time.Since()
* simplications
* static check
* Disable test/external_test
This commit is contained in:
Miek Gieben
2017-08-06 05:54:24 -07:00
committed by GitHub
parent 964f04f443
commit bcb2eb1ecc
25 changed files with 105 additions and 150 deletions

View File

@@ -37,20 +37,21 @@ func (rule *edns0NsidRule) Rewrite(r *dns.Msg) Result {
result := RewriteIgnored
o := setupEdns0Opt(r)
found := false
Option:
for _, s := range o.Option {
switch e := s.(type) {
case *dns.EDNS0_NSID:
if rule.action == "replace" || rule.action == "set" {
if rule.action == Replace || rule.action == Set {
e.Nsid = "" // make sure it is empty for request
result = RewriteDone
}
found = true
break
break Option
}
}
// add option if not found
if !found && (rule.action == "append" || rule.action == "set") {
if !found && (rule.action == Append || rule.action == Set) {
o.SetDo(true)
o.Option = append(o.Option, &dns.EDNS0_NSID{Code: dns.EDNS0NSID, Nsid: ""})
result = RewriteDone
@@ -68,7 +69,7 @@ func (rule *edns0LocalRule) Rewrite(r *dns.Msg) Result {
switch e := s.(type) {
case *dns.EDNS0_LOCAL:
if rule.code == e.Code {
if rule.action == "replace" || rule.action == "set" {
if rule.action == Replace || rule.action == Set {
e.Data = rule.data
result = RewriteDone
}
@@ -79,7 +80,7 @@ func (rule *edns0LocalRule) Rewrite(r *dns.Msg) Result {
}
// add option if not found
if !found && (rule.action == "append" || rule.action == "set") {
if !found && (rule.action == Append || rule.action == Set) {
o.SetDo(true)
var opt dns.EDNS0_LOCAL
opt.Code = rule.code
@@ -100,9 +101,9 @@ func newEdns0Rule(args ...string) (Rule, error) {
ruleType := strings.ToLower(args[0])
action := strings.ToLower(args[1])
switch action {
case "append":
case "replace":
case "set":
case Append:
case Replace:
case Set:
default:
return nil, fmt.Errorf("invalid action: %q", action)
}
@@ -139,3 +140,10 @@ func newEdns0LocalRule(action, code, data string) (*edns0LocalRule, error) {
return &edns0LocalRule{action: action, code: uint16(c), data: decoded}, nil
}
// These are all defined actions.
const (
Replace = "replace"
Set = "set"
Append = "append"
)