2 files changed, 0 insertions, 296 deletions
diff --git a/middleware/kubernetes/msg/service.go b/middleware/kubernetes/msg/service.go
deleted file mode 100644
index 24af6b4fd..000000000
--- a/middleware/kubernetes/msg/service.go
+++ /dev/null
@@ -1,171 +0,0 @@
-package msg
-
-import (
-	"net"
-	"strings"
-
-	"github.com/miekg/dns"
-)
-
-// This *is* the rdata from a SRV record, but with a twist.
-// Host (Target in SRV) must be a domain name, but if it looks like an IP
-// address (4/6), we will treat it like an IP address.
-type Service struct {
-	Host     string `json:"host,omitempty"`
-	Port     int    `json:"port,omitempty"`
-	Priority int    `json:"priority,omitempty"`
-	Weight   int    `json:"weight,omitempty"`
-	Text     string `json:"text,omitempty"`
-	Mail     bool   `json:"mail,omitempty"` // Be an MX record. Priority becomes Preference.
-	Ttl      uint32 `json:"ttl,omitempty"`
-
-	// When a SRV record with a "Host: IP-address" is added, we synthesize
-	// a srv.Target domain name.  Normally we convert the full Key where
-	// the record lives to a DNS name and use this as the srv.Target.  When
-	// TargetStrip > 0 we strip the left most TargetStrip labels from the
-	// DNS name.
-	TargetStrip int `json:"targetstrip,omitempty"`
-
-	// Group is used to group (or *not* to group) different services
-	// together. Services with an identical Group are returned in the same
-	// answer.
-	Group string `json:"group,omitempty"`
-
-	// Etcd key where we found this service and ignored from json un-/marshalling
-	Key string `json:"-"`
-}
-
-// NewSRV returns a new SRV record based on the Service.
-func (s *Service) NewSRV(name string, weight uint16) *dns.SRV {
-	host := targetStrip(dns.Fqdn(s.Host), s.TargetStrip)
-
-	return &dns.SRV{Hdr: dns.RR_Header{Name: name, Rrtype: dns.TypeSRV, Class: dns.ClassINET, Ttl: s.Ttl},
-		Priority: uint16(s.Priority), Weight: weight, Port: uint16(s.Port), Target: dns.Fqdn(host)}
-}
-
-// NewMX returns a new MX record based on the Service.
-func (s *Service) NewMX(name string) *dns.MX {
-	host := targetStrip(dns.Fqdn(s.Host), s.TargetStrip)
-
-	return &dns.MX{Hdr: dns.RR_Header{Name: name, Rrtype: dns.TypeMX, Class: dns.ClassINET, Ttl: s.Ttl},
-		Preference: uint16(s.Priority), Mx: host}
-}
-
-// NewA returns a new A record based on the Service.
-func (s *Service) NewA(name string, ip net.IP) *dns.A {
-	return &dns.A{Hdr: dns.RR_Header{Name: name, Rrtype: dns.TypeA, Class: dns.ClassINET, Ttl: s.Ttl}, A: ip}
-}
-
-// NewAAAA returns a new AAAA record based on the Service.
-func (s *Service) NewAAAA(name string, ip net.IP) *dns.AAAA {
-	return &dns.AAAA{Hdr: dns.RR_Header{Name: name, Rrtype: dns.TypeAAAA, Class: dns.ClassINET, Ttl: s.Ttl}, AAAA: ip}
-}
-
-// NewCNAME returns a new CNAME record based on the Service.
-func (s *Service) NewCNAME(name string, target string) *dns.CNAME {
-	return &dns.CNAME{Hdr: dns.RR_Header{Name: name, Rrtype: dns.TypeCNAME, Class: dns.ClassINET, Ttl: s.Ttl}, Target: dns.Fqdn(target)}
-}
-
-// NewTXT returns a new TXT record based on the Service.
-func (s *Service) NewTXT(name string) *dns.TXT {
-	return &dns.TXT{Hdr: dns.RR_Header{Name: name, Rrtype: dns.TypeTXT, Class: dns.ClassINET, Ttl: s.Ttl}, Txt: split255(s.Text)}
-}
-
-// NewNS returns a new NS record based on the Service.
-func (s *Service) NewNS(name string) *dns.NS {
-	host := targetStrip(dns.Fqdn(s.Host), s.TargetStrip)
-	return &dns.NS{Hdr: dns.RR_Header{Name: name, Rrtype: dns.TypeNS, Class: dns.ClassINET, Ttl: s.Ttl}, Ns: host}
-}
-
-// NewPTR returns a new PTR record based on the Service.
-func (s *Service) NewPTR(name string, target string) *dns.PTR {
-	return &dns.PTR{Hdr: dns.RR_Header{Name: name, Rrtype: dns.TypePTR, Class: dns.ClassINET, Ttl: s.Ttl}, Ptr: dns.Fqdn(target)}
-}
-
-// Group checks the services in sx, it looks for a Group attribute on the shortest
-// keys. If there are multiple shortest keys *and* the group attribute disagrees (and
-// is not empty), we don't consider it a group.
-// If a group is found, only services with *that* group (or no group) will be returned.
-func Group(sx []Service) []Service {
-	if len(sx) == 0 {
-		return sx
-	}
-
-	// Shortest key with group attribute sets the group for this set.
-	group := sx[0].Group
-	slashes := strings.Count(sx[0].Key, "/")
-	length := make([]int, len(sx))
-	for i, s := range sx {
-		x := strings.Count(s.Key, "/")
-		length[i] = x
-		if x < slashes {
-			if s.Group == "" {
-				break
-			}
-			slashes = x
-			group = s.Group
-		}
-	}
-
-	if group == "" {
-		return sx
-	}
-
-	ret := []Service{} // with slice-tricks in sx we can prolly save this allocation (TODO)
-
-	for i, s := range sx {
-		if s.Group == "" {
-			ret = append(ret, s)
-			continue
-		}
-
-		// Disagreement on the same level
-		if length[i] == slashes && s.Group != group {
-			return sx
-		}
-
-		if s.Group == group {
-			ret = append(ret, s)
-		}
-	}
-	return ret
-}
-
-// Split255 splits a string into 255 byte chunks.
-func split255(s string) []string {
-	if len(s) < 255 {
-		return []string{s}
-	}
-	sx := []string{}
-	p, i := 0, 255
-	for {
-		if i <= len(s) {
-			sx = append(sx, s[p:i])
-		} else {
-			sx = append(sx, s[p:])
-			break
-
-		}
-		p, i = p+255, i+255
-	}
-
-	return sx
-}
-
-// targetStrip strips "targetstrip" labels from the left side of the fully qualified name.
-func targetStrip(name string, targetStrip int) string {
-	if targetStrip == 0 {
-		return name
-	}
-
-	offset, end := 0, false
-	for i := 0; i < targetStrip; i++ {
-		offset, end = dns.NextLabel(name, offset)
-	}
-	if end {
-		// We overshot the name, use the orignal one.
-		offset = 0
-	}
-	name = name[offset:]
-	return name
-}
diff --git a/middleware/kubernetes/msg/service_test.go b/middleware/kubernetes/msg/service_test.go
deleted file mode 100644
index 0c19ba95b..000000000
--- a/middleware/kubernetes/msg/service_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package msg
-
-import "testing"
-
-func TestSplit255(t *testing.T) {
-	xs := split255("abc")
-	if len(xs) != 1 && xs[0] != "abc" {
-		t.Errorf("Failure to split abc")
-	}
-	s := ""
-	for i := 0; i < 255; i++ {
-		s += "a"
-	}
-	xs = split255(s)
-	if len(xs) != 1 && xs[0] != s {
-		t.Errorf("failure to split 255 char long string")
-	}
-	s += "b"
-	xs = split255(s)
-	if len(xs) != 2 || xs[1] != "b" {
-		t.Errorf("failure to split 256 char long string: %d", len(xs))
-	}
-	for i := 0; i < 255; i++ {
-		s += "a"
-	}
-	xs = split255(s)
-	if len(xs) != 3 || xs[2] != "a" {
-		t.Errorf("failure to split 510 char long string: %d", len(xs))
-	}
-}
-
-func TestGroup(t *testing.T) {
-	// Key are in the wrong order, but for this test it does not matter.
-	sx := Group(
-		[]Service{
-			{Host: "127.0.0.1", Group: "g1", Key: "b/sub/dom1/skydns/test"},
-			{Host: "127.0.0.2", Group: "g2", Key: "a/dom1/skydns/test"},
-		},
-	)
-	// Expecting to return the shortest key with a Group attribute.
-	if len(sx) != 1 {
-		t.Fatalf("failure to group zeroth set: %v", sx)
-	}
-	if sx[0].Key != "a/dom1/skydns/test" {
-		t.Fatalf("failure to group zeroth set: %v, wrong Key", sx)
-	}
-
-	// Groups disagree, so we will not do anything.
-	sx = Group(
-		[]Service{
-			{Host: "server1", Group: "g1", Key: "region1/skydns/test"},
-			{Host: "server2", Group: "g2", Key: "region1/skydns/test"},
-		},
-	)
-	if len(sx) != 2 {
-		t.Fatalf("failure to group first set: %v", sx)
-	}
-
-	// Group is g1, include only the top-level one.
-	sx = Group(
-		[]Service{
-			{Host: "server1", Group: "g1", Key: "a/dom/region1/skydns/test"},
-			{Host: "server2", Group: "g2", Key: "a/subdom/dom/region1/skydns/test"},
-		},
-	)
-	if len(sx) != 1 {
-		t.Fatalf("failure to group second set: %v", sx)
-	}
-
-	// Groupless services must be included.
-	sx = Group(
-		[]Service{
-			{Host: "server1", Group: "g1", Key: "a/dom/region1/skydns/test"},
-			{Host: "server2", Group: "g2", Key: "a/subdom/dom/region1/skydns/test"},
-			{Host: "server2", Group: "", Key: "b/subdom/dom/region1/skydns/test"},
-		},
-	)
-	if len(sx) != 2 {
-		t.Fatalf("failure to group third set: %v", sx)
-	}
-
-	// Empty group on the highest level: include that one also.
-	sx = Group(
-		[]Service{
-			{Host: "server1", Group: "g1", Key: "a/dom/region1/skydns/test"},
-			{Host: "server1", Group: "", Key: "b/dom/region1/skydns/test"},
-			{Host: "server2", Group: "g2", Key: "a/subdom/dom/region1/skydns/test"},
-		},
-	)
-	if len(sx) != 2 {
-		t.Fatalf("failure to group fourth set: %v", sx)
-	}
-
-	// Empty group on the highest level: include that one also, and the rest.
-	sx = Group(
-		[]Service{
-			{Host: "server1", Group: "g5", Key: "a/dom/region1/skydns/test"},
-			{Host: "server1", Group: "", Key: "b/dom/region1/skydns/test"},
-			{Host: "server2", Group: "g5", Key: "a/subdom/dom/region1/skydns/test"},
-		},
-	)
-	if len(sx) != 3 {
-		t.Fatalf("failure to group fith set: %v", sx)
-	}
-
-	// One group.
-	sx = Group(
-		[]Service{
-			{Host: "server1", Group: "g6", Key: "a/dom/region1/skydns/test"},
-		},
-	)
-	if len(sx) != 1 {
-		t.Fatalf("failure to group sixth set: %v", sx)
-	}
-
-	// No group, once service
-	sx = Group(
-		[]Service{
-			{Host: "server1", Key: "a/dom/region1/skydns/test"},
-		},
-	)
-	if len(sx) != 1 {
-		t.Fatalf("failure to group seventh set: %v", sx)
-	}
-}