domainToPath and domainToPathPfx rewrite namers

Sarah Brown · Sarah Brown · commit ff1b849e6362 · 2016-02-08T09:21:17.000-08:00
diff --git a/linkerd/admin/src/main/scala/io/buoyant/linkerd/admin/AdminInitializer.scala b/linkerd/admin/src/main/scala/io/buoyant/linkerd/admin/AdminInitializer.scala
@@ -10,6 +10,7 @@ import com.twitter.util.Monitor
 import io.buoyant.linkerd.Admin
 import io.buoyant.linkerd.Admin.AdminPort
 import java.net.InetSocketAddress
+import scala.util.Properties
 
 class AdminInitializer(admin: Admin, svc: Service[Request, Response]) {
 
@@ -22,6 +23,7 @@ class AdminInitializer(admin: Admin, svc: Service[Request, Response]) {
     val loggingMonitor = new Monitor {
       def handle(exc: Throwable): Boolean = {
         log.log(Level.ERROR, s"Caught exception in AdminInitializer: $exc", exc)
+        log.log(Level.ERROR, exc.getStackTrace().mkString("", Properties.lineSeparator, Properties.lineSeparator))
         false
       }
     }
diff --git a/router/http/src/main/scala/io/buoyant/http/namer.scala b/router/http/src/main/scala/io/buoyant/http/namer.scala
@@ -135,6 +135,40 @@ class subdomainOfPfx extends RewritingNamer {
   }
 }
 
+/**
+ * A rewriting namer that accepts names in the form:
+ *
+ *   /foo.buoyant.io/resource/name
+ *
+ * and rewrites to:
+ *
+ *   /io/buoyant/foo/resource/name
+ */
+class domainToPath extends RewritingNamer {
+  protected[this] def rewrite(path: Path) = path.take(1) match {
+    case Path.Utf8(host@Match.host()) =>
+      Some(Path.Utf8(host.split("\\.").reverse: _*) ++ path.drop(1))
+    case _ => None
+  }
+}
+
+/**
+ * A rewriting namer that accepts names in the form:
+ *
+ *   /pfx/foo.buoyant.io/resource/name
+ *
+ * and rewrites to:
+ *
+ *   /pfx/io/buoyant/foo/resource/name
+ */
+class domainToPathPfx extends RewritingNamer {
+  protected[this] def rewrite(path: Path) = path.take(2) match {
+    case Path.Utf8(pfx, host@Match.host()) =>
+      Some(Path.Utf8(pfx +: host.split("\\.").reverse: _*) ++ path.drop(2))
+    case _ => None
+  }
+}
+
 /**
  * A service namer that accepts names in the form:
  *
diff --git a/router/http/src/test/scala/io/buoyant/http/NamerTest.scala b/router/http/src/test/scala/io/buoyant/http/NamerTest.scala
@@ -61,6 +61,16 @@ class NamerTest extends FunSuite with Awaits {
     assert(lookup(path) == NameTree.Leaf(Name.Path(Path.Utf8("foo", "bar", "bah"))))
   }
 
+  test("domainToPath") {
+    val path = Path.read("/$/io.buoyant.http.domainToPath/foo.buoyant.io")
+    assert(lookup(path) == NameTree.Leaf(Name.Path(Path.Utf8("io", "buoyant", "foo"))))
+  }
+
+  test("domainToPathPfx") {
+    val path = Path.read("/$/io.buoyant.http.domainToPathPfx/pfx/foo.buoyant.io")
+    assert(lookup(path) == NameTree.Leaf(Name.Path(Path.Utf8("pfx", "io", "buoyant", "foo"))))
+  }
+
   test("status") {
     val client = Http.newService("/$/io.buoyant.http.status/401/foo/bar.a.b/bah")
     val rsp = await(client(Request()))

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import com.twitter.util.Monitor`
`10`	`10`	`import io.buoyant.linkerd.Admin`
`11`	`11`	`import io.buoyant.linkerd.Admin.AdminPort`
`12`	`12`	`import java.net.InetSocketAddress`
	`13`	`+import scala.util.Properties`
`13`	`14`
`14`	`15`	`class AdminInitializer(admin: Admin, svc: Service[Request, Response]) {`
`15`	`16`
`@@ -22,6 +23,7 @@ class AdminInitializer(admin: Admin, svc: Service[Request, Response]) {`
`22`	`23`	`val loggingMonitor = new Monitor {`
`23`	`24`	`def handle(exc: Throwable): Boolean = {`
`24`	`25`	`log.log(Level.ERROR, s"Caught exception in AdminInitializer: $exc", exc)`
	`26`	`+ log.log(Level.ERROR, exc.getStackTrace().mkString("", Properties.lineSeparator, Properties.lineSeparator))`
`25`	`27`	`false`
`26`	`28`	`}`
`27`	`29`	`}`